diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-06-17 15:07:50 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-06-17 15:07:50 +0000 |
| commit | 8891bef26f5e3acc7050d206670bc6fc0ddd66e2 (patch) | |
| tree | c7aa3e6ff87eff5dccdb0b91dbd64675d5b6d211 /Gemfile | |
| parent | 778d72664f386dfee45dab171f137395739958f6 (diff) | |
| parent | 402b651a552030c90af421ddd2a74f6cbf298413 (diff) | |
| download | gitlab-ce-8891bef26f5e3acc7050d206670bc6fc0ddd66e2.tar.gz | |
Merge branch 'feature/project-import' into 'feature/project-export'
Project import functionality
This is a MR for the import functionality of https://gitlab.com/gitlab-org/gitlab-ce/issues/3050, which adds the ability to import single projects.
Branched off https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3114
- [x] members
- DB data
- [x] issues
- [x] issue comments
- [x] merge requests
- [x] merge request diff
- [x] merge request comments
- [x] labels
- [x] milestones
- [x] snippets
- [x] releases
- [x] events
- [x] commit statuses
- [x] CI builds
- File system data
- [x] Git repository
- [x] wiki
- [x] uploads
- [ ] ~~CI build traces~~
- [ ] ~~CI build artifacts~~
- [ ] ~~LFS objects~~
- DB configuration
- [x] services
- [x] web hooks
- [x] protected branches
- [x] deploy keys
- [x] CI variables
- [x] CI triggers
See merge request !3142
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -221,7 +221,7 @@ gem 'jquery-turbolinks', '~> 2.1.0' gem 'addressable', '~> 2.3.8' gem 'bootstrap-sass', '~> 3.3.0' -gem 'font-awesome-rails', '~> 4.2' +gem 'font-awesome-rails', '~> 4.6.1' gem 'gitlab_emoji', '~> 0.3.0' gem 'gon', '~> 6.0.1' gem 'jquery-atwho-rails', '~> 1.3.2' |