diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2016-09-07 14:58:01 +0530 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2016-09-07 14:58:01 +0530 |
| commit | f5b9837c19f48255237eca1e618fc632a45b58b5 (patch) | |
| tree | 2653e9aa1e3bf0a1db6630bb52863c30e6313d87 /Gemfile | |
| parent | 72b9b87ca93615640dcc022f324b2af16ceaa4eb (diff) | |
| parent | 1d5488699678d22644d24add4b89cede0419ad25 (diff) | |
| download | gitlab-ce-f5b9837c19f48255237eca1e618fc632a45b58b5.tar.gz | |
Merge remote-tracking branch 'origin/master' into 21170-cycle-analytics
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -53,7 +53,7 @@ gem 'browser', '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem 'gitlab_git', '~> 10.4.7' +gem 'gitlab_git', '~> 10.6.3' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes @@ -97,9 +97,6 @@ gem 'fog-rackspace', '~> 0.1.1' # for aws storage gem 'unf', '~> 0.1.4' -# Authorization -gem 'six', '~> 0.2.0' - # Seed data gem 'seed-fu', '~> 2.3.5' |