CE upstream

Changes to be committed:

	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   app/assets/javascripts/environments/components/environment.js.es6
	modified:   app/assets/javascripts/environments/stores/environments_store.js.es6
	modified:   app/assets/javascripts/gfm_auto_complete.js.es6
	modified:   app/assets/javascripts/mini_pipeline_graph_dropdown.js.es6
	modified:   app/assets/javascripts/notes.js
	modified:   app/assets/javascripts/preview_markdown.js
	modified:   app/assets/javascripts/project_new.js
	modified:   app/assets/javascripts/u2f/authenticate.js.es6
	modified:   app/assets/javascripts/u2f/error.js
	modified:   app/assets/javascripts/u2f/register.js
	new file:   app/assets/javascripts/visibility_select.js.es6
	modified:   app/assets/javascripts/vue_pipelines_index/stage.js.es6
	modified:   app/assets/stylesheets/framework/buttons.scss
	modified:   app/assets/stylesheets/framework/filters.scss
	modified:   app/assets/stylesheets/framework/sidebar.scss
	modified:   app/assets/stylesheets/framework/typography.scss
	modified:   app/assets/stylesheets/pages/notes.scss
	modified:   app/assets/stylesheets/pages/pipelines.scss
	modified:   app/assets/stylesheets/pages/projects.scss
	modified:   app/controllers/autocomplete_controller.rb
	modified:   app/controllers/dashboard/milestones_controller.rb
	modified:   app/controllers/projects/builds_controller.rb
	modified:   app/controllers/projects/commit_controller.rb
	modified:   app/controllers/projects/compare_controller.rb
	modified:   app/controllers/projects/notes_controller.rb
	modified:   app/helpers/diff_helper.rb
	modified:   app/helpers/merge_requests_helper.rb
	modified:   app/helpers/projects_helper.rb
	modified:   app/helpers/todos_helper.rb
	modified:   app/models/commit.rb
	modified:   app/models/concerns/milestoneish.rb
	new file:   app/models/concerns/presentable.rb
	new file:   app/models/dashboard_milestone.rb
	modified:   app/models/generic_commit_status.rb
	modified:   app/models/merge_request.rb
	modified:   app/models/merge_request_diff.rb
	modified:   app/models/project_statistics.rb
	modified:   app/models/todo.rb
	modified:   app/policies/base_policy.rb
	new file:   app/presenters/README.md
	new file:   app/presenters/ci/build_presenter.rb
	modified:   app/services/merge_requests/refresh_service.rb
	modified:   app/services/merge_requests/update_service.rb
	modified:   app/services/notes/create_service.rb
	modified:   app/services/notes/slash_commands_service.rb
	modified:   app/services/slash_commands/interpret_service.rb
	modified:   app/services/system_note_service.rb
	modified:   app/views/dashboard/todos/_todo.html.haml
	new file:   app/views/projects/_visibility_select.html.haml
	modified:   app/views/projects/builds/_sidebar.html.haml
	modified:   app/views/projects/builds/show.html.haml
	modified:   app/views/projects/commit/_change.html.haml
	modified:   app/views/projects/commit/_ci_menu.html.haml
	modified:   app/views/projects/commit/pipelines.html.haml
	modified:   app/views/projects/diffs/_diffs.html.haml
	modified:   app/views/projects/merge_requests/_new_submit.html.haml
	modified:   app/views/projects/merge_requests/_show.html.haml
	modified:   app/views/projects/merge_requests/show/_diffs.html.haml
	modified:   app/views/projects/notes/_form.html.haml
	modified:   app/views/projects/services/mattermost_slash_commands/_help.html.haml
	modified:   app/views/projects/services/slack_slash_commands/_help.html.haml
	modified:   app/views/shared/issuable/_form.html.haml
	modified:   app/views/shared/issuable/form/_title.html.haml
	modified:   app/views/shared/milestones/_issuable.html.haml
	modified:   app/views/shared/milestones/_issuables.html.haml
	modified:   app/views/shared/milestones/_milestone.html.haml
	new file:   changelogs/unreleased/23524-notify-automerge-user-of-failed-build.yml
	new file:   changelogs/unreleased/24032-changed-visibility-level-to-public-but-project-is-not-public.yml
	new file:   changelogs/unreleased/24915_merge_slash_command.yml
	new file:   changelogs/unreleased/25507-handle-errors-environment-list.yml
	new file:   changelogs/unreleased/26117-sort-pipeline-for-commit.yml
	new file:   changelogs/unreleased/26472-math-margin.yml
	new file:   changelogs/unreleased/26601-dropdown-makes-request-close.yml
	new file:   changelogs/unreleased/26667-pipeline-width-for-huge-pipeline.yml
	new file:   changelogs/unreleased/26773-fix-project-statistics-repository-size.yml
	new file:   changelogs/unreleased/8623-correct-robots-txt.yml
	new file:   changelogs/unreleased/clipboard-button-commit-sha.yml
	new file:   changelogs/unreleased/feature-gitaly-feature-flag.yml
	new file:   changelogs/unreleased/fix-external-status-badge-links.yml
	new file:   changelogs/unreleased/fix-keep-artifacts-button-visibility.yml
	new file:   changelogs/unreleased/i--25814-500-error.yml
	new file:   changelogs/unreleased/input-button-hover.yml
	new file:   changelogs/unreleased/issue_25017.yml
	new file:   changelogs/unreleased/markdown-area-height-fix.yml
	new file:   changelogs/unreleased/mr-tabs-alignment-sidebar-open.yml
	new file:   changelogs/unreleased/reduce-queries-milestone-index.yml
	new file:   changelogs/unreleased/speed-up-dashboard-milestone-index.yml
	deleted:    changelogs/unreleased/switch-to-sassc.yml
	new file:   changelogs/unreleased/wip-mr-from-commits.yml
	modified:   config/application.rb
	modified:   config/initializers/1_settings.rb
	modified:   config/routes/project.rb
	new file:   db/migrate/20161223034433_add_estimate_to_issuables_ce.rb
	new file:   db/migrate/20161223034646_create_timelogs_ce.rb
	modified:   doc/ci/git_submodules.md
	modified:   doc/ci/yaml/README.md
	modified:   doc/development/frontend.md
	modified:   doc/integration/omniauth.md
	modified:   doc/project_services/project_services.md
	new file:   doc/public_access/img/restrict_visibility_levels.png
	modified:   doc/public_access/public_access.md
	modified:   doc/user/project/slash_commands.md
	modified:   doc/workflow/importing/migrating_from_svn.md
	modified:   lib/api/commit_statuses.rb
	modified:   lib/banzai/filter/reference_filter.rb
	new file:   lib/gitlab/ci/status/external/common.rb
	new file:   lib/gitlab/ci/status/external/factory.rb
	modified:   lib/gitlab/git/blame.rb
	modified:   lib/gitlab/git/blob.rb
	modified:   lib/gitlab/git/repository.rb
	new file:   lib/gitlab/view/presenter/base.rb
	new file:   lib/gitlab/view/presenter/delegated.rb
	new file:   lib/gitlab/view/presenter/factory.rb
	new file:   lib/gitlab/view/presenter/simple.rb
	modified:   lib/gitlab/workhorse.rb
	modified:   public/robots.txt
	new file:   spec/controllers/admin/services_controller_spec.rb
	modified:   spec/controllers/projects/commit_controller_spec.rb
	modified:   spec/controllers/projects/compare_controller_spec.rb
	modified:   spec/controllers/projects/merge_requests_controller_spec.rb
	modified:   spec/controllers/projects/notes_controller_spec.rb
	modified:   spec/factories/todos.rb
	modified:   spec/features/issues/filtered_search/dropdown_assignee_spec.rb
	modified:   spec/features/issues/filtered_search/dropdown_author_spec.rb
	modified:   spec/features/issues/gfm_autocomplete_spec.rb
	modified:   spec/features/merge_requests/cherry_pick_spec.rb
	modified:   spec/features/merge_requests/diffs_spec.rb
	modified:   spec/features/merge_requests/edit_mr_spec.rb
	modified:   spec/features/merge_requests/user_uses_slash_commands_spec.rb
	new file:   spec/features/merge_requests/wip_message_spec.rb
	modified:   spec/features/projects/builds_spec.rb
	modified:   spec/features/projects/commits/cherry_pick_spec.rb
	modified:   spec/features/projects/pipelines/pipeline_spec.rb
	new file:   spec/features/projects/settings/visibility_settings_spec.rb
	modified:   spec/features/todos/todos_spec.rb
	modified:   spec/helpers/merge_requests_helper_spec.rb
	modified:   spec/javascripts/.eslintrc
	new file:   spec/javascripts/environments/environment_spec.js.es6
	modified:   spec/javascripts/environments/mock_data.js.es6
	modified:   spec/javascripts/fixtures/environments/environments.html.haml
	modified:   spec/javascripts/fixtures/mini_dropdown_graph.html.haml
	new file:   spec/javascripts/gfm_auto_complete_spec.js.es6
	new file:   spec/javascripts/helpers/class_spec_helper.js.es6
	new file:   spec/javascripts/helpers/class_spec_helper_spec.js.es6
	new file:   spec/javascripts/visibility_select_spec.js.es6
	new file:   spec/lib/gitlab/ci/status/external/common_spec.rb
	new file:   spec/lib/gitlab/ci/status/external/factory_spec.rb
	new file:   spec/lib/gitlab/view/presenter/base_spec.rb
	new file:   spec/lib/gitlab/view/presenter/delegated_spec.rb
	new file:   spec/lib/gitlab/view/presenter/factory_spec.rb
	new file:   spec/lib/gitlab/view/presenter/simple_spec.rb
	modified:   spec/lib/gitlab/workhorse_spec.rb
	modified:   spec/models/ci/build_spec.rb
	modified:   spec/models/commit_spec.rb
	new file:   spec/models/concerns/presentable_spec.rb
	modified:   spec/models/generic_commit_status_spec.rb
	modified:   spec/models/merge_request_diff_spec.rb
	modified:   spec/models/merge_request_spec.rb
	modified:   spec/models/project_statistics_spec.rb
	new file:   spec/policies/base_policy_spec.rb
	new file:   spec/presenters/ci/build_presenter_spec.rb
	modified:   spec/requests/api/access_requests_spec.rb
	modified:   spec/requests/api/boards_spec.rb
	modified:   spec/requests/api/commit_statuses_spec.rb
	modified:   spec/requests/api/deploy_keys_spec.rb
	modified:   spec/requests/api/environments_spec.rb
	modified:   spec/requests/api/fork_spec.rb
	modified:   spec/requests/api/groups_spec.rb
	modified:   spec/requests/api/internal_spec.rb
	modified:   spec/requests/api/issues_spec.rb
	modified:   spec/requests/api/labels_spec.rb
	modified:   spec/requests/api/members_spec.rb
	modified:   spec/requests/api/notes_spec.rb
	modified:   spec/requests/api/notification_settings_spec.rb
	modified:   spec/requests/api/project_hooks_spec.rb
	modified:   spec/requests/api/projects_spec.rb
	modified:   spec/requests/api/runners_spec.rb
	modified:   spec/requests/api/todos_spec.rb
	modified:   spec/requests/api/triggers_spec.rb
	modified:   spec/requests/api/variables_spec.rb
	modified:   spec/services/merge_requests/refresh_service_spec.rb
	modified:   spec/services/merge_requests/update_service_spec.rb
	modified:   spec/services/notes/create_service_spec.rb
	modified:   spec/services/slash_commands/interpret_service_spec.rb
	modified:   spec/services/system_note_service_spec.rb
	modified:   spec/services/todo_service_spec.rb
	modified:   spec/support/test_env.rb
	modified:   spec/teaspoon_env.rb

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

	both modified:   app/assets/javascripts/boards/services/board_service.js.es6
	both modified:   app/assets/javascripts/protected_branches/protected_branch_access_dropdown.js.es6
	both modified:   app/assets/javascripts/protected_branches/protected_branch_create.js.es6
	both modified:   app/assets/javascripts/protected_branches/protected_branch_edit.js.es6
	both modified:   app/controllers/projects/merge_requests_controller.rb
	both modified:   app/models/ci/build.rb
	both modified:   app/services/issuable_base_service.rb
	both modified:   app/services/todo_service.rb
	both modified:   app/views/projects/edit.html.haml
	both modified:   doc/api/merge_requests.md
	both modified:   doc/workflow/README.md
	both added:      doc/workflow/time_tracking.md
	both modified:   features/steps/shared/project.rb
	both modified:   spec/features/issues/user_uses_slash_commands_spec.rb
	both added:      spec/javascripts/issuable_time_tracker_spec.js.es6
	both modified:   spec/lib/gitlab/import_export/all_models.yml
	both modified:   spec/requests/api/merge_requests_spec.rb

added 1 commit

• 56049ad0 - WIP: fix conflicts

Compare with previous version

added 1 commit

• 3847542d - WIP: fix conflicts

Compare with previous version

added 1 commit

• 675598d7 - Fix CE -> EE merge conflicts

Compare with previous version

assigned to @nick.thomas

mentioned in merge request !1074 (merged)

Waiting for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8644 to be merged to CE master so I can make this green.

added 48 commits

• 932bcb4d - Added isAuthenticate to differentiate between ineligible messages
• 047107a4 - Add margin to math blocks
• 2f0bbd3d - Adds .catch to the request in order to handle erros and show a feedback to the user
• 463fddea - Adds tests
• 683ea89e - Use bootstrap dropdown events to only make the request when the dropdown is being opened
• 725b1654 - Filter environments visibility in store instead of the view in order to not get …
• eb61d493 - Autoresize markdown preview
• 9c560b5c - Replace many :project with :empty_projects in API specs
• 2d2fe2cf - Add first shared examples to a helper and updated teaspoon_env to allow helper specs to run
• f7eb3573 - Ensure group acts as a namespace for polymorphic routes
• 504bdaf3 - Upgrade Brakeman to 3.4.1
• 0a1c8bb3 - Pass Gitaly resource path to gitlab-workhorse if Gitaly is enabled
• 6359a3fc - Fix small button alignment issues
• 9e4d0491 - resolve all no-plusplus eslint violations
• e7b5945c - resolve all semi and no-extra-semi eslint violations
• ccada28f - resolve all padded-blocks eslint violations
• bf638d68 - resolve all no-irregular-whitespace eslint violations
• b857b21f - resolve all no-trailing-spaces eslint violations
• 96931b17 - resolve all indent eslint violations
• 04eff5fd - resolve all x-spacing and no-spaced-x eslint violations
• 588d7e8a - resolve all parseInt radix eslint violations
• 0b3f0049 - resolve all no-dupe-keys eslint violations
• 83ecc02d - resolve all prefer-const eslint violations
• d55d4cdf - resolve all space-in-parens eslint violations
• e59623e7 - Mark MR as WIP when pushing WIP commits
• ea7bf7ed - Show a custom WIP help message for MR's with WIP commits
• fb347f90 - Revert "Merge branch 'switch-to-sassc' into 'master'"
• 0ece506e - Merge branch 'rs-revert-sassc' into 'master'
• 4f1eb8cd - Fix todos spec
• b67a1b60 - Merge branch 'wip-mr-from-commits' into 'master'
• 4616617d - Merge branch 'simple-eslint-fixes' into 'master'
• 52762df2 - Merge branch 'brakeman-upgrade' into 'master'
• aab60054 - Merge branch 'allow-shared-examples-jasmine' into 'master'
• 639b880e - Merge branch 'button-alignment' into 'master'
• c84272dc - Merge branch 'feature/gitaly-feature-flag' into 'master'
• e8e2a6a9 - Merge branch 'didemacet-markdown-area-height-fix' into 'master'
• 621b23da - Add an image to the public access documentation and fix wrong profile path
• 2de5f511 - Merge branch 'fix-dashboard-spec' into 'master'
• 4b999ccd - Merge branch '26810-fix-undefined-method-revert_group_project_commit_path' into 'master'
• f1568d71 - Merge branch 'use-empty_project-factory-in-api-specs' into 'master'
• bb56a1fe - Merge branch '26472-math-margin' into 'master'
• 1c81452a - Merge branch '26601-dropdown-makes-request-close' into 'master'
• 6669bfd3 - Merge branch '25507-handle-errors-environment-list' into 'master'
• d7318a56 - Merge branch 'improve-public_access-documentation' into 'master'
• 4bf97250 - Merge branch '26066-wrong-messsage-for-unregistered-u2f-device-on-sign-in' into 'master'
• 2bf5fe5e - Rename duplicate migrations and skip them if table/columns are already present
• 0eef032d - Merge branch '26868-fix-duplicate-backported-migrations' into 'master'
• 21782f81 - Merge remote-tracking branch 'ce/master' into ce-to-ee

Compare with previous version

added 1 commit

• d783e08a - Merge remote-tracking branch 'ce/master' into ce-to-ee

Compare with previous version

added 94 commits

• d783e08a...57293569 - 90 commits from branch gitlab-org:master
• 90ee81dc - Document GIT_SUBMODULE_STRATEGY
• cf1f7e89 - Merge branch 'ci-submodule-doc-update' into 'master'
• 9d9f62a4 - Merge remote-tracking branch 'ce/master' into ce-to-ee-2
• 3e1b70c2 - Fix CE -> EE merge conflicts

Compare with previous version

@mikegreiling these four files:

	both modified:   app/assets/javascripts/boards/services/board_service.js.es6
	both modified:   app/assets/javascripts/protected_branches/protected_branch_access_dropdown.js.es6
	both modified:   app/assets/javascripts/protected_branches/protected_branch_create.js.es6
	both modified:   app/assets/javascripts/protected_branches/protected_branch_edit.js.es6

all had conflicts due to changes in the list of eslint exceptions.

For the sake of resolution, I've chosen the most permissive eslint-disable lines for each file. I can't work out how to run eslint on a single file, so trying to be more specific is going to kill me. Are you OK with these resolutions?

Is it worth running your eslint cleanups against ee as well as ce in a separate MR / set of MRs? Or can we reorganise code so that EE-specific JS doesn't share the same file?

Conflict resolutions are in https://gitlab.com/nick.thomas/gitlab-ee/commit/3e1b70c2d9f4297c203cf39aee466e9e0dc9b1b7

added 1 commit

• 586b40d8 - Fix CE -> EE merge conflicts

Compare with previous version

Coordinating with @briann over the brakeman failure

added 1 commit

• 94e33032 - Fix CE -> EE merge conflicts

Compare with previous version

Or can we reorganise code so that EE-specific JS doesn't share the same file?

@mikegreiling Please try to do that in the future. And at least open a EE-port MR for your CE MR that don't pass the ee_compat_check build. /cc @jschatz1

assigned to @rymai

merged

mentioned in commit 5fb89926

@rymai @nick.thomas I did have an ee-branch for this merge request, and it got merged too:

see: !1049 (merged)

I'm not sure what happened here. I can open another EE merge request to fix the eslint rules. Ideally we will eventually fix all of them and stop disabling rules in the header of all of our javascript files so conflicts like this shouldn't be a problem in the future.

Did !1049 (merged) not make it in this upstream merge?

@mikegreiling Milestone was missing!

mentioned in merge request !1049 (merged)