diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-02-04 17:40:25 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-02-04 17:40:25 +0000 |
commit | 8a333d45059688bfd5245eb91f206bbbcf7d18eb (patch) | |
tree | b4f615a30233a8039fd26e9982053ffdf5e080d6 | |
parent | 9c49a1812aaa7e858295be5abbf9e1a7c1346699 (diff) | |
parent | d29a527ae80060b5dc1244364d495758195496e1 (diff) | |
download | gitlab-ce-8a333d45059688bfd5245eb91f206bbbcf7d18eb.tar.gz |
Merge branch 'fix-rack-proxy' into 'master'
Fix "NameError: uninitialized constant Rack::Proxy" in production environment
See merge request !8977
-rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -219,6 +219,8 @@ gem 'chronic', '~> 0.10.2' gem 'chronic_duration', '~> 0.10.6' gem 'webpack-rails', '~> 0.9.9' +gem 'rack-proxy', '~> 0.6.0' + gem 'sass-rails', '~> 5.0.6' gem 'coffee-rails', '~> 4.1.0' gem 'uglifier', '~> 2.7.2' @@ -311,8 +313,6 @@ group :development, :test do gem 'activerecord_sane_schema_dumper', '0.2' gem 'stackprof', '~> 0.2.10' - - gem 'rack-proxy', '~> 0.6.0' end group :test do |