Merge branch 'ce-to-ee-2017-07-13' into 'master'
CE upstream: Thursday Closes gitlab-shell#92, gitaly#356, gitlab-ce#34853, and gitlab-ce#34941 See merge request !2422
Showing
with
2326 additions
and
1215 deletions
+2326
-1215
- .scss-lint.yml .scss-lint.yml +11 -6
- GITALY_SERVER_VERSION GITALY_SERVER_VERSION +1 -1
- GITLAB_SHELL_VERSION GITLAB_SHELL_VERSION +1 -1
- GITLAB_WORKHORSE_VERSION GITLAB_WORKHORSE_VERSION +1 -1
- Gemfile Gemfile +7 -7
- Gemfile.lock Gemfile.lock +5 -7
- app/assets/images/new_nav.png app/assets/images/new_nav.png +0 -0
- app/assets/javascripts/environments/components/environment_item.vue .../javascripts/environments/components/environment_item.vue +2 -2
- app/assets/stylesheets/application.scss app/assets/stylesheets/application.scss +1 -1
- app/assets/stylesheets/framework.scss app/assets/stylesheets/framework.scss +44 -44
- app/assets/stylesheets/framework/awards.scss app/assets/stylesheets/framework/awards.scss +2 -2
- app/assets/stylesheets/framework/blank.scss app/assets/stylesheets/framework/blank.scss +19 -72
- app/assets/stylesheets/framework/common.scss app/assets/stylesheets/framework/common.scss +0 -6
- app/assets/stylesheets/framework/dropdowns.scss app/assets/stylesheets/framework/dropdowns.scss +4 -4
- app/assets/stylesheets/framework/filters.scss app/assets/stylesheets/framework/filters.scss +2 -2
- app/assets/stylesheets/framework/header.scss app/assets/stylesheets/framework/header.scss +1 -1
- app/assets/stylesheets/framework/highlight.scss app/assets/stylesheets/framework/highlight.scss +1 -1
- app/assets/stylesheets/framework/markdown_area.scss app/assets/stylesheets/framework/markdown_area.scss +1 -1
- app/assets/stylesheets/framework/responsive-tables.scss app/assets/stylesheets/framework/responsive-tables.scss +1 -1
- app/assets/stylesheets/framework/variables.scss app/assets/stylesheets/framework/variables.scss +3 -2
- app/assets/stylesheets/highlight/white.scss app/assets/stylesheets/highlight/white.scss +4 -4
- app/assets/stylesheets/new_sidebar.scss app/assets/stylesheets/new_sidebar.scss +2 -2
- app/assets/stylesheets/pages/boards.scss app/assets/stylesheets/pages/boards.scss +3 -3
- app/assets/stylesheets/pages/builds.scss app/assets/stylesheets/pages/builds.scss +8 -8
- app/assets/stylesheets/pages/commits.scss app/assets/stylesheets/pages/commits.scss +1 -1
- app/assets/stylesheets/pages/cycle_analytics.scss app/assets/stylesheets/pages/cycle_analytics.scss +4 -4
- app/assets/stylesheets/pages/diff.scss app/assets/stylesheets/pages/diff.scss +4 -4
- app/assets/stylesheets/pages/issues.scss app/assets/stylesheets/pages/issues.scss +2 -2
- app/assets/stylesheets/pages/members.scss app/assets/stylesheets/pages/members.scss +1 -1
- app/assets/stylesheets/pages/merge_requests.scss app/assets/stylesheets/pages/merge_requests.scss +1 -1
- app/assets/stylesheets/pages/milestone.scss app/assets/stylesheets/pages/milestone.scss +2 -2
- app/assets/stylesheets/pages/notes.scss app/assets/stylesheets/pages/notes.scss +3 -2
- app/assets/stylesheets/pages/pipeline_schedules.scss app/assets/stylesheets/pages/pipeline_schedules.scss +4 -4
- app/assets/stylesheets/pages/pipelines.scss app/assets/stylesheets/pages/pipelines.scss +1 -1
- app/assets/stylesheets/pages/projects.scss app/assets/stylesheets/pages/projects.scss +3 -3
- app/assets/stylesheets/pages/todos.scss app/assets/stylesheets/pages/todos.scss +1 -1
- app/assets/stylesheets/pages/ui_dev_kit.scss app/assets/stylesheets/pages/ui_dev_kit.scss +4 -4
- app/assets/stylesheets/pages/wiki.scss app/assets/stylesheets/pages/wiki.scss +2 -2
- app/assets/stylesheets/print.scss app/assets/stylesheets/print.scss +1 -1
- app/helpers/application_settings_helper.rb app/helpers/application_settings_helper.rb +2 -2
- app/models/user.rb app/models/user.rb +1 -1
- app/views/dashboard/projects/_blank_state_admin_welcome.html.haml ...s/dashboard/projects/_blank_state_admin_welcome.html.haml +9 -9
- app/views/dashboard/projects/_blank_state_welcome.html.haml app/views/dashboard/projects/_blank_state_welcome.html.haml +9 -9
- app/views/dashboard/projects/_zero_authorized_projects.html.haml ...ws/dashboard/projects/_zero_authorized_projects.html.haml +2 -2
- app/views/help/ui.html.haml app/views/help/ui.html.haml +1 -1
- app/views/layouts/header/_default.html.haml app/views/layouts/header/_default.html.haml +1 -1
- app/views/layouts/header/_new.html.haml app/views/layouts/header/_new.html.haml +1 -1
- app/views/layouts/nav/_breadcrumbs.html.haml app/views/layouts/nav/_breadcrumbs.html.haml +1 -1
- app/views/layouts/nav/_new_project_sidebar.html.haml app/views/layouts/nav/_new_project_sidebar.html.haml +2 -2
- app/views/projects/commit/_commit_box.html.haml app/views/projects/commit/_commit_box.html.haml +1 -1
- app/views/projects/commit/show.html.haml app/views/projects/commit/show.html.haml +1 -0
- app/views/projects/new.html.haml app/views/projects/new.html.haml +3 -2
- app/views/projects/pipeline_schedules/index.html.haml app/views/projects/pipeline_schedules/index.html.haml +4 -3
- app/views/projects/show.html.haml app/views/projects/show.html.haml +1 -0
- app/views/projects/tree/show.html.haml app/views/projects/tree/show.html.haml +1 -0
- changelogs/unreleased/10085-stop-encoding-user-name.yml changelogs/unreleased/10085-stop-encoding-user-name.yml +4 -0
- changelogs/unreleased/34325-reinstate-is_admin-for-user-api.yml ...logs/unreleased/34325-reinstate-is_admin-for-user-api.yml +4 -0
- changelogs/unreleased/34729-blob.yml changelogs/unreleased/34729-blob.yml +4 -0
- changelogs/unreleased/34858-bump-scss-lint-to-0-54-0.yml changelogs/unreleased/34858-bump-scss-lint-to-0-54-0.yml +4 -0
- changelogs/unreleased/34867-remove-net-ssh-gem.yml changelogs/unreleased/34867-remove-net-ssh-gem.yml +4 -0
- changelogs/unreleased/34907-dont-show-pipeline-schedule-button-for-non-member.yml ...907-dont-show-pipeline-schedule-button-for-non-member.yml +4 -0
- changelogs/unreleased/34978-remove-public-ci-favicon-ico.yml changelogs/unreleased/34978-remove-public-ci-favicon-ico.yml +4 -0
- changelogs/unreleased/enable-scss-lint-bang-format.yml changelogs/unreleased/enable-scss-lint-bang-format.yml +4 -0
- changelogs/unreleased/enable-scss-lint-declaration-order.yml changelogs/unreleased/enable-scss-lint-declaration-order.yml +4 -0
- changelogs/unreleased/enable-scss-lint-import-path.yml changelogs/unreleased/enable-scss-lint-import-path.yml +4 -0
- changelogs/unreleased/enable-scss-lint-property-spelling.yml changelogs/unreleased/enable-scss-lint-property-spelling.yml +4 -0
- changelogs/unreleased/enable-scss-lint-space-after-comma.yml changelogs/unreleased/enable-scss-lint-space-after-comma.yml +4 -0
- changelogs/unreleased/enable-scss-lint-unnecessary-parent-reference.yml ...eleased/enable-scss-lint-unnecessary-parent-reference.yml +4 -0
- changelogs/unreleased/fix-n-plus-one-in-url-builder.yml changelogs/unreleased/fix-n-plus-one-in-url-builder.yml +4 -0
- changelogs/unreleased/remove-nprogress-gleaning.yml changelogs/unreleased/remove-nprogress-gleaning.yml +4 -0
- changelogs/unreleased/replace_spinach_spec_browse_files.yml changelogs/unreleased/replace_spinach_spec_browse_files.yml +4 -0
- changelogs/unreleased/sh-add-mr-simple-mode.yml changelogs/unreleased/sh-add-mr-simple-mode.yml +4 -0
- changelogs/unreleased/toggle-new-project-import-description.yml ...logs/unreleased/toggle-new-project-import-description.yml +4 -0
- doc/api/merge_requests.md doc/api/merge_requests.md +1 -0
- doc/api/users.md doc/api/users.md +1 -1
- doc/install/installation.md doc/install/installation.md +2 -2
- doc/install/requirements.md doc/install/requirements.md +1 -1
- doc/update/9.3-to-9.4.md doc/update/9.3-to-9.4.md +33 -12
- features/project/source/browse_files.feature features/project/source/browse_files.feature +0 -323
- lib/api/entities.rb lib/api/entities.rb +7 -0
- lib/api/merge_requests.rb lib/api/merge_requests.rb +20 -5
- lib/api/users.rb lib/api/users.rb +10 -1
- lib/gitlab/git/attributes.rb lib/gitlab/git/attributes.rb +5 -0
- lib/gitlab/git/blame.rb lib/gitlab/git/blame.rb +3 -0
- lib/gitlab/git/blob.rb lib/gitlab/git/blob.rb +4 -0
- lib/gitlab/git/blob_snippet.rb lib/gitlab/git/blob_snippet.rb +2 -0
- lib/gitlab/git/branch.rb lib/gitlab/git/branch.rb +2 -0
- lib/gitlab/git/commit.rb lib/gitlab/git/commit.rb +4 -0
- lib/gitlab/git/commit_stats.rb lib/gitlab/git/commit_stats.rb +4 -0
- lib/gitlab/git/compare.rb lib/gitlab/git/compare.rb +2 -0
- lib/gitlab/git/diff.rb lib/gitlab/git/diff.rb +4 -96
- lib/gitlab/git/diff_collection.rb lib/gitlab/git/diff_collection.rb +2 -0
- lib/gitlab/git/env.rb lib/gitlab/git/env.rb +2 -0
- lib/gitlab/git/gitmodules_parser.rb lib/gitlab/git/gitmodules_parser.rb +2 -0
- lib/gitlab/git/hook.rb lib/gitlab/git/hook.rb +4 -0
- lib/gitlab/git/index.rb lib/gitlab/git/index.rb +4 -0
- lib/gitlab/git/path_helper.rb lib/gitlab/git/path_helper.rb +2 -0
- lib/gitlab/git/popen.rb lib/gitlab/git/popen.rb +2 -0
- lib/gitlab/git/ref.rb lib/gitlab/git/ref.rb +3 -0
- lib/gitlab/git/repository.rb lib/gitlab/git/repository.rb +5 -0
- lib/gitlab/git/rev_list.rb lib/gitlab/git/rev_list.rb +4 -0
- lib/gitlab/git/tag.rb lib/gitlab/git/tag.rb +2 -0
- lib/gitlab/git/tree.rb lib/gitlab/git/tree.rb +6 -0
- lib/gitlab/git/util.rb lib/gitlab/git/util.rb +2 -0
- lib/gitlab/redis/wrapper.rb lib/gitlab/redis/wrapper.rb +20 -8
- lib/gitlab/url_builder.rb lib/gitlab/url_builder.rb +3 -5
- lib/gitlab/workhorse.rb lib/gitlab/workhorse.rb +22 -4
- locale/bg/gitlab.po locale/bg/gitlab.po +59 -2
- locale/eo/gitlab.po locale/eo/gitlab.po +59 -2
- locale/es/gitlab.po locale/es/gitlab.po +81 -7
- locale/gitlab.pot locale/gitlab.pot +6 -6
- locale/it/gitlab.po locale/it/gitlab.po +65 -8
- locale/zh_CN/gitlab.po locale/zh_CN/gitlab.po +56 -2
- locale/zh_HK/gitlab.po locale/zh_HK/gitlab.po +57 -5
- locale/zh_TW/gitlab.po locale/zh_TW/gitlab.po +58 -4
- public/ci/favicon.ico public/ci/favicon.ico +0 -0
- spec/features/projects/pipeline_schedules_spec.rb spec/features/projects/pipeline_schedules_spec.rb +161 -127
- spec/features/projects/user_browses_files_spec.rb spec/features/projects/user_browses_files_spec.rb +188 -0
- spec/features/projects/user_create_dir_spec.rb spec/features/projects/user_create_dir_spec.rb +0 -57
- spec/features/projects/user_creates_directory_spec.rb spec/features/projects/user_creates_directory_spec.rb +87 -0
- spec/features/projects/user_creates_files_spec.rb spec/features/projects/user_creates_files_spec.rb +153 -0
- spec/features/projects/user_deletes_files_spec.rb spec/features/projects/user_deletes_files_spec.rb +68 -0
- spec/features/projects/user_edits_files_spec.rb spec/features/projects/user_edits_files_spec.rb +122 -0
- spec/features/projects/user_replaces_files_spec.rb spec/features/projects/user_replaces_files_spec.rb +87 -0
- spec/features/projects/user_uploads_files_spec.rb spec/features/projects/user_uploads_files_spec.rb +82 -0
- spec/fixtures/api/schemas/public_api/v4/user/admin.json spec/fixtures/api/schemas/public_api/v4/user/admin.json +34 -0
- spec/lib/gitlab/git/diff_spec.rb spec/lib/gitlab/git/diff_spec.rb +5 -5
- spec/lib/gitlab/git/hook_spec.rb spec/lib/gitlab/git/hook_spec.rb +6 -0
- spec/lib/gitlab/workhorse_spec.rb spec/lib/gitlab/workhorse_spec.rb +38 -0
- spec/models/user_spec.rb spec/models/user_spec.rb +12 -0
- spec/requests/api/merge_requests_spec.rb spec/requests/api/merge_requests_spec.rb +16 -0
- spec/requests/api/users_spec.rb spec/requests/api/users_spec.rb +4 -4
- spec/spec_helper.rb spec/spec_helper.rb +5 -0
- spec/support/dropzone_helper.rb spec/support/dropzone_helper.rb +19 -0
- spec/support/redis/redis_shared_examples.rb spec/support/redis/redis_shared_examples.rb +13 -1
- vendor/gitlab-ci-yml/Docker.gitlab-ci.yml vendor/gitlab-ci-yml/Docker.gitlab-ci.yml +15 -4
- vendor/gitlab-ci-yml/autodeploy/Kubernetes-with-canary.gitlab-ci.yml ...ab-ci-yml/autodeploy/Kubernetes-with-canary.gitlab-ci.yml +4 -4
- vendor/gitlab-ci-yml/autodeploy/Kubernetes.gitlab-ci.yml vendor/gitlab-ci-yml/autodeploy/Kubernetes.gitlab-ci.yml +3 -3
- vendor/gitlab-ci-yml/autodeploy/OpenShift.gitlab-ci.yml vendor/gitlab-ci-yml/autodeploy/OpenShift.gitlab-ci.yml +3 -9
- vendor/licenses.csv vendor/licenses.csv +300 -260
- No files found.
Please register or sign in to comment