summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-01-31 14:38:45 -0600
committerMike Greiling <mike@pixelcog.com>2017-01-31 14:38:45 -0600
commit5fcbe12730960e93b1d3afe6be846eb9ef570d32 (patch)
tree79a09bfb5e38f7c366b503d363d561ba98f13799 /Gemfile
parentecdcd1be87e140c144bb2afc861a1dc56b297cdd (diff)
parent2c358b4b5613d6d398533dc559674da14de3c0d7 (diff)
downloadgitlab-ce-5fcbe12730960e93b1d3afe6be846eb9ef570d32.tar.gz
Merge branch 'master' into go-go-gadget-webpack
* master: (83 commits) Fix small typo on new branch button spec Abillity to promote project labels to group labels Update and pin the `jwt` gem to ~> 1.5.6 refactor merge request build service Update index.md Clarify that Auto Deploy requires a public project. cop for gem fetched from a git source Add CHANGELOG entry Remove new branch button for confidential issues Remove flash warning from login page add complete changelog Add project ID index to `project_authorizations` table to optimize queries Fix disable storing of sensitive information when importing a new repo Fix notification when global=disabled, group=watch Ensure rake is called within the correct bundle context Fix 8.16.0 release date. Improve search within group logic Add changelog item about new attributes in group api Update group api doc with full_name and full_path attributes Add tests for nested groups in search service and search helper ...
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 726d4484dc0..f9aecca70ff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -35,7 +35,7 @@ gem 'omniauth-twitter', '~> 1.2.0'
gem 'omniauth_crowd', '~> 2.2.0'
gem 'omniauth-authentiq', '~> 0.2.0'
gem 'rack-oauth2', '~> 1.2.1'
-gem 'jwt'
+gem 'jwt', '~> 1.5.6'
# Spam and anti-bot protection
gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'