summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-03-28 16:02:32 -0700
committerelijah <elijah@riseup.net>2016-03-28 16:02:32 -0700
commitef5f9636863a8bddb704714027c6540dc5a0b781 (patch)
tree6e7fa2ce54895643f4c247db2fed9350eca1539b
parentd7899039a4431cfac22d710bbc37b06160e8fc8c (diff)
parent6f2b628d884336e3c63dd77255ce0d95f6c2435e (diff)
Merge branch 'azul-upgrade/rails' into develop
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock59
2 files changed, 32 insertions, 29 deletions
diff --git a/Gemfile b/Gemfile
index 0399117..318b65e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,6 +3,8 @@ source 'https://rubygems.org'
require File.expand_path('../lib/gemfile_tools.rb', __FILE__)
## CORE
+# rake 11.x throws lots of warnings about rails 3.2 code
+gem "rake", "~> 10.4"
gem "rails", "~> 3.2.21"
gem "couchrest", "~> 1.1.3"
gem "couchrest_model", "~> 2.0.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 71ec0fc..5100a31 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -26,12 +26,12 @@ GEM
remote: https://rubygems.org/
specs:
SyslogLogger (2.0)
- actionmailer (3.2.21)
- actionpack (= 3.2.21)
+ actionmailer (3.2.22.2)
+ actionpack (= 3.2.22.2)
mail (~> 2.5.4)
- actionpack (3.2.21)
- activemodel (= 3.2.21)
- activesupport (= 3.2.21)
+ actionpack (3.2.22.2)
+ activemodel (= 3.2.22.2)
+ activesupport (= 3.2.22.2)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@@ -39,18 +39,18 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.21)
- activesupport (= 3.2.21)
+ activemodel (3.2.22.2)
+ activesupport (= 3.2.22.2)
builder (~> 3.0.0)
- activerecord (3.2.21)
- activemodel (= 3.2.21)
- activesupport (= 3.2.21)
+ activerecord (3.2.22.2)
+ activemodel (= 3.2.22.2)
+ activesupport (= 3.2.22.2)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.21)
- activemodel (= 3.2.21)
- activesupport (= 3.2.21)
- activesupport (3.2.21)
+ activeresource (3.2.22.2)
+ activemodel (= 3.2.22.2)
+ activesupport (= 3.2.22.2)
+ activesupport (3.2.22.2)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.3.6)
@@ -175,36 +175,36 @@ GEM
slop (~> 3.4)
quiet_assets (1.0.3)
railties (>= 3.1, < 5.0)
- rack (1.4.5)
- rack-cache (1.2)
+ rack (1.4.7)
+ rack-cache (1.6.1)
rack (>= 0.4)
rack-protection (1.5.3)
rack
rack-ssl (1.3.4)
rack
- rack-test (0.6.2)
+ rack-test (0.6.3)
rack (>= 1.0)
- rails (3.2.21)
- actionmailer (= 3.2.21)
- actionpack (= 3.2.21)
- activerecord (= 3.2.21)
- activeresource (= 3.2.21)
- activesupport (= 3.2.21)
+ rails (3.2.22.2)
+ actionmailer (= 3.2.22.2)
+ actionpack (= 3.2.22.2)
+ activerecord (= 3.2.22.2)
+ activeresource (= 3.2.22.2)
+ activesupport (= 3.2.22.2)
bundler (~> 1.0)
- railties (= 3.2.21)
+ railties (= 3.2.22.2)
rails-i18n (3.0.1)
i18n (~> 0.5)
rails (>= 3.0.0, < 4.0.0)
rails_warden (0.5.8)
warden (>= 1.0.0)
- railties (3.2.21)
- actionpack (= 3.2.21)
- activesupport (= 3.2.21)
+ railties (3.2.22.2)
+ actionpack (= 3.2.22.2)
+ activesupport (= 3.2.22.2)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (10.4.2)
+ rake (10.5.0)
rdiscount (2.1.7.1)
rdoc (3.12.2)
json (~> 1.4)
@@ -244,7 +244,7 @@ GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.44)
+ tzinfo (0.3.47)
uglifier (1.2.7)
execjs (>= 0.3.0)
multi_json (~> 1.3)
@@ -297,6 +297,7 @@ DEPENDENCIES
rails (~> 3.2.21)
rails-i18n
rails_warden
+ rake (~> 10.4)
rdiscount
ruby-srp (~> 0.2.1)
sass-rails (~> 3.2.5)