GitLab merge requestshttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests2017-01-05T10:40:17Zhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1026Remove a custom validation in the LDAP Group link API2017-01-05T10:40:17Zusername-removed-128633Remove a custom validation in the LDAP Group link APIThe validation is now done by Grape since 16a8b5c6f90 (!1002).
Closes #972The validation is now done by Grape since 16a8b5c6f90 (!1002).
Closes #9728.16username-removed-443319username-removed-443319https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1027Absorb gitlab_git2017-01-09T20:08:59ZRobert SpeicherAbsorb gitlab_gitEE port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8447EE port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/84478.16Douwe MaanDouwe Maanhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1028Port of 26226-generate-all-haml-fixtures-within-teaspoon-fixtures-task to EE2017-06-19T14:48:01Zusername-removed-636429Port of 26226-generate-all-haml-fixtures-within-teaspoon-fixtures-task to EEThis MR encompasses the changes in gitlab-ce\!8384 and gitlab-ce\!8426 plus an additional change to `issuable_time_tracker_spec.js.es6` which is an ee-only frontend test that also required a similar update.This MR encompasses the changes in gitlab-ce\!8384 and gitlab-ce\!8426 plus an additional change to `issuable_time_tracker_spec.js.es6` which is an ee-only frontend test that also required a similar update.8.16https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1031[EE] Fixes the incoherent filtering by milestone in `/projects/:id/issues` an...2020-07-09T15:37:50Zusername-removed-128633[EE] Fixes the incoherent filtering by milestone in `/projects/:id/issues` and `/groups/:id/issues` endpointsEE port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8457EE port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/84578.16username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1036Added 8.16 CE to EE guide2017-01-09T14:02:27ZJames LopezAdded 8.16 CE to EE guide8.16username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1037Ce to ee2017-06-19T14:48:01ZJames LopezCe to eeMerge CE to EE - For 8.16 RC1 release
### Conflicts:
app/assets/stylesheets/pages/boards.scss
app/views/admin/groups/show.html.haml
app/views/devise/shared/_tabs_ldap.html.haml
app/views/notify/new_merge_request_email....Merge CE to EE - For 8.16 RC1 release
### Conflicts:
app/assets/stylesheets/pages/boards.scss
app/views/admin/groups/show.html.haml
app/views/devise/shared/_tabs_ldap.html.haml
app/views/notify/new_merge_request_email.html.haml
app/views/projects/commits/_commit.html.haml
app/views/projects/commits/show.html.haml
app/views/projects/merge_requests/widget/_open.html.haml
app/views/projects/project_members/index.html.haml
config/routes/project.rb
spec/features/notes_on_merge_requests_spec.rb
spec/models/project_spec.rb8.16James LopezJames Lopezhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1040[Doc] Remove one more confision about ES requirements2017-01-12T10:17:31ZValery Sizov[Doc] Remove one more confision about ES requirements8.16username-removed-443319username-removed-443319https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1041[EE] Refactor admin controllers params2017-01-12T02:00:40Zusername-removed-128633[EE] Refactor admin controllers paramsEE MR for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8521EE MR for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/85218.16Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1042[EE] Refactor controller params2017-01-12T23:53:29Zusername-removed-128633[EE] Refactor controller paramsEE MR for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8522EE MR for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/85228.16Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1044Updated Turbolinks to patched version of turbolinks-classic2017-01-11T15:32:15ZJames LopezUpdated Turbolinks to patched version of turbolinks-classicPicked from CE
See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2048
Conflicts:
Gemfile.lockPicked from CE
See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2048
Conflicts:
Gemfile.lock8.16username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1045CE upstream2017-01-11T16:54:47Zusername-removed-128633CE upstream8.16username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1047Fix project queued for deletion re-creation tooltip2017-01-12T10:22:48ZJames LopezFix project queued for deletion re-creation tooltipEE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5393EE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/53938.16username-removed-443319username-removed-443319https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1048Copy <some text> to clipboard2017-01-23T16:43:27ZVictor WuCopy <some text> to clipboardCompanion MR to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8535.Companion MR to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8535.8.16username-removed-443319username-removed-443319https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1050Thursday: Merge CE -> EE2017-01-12T20:27:57ZNick ThomasThursday: Merge CE -> EE8.16username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1053Use ReactiveCaching in the JenkinsDeprecatedService2017-01-25T15:05:30ZNick ThomasUse ReactiveCaching in the JenkinsDeprecatedServiceSee https://gitlab.com/gitlab-org/gitlab-ce/issues/24185 for more details
`JenkinsDeprecatedService` is an EE-only CI service that can benefit from `ReactiveCaching` in the same way as the four CE+EE CI services.See https://gitlab.com/gitlab-org/gitlab-ce/issues/24185 for more details
`JenkinsDeprecatedService` is an EE-only CI service that can benefit from `ReactiveCaching` in the same way as the four CE+EE CI services.8.16Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1054Ce to ee2017-01-13T18:48:09ZJames LopezCe to eeMerge CE master into EE master
### Conflicts:
app/controllers/admin/application_settings_controller.rb
app/controllers/admin/groups_controller.rb
app/controllers/admin/users_controller.rb
app/controllers/concerns/service_param...Merge CE master into EE master
### Conflicts:
app/controllers/admin/application_settings_controller.rb
app/controllers/admin/groups_controller.rb
app/controllers/admin/users_controller.rb
app/controllers/concerns/service_params.rb
app/controllers/groups_controller.rb
app/models/project.rb
app/views/shared/_clone_panel.html.haml
doc/api/settings.md
features/admin/users.feature
features/steps/admin/users.rb
lib/api/settings.rb
spec/factories/projects.rb
spec/features/issues/reset_filters_spec.rb
spec/requests/api/issues_spec.rb8.16James LopezJames Lopezhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1058CE upstream2017-01-16T00:48:30Zusername-removed-128633CE upstreamNo conflicts!No conflicts!8.16username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1060[EE] Ensure updating project settings shows a flash message on success2017-01-16T18:29:22Zusername-removed-128633[EE] Ensure updating project settings shows a flash message on successEE MR for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8579EE MR for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/85798.16Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1061Ce to ee2017-01-17T06:11:57ZJames LopezCe to eeMerge remote-tracking branch 'gitlab-ce/master' into ce-to-ee
### Conflicts:
spec/models/project_spec.rb
Merge remote-tracking branch 'gitlab-ce/master' into ce-to-ee
### Conflicts:
spec/models/project_spec.rb
8.16James LopezJames Lopezhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1064Refactored 1st iteration of cycle analytics and stages in general (EE version)2017-01-19T10:35:31ZJames LopezRefactored 1st iteration of cycle analytics and stages in general (EE version)EE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7647EE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/76478.16Douwe MaanDouwe Maan