summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock75
2 files changed, 38 insertions, 39 deletions
diff --git a/Gemfile b/Gemfile
index cb89df2..9c616c8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '4.2.0'
+gem 'rails', '~> 4.2'
gem 'rake', '10.4.2'
# Bundle edge Rails instead:
diff --git a/Gemfile.lock b/Gemfile.lock
index da6aaeb..0f64bf5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,38 +9,37 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- actionmailer (4.2.0)
- actionpack (= 4.2.0)
- actionview (= 4.2.0)
- activejob (= 4.2.0)
+ actionmailer (4.2.11.1)
+ actionpack (= 4.2.11.1)
+ actionview (= 4.2.11.1)
+ activejob (= 4.2.11.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
- actionpack (4.2.0)
- actionview (= 4.2.0)
- activesupport (= 4.2.0)
- rack (~> 1.6.0)
+ actionpack (4.2.11.1)
+ actionview (= 4.2.11.1)
+ activesupport (= 4.2.11.1)
+ rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
- rails-html-sanitizer (~> 1.0, >= 1.0.1)
- actionview (4.2.0)
- activesupport (= 4.2.0)
+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
+ actionview (4.2.11.1)
+ activesupport (= 4.2.11.1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
- rails-html-sanitizer (~> 1.0, >= 1.0.1)
- activejob (4.2.0)
- activesupport (= 4.2.0)
+ rails-html-sanitizer (~> 1.0, >= 1.0.3)
+ activejob (4.2.11.1)
+ activesupport (= 4.2.11.1)
globalid (>= 0.3.0)
- activemodel (4.2.0)
- activesupport (= 4.2.0)
+ activemodel (4.2.11.1)
+ activesupport (= 4.2.11.1)
builder (~> 3.1)
- activerecord (4.2.0)
- activemodel (= 4.2.0)
- activesupport (= 4.2.0)
+ activerecord (4.2.11.1)
+ activemodel (= 4.2.11.1)
+ activesupport (= 4.2.11.1)
arel (~> 6.0)
- activesupport (4.2.0)
+ activesupport (4.2.11.1)
i18n (~> 0.7)
- json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
@@ -56,7 +55,7 @@ GEM
sshkit (>= 1.9.0)
ci_reporter (2.0.0)
builder (>= 2.1.2)
- concurrent-ruby (1.1.4)
+ concurrent-ruby (1.1.5)
connection_pool (2.2.2)
crass (1.0.4)
daemons (1.3.1)
@@ -99,7 +98,7 @@ GEM
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
- mini_mime (1.0.1)
+ mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
minitest-reporters (1.3.6)
@@ -115,22 +114,22 @@ GEM
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (5.1.0)
- nokogiri (1.10.1)
+ nokogiri (1.10.3)
mini_portile2 (~> 2.4.0)
ntlm-http (0.1.1)
rack (1.6.11)
rack-test (0.6.3)
rack (>= 1.0)
- rails (4.2.0)
- actionmailer (= 4.2.0)
- actionpack (= 4.2.0)
- actionview (= 4.2.0)
- activejob (= 4.2.0)
- activemodel (= 4.2.0)
- activerecord (= 4.2.0)
- activesupport (= 4.2.0)
+ rails (4.2.11.1)
+ actionmailer (= 4.2.11.1)
+ actionpack (= 4.2.11.1)
+ actionview (= 4.2.11.1)
+ activejob (= 4.2.11.1)
+ activemodel (= 4.2.11.1)
+ activerecord (= 4.2.11.1)
+ activesupport (= 4.2.11.1)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.2.0)
+ railties (= 4.2.11.1)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
@@ -140,9 +139,9 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
- railties (4.2.0)
- actionpack (= 4.2.0)
- activesupport (= 4.2.0)
+ railties (4.2.11.1)
+ actionpack (= 4.2.11.1)
+ activesupport (= 4.2.11.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
@@ -215,7 +214,7 @@ DEPENDENCIES
mysql2 (~> 0.3.18)
nokogiri
prototype-rails!
- rails (= 4.2.0)
+ rails (~> 4.2)
rake (= 10.4.2)
rspec
simplecov
@@ -224,4 +223,4 @@ DEPENDENCIES
thinking-sphinx (~> 3.1.4)
BUNDLED WITH
- 1.16.1
+ 1.17.3