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
This commit is contained in:
Dmitriy Zaporozhets 2016-10-13 14:22:53 +00:00
commit 4b889dbb3c
2 changed files with 2 additions and 2 deletions

View File

@ -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'

View File

@ -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)