CE upstream: Friday
Remaining conflicts:
-
doc/api/projects.md -
doc/user/permissions.md -
lib/gitlab/url_sanitizer.rb -
lib/gitlab/workhorse.rb -
app/assets/javascripts/api.js -
app/assets/javascripts/dispatcher.js -
app/controllers/admin/dashboard_controller.rb -
app/assets/javascripts/gl_dropdown.js -
app/services/ci/create_pipeline_service.rb -
app/views/projects/edit.html.haml -
doc/ci/autodeploy/index.md -
doc/ci/autodeploy/quick_start_guide.md -
app/views/groups/edit.html.haml -
app/views/groups/issues.html.haml -
doc/user/group/index.md -
doc/user/project/description_templates.md -
spec/lib/gitlab/url_sanitizer_spec.rb -
spec/requests/api/jobs_spec.rb -
app/assets/stylesheets/framework/dropdowns.scss -
spec/lib/gitlab/ldap/user_spec.rb
Conflicts:
both modified: app/assets/javascripts/api.js
both modified: app/assets/javascripts/gl_dropdown.js
both modified: app/assets/stylesheets/framework/dropdowns.scss
both modified: app/assets/stylesheets/new_nav.scss
both modified: app/controllers/admin/dashboard_controller.rb
both modified: app/services/ci/create_pipeline_service.rb
both modified: app/views/groups/edit.html.haml
both modified: app/views/groups/issues.html.haml
both modified: app/views/layouts/_page.html.haml
both modified: app/views/layouts/header/_default.html.haml
both modified: app/views/layouts/header/_new_dropdown.haml
both modified: app/views/layouts/nav/_dashboard.html.haml
both modified: app/views/layouts/nav/_explore.html.haml
both modified: app/views/layouts/nav/sidebar/_group.html.haml
added by them: app/views/layouts/nav/sidebar/_profile.html.haml
both modified: app/views/layouts/nav/sidebar/_project.html.haml
both modified: app/views/layouts/project.html.haml
both modified: app/views/projects/edit.html.haml
both modified: doc/README.md
both modified: doc/api/projects.md
both modified: doc/ci/autodeploy/index.md
both added: doc/ci/autodeploy/quick_start_guide.md
both modified: doc/integration/README.md
both modified: doc/user/group/index.md
both modified: doc/user/permissions.md
both modified: doc/user/project/description_templates.md
both modified: lib/gitlab/url_sanitizer.rb
both modified: lib/gitlab/workhorse.rb
both modified: locale/gitlab.pot
both modified: spec/controllers/projects/artifacts_controller_spec.rb
both modified: spec/helpers/groups_helper_spec.rb
both modified: spec/lib/gitlab/ldap/user_spec.rb
both modified: spec/lib/gitlab/url_sanitizer_spec.rb
both modified: spec/requests/api/jobs_spec.rb
Resolved:
both modified: app/assets/javascripts/boards/boards_bundle.js
both modified: app/assets/javascripts/boards/components/board_list.js
both modified: app/assets/javascripts/boards/components/board_new_issue.js
both modified: app/assets/javascripts/boards/components/issue_card_inner.js
both modified: app/assets/javascripts/boards/components/sidebar/remove_issue.js
both modified: app/assets/javascripts/boards/models/list.js
both added: app/controllers/boards/lists_controller.rb
both modified: app/controllers/projects/boards_controller.rb
both modified: app/controllers/projects/issues_controller.rb
both modified: app/helpers/boards_helper.rb
both modified: app/helpers/issuables_helper.rb
both modified: app/helpers/nav_helper.rb
both modified: app/models/board.rb
both modified: app/models/ci/build.rb
both modified: app/models/note.rb
both modified: app/serializers/environment_entity.rb
both modified: app/services/boards/create_service.rb
both modified: app/services/boards/issues/list_service.rb
both modified: app/services/boards/issues/move_service.rb
both modified: app/services/boards/list_service.rb
both modified: app/services/boards/lists/create_service.rb
both modified: app/services/groups/create_service.rb
both modified: app/services/groups/update_service.rb
both modified: app/services/issues/update_service.rb
both modified: app/services/projects/update_service.rb
both modified: app/views/layouts/nav/sidebar/_admin.html.haml
both modified: app/views/shared/boards/_show.html.haml
both modified: app/views/shared/boards/components/_board.html.haml
both modified: app/views/shared/boards/components/sidebar/_due_date.html.haml
both modified: app/views/shared/issuable/_search_bar.html.haml
both modified: config/initializers/0_inflections.rb
both modified: db/schema.rb
both modified: lib/api/v3/merge_request_diffs.rb
both modified: lib/api/jobs.rb
both modified: spec/javascripts/boards/issue_card_spec.js
both modified: spec/javascripts/boards/list_spec.js
both modified: spec/javascripts/boards/mock_data.js
both modified: spec/javascripts/boards/modal_store_spec.js
both modified: spec/lib/gitlab/import_export/all_models.yml
Edited by username-removed-423915