CE upstream
Changes to be committed:
modified: .rubocop.yml
modified: app/assets/javascripts/build.js
modified: app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
modified: app/assets/javascripts/lib/utils/common_utils.js.es6
modified: app/assets/javascripts/merge_request.js
modified: app/assets/javascripts/merge_request_tabs.js.es6
modified: app/assets/javascripts/sidebar.js.es6
modified: app/assets/stylesheets/framework/header.scss
modified: app/assets/stylesheets/framework/nav.scss
modified: app/assets/stylesheets/framework/sidebar.scss
modified: app/assets/stylesheets/mailers/highlighted_diff_email.scss
modified: app/assets/stylesheets/pages/boards.scss
modified: app/assets/stylesheets/pages/events.scss
modified: app/assets/stylesheets/pages/issuable.scss
modified: app/assets/stylesheets/pages/merge_requests.scss
modified: app/assets/stylesheets/pages/pipelines.scss
modified: app/assets/stylesheets/pages/tree.scss
modified: app/controllers/concerns/issuable_collections.rb
modified: app/controllers/concerns/issues_action.rb
modified: app/controllers/concerns/merge_requests_action.rb
modified: app/controllers/groups/group_members_controller.rb
modified: app/controllers/projects/blob_controller.rb
modified: app/controllers/projects/issues_controller.rb
modified: app/controllers/projects/merge_requests_controller.rb
new file: app/finders/group_members_finder.rb
modified: app/mailers/notify.rb
modified: app/models/application_setting.rb
modified: app/models/award_emoji.rb
modified: app/models/concerns/issuable.rb
modified: app/models/concerns/milestoneish.rb
modified: app/models/group.rb
modified: app/models/group_milestone.rb
modified: app/models/member.rb
modified: app/models/note.rb
modified: app/models/user.rb
modified: app/models/wiki_page.rb
modified: app/services/create_tag_service.rb
modified: app/services/delete_tag_service.rb
renamed: app/services/files/delete_service.rb -> app/services/files/destroy_service.rb
modified: app/services/issues/build_service.rb
modified: app/views/layouts/header/_default.html.haml
modified: app/views/projects/builds/_sidebar.html.haml
modified: app/views/projects/ci/pipelines/_pipeline.html.haml
modified: app/views/projects/environments/terminal.html.haml
modified: app/views/projects/issues/_issue.html.haml
modified: app/views/projects/merge_requests/_merge_request.html.haml
modified: app/views/projects/merge_requests/widget/_heading.html.haml
modified: app/views/projects/merge_requests/widget/_show.html.haml
modified: app/views/projects/merge_requests/widget/open/_build_failed.html.haml
modified: app/views/projects/new.html.haml
modified: app/views/projects/triggers/_index.html.haml
modified: app/views/projects/wikis/_sidebar.html.haml
modified: app/views/shared/_commit_message_container.html.haml
new file: app/views/shared/_issuable_meta_data.html.haml
modified: app/views/shared/_visibility_level.html.haml
modified: app/views/shared/issuable/_sidebar.html.haml
modified: app/workers/authorized_projects_worker.rb
new file: changelogs/unreleased/1051-api-create-users-without-password.yml
new file: changelogs/unreleased/27336-add-environment-url-link-to-terminal-page.yml
new file: changelogs/unreleased/27608-fixes-markdown-in-activity-feed-is-light-gray.yml
new file: changelogs/unreleased/27783-fix-fe-doc-broken-link.yml
new file: changelogs/unreleased/27963-tooltips-jobs.yml
new file: changelogs/unreleased/27987-skipped-pipeline-mr-graph.yml
new file: changelogs/unreleased/27991-success-with-warnings-caret.yml
new file: changelogs/unreleased/27994-fix-mr-widget-jump.yml
new file: changelogs/unreleased/28029-improve-blockquote-formatting-on-emails.yml
new file: changelogs/unreleased/fix-job-to-pipeline-renaming.yml
new file: changelogs/unreleased/fix_issue_from_milestone.yml
new file: changelogs/unreleased/issue-newproj-layout.yml
new file: changelogs/unreleased/issue_25900.yml
new file: changelogs/unreleased/rename_files_delete_service.yml
new file: changelogs/unreleased/sh-add-index-to-ci-trigger-requests.yml
new file: changelogs/unreleased/static-navbar.yml
modified: config/initializers/rspec_profiling.rb
modified: db/migrate/20160919145149_add_group_id_to_labels.rb
modified: db/migrate/20161020083353_add_pipeline_id_to_merge_request_metrics.rb
modified: db/migrate/20161031171301_add_project_id_to_subscriptions.rb
new file: db/migrate/20170210075922_add_index_to_ci_trigger_requests_for_commit_id.rb
modified: doc/api/users.md
modified: doc/development/frontend.md
modified: doc/development/rake_tasks.md
modified: doc/development/testing.md
modified: doc/user/project/img/issue_board.png
deleted: doc/user/project/img/issue_board_search_backlog.png
modified: doc/user/project/img/issue_board_welcome_message.png
new file: doc/user/project/img/issue_boards_add_issues_modal.png
new file: doc/user/project/img/issue_boards_remove_issue.png
modified: doc/user/project/img/protected_branches_devs_can_push.png
modified: doc/user/project/issue_board.md
new file: doc/user/project/merge_requests/index.md
modified: doc/user/project/merge_requests/versions.md
modified: doc/workflow/README.md
modified: lib/api/branches.rb
modified: lib/api/entities.rb
modified: lib/api/files.rb
modified: lib/api/users.rb
modified: lib/gitlab/ci/config/entry/configurable.rb
modified: lib/gitlab/database/migration_helpers.rb
modified: lib/gitlab/email/message/repository_push.rb
modified: lib/gitlab/git/blob_snippet.rb
modified: lib/gitlab/metrics.rb
new file: rubocop/cop/migration/add_concurrent_foreign_key.rb
modified: rubocop/rubocop.rb
new file: spec/controllers/dashboard_controller_spec.rb
modified: spec/controllers/projects/issues_controller_spec.rb
modified: spec/controllers/projects/merge_requests_controller_spec.rb
modified: spec/features/boards/sidebar_spec.rb
modified: spec/features/environment_spec.rb
new file: spec/features/groups/members/list_spec.rb
new file: spec/features/issuables/issuable_list_spec.rb
modified: spec/features/merge_requests/conflicts_spec.rb
modified: spec/features/merge_requests/mini_pipeline_graph_spec.rb
new file: spec/finders/group_members_finder_spec.rb
modified: spec/javascripts/behaviors/quick_submit_spec.js
modified: spec/javascripts/fixtures/header.html.haml
modified: spec/lib/gitlab/database/migration_helpers_spec.rb
modified: spec/lib/gitlab/diff/position_tracer_spec.rb
modified: spec/models/member_spec.rb
modified: spec/requests/api/users_spec.rb
new file: spec/rubocop/cop/migration/add_concurrent_foreign_key_spec.rb
modified: spec/services/issues/build_service_spec.rb
modified: spec/services/issues/create_service_spec.rb
new file: spec/support/issuables_list_metadata_shared_examples.rb
modified: spec/support/services/issuable_create_service_slash_commands_shared_examples.rb
modified: spec/support/slash_commands_helpers.rb
modified: spec/support/time_tracking_shared_examples.rb
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: app/assets/javascripts/application.js
both modified: app/controllers/projects/wikis_controller.rb
both modified: app/models/project.rb
both modified: app/services/projects/create_service.rb
both modified: app/views/shared/members/_member.html.haml
both modified: db/schema.rb
both modified: doc/user/project/merge_requests.md
both modified: spec/factories/users.rbMerge request reports
Activity
enabled an automatic merge when the pipeline for a50741de succeeds
added 3 commits
-
7aa40b33...e21257f7 - 2 commits from branch
master - ff2445d0 - Merge branch 'master' into 'ce-to-ee'
-
7aa40b33...e21257f7 - 2 commits from branch
enabled an automatic merge when the pipeline for ff2445d0 succeeds
enabled an automatic merge when the pipeline for a34eb837 succeeds
Please register or sign in to reply