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