Merge branch 'master' into french-translation

1 files changed, 39 insertions, 24 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index a31573af6..28ad1abb6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,5 +1,7 @@
-GEM
-  remote: https://rubygems.org/
+GIT
+  remote: https://github.com/rails/rails.git
+  revision: ecb394a31420f6fd1d0ab692c79f2dd44176e2c9
+  branch: 5-0-stable
   specs:
     actioncable (5.0.0.1)
       actionpack (= 5.0.0.1)
@@ -24,7 +26,6 @@ GEM
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    active_record_query_trace (1.5.3)
     activejob (5.0.0.1)
       activesupport (= 5.0.0.1)
       globalid (>= 0.3.6)
@@ -39,8 +40,31 @@ GEM
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+    rails (5.0.0.1)
+      actioncable (= 5.0.0.1)
+      actionmailer (= 5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activerecord (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 5.0.0.1)
+      sprockets-rails (>= 2.0.0)
+    railties (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    active_record_query_trace (1.5.3)
     addressable (2.4.0)
-    arel (7.1.1)
+    arel (7.1.4)
     ast (2.3.0)
     autoprefixer-rails (6.5.0.2)
       execjs
@@ -112,6 +136,7 @@ GEM
     execjs (2.7.0)
     fabrication (2.15.2)
     fast_blank (1.0.0)
+    flamegraph (0.9.5)
     font-awesome-rails (4.6.3.1)
       railties (>= 3.2, < 5.1)
     fuubar (2.1.1)
@@ -181,6 +206,7 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
+    memory_profiler (0.9.7)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
@@ -238,22 +264,12 @@ GEM
     rack-attack (5.0.1)
       rack
     rack-cors (0.4.0)
+    rack-mini-profiler (0.10.1)
+      rack (>= 1.2.0)
     rack-protection (1.5.3)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.0.1)
-      actioncable (= 5.0.0.1)
-      actionmailer (= 5.0.0.1)
-      actionpack (= 5.0.0.1)
-      actionview (= 5.0.0.1)
-      activejob (= 5.0.0.1)
-      activemodel (= 5.0.0.1)
-      activerecord (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.0.1)
-      sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.1)
       activesupport (>= 4.2.0, < 6.0)
       nokogiri (~> 1.6.0)
@@ -266,12 +282,6 @@ GEM
       rails (> 3.1)
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (5.0.0.1)
-      actionpack (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
     rainbow (2.1.0)
     rake (11.3.0)
     rdoc (4.2.2)
@@ -362,10 +372,11 @@ GEM
     sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.1.1)
+    sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    stackprof (0.2.10)
     temple (0.7.7)
     term-ansicolor (1.4.0)
       tins (~> 1.0)
@@ -414,6 +425,7 @@ DEPENDENCIES
   dotenv-rails
   fabrication
   fast_blank
+  flamegraph
   font-awesome-rails
   fuubar
   goldfinger
@@ -429,6 +441,7 @@ DEPENDENCIES
   letter_opener
   link_header
   lograge
+  memory_profiler
   neography
   nokogiri
   oj
@@ -443,7 +456,8 @@ DEPENDENCIES
   rabl
   rack-attack
   rack-cors
-  rails (= 5.0.0.1)
+  rack-mini-profiler
+  rails!
   rails_12factor
   rails_autolink
   react-rails
@@ -457,6 +471,7 @@ DEPENDENCIES
   sidekiq
   simple_form
   simplecov
+  stackprof
   uglifier (>= 1.3.0)
   webmock
   will_paginate