diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-10-13 14:22:53 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-10-13 14:22:53 +0000 |
| commit | 4b889dbb3cbe0eb3ab639ca68bbe6e71abec711c (patch) | |
| tree | c871bc277faa76921df73238eb33135c7e7c7374 | |
| parent | 11e93ad59d6209bf9805a6f7053719e8052cc508 (diff) | |
| parent | 2709f679d07a5fc08f5cc31a416e00e61a04d2c1 (diff) | |
| download | gitlab-ce-4b889dbb3cbe0eb3ab639ca68bbe6e71abec711c.tar.gz | |
Merge branch 'rs-loosen-request_store' into 'master'
Loosen requirement on request_store version
This gem follows semantic versioning and will not introduce breaking
changes in a minor version. See
https://github.com/steveklabnik/request_store#semantic-versioning
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2868
See merge request !6853
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -225,7 +225,7 @@ gem 'gon', '~> 6.1.0' gem 'jquery-atwho-rails', '~> 1.3.2' gem 'jquery-rails', '~> 4.1.0' gem 'jquery-ui-rails', '~> 5.0.0' -gem 'request_store', '~> 1.3.0' +gem 'request_store', '~> 1.3' gem 'select2-rails', '~> 3.5.9' gem 'virtus', '~> 1.0.1' gem 'net-ssh', '~> 3.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index 25a176da8fd..a9892d1c130 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -938,7 +938,7 @@ DEPENDENCIES redis (~> 3.2) redis-namespace (~> 1.5.2) redis-rails (~> 4.0.0) - request_store (~> 1.3.0) + request_store (~> 1.3) rerun (~> 0.11.0) responders (~> 2.0) rouge (~> 2.0) |