Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source :rubygems

gem 'rails', '3.2.7'
gem 'rails', '3.2.17'
gem 'pg', '0.14.0'
gem 'omniauth-twitter'
gem 'twitter_oauth', '~> 0.4.3'
Expand Down
102 changes: 52 additions & 50 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
GEM
remote: http://rubygems.org/
specs:
actionmailer (3.2.7)
actionpack (= 3.2.7)
mail (~> 2.4.4)
actionpack (3.2.7)
activemodel (= 3.2.7)
activesupport (= 3.2.7)
actionmailer (3.2.17)
actionpack (= 3.2.17)
mail (~> 2.5.4)
actionpack (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.0)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.3)
activemodel (3.2.7)
activesupport (= 3.2.7)
sprockets (~> 2.2.1)
activemodel (3.2.17)
activesupport (= 3.2.17)
builder (~> 3.0.0)
activerecord (3.2.7)
activemodel (= 3.2.7)
activesupport (= 3.2.7)
activerecord (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.7)
activemodel (= 3.2.7)
activesupport (= 3.2.7)
activesupport (3.2.7)
i18n (~> 0.6)
activeresource (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
activesupport (3.2.17)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.3.2)
annotate (2.5.0)
rake
arel (3.0.2)
builder (3.0.0)
arel (3.0.3)
builder (3.0.4)
capybara (1.1.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
Expand All @@ -56,6 +56,7 @@ GEM
sass (~> 3.1)
compass-rails (1.0.3)
compass (>= 0.12.2, < 0.14)
concurrent-ruby (1.1.5)
database_cleaner (0.8.0)
diff-lcs (1.1.3)
erubis (2.7.0)
Expand All @@ -76,13 +77,14 @@ GEM
spork (>= 0.8.4)
haml (3.1.6)
hashie (1.2.0)
hike (1.2.1)
i18n (0.6.0)
hike (1.2.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
journey (1.0.4)
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
json (1.7.4)
json (1.8.6)
kaminari (0.13.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
Expand All @@ -95,12 +97,11 @@ GEM
rb-fchange (~> 0.0.5)
rb-fsevent (~> 0.9.1)
rb-inotify (~> 0.8.8)
mail (2.4.4)
i18n (>= 0.4.0)
mail (2.5.5)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
multi_json (1.3.6)
mime-types (1.25.1)
multi_json (1.14.1)
nokogiri (1.5.5)
oauth (0.4.6)
omniauth (1.1.0)
Expand All @@ -113,38 +114,38 @@ GEM
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
pg (0.14.0)
polyglot (0.3.3)
polyglot (0.3.5)
quiet_assets (1.0.1)
railties (~> 3.1)
rack (1.4.1)
rack-cache (1.2)
rack (1.4.7)
rack-cache (1.9.0)
rack (>= 0.4)
rack-ssl (1.3.2)
rack-ssl (1.3.4)
rack
rack-test (0.6.1)
rack-test (0.6.3)
rack (>= 1.0)
rails (3.2.7)
actionmailer (= 3.2.7)
actionpack (= 3.2.7)
activerecord (= 3.2.7)
activeresource (= 3.2.7)
activesupport (= 3.2.7)
rails (3.2.17)
actionmailer (= 3.2.17)
actionpack (= 3.2.17)
activerecord (= 3.2.17)
activeresource (= 3.2.17)
activesupport (= 3.2.17)
bundler (~> 1.0)
railties (= 3.2.7)
railties (3.2.7)
actionpack (= 3.2.7)
activesupport (= 3.2.7)
railties (= 3.2.17)
railties (3.2.17)
actionpack (= 3.2.17)
activesupport (= 3.2.17)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
rake (13.0.0)
rb-fchange (0.0.5)
ffi
rb-fsevent (0.9.1)
rb-inotify (0.8.8)
ffi (>= 0.5.0)
rdoc (3.12)
rdoc (3.12.2)
json (~> 1.4)
rspec (2.10.0)
rspec-core (~> 2.10.0)
Expand Down Expand Up @@ -177,20 +178,21 @@ GEM
simplecov-html (~> 0.5.3)
simplecov-html (0.5.3)
spork (0.9.0)
sprockets (2.1.3)
sprockets (2.2.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
thor (0.15.4)
tilt (1.3.3)
treetop (1.4.10)
thor (0.20.3)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
twitter_oauth (0.4.3)
json (>= 1.1.9)
mime-types (>= 1.16)
oauth (>= 0.4.1)
tzinfo (0.3.33)
tzinfo (0.3.55)
uglifier (1.2.7)
execjs (>= 0.3.0)
multi_json (~> 1.3)
Expand Down Expand Up @@ -221,7 +223,7 @@ DEPENDENCIES
omniauth-twitter
pg (= 0.14.0)
quiet_assets (= 1.0.1)
rails (= 3.2.7)
rails (= 3.2.17)
rspec-rails (= 2.10.0)
sass-rails (= 3.2.5)
shoulda-matchers
Expand Down