Skip to content

CE upstream

username-removed-444 requested to merge ce-to-ee into master 
→ git merge --no-ff ce-com/master
Auto-merging spec/spec_helper.rb
Auto-merging spec/features/issues/issue_sidebar_spec.rb
Auto-merging lib/gitlab/upgrader.rb
Auto-merging doc/install/installation.md
Auto-merging app/views/projects/merge_requests/_show.html.haml
Auto-merging app/views/projects/issues/index.html.haml
CONFLICT (content): Merge conflict in app/views/projects/issues/index.html.haml
Auto-merging app/views/projects/edit.html.haml
Auto-merging app/models/application_setting.rb
CONFLICT (content): Merge conflict in app/models/application_setting.rb
Auto-merging app/controllers/autocomplete_controller.rb
Auto-merging app/assets/stylesheets/pages/merge_requests.scss
Auto-merging app/assets/javascripts/application.js
Auto-merging Gemfile.lock
Auto-merging Gemfile
Auto-merging .gitlab-ci.yml
Automatic merge failed; fix conflicts and then commit the result.

dzaporozhets:~/Projects/gitlab-development-kit/gitlab ce-to-ee|MERGING 
→ gstt
On branch ce-to-ee
Your branch is up-to-date with 'ee-com/master'.
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:

	modified:   .gitlab-ci.yml
	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   app/assets/javascripts/application.js
	modified:   app/assets/javascripts/commits.js
	modified:   app/assets/javascripts/filtered_search/dropdown_utils.js.es6
	modified:   app/assets/javascripts/filtered_search/filtered_search_manager.js.es6
	modified:   app/assets/javascripts/issuable_context.js
	modified:   app/assets/javascripts/lib/ace.js
	new file:   app/assets/javascripts/lib/ace/ace_config_paths.js.erb
	modified:   app/assets/javascripts/users/calendar.js
	modified:   app/assets/stylesheets/framework/calendar.scss
	modified:   app/assets/stylesheets/pages/issuable.scss
	modified:   app/assets/stylesheets/pages/merge_requests.scss
	modified:   app/controllers/autocomplete_controller.rb
	modified:   app/views/ci/status/_badge.html.haml
	modified:   app/views/projects/builds/_header.html.haml
	modified:   app/views/projects/edit.html.haml
	modified:   app/views/projects/merge_requests/_show.html.haml
	modified:   app/views/projects/services/_form.html.haml
	new file:   changelogs/unreleased/26947-build-status-self-link.yml
	new file:   changelogs/unreleased/27248-filtered-search-does-not-allow-filtering-labels-with-multiple-words.yml
	new file:   changelogs/unreleased/27259-label-for-references-the-wrong-associated-text-input.yml
	new file:   changelogs/unreleased/contribution-calendar-scroll.yml
	new file:   changelogs/unreleased/fix-cancel-integration-settings.yml
	new file:   changelogs/unreleased/fix-search-bar-search-param.yml
	new file:   changelogs/unreleased/issuable-sidebar-bug.yml
	new file:   changelogs/unreleased/mr-tabs-container-offset.yml
	new file:   changelogs/unreleased/relative-url-assets.yml
	new file:   config/initializers/rspec_profiling.rb
	modified:   doc/administration/raketasks/maintenance.md
	modified:   doc/api/commits.md
	modified:   doc/development/performance.md
	modified:   doc/development/ux_guide/components.md
	modified:   doc/development/ux_guide/copy.md
	modified:   doc/install/installation.md
	modified:   doc/install/relative_url.md
	modified:   doc/update/patch_versions.md
	modified:   lib/gitlab/upgrader.rb
	modified:   lib/support/deploy/deploy.sh
	new file:   lib/tasks/gitlab/assets.rake
	modified:   spec/controllers/explore/projects_controller_spec.rb
	modified:   spec/features/issues/issue_sidebar_spec.rb
	modified:   spec/features/projects/project_settings_spec.rb
	new file:   spec/javascripts/commits_spec.js.es6
	modified:   spec/javascripts/filtered_search/dropdown_utils_spec.js.es6
	new file:   spec/javascripts/filtered_search/filtered_search_manager_spec.js.es6
	modified:   spec/spec_helper.rb
	new file:   spec/support/mobile_helpers.rb
	modified:   spec/views/projects/builds/show.html.haml_spec.rb

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   app/models/application_setting.rb
	both modified:   app/views/projects/issues/index.html.haml

Merge request reports