diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-21 16:03:33 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-21 16:03:33 -0500 |
| commit | c9fe9f59d27bacb60c264678cce3cbe45d514a69 (patch) | |
| tree | 0c7c497a5fbb96264d0c19a08aee17ad31f7fb05 /Gemfile.lock | |
| parent | 80ae3790b456b12314243c75632ed6024ac16424 (diff) | |
| parent | c22c4048ce1a4233c0a6f9a9cd59a53efe49da53 (diff) | |
| download | gitlab-ce-c9fe9f59d27bacb60c264678cce3cbe45d514a69.tar.gz | |
Merge remote-tracking branch 'origin/master' into issue_3799
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 958824f7ed9..b00d7b35c84 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -452,6 +452,8 @@ GEM addressable (~> 2.3) letter_opener (1.1.2) launchy (~> 2.2) + licensee (8.0.0) + rugged (>= 0.24b) listen (3.0.5) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) @@ -957,6 +959,7 @@ DEPENDENCIES jquery-ui-rails (~> 5.0.0) kaminari (~> 0.16.3) letter_opener (~> 1.1.2) + licensee (~> 8.0.0) loofah (~> 2.0.3) mail_room (~> 0.6.1) method_source (~> 0.8) |