- 08 Nov, 2017 30 commits
-
-
Douwe Maan authored
-
Phil Hughes authored
[ci skip]
-
https://gitlab.com/gitlab-org/gitlab-eeShinya Maeda authored
Merge branch 'ce-to-ee-2017-11-08' of https://gitlab.com/gitlab-org/gitlab-ee into ce-to-ee-2017-11-08
-
Shinya Maeda authored
Fix lib/gitlab/usage_data.rb. spec/lib/gitlab/usage_data_spec.rb. spec/support/kubernetes_helpers.rb.
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
# Conflicts: # app/assets/javascripts/boards/stores/boards_store.js # app/assets/javascripts/dispatcher.js # app/assets/javascripts/milestone_select.js # app/assets/javascripts/repo/components/repo_file.vue # app/assets/javascripts/repo/components/repo_loading_file.vue # app/assets/stylesheets/framework/avatar.scss # app/assets/stylesheets/framework/modal.scss # app/assets/stylesheets/pages/note_form.scss # app/controllers/projects/issues_controller.rb # app/controllers/projects/refs_controller.rb # app/models/merge_request.rb # app/models/repository.rb # config/initializers/8_metrics.rb # config/routes/group.rb # db/schema.rb # doc/api/merge_requests.md # lib/gitlab/checks/change_access.rb # lib/gitlab/metrics/transaction.rb # lib/gitlab/path_regex.rb # lib/gitlab/usage_data.rb # spec/lib/gitlab/checks/change_access_spec.rb # spec/lib/gitlab/metrics/web_transaction_spec.rb # spec/lib/gitlab/usage_data_spec.rb # spec/models/merge_request_spec.rb # spec/requests/api/groups_spec.rb # spec/routing/group_routing_spec.rb # spec/support/kubernetes_helpers.rb [ci skip]
-
Tim Zallmann authored
Cleanup tests See merge request gitlab-org/gitlab-ce!15261
-
Douwe Maan authored
When deleting merged branches, ignore protected tags Closes #39732 See merge request gitlab-org/gitlab-ce!15252
-
Rémy Coutable authored
CE Upstream - Monday Closes gitlab-ce#39776, gitlab-ce#39771 et #3544 See merge request gitlab-org/gitlab-ee!3277
-
Douwe Maan authored
Free some reserved group routes See merge request gitlab-org/gitlab-ce!15052
-
Stan Hu authored
Make BackgroundTransaction#labels public See merge request gitlab-org/gitlab-ce!15257
-
Stan Hu authored
Make BackgroundTransaction#labels public See merge request gitlab-org/gitlab-ce!15257
-
Mike Greiling authored
fix karma config file See merge request gitlab-org/gitlab-ce!15263
-
Marcia Ramos authored
Modals in UX guide See merge request gitlab-org/gitlab-ce!14886
-
Stan Hu authored
Adds typescript support in webpack. With Mike G. See merge request gitlab-org/gitlab-ce!15264
-
- 07 Nov, 2017 10 commits
-
-
Nick Thomas authored
Add API support and storage for GeoNode status in the database Closes #3867 and #3740 See merge request gitlab-org/gitlab-ee!3230
-
Stan Hu authored
-
Jacob Schatz authored
-
Jacob Schatz authored
-
Jacob Schatz authored
-
Marcia Ramos authored
Add note on registry restrictions on GitLab.com See merge request gitlab-org/gitlab-ce!15174
-
Chenjerai Katanda authored
-
Annabel Dunstone Gray authored
Project with many branches can lock server running "git branch --contains XXX" Closes #37824 See merge request gitlab-org/gitlab-ce!14812
-
Jose Ivan Vargas authored
-
Annabel Dunstone Gray authored
-