summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-10-13 15:02:05 +0200
committerRobert Speicher <rspeicher@gmail.com>2016-10-13 15:02:05 +0200
commit2709f679d07a5fc08f5cc31a416e00e61a04d2c1 (patch)
treefb62ac3b75c71b92799870f7b5e6fb5f4891b169
parent6d48c489d93d6dcbdfd955b7456d97ba6cdb23d1 (diff)
downloadgitlab-ce-2709f679d07a5fc08f5cc31a416e00e61a04d2c1.tar.gz
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
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock2
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 230561f90d3..2601c33a5b4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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 067908af3fb..77370e8bdaf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -937,7 +937,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)