diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-04-20 01:38:49 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-04-20 01:38:49 +0000 |
| commit | 3d4875f86a3b23789f5ea801c096754fced25166 (patch) | |
| tree | 3d3c370437a606dcdf2498546f5efd1f13eb44b6 /Gemfile.lock | |
| parent | 9617c274ab301e4d2401b2d9a179f40649259d3c (diff) | |
| parent | 50bee8e9198f65a692e32710a32089270e166f6b (diff) | |
| download | gitlab-ce-3d4875f86a3b23789f5ea801c096754fced25166.tar.gz | |
Merge branch 'license-templates-and-api-12804' into 'master'
License templates when creating/editing a LICENSE file
Closes #12804
See merge request !3660
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) |