diff --git a/Gemfile b/Gemfile index cf753556a..d4153dc0f 100644 --- a/Gemfile +++ b/Gemfile @@ -82,7 +82,7 @@ group :development, :test do gem 'i18n-tasks' gem 'capistrano', '3.5.0', require: false gem "capistrano-bundler", '1.1.4', require: false - gem "capistrano-rails", '1.1.7', require: false + gem "capistrano-rails", '1.1.8', require: false gem "capistrano-rvm", require: false gem 'capistrano3-delayed-job', '~> 1.0' gem "bullet" diff --git a/Gemfile.lock b/Gemfile.lock index 71a7ce2eb..b36245a4d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,7 +51,7 @@ GEM safely_block (>= 0.1.1) user_agent_parser uuidtools - airbrussh (1.0.2) + airbrussh (1.1.1) sshkit (>= 1.6.1, != 1.7.0) akami (1.3.1) gyoku (>= 0.4.0) @@ -70,7 +70,7 @@ GEM bullet (5.2.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.10.0) - byebug (9.0.5) + byebug (9.0.6) cancancan (1.15.0) capistrano (3.5.0) airbrussh (>= 1.0.0) @@ -81,8 +81,8 @@ GEM capistrano-bundler (1.1.4) capistrano (~> 3.1) sshkit (~> 1.2) - capistrano-harrow (0.5.2) - capistrano-rails (1.1.7) + capistrano-harrow (0.5.3) + capistrano-rails (1.1.8) capistrano (~> 3.1) capistrano-bundler (~> 1.1) capistrano-rvm (0.1.2) @@ -120,7 +120,7 @@ GEM term-ansicolor (~> 1.3) thor (~> 0.19.1) tins (>= 1.6.0, < 2) - daemons (1.2.3) + daemons (1.2.4) dalli (2.7.6) database_cleaner (1.5.3) debug_inspector (0.0.2) @@ -179,7 +179,7 @@ GEM graphiql-rails (1.3.0) rails graphql (0.18.11) - groupdate (3.0.1) + groupdate (3.0.2) activesupport (>= 3) gyoku (1.3.1) builder (>= 2.1.2) @@ -231,14 +231,14 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_portile2 (2.1.0) - minitest (5.9.0) + minitest (5.9.1) multi_json (1.12.1) multi_xml (0.5.5) multipart-post (2.0.0) net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (3.2.0) - newrelic_rpm (3.16.0.318) + newrelic_rpm (3.16.3.323) nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) @@ -318,7 +318,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.16.0) - rake (11.2.2) + rake (11.3.0) redcarpet (3.3.4) referer-parser (0.3.0) request_store (1.3.1) @@ -331,7 +331,7 @@ GEM rspec-core (~> 3.5.0) rspec-expectations (~> 3.5.0) rspec-mocks (~> 3.5.0) - rspec-core (3.5.1) + rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) @@ -339,7 +339,7 @@ GEM rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.5.0) - rspec-rails (3.5.1) + rspec-rails (3.5.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -389,7 +389,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sshkit (1.11.1) + sshkit (1.11.3) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) term-ansicolor (1.3.2) @@ -411,7 +411,7 @@ GEM tilt (>= 1.4, < 3) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (3.0.1) + uglifier (3.0.2) execjs (>= 0.3.0, < 3) unicorn (5.1.0) kgio (~> 2.6) @@ -450,7 +450,7 @@ DEPENDENCIES cancancan capistrano (= 3.5.0) capistrano-bundler (= 1.1.4) - capistrano-rails (= 1.1.7) + capistrano-rails (= 1.1.8) capistrano-rvm capistrano3-delayed-job (~> 1.0) capybara diff --git a/public/404.html b/public/404.html index 5d519fb70..cc6820bba 100644 --- a/public/404.html +++ b/public/404.html @@ -5,7 +5,7 @@