diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-08-17 18:02:26 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-08-17 18:02:26 +0000 |
| commit | 46dc00631aeae34c1964888625c5ccd04da6b4c1 (patch) | |
| tree | 78698b5129eb4d91eeca9d75712759c1e4a1bce7 /Gemfile.lock | |
| parent | c063ee5e35146a30825edcfbf15da88585cecdcb (diff) | |
| parent | 35caa356f6f111a358c7057b9c3cf9b029483343 (diff) | |
| download | gitlab-ce-46dc00631aeae34c1964888625c5ccd04da6b4c1.tar.gz | |
Merge branch 'issue-boards' into 'master'
Issue boards
## What are the relevant issue numbers?
- Issue: #17907
- Issue backend: #20335
- Backend MR: !5548
- Frontend MR: !5554
- Documentation !5713
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [X] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- [X] ~~API support added~~
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5548
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 2244c20203b..58c84c47575 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -356,6 +356,8 @@ GEM jquery-ui-rails (5.0.5) railties (>= 3.2.16) json (1.8.3) + json-schema (2.6.2) + addressable (~> 2.3.8) jwt (1.5.4) kaminari (0.17.0) actionpack (>= 3.0.0) @@ -873,6 +875,7 @@ DEPENDENCIES jquery-rails (~> 4.1.0) jquery-turbolinks (~> 2.1.0) jquery-ui-rails (~> 5.0.0) + json-schema (~> 2.6.2) jwt kaminari (~> 0.17.0) knapsack (~> 1.11.0) |