diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-07-26 14:47:50 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-07-26 14:47:50 +0200 |
| commit | d29598e69190d6bc3a7d3cea44892d2db69d20e0 (patch) | |
| tree | 7b130b29dd5c4042846b51791ce1e09d7ea48326 /Gemfile.lock | |
| parent | 5f35901a01ff822ba1e637251d9726a41e73ed17 (diff) | |
| parent | 2f825cad72cfc6fd25df3a57c5f3c138bb47f89d (diff) | |
| download | gitlab-ce-d29598e69190d6bc3a7d3cea44892d2db69d20e0.tar.gz | |
Merge remote-tracking branch 'dev/master'
# Conflicts:
# Gemfile
# Gemfile.lock
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 58a203c9b61..6c2ac9368f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1013,6 +1013,7 @@ DEPENDENCIES minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) mysql2 (~> 0.4.5) + net-ldap nokogiri (~> 1.6.7, >= 1.6.7.2) oauth2 (~> 1.4) octokit (~> 4.6.2) |