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.13'
gem 'rails', '3.2.17'

# Use jQuery instead of Prototype
gem 'jquery-ui-rails'
Expand Down
88 changes: 45 additions & 43 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,34 @@ GEM
Platform (>= 0.4.0)
open4
Platform (0.4.0)
actionmailer (3.2.13)
actionpack (= 3.2.13)
mail (~> 2.5.3)
actionpack (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
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.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.13)
activesupport (= 3.2.13)
activemodel (3.2.17)
activesupport (= 3.2.17)
builder (~> 3.0.0)
activerecord (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
activerecord (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
activesupport (3.2.13)
i18n (= 0.6.1)
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)
arel (3.0.2)
arel (3.0.3)
backup (3.4.0)
open4 (~> 1.3.0)
thor (>= 0.15.4, < 2)
Expand Down Expand Up @@ -65,6 +65,7 @@ GEM
sass (~> 3.1)
compass-rails (1.0.3)
compass (>= 0.12.2, < 0.14)
concurrent-ruby (1.1.5)
daemons (1.1.9)
database_cleaner (1.0.1)
delayed_job (3.0.5)
Expand Down Expand Up @@ -93,17 +94,18 @@ GEM
tilt
highline (1.6.19)
hike (1.2.3)
i18n (0.6.1)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
journey (1.0.4)
jquery-rails (3.0.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (4.0.3)
jquery-rails
railties (>= 3.1.0)
json (1.8.0)
json (1.8.6)
libv8 (3.11.8.17)
mail (2.5.4)
mail (2.5.5)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mailcatcher (0.5.12)
Expand All @@ -115,9 +117,9 @@ GEM
skinny (~> 0.2.3)
sqlite3 (~> 1.3)
thin (~> 1.5.0)
mime-types (1.23)
mime-types (1.25.1)
mini_portile (0.5.0)
multi_json (1.7.6)
multi_json (1.13.1)
mysql2 (0.3.11)
net-scp (1.1.1)
net-ssh (>= 2.6.5)
Expand All @@ -135,35 +137,35 @@ GEM
activesupport (>= 2.3.2)
cocaine (>= 0.0.2)
mime-types
polyglot (0.3.3)
polyglot (0.3.5)
populator (1.0.0)
rack (1.4.5)
rack-cache (1.2)
rack (1.4.7)
rack-cache (1.9.0)
rack (>= 0.4)
rack-protection (1.5.0)
rack
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.13)
actionmailer (= 3.2.13)
actionpack (= 3.2.13)
activerecord (= 3.2.13)
activeresource (= 3.2.13)
activesupport (= 3.2.13)
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.13)
railties (= 3.2.17)
rails_autolink (1.1.0)
rails (> 3.1)
railties (3.2.13)
actionpack (= 3.2.13)
activesupport (= 3.2.13)
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.0.4)
rake (13.0.0)
rdoc (3.12.2)
json (~> 1.4)
recaptcha (0.3.5)
Expand All @@ -188,7 +190,7 @@ GEM
skinny (0.2.3)
eventmachine (~> 1.0.0)
thin (~> 1.5.0)
sprockets (2.2.2)
sprockets (2.2.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
Expand All @@ -201,12 +203,12 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.18.1)
thor (0.20.3)
tilt (1.4.1)
treetop (1.4.14)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.37)
tzinfo (0.3.55)
uglifier (2.1.1)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
Expand Down Expand Up @@ -244,7 +246,7 @@ DEPENDENCIES
mysql2
paperclip (~> 2.3)
populator
rails (= 3.2.13)
rails (= 3.2.17)
rails_autolink
recaptcha
remotipart
Expand Down