[cincinnatirb/cincyrb] 9d7fee: adding oath gem

[Ben Stafford]

Branch: refs/heads/campbecf-twitterfix
Home: https://github.com/cincinnatirb/cincyrb
Commit: 9d7fee74a832bcc493353c0d9aa0421c4221ca29
https://github.com/cincinnatirb/cincyrb/commit/9d7fee74a832bcc493353c0d9aa0421c4221ca29
Author: Cliff Campbell <cliff.c...@crakn.net>
Date: 2015-03-17 (Tue, 17 Mar 2015)

Changed paths:
M Gemfile
M Gemfile.lock

Log Message:
-----------
adding oath gem


Commit: 7a41cac6c98f6bb5d1efed6d37726455cd3674a3
https://github.com/cincinnatirb/cincyrb/commit/7a41cac6c98f6bb5d1efed6d37726455cd3674a3
Author: Cliff Campbell <cliff.c...@crakn.net>
Date: 2015-03-17 (Tue, 17 Mar 2015)

Changed paths:
A app/assets/javascripts/twitter.js.coffee
M app/assets/javascripts/views/meetings.coffee
A app/assets/stylesheets/twitter.css.scss
A app/controllers/twitter_controller.rb
A app/helpers/twitter_helper.rb
A app/views/twitter/timeline.html.haml
M config/routes.rb
A spec/controllers/twitter_controller_spec.rb
A spec/helpers/twitter_helper_spec.rb
A spec/views/twitter/timeline.html.haml_spec.rb

Log Message:
-----------
Fixing Twitter API integration, 1.1 requires oauth. I've configured an application key for use. May need help on setting up tests for the new code.


Commit: c8717d9a6501fee5cb95732fa9b1fc6eadcfc2b4
https://github.com/cincinnatirb/cincyrb/commit/c8717d9a6501fee5cb95732fa9b1fc6eadcfc2b4
Author: Cliff Campbell <cliff.c...@crakn.net>
Date: 2015-03-18 (Wed, 18 Mar 2015)

Changed paths:
A vendor/cache/oauth-0.4.7.gem

Log Message:
-----------
adding vendor cache for oath


Commit: 30e1955542bcedc09c5f13fa92abe8ddb26964f1
https://github.com/cincinnatirb/cincyrb/commit/30e1955542bcedc09c5f13fa92abe8ddb26964f1
Author: Cliff Campbell <cliff.c...@crakn.net>
Date: 2015-03-18 (Wed, 18 Mar 2015)

Changed paths:
A spec/cassettes/twitter.yml
M spec/controllers/twitter_controller_spec.rb

Log Message:
-----------
fixing tests for Twitter to use VCR


Commit: 95ac7ba6d97574dee7ee30e257b9190bca913f2e
https://github.com/cincinnatirb/cincyrb/commit/95ac7ba6d97574dee7ee30e257b9190bca913f2e
Author: Ben Stafford <bendst...@gmail.com>
Date: 2017-10-17 (Tue, 17 Oct 2017)

Changed paths:
M Gemfile
M Gemfile.lock
A app/assets/javascripts/twitter.js.coffee
M app/assets/javascripts/views/meetings.coffee
A app/assets/stylesheets/twitter.css.scss
A app/controllers/twitter_controller.rb
A app/helpers/twitter_helper.rb
A app/views/twitter/timeline.html.haml
M config/routes.rb
A spec/cassettes/twitter.yml
A spec/controllers/twitter_controller_spec.rb
A spec/helpers/twitter_helper_spec.rb
A spec/views/twitter/timeline.html.haml_spec.rb
A vendor/cache/oauth-0.4.7.gem

Log Message:
-----------
Resolve conflicts


Compare: https://github.com/cincinnatirb/cincyrb/compare/9d7fee74a832^...95ac7ba6d975

[Ben Stafford]

Branch: refs/heads/master

Commit: 511c37641a771d975d722965fecbf58ae6796ab0
https://github.com/cincinnatirb/cincyrb/commit/511c37641a771d975d722965fecbf58ae6796ab0

Author: Ben Stafford <bendst...@gmail.com>
Date: 2017-10-17 (Tue, 17 Oct 2017)

Changed paths:
M Gemfile
M Gemfile.lock
A app/assets/javascripts/twitter.js.coffee
M app/assets/javascripts/views/meetings.coffee
A app/assets/stylesheets/twitter.css.scss
A app/controllers/twitter_controller.rb
A app/helpers/twitter_helper.rb
A app/views/twitter/timeline.html.haml
M config/routes.rb
A spec/cassettes/twitter.yml
A spec/controllers/twitter_controller_spec.rb
A spec/helpers/twitter_helper_spec.rb
A spec/views/twitter/timeline.html.haml_spec.rb
A vendor/cache/oauth-0.4.7.gem

Log Message:
-----------

Merge branch 'campbecf-twitterfix'


Compare: https://github.com/cincinnatirb/cincyrb/compare/8680f7e414ab...511c37641a77