diff options
| author | nicolas <nclm@users.noreply.github.com> | 2016-11-23 15:43:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-23 15:43:27 +0100 |
| commit | 23677bc51e657522049fb904e626f81f577de515 (patch) | |
| tree | dc9417c57a3af3036d621940a751e9adf1b09ce3 /Gemfile | |
| parent | 1e95fbb10b81ea0eedcb39a83e52f42e3dbb456c (diff) | |
| parent | 82191b33831f26e071a27dd59ce2e46fb467589c (diff) | |
Merge branch 'master' into french-translation
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile index 9654c8828..327a17ee9 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -gem 'rails', '5.0.0.1' +gem 'rails', git: 'https://github.com/rails/rails.git', branch: '5-0-stable' gem 'sass-rails', '~> 5.0' gem 'uglifier', '>= 1.3.0' gem 'coffee-rails', '~> 4.1.0' @@ -50,6 +50,11 @@ gem 'react-rails' gem 'browserify-rails' gem 'autoprefixer-rails' +gem 'rack-mini-profiler', require: false +gem 'flamegraph' +gem 'stackprof' +gem 'memory_profiler' + group :development, :test do gem 'rspec-rails' gem 'pry-rails' |