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,7 +1,7 @@
source 'https://rubygems.org'

# ruby '1.9.3'
gem 'rails', '3.2.11'
gem 'rails', '3.2.17'
gem 'bootstrap-sass', '~> 2.1'
gem 'pg', '0.14.1'
gem 'bcrypt-ruby', '3.0.1'
Expand Down
85 changes: 43 additions & 42 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (3.2.11)
actionpack (= 3.2.11)
mail (~> 2.4.4)
actionpack (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
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.2.1)
activemodel (3.2.11)
activesupport (= 3.2.11)
activemodel (3.2.17)
activesupport (= 3.2.17)
builder (~> 3.0.0)
activerecord (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
activerecord (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
activesupport (3.2.11)
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)
annotate (2.4.1.beta1)
arel (3.0.3)
Expand All @@ -53,6 +53,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.7.0)
concurrent-ruby (1.1.6)
cucumber (1.3.10)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
Expand Down Expand Up @@ -93,54 +94,54 @@ GEM
guard (>= 1.1)
spork (>= 0.8.4)
hike (1.2.3)
i18n (0.6.9)
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.8.1)
json (1.8.6)
listen (0.7.3)
lumberjack (1.0.4)
mail (2.4.4)
i18n (>= 0.4.0)
mail (2.5.5)
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.5.2)
multi_json (1.8.4)
multi_json (1.14.1)
multi_test (0.0.3)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
pg (0.14.1)
polyglot (0.3.3)
polyglot (0.3.5)
pry (0.9.12.6)
coderay (~> 1.0)
method_source (~> 0.8)
slop (~> 3.4)
rack (1.4.5)
rack-cache (1.2)
rack (1.4.7)
rack-cache (1.11.1)
rack (>= 0.4)
rack-ssl (1.3.3)
rack-ssl (1.3.4)
rack
rack-test (0.6.2)
rack-test (0.6.3)
rack (>= 1.0)
rails (3.2.11)
actionmailer (= 3.2.11)
actionpack (= 3.2.11)
activerecord (= 3.2.11)
activeresource (= 3.2.11)
activesupport (= 3.2.11)
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.11)
railties (3.2.11)
actionpack (= 3.2.11)
activesupport (= 3.2.11)
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 (10.1.1)
rake (13.0.1)
rb-fsevent (0.9.1)
rdoc (3.12.2)
json (~> 1.4)
Expand Down Expand Up @@ -173,17 +174,17 @@ GEM
websocket (~> 1.0.4)
slop (3.4.7)
spork (0.9.2)
sprockets (2.2.2)
sprockets (2.2.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
thor (0.18.1)
thor (0.20.3)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.38)
tzinfo (0.3.56)
uglifier (1.2.7)
execjs (>= 0.3.0)
multi_json (~> 1.3)
Expand Down Expand Up @@ -211,7 +212,7 @@ DEPENDENCIES
guard-spork
jquery-rails (= 2.0.2)
pg (= 0.14.1)
rails (= 3.2.11)
rails (= 3.2.17)
rb-fsevent (= 0.9.1)
rspec-rails
sass-rails (~> 3.2.5)
Expand Down