summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock54
2 files changed, 28 insertions, 28 deletions
diff --git a/Gemfile b/Gemfile
index 8a19885bcb1..98890108562 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
source "https://rubygems.org"
-gem 'rails', '4.1.12'
+gem 'rails', '4.1.14'
# Specify a sprockets version due to security issue
# See https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY
diff --git a/Gemfile.lock b/Gemfile.lock
index 99cdc2a50ae..8dd49bcf968 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,25 +4,25 @@ GEM
CFPropertyList (2.3.1)
RedCloth (4.2.9)
ace-rails-ap (2.0.1)
- actionmailer (4.1.12)
- actionpack (= 4.1.12)
- actionview (= 4.1.12)
+ actionmailer (4.1.14)
+ actionpack (= 4.1.14)
+ actionview (= 4.1.14)
mail (~> 2.5, >= 2.5.4)
- actionpack (4.1.12)
- actionview (= 4.1.12)
- activesupport (= 4.1.12)
+ actionpack (4.1.14)
+ actionview (= 4.1.14)
+ activesupport (= 4.1.14)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
- actionview (4.1.12)
- activesupport (= 4.1.12)
+ actionview (4.1.14)
+ activesupport (= 4.1.14)
builder (~> 3.1)
erubis (~> 2.7.0)
- activemodel (4.1.12)
- activesupport (= 4.1.12)
+ activemodel (4.1.14)
+ activesupport (= 4.1.14)
builder (~> 3.1)
- activerecord (4.1.12)
- activemodel (= 4.1.12)
- activesupport (= 4.1.12)
+ activerecord (4.1.14)
+ activemodel (= 4.1.14)
+ activesupport (= 4.1.14)
arel (~> 5.0.0)
activerecord-deprecated_finders (1.0.4)
activerecord-session_store (0.1.1)
@@ -33,7 +33,7 @@ GEM
activemodel (~> 4.0)
activesupport (~> 4.0)
rails-observers (~> 0.1.1)
- activesupport (4.1.12)
+ activesupport (4.1.14)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@@ -509,21 +509,21 @@ GEM
rack
rack-test (0.6.3)
rack (>= 1.0)
- rails (4.1.12)
- actionmailer (= 4.1.12)
- actionpack (= 4.1.12)
- actionview (= 4.1.12)
- activemodel (= 4.1.12)
- activerecord (= 4.1.12)
- activesupport (= 4.1.12)
+ rails (4.1.14)
+ actionmailer (= 4.1.14)
+ actionpack (= 4.1.14)
+ actionview (= 4.1.14)
+ activemodel (= 4.1.14)
+ activerecord (= 4.1.14)
+ activesupport (= 4.1.14)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.1.12)
+ railties (= 4.1.14)
sprockets-rails (~> 2.0)
rails-observers (0.1.2)
activemodel (~> 4.0)
- railties (4.1.12)
- actionpack (= 4.1.12)
- activesupport (= 4.1.12)
+ railties (4.1.14)
+ actionpack (= 4.1.14)
+ activesupport (= 4.1.14)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.0.0)
@@ -687,7 +687,7 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sprockets-rails (2.3.2)
+ sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
@@ -886,7 +886,7 @@ DEPENDENCIES
rack-attack (~> 4.3.0)
rack-cors (~> 0.4.0)
rack-oauth2 (~> 1.0.5)
- rails (= 4.1.12)
+ rails (= 4.1.14)
raphael-rails (~> 2.1.2)
rblineprof
rdoc (~> 3.6)