diff options
219 files changed, 740 insertions, 934 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 80ba8e5c1a1..f9c5ebe7a35 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -290,7 +290,7 @@ flaky-examples-check: - scripts/merge-reports ${NEW_FLAKY_SPECS_REPORT} rspec_flaky/new_*_*.json - scripts/detect-new-flaky-examples $NEW_FLAKY_SPECS_REPORT -setup-test-env: +compile-assets: <<: *dedicated-runner <<: *except-docs <<: *use-pg @@ -301,13 +301,25 @@ setup-test-env: - node --version - yarn install --frozen-lockfile --cache-folder .yarn-cache - bundle exec rake gitlab:assets:compile - - bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init' - - scripts/gitaly-test-build # Do not use 'bundle exec' here artifacts: expire_in: 7d paths: - node_modules - public/assets + +setup-test-env: + <<: *dedicated-runner + <<: *except-docs + <<: *use-pg + stage: prepare + cache: + <<: *default-cache + script: + - bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init' + - scripts/gitaly-test-build # Do not use 'bundle exec' here + artifacts: + expire_in: 7d + paths: - tmp/tests rspec-pg 0 26: *rspec-metadata-pg @@ -664,6 +676,7 @@ lint:javascript:report: <<: *pull-cache stage: post-test dependencies: + - compile-assets - setup-test-env before_script: [] script: diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fbe6e47e24..9d1cb987472 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,170 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 10.4.0 (2018-01-22) + +### Security (8 changes, 1 of them is from the community) + +- Upgrade Ruby to 2.3.6 to include security patches. !16016 +- Prevent a SQL injection in the MilestonesFinder. +- Check user authorization for source and target projects when creating a merge request. +- Fix path traversal in gitlab-ci.yml cache:key. +- Fix writable shared deploy keys. +- Filter out sensitive fields from the project services API. (Robert Schilling) +- Fix RCE via project import mechanism. +- Prevent OAuth login POST requests when a provider has been disabled. + +### Fixed (68 changes, 24 of them are from the community) + +- Update comment on image cursor and icons. !15760 +- Fixes the wording of headers in system info page. !15802 (Gilbert Roulot) +- Reset todo counters when the target is deleted. !15807 +- Execute quick actions (if present) when creating MR from issue. !15810 +- fix build count in pipeline success mail. !15827 (Christiaan Van den Poel) +- Fix error that was preventing users to change the access level of access requests for Groups or Projects. !15832 +- Last push event widget width for fixed layout. !15862 (George Tsiolis) +- Hide link to issues/MRs from labels list if issues/MRs are disabled. !15863 (Sophie Herold) +- Use relative URL for projects to avoid storing domains. !15876 +- Fix gitlab-rake gitlab:import:repos import schedule. !15931 +- Removed incorrect guidance stating blocked users will be removed from groups and project as members. !15947 (CesarApodaca) +- Fix some POST/DELETE requests in IE by switching some bundles to Axios for Ajax requests. !15951 +- Fixing error 500 when member exist but not the user. !15970 +- show None when issue is in closed list and no labels assigned. !15976 (Christiaan Van den Poel) +- Fix tags in the Activity tab not being clickable. !15996 (Mario de la Ossa) +- Disable Vue pagination when only one page of content is available. !15999 (Mario de la Ossa) +- disables shortcut to issue boards when issues are not enabled. !16020 (Christiaan Van den Poel) +- Ignore lost+found folder during backup on a volume. !16036 (Julien Millau) +- Fix abuse reports link url in admin area navbar. !16068 (megos) +- Keep typographic hierarchy in User Settings. !16090 (George Tsiolis) +- Adjust content width for User Settings, GPG Keys. !16093 (George Tsiolis) +- Fix gitlab-rake gitlab:import:repos import schedule. !16115 +- Fix import project url not updating project name. !16120 +- Fix activity inline event line height on mobile. !16121 (George Tsiolis) +- Fix slash commands dropdown description mis-alignment on Firefox. !16125 (Maurizio De Santis) +- Remove unnecessary sidebar element realignment. !16159 (George Tsiolis) +- User#projects_limit remove DB default and added NOT NULL constraint. !16165 (Mario de la Ossa) +- Fix API endpoints to edit wiki pages where project belongs to a group. !16170 +- Fix breadcrumbs in User Settings. !16172 (rfwatson) +- Move 2FA disable button. !16177 (George Tsiolis) +- Fixing bug when wiki last version. !16197 +- Protected branch is now created for default branch on import. !16198 +- Prevent excessive DB load due to faulty DeleteConflictingRedirectRoutes background migration. !16205 +- Force Auto DevOps kubectl version to 1.8.6. !16218 +- Fix missing references to pipeline objects when restoring project with import/export feature. !16221 +- Fix inconsistent downcase of filenames in prefilled `Add` commit messages. !16232 (James Ramsay) +- Default merge request title is set correctly again when external issue tracker is activated. !16356 (Ben305) +- Ensure that emails contain absolute, rather than relative, links to user uploads. !16364 +- Prevent invalid Route path if path is unchanged. !16397 +- Fixing rack request mime type when using rack attack. !16427 +- Prevent RevList failing on non utf8 paths. !16440 +- Fix giant fork icons on forks page. !16474 +- Fix links to uploaded files on wiki pages. !16499 +- Modify `LDAP::Person` to return username value based on attributes. +- Fixed merge request status badge not updating after merging. +- Remove related links in MR widget when empty state. +- Gracefully handle garbled URIs in Markdown. +- Fix hooks not being set up properly for bare import Rake task. +- Fix Mermaid drawings not loading on some browsers. +- Humanize the units of "Showing last X KiB of log" in job trace. +- Avoid leaving a push event empty if payload cannot be created. +- Show authored date rather than committed date on the commit list. +- Fix when branch creation fails don't post system note. (Mateusz Bajorski) +- Fix viewing merge request diffs where the underlying blobs are unavailable. +- Fix 500 error when visiting a commit where the blobs do not exist. +- Set target_branch to the ref branch when creating MR from issue. +- Fix closed text for issues on Todos page. +- [API] Fix creating issue when assignee_id is empty. +- Fix false positive issue references in merge requests caused by header anchor links. +- Fixed chanages dropdown ellipsis positioning. +- Fix shortcut links on help page. +- Clears visual token on second backspace. (Martin Wortschack) +- Fix onion-skin re-entering state. +- fix button alignment on MWPS component. +- Add optional search param for Merge Requests API. +- Normalizing Identity extern_uid when saving the record. +- Fixed typo for issue description field declaration. (Marcus Amargi) +- Fix ANSI 256 bold colors in pipelines job output. + +### Changed (18 changes, 3 of them are from the community) + +- Make mail notifications of discussion notes In-Reply-To of each other. !14289 +- Migrate existing data from KubernetesService to Clusters::Platforms::Kubernetes. !15589 +- Implement checking GCP project billing status in cluster creation form. !15665 +- Present multiple clusters in a single list instead of a tabbed view. !15669 +- Remove soft removals related code. !15789 +- Only mark import and fork jobs as failed once all Sidekiq retries get exhausted. !15844 +- Translate date ranges on contributors page. !15846 +- Update issuable status icons. !15898 +- Update feature toggle design to use icons and make it i18n friendly. !15904 +- Update groups tree to use GitLab SVG icons, add last updated at information for projects. !15980 +- Allow forking a public project to a private group. !16050 +- Expose project_id on /api/v4/pages/domains. !16200 (Luc Didry) +- Display graph values on hover within monitoring page. !16261 +- removed tabindexes from tag form. (Marcus Amargi) +- Move edit button to second row on issue page (and change it to a pencil icon). +- Run background migrations with a minimum interval. +- Provide additional cookies to JIRA service requests to allow Oracle WebGates Basic Auth. (Stanislaw Wozniak) +- Hide markdown toolbar in preview mode. + +### Performance (11 changes) + +- Improve the performance for counting diverging commits. Show 999+ if it is more than 1000 commits. !15963 +- Treat empty markdown and html strings as valid cached text, not missing cache that needs to be updated. +- Cache merged and closed events data in merge_request_metrics table. +- Speed up generation of commit stats by using Rugged native methods. +- Improve search query for issues. +- Improve search query for merge requests. +- Eager load event target authors whenever possible. +- Use simple Next/Prev paging for jobs to avoid large count queries on arbitrarily large sets of historical jobs. +- Improve performance of MR discussions on large diffs. +- Add index on namespaces lower(name) for UsersController#exists. +- Fix timeout when filtering issues by label. + +### Added (26 changes, 8 of them are from the community) + +- Support new chat notifications parameters in Services API. !11435 +- Add online and status attribute to runner api entity. !11750 +- Adds ordering to projects contributors in API. !15469 (Jacopo Beschi @jacopo-beschi) +- Add assets_sync gem to Gemfile. !15734 +- Add a gitlab:tcp_check rake task. !15759 +- add support for sorting in tags api. !15772 (haseebeqx) +- Add Prometheus to available Cluster applications. !15895 +- Validate file status when commiting multiple files. !15922 +- List of avatars should never show +1. !15972 (Jacopo Beschi @jacopo-beschi) +- Do not generate NPM links for private NPM modules in blob view. !16002 (Mario de la Ossa) +- Backport fast database lookup of SSH authorized_keys from EE. !16014 +- Add i18n helpers to branch comparison view. !16031 (James Ramsay) +- Add pause/resume button to project runners. !16032 (Mario de la Ossa) +- Added option to user preferences to enable the multi file editor. !16056 +- Implement project jobs cache reset. !16067 +- Rendering of emoji's in Group-Overview. !16098 (Jacopo Beschi @jacopo-beschi) +- Allow automatic creation of Kubernetes Integration from template. !16104 +- API: get participants from merge_requests & issues. !16187 (Brent Greeff) +- Added option to disable commits stats in the commit endpoint. !16309 +- Disable creation of new Kubernetes Integrations unless they're active or created from template. !41054 +- Added badge to tree & blob views to indicate LFS tracked files. +- Enable ordering of groups and their children by name. +- Add button to run scheduled pipeline immediately. +- Allow user to rebase merge requests. +- Handle GitLab hashed storage repositories using the repo import task. +- Hide runner token in CI/CD settings page. + +### Other (12 changes, 3 of them are from the community) + +- Adds the multi file editor as a new beta feature. !15430 +- Use relative URLs when linking to uploaded files. !15751 +- Add docs for why you might be signed out when using the Remember me token. !15756 +- Replace '.team << [user, role]' with 'add_role(user)' in specs. !16069 (@blackst0ne) +- Add id to modal.vue to support data-toggle="modal". !16189 +- Update scss-lint to 0.56.0. !16278 (Takuya Noguchi) +- Fix web ide user preferences copy and buttons. !41789 +- Update redis-rack to 2.0.4. +- Import some code and functionality from gitlab-shell to improve subprocess handling. +- Update Browse file to Choose file in all occurences. +- Bump mysql2 gem version from 0.4.5 to 0.4.10. (asaparov) +- Use a background migration for issues.closed_at. + + ## 10.3.5 (2018-01-18) - No changes. @@ -1 +1 @@ -10.4.0-pre +10.5.0-pre diff --git a/app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js b/app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js index f99573e5c74..08f0afdcce3 100644 --- a/app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js +++ b/app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js @@ -1,5 +1,3 @@ -/* eslint no-param-reassign: ["error", { "props": false }]*/ -/* eslint no-new: "off" */ import AccessorUtilities from '~/lib/utils/accessor'; /** @@ -11,6 +9,10 @@ export default class SigninTabsMemoizer { this.currentTabKey = currentTabKey; this.tabSelector = tabSelector; this.isLocalStorageAvailable = AccessorUtilities.isLocalStorageAccessSafe(); + // sets selected tab if given as hash tag + if (window.location.hash) { + this.saveData(window.location.hash); + } this.bootstrap(); } diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js deleted file mode 100644 index 5648208f7b1..00000000000 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js +++ /dev/null @@ -1,47 +0,0 @@ -import eventHub from '../../event_hub'; -import statusIcon from '../mr_widget_status_icon'; - -export default { - name: 'MRWidgetAutoMergeFailed', - props: { - mr: { type: Object, required: true }, - }, - data() { - return { - isRefreshing: false, - }; - }, - components: { - statusIcon, - }, - methods: { - refreshWidget() { - this.isRefreshing = true; - eventHub.$emit('MRWidgetUpdateRequested', () => { - this.isRefreshing = false; - }); - }, - }, - template: ` - <div class="mr-widget-body media"> - <status-icon status="failed" /> - <div class="media-body space-children"> - <span class="bold"> - <template v-if="mr.mergeError">{{mr.mergeError}}.</template> - This merge request failed to be merged automatically - </span> - <button - @click="refreshWidget" - :disabled="isRefreshing" - type="button" - class="btn btn-xs btn-default"> - <i - v-if="isRefreshing" - class="fa fa-spinner fa-spin" - aria-hidden="true" /> - Refresh - </button> - </div> - </div> - `, -}; diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue new file mode 100644 index 00000000000..77dd243d617 --- /dev/null +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue @@ -0,0 +1,52 @@ +<script> + import loadingIcon from '~/vue_shared/components/loading_icon.vue'; + import eventHub from '../../event_hub'; + import statusIcon from '../mr_widget_status_icon'; + + export default { + name: 'MRWidgetAutoMergeFailed', + components: { + statusIcon, + loadingIcon, + }, + props: { + mr: { + type: Object, + required: true, + }, + }, + data() { + return { + isRefreshing: false, + }; + }, + methods: { + refreshWidget() { + this.isRefreshing = true; + eventHub.$emit('MRWidgetUpdateRequested', () => { + this.isRefreshing = false; + }); + }, + }, + }; +</script> +<template> + <div class="mr-widget-body media"> + <status-icon status="warning" /> + <div class="media-body space-children"> + <span class="bold"> + <template v-if="mr.mergeError">{{ mr.mergeError }}.</template> + {{ s__("mrWidget|This merge request failed to be merged automatically") }} + </span> + <button + @click="refreshWidget" + :disabled="isRefreshing" + type="button" + class="btn btn-xs btn-default" + > + <loading-icon v-if="isRefreshing" /> + {{ s__("mrWidget|Refresh") }} + </button> + </div> + </div> +</template> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.js index dd8b2665b1d..dc19b20aa11 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.js @@ -12,7 +12,7 @@ export default { }, template: ` <div class="mr-widget-body media"> - <status-icon status="failed" /> + <status-icon status="warning" /> <div class="media-body"> <mr-widget-author-and-time actionText="Closed by" diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js index 5d468a085cb..7a887bacfa7 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js @@ -11,7 +11,7 @@ export default { template: ` <div class="mr-widget-body media"> <status-icon - status="failed" + status="warning" :show-disabled-button="true" /> <div class="media-body space-children"> <span diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.js index c25d6c359bb..fc5f18695b7 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.js @@ -51,7 +51,7 @@ export default { </span> </template> <template v-else> - <status-icon status="failed" :show-disabled-button="true" /> + <status-icon status="warning" :show-disabled-button="true" /> <div class="media-body space-children"> <span class="bold"> <span diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.js index 1bc0b7e0819..16ff1109e3f 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.js @@ -24,7 +24,7 @@ export default { }, template: ` <div class="mr-widget-body media"> - <status-icon status="failed" :show-disabled-button="true" /> + <status-icon status="warning" :show-disabled-button="true" /> <div class="media-body space-children"> <span class="bold js-branch-text"> <span class="capitalize"> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.js index 1cedf86e811..2c84f423ee2 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.js @@ -7,7 +7,7 @@ export default { }, template: ` <div class="mr-widget-body media"> - <status-icon status="failed" :show-disabled-button="true" /> + <status-icon status="warning" :show-disabled-button="true" /> <div class="media-body space-children"> <span class="bold"> Pipeline blocked. The pipeline for this merge request requires a manual action to proceed diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_failed.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_failed.js index 6853ba4b9f8..cbaa73deffa 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_failed.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_failed.js @@ -7,7 +7,7 @@ export default { }, template: ` <div class="mr-widget-body media"> - <status-icon status="failed" :show-disabled-button="true" /> + <status-icon status="warning" :show-disabled-button="true" /> <div class="media-body space-children"> <span class="bold"> The pipeline for this merge request failed. Please retry the job or push a new commit to fix the failure diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js index f16414ad5c0..e51eef07093 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js @@ -69,7 +69,7 @@ export default { }, iconClass() { if (this.status === 'failed' || !this.commitMessage.length || !this.mr.isMergeAllowed || this.mr.preventMerge) { - return 'failed'; + return 'warning'; } return 'success'; }, diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_sha_mismatch.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_sha_mismatch.js index af19cf6ab87..46687cc85e1 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_sha_mismatch.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_sha_mismatch.js @@ -7,7 +7,7 @@ export default { }, template: ` <div class="mr-widget-body media"> - <status-icon status="failed" :show-disabled-button="true" /> + <status-icon status="warning" :show-disabled-button="true" /> <div class="media-body space-children"> <span class="bold"> The source branch HEAD has recently changed. Please reload the page and review the changes before merging diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions.js index a119ecbbdfe..97b1940f4be 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions.js @@ -10,7 +10,7 @@ export default { }, template: ` <div class="mr-widget-body media"> - <status-icon status="failed" :show-disabled-button="true" /> + <status-icon status="warning" :show-disabled-button="true" /> <div class="media-body space-children"> <span class="bold"> There are unresolved discussions. Please resolve these discussions diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js index 13461440ef2..b4b0f00445c 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js @@ -37,7 +37,7 @@ export default { }, template: ` <div class="mr-widget-body media"> - <status-icon status="failed" :show-disabled-button="Boolean(mr.removeWIPPath)" /> + <status-icon status="warning" :show-disabled-button="Boolean(mr.removeWIPPath)" /> <div class="media-body space-children"> <span class="bold"> This is a Work in Progress diff --git a/app/assets/javascripts/vue_merge_request_widget/dependencies.js b/app/assets/javascripts/vue_merge_request_widget/dependencies.js index 12610501868..2dd3b2c2f98 100644 --- a/app/assets/javascripts/vue_merge_request_widget/dependencies.js +++ b/app/assets/javascripts/vue_merge_request_widget/dependencies.js @@ -33,7 +33,7 @@ export { default as PipelineBlockedState } from './components/states/mr_widget_p export { default as PipelineFailedState } from './components/states/mr_widget_pipeline_failed'; export { default as MergeWhenPipelineSucceedsState } from './components/states/mr_widget_merge_when_pipeline_succeeds'; export { default as RebaseState } from './components/states/mr_widget_rebase.vue'; -export { default as AutoMergeFailed } from './components/states/mr_widget_auto_merge_failed'; +export { default as AutoMergeFailed } from './components/states/mr_widget_auto_merge_failed.vue'; export { default as CheckingState } from './components/states/mr_widget_checking'; export { default as MRWidgetStore } from './stores/mr_widget_store'; export { default as MRWidgetService } from './services/mr_widget_service'; diff --git a/app/assets/stylesheets/framework/layout.scss b/app/assets/stylesheets/framework/layout.scss index fab3270b9f5..d107422e517 100644 --- a/app/assets/stylesheets/framework/layout.scss +++ b/app/assets/stylesheets/framework/layout.scss @@ -1,10 +1,16 @@ html { overflow-y: scroll; - &.touch .tooltip { display: none !important; } + &.touch .tooltip { + display: none !important; + } } body { + // Improves readability for dyslexic users; supported only in Chrome/Safari so far + // scss-lint:disable PropertySpelling + text-decoration-skip: ink; + // scss-lint:enable PropertySpelling &.navless { background-color: $white-light !important; } diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb index bc0948cd3fb..6d9c38d9581 100644 --- a/app/controllers/confirmations_controller.rb +++ b/app/controllers/confirmations_controller.rb @@ -17,7 +17,7 @@ class ConfirmationsController < Devise::ConfirmationsController else Gitlab::AppLogger.info("Email Confirmed: username=#{resource.username} email=#{resource.email} ip=#{request.remote_ip}") flash[:notice] += " Please sign in." - new_session_path(:user) + new_session_path(:user, anchor: 'login-pane') end end diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 45f7d29eb05..8ef561d90e6 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -201,6 +201,7 @@ module ApplicationSettingsHelper :metrics_sample_interval, :metrics_timeout, :password_authentication_enabled_for_web, + :password_authentication_enabled_for_git, :performance_bar_allowed_group_id, :performance_bar_enabled, :plantuml_enabled, diff --git a/app/models/project.rb b/app/models/project.rb index 5d0e61ecaa7..c0f7b30ceb0 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1438,7 +1438,7 @@ class Project < ActiveRecord::Base # We'd need to keep track of project full path otherwise directory tree # created with hashed storage enabled cannot be usefully imported using # the import rake task. - repository.rugged.config['gitlab.fullpath'] = gl_full_path + repository.raw_repository.write_config(full_path: gl_full_path) rescue Gitlab::Git::Repository::NoRepository => e Rails.logger.error("Error writing to .git/config for project #{full_path} (#{id}): #{e.message}.") nil diff --git a/app/views/devise/shared/_signin_box.html.haml b/app/views/devise/shared/_signin_box.html.haml index 6087f4a0b37..5ddb3ece1cb 100644 --- a/app/views/devise/shared/_signin_box.html.haml +++ b/app/views/devise/shared/_signin_box.html.haml @@ -8,7 +8,7 @@ .login-body = render 'devise/sessions/new_ldap', server: server - if password_authentication_enabled_for_web? - .login-box.tab-pane{ id: 'ldap-standard', role: 'tabpanel' } + .login-box.tab-pane{ id: 'login-pane', role: 'tabpanel' } .login-body = render 'devise/sessions/new_base' diff --git a/app/views/devise/shared/_tabs_ldap.html.haml b/app/views/devise/shared/_tabs_ldap.html.haml index 94f19ccd44c..270191f9452 100644 --- a/app/views/devise/shared/_tabs_ldap.html.haml +++ b/app/views/devise/shared/_tabs_ldap.html.haml @@ -7,7 +7,7 @@ = link_to server['label'], "##{server['provider_name']}", 'data-toggle' => 'tab' - if password_authentication_enabled_for_web? %li - = link_to 'Standard', '#ldap-standard', 'data-toggle' => 'tab' + = link_to 'Standard', '#login-pane', 'data-toggle' => 'tab' - if allow_signup? %li = link_to 'Register', '#register-pane', 'data-toggle' => 'tab' diff --git a/app/views/projects/commits/_commit.atom.builder b/app/views/projects/commits/_commit.atom.builder index d806acdda13..04914888763 100644 --- a/app/views/projects/commits/_commit.atom.builder +++ b/app/views/projects/commits/_commit.atom.builder @@ -1,7 +1,7 @@ xml.entry do xml.id project_commit_url(@project, id: commit.id) xml.link href: project_commit_url(@project, id: commit.id) - xml.title truncate(commit.title, length: 80) + xml.title truncate(commit.title, length: 80, escape: false) xml.updated commit.committed_date.xmlschema xml.media :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(commit.author_email)) @@ -10,5 +10,5 @@ xml.entry do xml.email commit.author_email end - xml.summary markdown(commit.description, pipeline: :single_line) + xml.summary markdown(commit.description, pipeline: :single_line), type: 'html' end diff --git a/changelogs/unreleased/13695-order-contributors-in-api.yml b/changelogs/unreleased/13695-order-contributors-in-api.yml deleted file mode 100644 index 26bf8650a4a..00000000000 --- a/changelogs/unreleased/13695-order-contributors-in-api.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Adds ordering to projects contributors in API -merge_request: 15469 -author: Jacopo Beschi @jacopo-beschi -type: added diff --git a/changelogs/unreleased/15832-fix-access-level-update-for-requesters.yml b/changelogs/unreleased/15832-fix-access-level-update-for-requesters.yml deleted file mode 100644 index 9d6c958cb3e..00000000000 --- a/changelogs/unreleased/15832-fix-access-level-update-for-requesters.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix error that was preventing users to change the access level of access requests for Groups or Projects -merge_request: 15832 -author: -type: fixed diff --git a/changelogs/unreleased/15922-validate-file-status-when-commiting-multiple-files.yml b/changelogs/unreleased/15922-validate-file-status-when-commiting-multiple-files.yml deleted file mode 100644 index db2bd6e692b..00000000000 --- a/changelogs/unreleased/15922-validate-file-status-when-commiting-multiple-files.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: 'Validate file status when commiting multiple files' -merge_request: 15922 -author: -type: added diff --git a/changelogs/unreleased/15955-improve-search-query.yml b/changelogs/unreleased/15955-improve-search-query.yml deleted file mode 100644 index 80cb8af617f..00000000000 --- a/changelogs/unreleased/15955-improve-search-query.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Improve search query for merge requests. -merge_request: -author: -type: performance diff --git a/changelogs/unreleased/16036-ignore-lost-found-folder-during-backup-on-a-volume.yml b/changelogs/unreleased/16036-ignore-lost-found-folder-during-backup-on-a-volume.yml deleted file mode 100644 index 833650559a3..00000000000 --- a/changelogs/unreleased/16036-ignore-lost-found-folder-during-backup-on-a-volume.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: "Ignore lost+found folder during backup on a volume" -merge_request: 16036 -author: Julien Millau -type: fixed
\ No newline at end of file diff --git a/changelogs/unreleased/16117-improve-search-for-issues.yml b/changelogs/unreleased/16117-improve-search-for-issues.yml deleted file mode 100644 index 92d5820ddd2..00000000000 --- a/changelogs/unreleased/16117-improve-search-for-issues.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Improve search query for issues. -merge_request: -author: -type: performance diff --git a/changelogs/unreleased/20035-pause-resume-runners.yml b/changelogs/unreleased/20035-pause-resume-runners.yml deleted file mode 100644 index 98757e60683..00000000000 --- a/changelogs/unreleased/20035-pause-resume-runners.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add pause/resume button to project runners -merge_request: 16032 -author: Mario de la Ossa -type: added diff --git a/changelogs/unreleased/24347-dont-post-system-note-when-branch-creation-fails.yml b/changelogs/unreleased/24347-dont-post-system-note-when-branch-creation-fails.yml deleted file mode 100644 index 61153ad4f1a..00000000000 --- a/changelogs/unreleased/24347-dont-post-system-note-when-branch-creation-fails.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix when branch creation fails don't post system note -merge_request: -author: Mateusz Bajorski -type: fixed diff --git a/changelogs/unreleased/25317-prioritize-author-date-over-commit.yml b/changelogs/unreleased/25317-prioritize-author-date-over-commit.yml deleted file mode 100644 index a5f6d316a7d..00000000000 --- a/changelogs/unreleased/25317-prioritize-author-date-over-commit.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Show authored date rather than committed date on the commit list -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/28004-consider-refactoring-member-view-by-using-presenter.yml b/changelogs/unreleased/28004-consider-refactoring-member-view-by-using-presenter.yml deleted file mode 100644 index 0e91d4ae403..00000000000 --- a/changelogs/unreleased/28004-consider-refactoring-member-view-by-using-presenter.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Refactor member view using a Presenter -merge_request: 9645 -author: TM Lee diff --git a/changelogs/unreleased/31995-project-limit-default-fix.yml b/changelogs/unreleased/31995-project-limit-default-fix.yml deleted file mode 100644 index 4f25eb34b45..00000000000 --- a/changelogs/unreleased/31995-project-limit-default-fix.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: User#projects_limit remove DB default and added NOT NULL constraint -merge_request: 16165 -author: Mario de la Ossa -type: fixed diff --git a/changelogs/unreleased/32364-updating-slack-notification-not-working-by-api.yml b/changelogs/unreleased/32364-updating-slack-notification-not-working-by-api.yml deleted file mode 100644 index e3fae55c6f0..00000000000 --- a/changelogs/unreleased/32364-updating-slack-notification-not-working-by-api.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Support new chat notifications parameters in Services API -merge_request: 11435 -author: -type: added diff --git a/changelogs/unreleased/33028-event-tag-links.yml b/changelogs/unreleased/33028-event-tag-links.yml deleted file mode 100644 index 1d674200dcd..00000000000 --- a/changelogs/unreleased/33028-event-tag-links.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix tags in the Activity tab not being clickable -merge_request: 15996 -author: Mario de la Ossa -type: fixed diff --git a/changelogs/unreleased/33609-hide-pagination.yml b/changelogs/unreleased/33609-hide-pagination.yml deleted file mode 100644 index 3586b091cb1..00000000000 --- a/changelogs/unreleased/33609-hide-pagination.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Disable Vue pagination when only one page of content is available -merge_request: 15999 -author: Mario de la Ossa -type: fixed diff --git a/changelogs/unreleased/33926-update-issuable-icons.yml b/changelogs/unreleased/33926-update-issuable-icons.yml deleted file mode 100644 index 87076dde545..00000000000 --- a/changelogs/unreleased/33926-update-issuable-icons.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Update issuable status icons -merge_request: 15898 -author: -type: changed diff --git a/changelogs/unreleased/34534-switch-to-axios.yml b/changelogs/unreleased/34534-switch-to-axios.yml deleted file mode 100644 index 1200272c9eb..00000000000 --- a/changelogs/unreleased/34534-switch-to-axios.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix some POST/DELETE requests in IE by switching some bundles to Axios for Ajax requests -merge_request: 15951 -author: -type: fixed diff --git a/changelogs/unreleased/36020-private-npm-modules.yml b/changelogs/unreleased/36020-private-npm-modules.yml deleted file mode 100644 index 5c2585a602e..00000000000 --- a/changelogs/unreleased/36020-private-npm-modules.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Do not generate NPM links for private NPM modules in blob view -merge_request: 16002 -author: Mario de la Ossa -type: added diff --git a/changelogs/unreleased/36669-default-mr-title-with-external-issues.yml b/changelogs/unreleased/36669-default-mr-title-with-external-issues.yml deleted file mode 100644 index 6af9ac4b099..00000000000 --- a/changelogs/unreleased/36669-default-mr-title-with-external-issues.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Default merge request title is set correctly again when external issue tracker is activated -merge_request: 16356 -author: Ben305 -type: fixed diff --git a/changelogs/unreleased/36782-replace-team-user-role-with-add_role-user-in-specs.yml b/changelogs/unreleased/36782-replace-team-user-role-with-add_role-user-in-specs.yml deleted file mode 100644 index 8773ac73a75..00000000000 --- a/changelogs/unreleased/36782-replace-team-user-role-with-add_role-user-in-specs.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace '.team << [user, role]' with 'add_role(user)' in specs -merge_request: 16069 -author: "@blackst0ne" -type: other diff --git a/changelogs/unreleased/36958-enable-ordering-projects-subgroups-by-name.yml b/changelogs/unreleased/36958-enable-ordering-projects-subgroups-by-name.yml deleted file mode 100644 index 8348e3e8ceb..00000000000 --- a/changelogs/unreleased/36958-enable-ordering-projects-subgroups-by-name.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Enable ordering of groups and their children by name -merge_request: -author: -type: added diff --git a/changelogs/unreleased/37843-ci-trace-ansi-colours-256-bold-have-no-css-due-wrongly-ansi2html-light-color-variant-conversion-feature.yml b/changelogs/unreleased/37843-ci-trace-ansi-colours-256-bold-have-no-css-due-wrongly-ansi2html-light-color-variant-conversion-feature.yml deleted file mode 100644 index abf98cd2af4..00000000000 --- a/changelogs/unreleased/37843-ci-trace-ansi-colours-256-bold-have-no-css-due-wrongly-ansi2html-light-color-variant-conversion-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix ANSI 256 bold colors in pipelines job output -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/38019-hide-runner-token.yml b/changelogs/unreleased/38019-hide-runner-token.yml deleted file mode 100644 index 11ae0a685ef..00000000000 --- a/changelogs/unreleased/38019-hide-runner-token.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Hide runner token in CI/CD settings page -merge_request: -author: -type: added diff --git a/changelogs/unreleased/38030-add-graph-value-to-hover.yml b/changelogs/unreleased/38030-add-graph-value-to-hover.yml deleted file mode 100644 index 233db2b19c9..00000000000 --- a/changelogs/unreleased/38030-add-graph-value-to-hover.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Display graph values on hover within monitoring page -merge_request: 16261 -author: -type: changed diff --git a/changelogs/unreleased/38145_ux_issues_in_system_info_page.yml b/changelogs/unreleased/38145_ux_issues_in_system_info_page.yml deleted file mode 100644 index d2358750518..00000000000 --- a/changelogs/unreleased/38145_ux_issues_in_system_info_page.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixes the wording of headers in system info page -merge_request: 15802 -author: Gilbert Roulot -type: fixed diff --git a/changelogs/unreleased/38239-update-toggle-design.yml b/changelogs/unreleased/38239-update-toggle-design.yml deleted file mode 100644 index 4d9034e8515..00000000000 --- a/changelogs/unreleased/38239-update-toggle-design.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Update feature toggle design to use icons and make it i18n friendly -merge_request: 15904 -author: -type: changed diff --git a/changelogs/unreleased/38318-search-merge-requests-with-api.yml b/changelogs/unreleased/38318-search-merge-requests-with-api.yml deleted file mode 100644 index d8b2f1f25c8..00000000000 --- a/changelogs/unreleased/38318-search-merge-requests-with-api.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add optional search param for Merge Requests API -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/38541-cancel-alignment.yml b/changelogs/unreleased/38541-cancel-alignment.yml deleted file mode 100644 index c6d5136dd57..00000000000 --- a/changelogs/unreleased/38541-cancel-alignment.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: fix button alignment on MWPS component -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/38596-fix-backspace-visual-token-clearing.yml b/changelogs/unreleased/38596-fix-backspace-visual-token-clearing.yml deleted file mode 100644 index 4a9d0b66a8c..00000000000 --- a/changelogs/unreleased/38596-fix-backspace-visual-token-clearing.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Clears visual token on second backspace -merge_request: -author: Martin Wortschack -type: fixed diff --git a/changelogs/unreleased/38893-banzai-upload-filter-relative-urls.yml b/changelogs/unreleased/38893-banzai-upload-filter-relative-urls.yml deleted file mode 100644 index 9ab0a0159e9..00000000000 --- a/changelogs/unreleased/38893-banzai-upload-filter-relative-urls.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Use relative URLs when linking to uploaded files -merge_request: 15751 -author: -type: other diff --git a/changelogs/unreleased/39246-fork-and-import-jobs-should-only-be-marked-as-failed-when-the-number-of-retries-was-exhausted.yml b/changelogs/unreleased/39246-fork-and-import-jobs-should-only-be-marked-as-failed-when-the-number-of-retries-was-exhausted.yml deleted file mode 100644 index ce238a2c79f..00000000000 --- a/changelogs/unreleased/39246-fork-and-import-jobs-should-only-be-marked-as-failed-when-the-number-of-retries-was-exhausted.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Only mark import and fork jobs as failed once all Sidekiq retries get exhausted -merge_request: 15844 -author: -type: changed diff --git a/changelogs/unreleased/39298-list-of-avatars-2.yml b/changelogs/unreleased/39298-list-of-avatars-2.yml deleted file mode 100644 index e2095561c0e..00000000000 --- a/changelogs/unreleased/39298-list-of-avatars-2.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: List of avatars should never show +1 -merge_request: 15972 -author: Jacopo Beschi @jacopo-beschi -type: added diff --git a/changelogs/unreleased/39608-comment-on-image-discussions-tab-alignment.yml b/changelogs/unreleased/39608-comment-on-image-discussions-tab-alignment.yml deleted file mode 100644 index 5021fe88caf..00000000000 --- a/changelogs/unreleased/39608-comment-on-image-discussions-tab-alignment.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Update comment on image cursor and icons -merge_request: 15760 -author: -type: fixed diff --git a/changelogs/unreleased/3968-protected-branch-is-not-set-for-default-branch-on-import.yml b/changelogs/unreleased/3968-protected-branch-is-not-set-for-default-branch-on-import.yml deleted file mode 100644 index e972ac6d54a..00000000000 --- a/changelogs/unreleased/3968-protected-branch-is-not-set-for-default-branch-on-import.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Protected branch is now created for default branch on import -merge_request: 16198 -author: -type: fixed diff --git a/changelogs/unreleased/39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled.yml b/changelogs/unreleased/39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled.yml deleted file mode 100644 index d8fd1f14bd4..00000000000 --- a/changelogs/unreleased/39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Implement checking GCP project billing status in cluster creation form. -merge_request: 15665 -author: -type: changed diff --git a/changelogs/unreleased/40031-include-assset_sync-gem.yml b/changelogs/unreleased/40031-include-assset_sync-gem.yml deleted file mode 100644 index 93ce565b32c..00000000000 --- a/changelogs/unreleased/40031-include-assset_sync-gem.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add assets_sync gem to Gemfile -merge_request: 15734 -author: -type: added diff --git a/changelogs/unreleased/40040-decouple-multi-file-editor-from-file-list.yml b/changelogs/unreleased/40040-decouple-multi-file-editor-from-file-list.yml deleted file mode 100644 index e2fade2bfd9..00000000000 --- a/changelogs/unreleased/40040-decouple-multi-file-editor-from-file-list.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Adds the multi file editor as a new beta feature -merge_request: 15430 -author: -type: feature diff --git a/changelogs/unreleased/40063-markdown-editor-improvements.yml b/changelogs/unreleased/40063-markdown-editor-improvements.yml deleted file mode 100644 index fa2f09408b4..00000000000 --- a/changelogs/unreleased/40063-markdown-editor-improvements.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Hide markdown toolbar in preview mode -merge_request: -author: -type: changed diff --git a/changelogs/unreleased/40190-fix-slash-commands-dropdown-description-mis-alignement-on-firefox.yml b/changelogs/unreleased/40190-fix-slash-commands-dropdown-description-mis-alignement-on-firefox.yml deleted file mode 100644 index 71a606ff607..00000000000 --- a/changelogs/unreleased/40190-fix-slash-commands-dropdown-description-mis-alignement-on-firefox.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: "Fix slash commands dropdown description mis-alignment on Firefox" -merge_request: 16125 -author: Maurizio De Santis -type: fixed diff --git a/changelogs/unreleased/40228-verify-integrity-of-repositories.yml b/changelogs/unreleased/40228-verify-integrity-of-repositories.yml deleted file mode 100644 index 261d48652db..00000000000 --- a/changelogs/unreleased/40228-verify-integrity-of-repositories.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix gitlab-rake gitlab:import:repos import schedule -merge_request: 15931 -author: -type: fixed diff --git a/changelogs/unreleased/40274-user-settings-breadcrumbs.yml b/changelogs/unreleased/40274-user-settings-breadcrumbs.yml deleted file mode 100644 index 1f381668aca..00000000000 --- a/changelogs/unreleased/40274-user-settings-breadcrumbs.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix breadcrumbs in User Settings -merge_request: 16172 -author: rfwatson -type: fixed diff --git a/changelogs/unreleased/40301-rebase.yml b/changelogs/unreleased/40301-rebase.yml deleted file mode 100644 index 1c0fc0cd8ae..00000000000 --- a/changelogs/unreleased/40301-rebase.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Allow user to rebase merge requests. -merge_request: -author: -type: added diff --git a/changelogs/unreleased/40418-migrate-existing-data-from-kubernetesservice-to-clusters-platforms-kubernetes.yml b/changelogs/unreleased/40418-migrate-existing-data-from-kubernetesservice-to-clusters-platforms-kubernetes.yml deleted file mode 100644 index 5e158d831a6..00000000000 --- a/changelogs/unreleased/40418-migrate-existing-data-from-kubernetesservice-to-clusters-platforms-kubernetes.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Migrate existing data from KubernetesService to Clusters::Platforms::Kubernetes -merge_request: 15589 -author: -type: changed diff --git a/changelogs/unreleased/40453-fix-api-endpoints-to-edit-wiki-pages-where-project-belongs-to-a-group.yml b/changelogs/unreleased/40453-fix-api-endpoints-to-edit-wiki-pages-where-project-belongs-to-a-group.yml deleted file mode 100644 index 30917098a95..00000000000 --- a/changelogs/unreleased/40453-fix-api-endpoints-to-edit-wiki-pages-where-project-belongs-to-a-group.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix API endpoints to edit wiki pages where project belongs to a group -merge_request: 16170 -author: -type: fixed diff --git a/changelogs/unreleased/40509_sorting_tags_api.yml b/changelogs/unreleased/40509_sorting_tags_api.yml deleted file mode 100644 index 38b198d0fe3..00000000000 --- a/changelogs/unreleased/40509_sorting_tags_api.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: add support for sorting in tags api -merge_request: 15772 -author: haseebeqx -type: added diff --git a/changelogs/unreleased/40533-groups-tree-updates.yml b/changelogs/unreleased/40533-groups-tree-updates.yml deleted file mode 100644 index 1bc0aa90f9e..00000000000 --- a/changelogs/unreleased/40533-groups-tree-updates.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Update groups tree to use GitLab SVG icons, add last updated at information - for projects -merge_request: 15980 -author: -type: changed diff --git a/changelogs/unreleased/40549-render-emoj-in-groups-overview.yml b/changelogs/unreleased/40549-render-emoj-in-groups-overview.yml deleted file mode 100644 index 9b2f58df440..00000000000 --- a/changelogs/unreleased/40549-render-emoj-in-groups-overview.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Rendering of emoji's in Group-Overview -merge_request: 16098 -author: Jacopo Beschi @jacopo-beschi -type: added diff --git a/changelogs/unreleased/40622-use-left-right-and-max-count.yml b/changelogs/unreleased/40622-use-left-right-and-max-count.yml deleted file mode 100644 index c4c8f271cbe..00000000000 --- a/changelogs/unreleased/40622-use-left-right-and-max-count.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Improve the performance for counting diverging commits. Show 999+ - if it is more than 1000 commits -merge_request: 15963 -author: -type: performance diff --git a/changelogs/unreleased/40780-choose-file.yml b/changelogs/unreleased/40780-choose-file.yml deleted file mode 100644 index 73e59dfcce8..00000000000 --- a/changelogs/unreleased/40780-choose-file.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Update Browse file to Choose file in all occurences -merge_request: -author: -type: other diff --git a/changelogs/unreleased/40871-todo-notification-count-shows-notification-without-having-a-todo.yml b/changelogs/unreleased/40871-todo-notification-count-shows-notification-without-having-a-todo.yml deleted file mode 100644 index ee196629def..00000000000 --- a/changelogs/unreleased/40871-todo-notification-count-shows-notification-without-having-a-todo.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Reset todo counters when the target is deleted -merge_request: 15807 -author: -type: fixed diff --git a/changelogs/unreleased/40895-fix-frequent-projects-stale-path.yml b/changelogs/unreleased/40895-fix-frequent-projects-stale-path.yml deleted file mode 100644 index 485133b46a7..00000000000 --- a/changelogs/unreleased/40895-fix-frequent-projects-stale-path.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Use relative URL for projects to avoid storing domains -merge_request: 15876 -author: -type: fixed diff --git a/changelogs/unreleased/41016-import-gitlab-shell-projects.yml b/changelogs/unreleased/41016-import-gitlab-shell-projects.yml deleted file mode 100644 index 47a9e9c3eec..00000000000 --- a/changelogs/unreleased/41016-import-gitlab-shell-projects.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Import some code and functionality from gitlab-shell to improve subprocess - handling -merge_request: -author: -type: other diff --git a/changelogs/unreleased/41053-extend-cluster-applications-to-allow-install-to-prometheus.yml b/changelogs/unreleased/41053-extend-cluster-applications-to-allow-install-to-prometheus.yml deleted file mode 100644 index ffb79d7d79f..00000000000 --- a/changelogs/unreleased/41053-extend-cluster-applications-to-allow-install-to-prometheus.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add Prometheus to available Cluster applications -merge_request: 15895 -author: -type: added diff --git a/changelogs/unreleased/41054-disable-creation-of-new-kubernetes-integrations.yml b/changelogs/unreleased/41054-disable-creation-of-new-kubernetes-integrations.yml deleted file mode 100644 index b960b14624c..00000000000 --- a/changelogs/unreleased/41054-disable-creation-of-new-kubernetes-integrations.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Disable creation of new Kubernetes Integrations unless they're active or created - from template -merge_request: 41054 -author: -type: added diff --git a/changelogs/unreleased/41056-create-cluster-from-kubernetes-integration-application-template.yml b/changelogs/unreleased/41056-create-cluster-from-kubernetes-integration-application-template.yml deleted file mode 100644 index 2dd6fc5f1b5..00000000000 --- a/changelogs/unreleased/41056-create-cluster-from-kubernetes-integration-application-template.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Allow automatic creation of Kubernetes Integration from template -merge_request: 16104 -author: -type: added diff --git a/changelogs/unreleased/41206-show-signin-pane-after-email-confirmation.yml b/changelogs/unreleased/41206-show-signin-pane-after-email-confirmation.yml new file mode 100644 index 00000000000..5e706740962 --- /dev/null +++ b/changelogs/unreleased/41206-show-signin-pane-after-email-confirmation.yml @@ -0,0 +1,5 @@ +--- +title: Shows signin tab after new user email confirmation +merge_request: 16174 +author: Jacopo Beschi @jacopo-beschi +type: fixed diff --git a/changelogs/unreleased/41208-commit-atom-feeds-double-escaped.yml b/changelogs/unreleased/41208-commit-atom-feeds-double-escaped.yml new file mode 100644 index 00000000000..76d3c6eda24 --- /dev/null +++ b/changelogs/unreleased/41208-commit-atom-feeds-double-escaped.yml @@ -0,0 +1,5 @@ +--- +title: Allows html text in commits atom feed +merge_request: 16603 +author: Jacopo Beschi @jacopo-beschi +type: fixed diff --git a/changelogs/unreleased/41244-issue-board-shortcut-working-while-no-issues.yml b/changelogs/unreleased/41244-issue-board-shortcut-working-while-no-issues.yml deleted file mode 100644 index b2c3a86551b..00000000000 --- a/changelogs/unreleased/41244-issue-board-shortcut-working-while-no-issues.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: disables shortcut to issue boards when issues are not enabled -merge_request: 16020 -author: Christiaan Van den Poel -type: fixed diff --git a/changelogs/unreleased/41249-clearing-the-cache.yml b/changelogs/unreleased/41249-clearing-the-cache.yml deleted file mode 100644 index 221589a1239..00000000000 --- a/changelogs/unreleased/41249-clearing-the-cache.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Implement project jobs cache reset -merge_request: 16067 -author: -type: added diff --git a/changelogs/unreleased/41268-bump-ruby-to-2-3-6.yml b/changelogs/unreleased/41268-bump-ruby-to-2-3-6.yml deleted file mode 100644 index 188a854ebee..00000000000 --- a/changelogs/unreleased/41268-bump-ruby-to-2-3-6.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Upgrade Ruby to 2.3.6 to include security patches -merge_request: 16016 -author: -type: security diff --git a/changelogs/unreleased/41424-gitlab-rake-gitlab-import-repos-schedules-an-import.yml b/changelogs/unreleased/41424-gitlab-rake-gitlab-import-repos-schedules-an-import.yml deleted file mode 100644 index b495754a5a8..00000000000 --- a/changelogs/unreleased/41424-gitlab-rake-gitlab-import-repos-schedules-an-import.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix gitlab-rake gitlab:import:repos import schedule -merge_request: 16115 -author: -type: fixed diff --git a/changelogs/unreleased/41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclass.yml b/changelogs/unreleased/41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclass.yml deleted file mode 100644 index f69116382f0..00000000000 --- a/changelogs/unreleased/41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclass.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix viewing merge request diffs where the underlying blobs are unavailable -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/41491-fix-nil-blob-name-error.yml b/changelogs/unreleased/41491-fix-nil-blob-name-error.yml deleted file mode 100644 index cf7e63ea46a..00000000000 --- a/changelogs/unreleased/41491-fix-nil-blob-name-error.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix 500 error when visiting a commit where the blobs do not exist -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/41727-target-branch-name.yml b/changelogs/unreleased/41727-target-branch-name.yml deleted file mode 100644 index aaedf6f1d12..00000000000 --- a/changelogs/unreleased/41727-target-branch-name.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Set target_branch to the ref branch when creating MR from issue -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/41754-update-scss-lint-to-0-56-0.yml b/changelogs/unreleased/41754-update-scss-lint-to-0-56-0.yml deleted file mode 100644 index b96dd376cec..00000000000 --- a/changelogs/unreleased/41754-update-scss-lint-to-0-56-0.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Update scss-lint to 0.56.0 -merge_request: 16278 -author: Takuya Noguchi -type: other diff --git a/changelogs/unreleased/41789-fix-up-web-ide-user-preference-copy-and-buttons.yml b/changelogs/unreleased/41789-fix-up-web-ide-user-preference-copy-and-buttons.yml deleted file mode 100644 index fe87cd5cadb..00000000000 --- a/changelogs/unreleased/41789-fix-up-web-ide-user-preference-copy-and-buttons.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix web ide user preferences copy and buttons -merge_request: 41789 -author: -type: other diff --git a/changelogs/unreleased/41814-text-decoration-skip.yml b/changelogs/unreleased/41814-text-decoration-skip.yml new file mode 100644 index 00000000000..3e39d26be93 --- /dev/null +++ b/changelogs/unreleased/41814-text-decoration-skip.yml @@ -0,0 +1,5 @@ +--- +title: Improve readability of underlined links for dyslexic users +merge_request: +author: +type: other diff --git a/changelogs/unreleased/41874-closed-todo.yml b/changelogs/unreleased/41874-closed-todo.yml deleted file mode 100644 index 615bd011579..00000000000 --- a/changelogs/unreleased/41874-closed-todo.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix closed text for issues on Todos page -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/41882-respect-only-path-in-relative-link-filter.yml b/changelogs/unreleased/41882-respect-only-path-in-relative-link-filter.yml deleted file mode 100644 index d4b7ec6a3b5..00000000000 --- a/changelogs/unreleased/41882-respect-only-path-in-relative-link-filter.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Ensure that emails contain absolute, rather than relative, links to user uploads -merge_request: 16364 -author: -type: fixed diff --git a/changelogs/unreleased/42025-fix-issue-api.yml b/changelogs/unreleased/42025-fix-issue-api.yml deleted file mode 100644 index abb83bb2fad..00000000000 --- a/changelogs/unreleased/42025-fix-issue-api.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: "[API] Fix creating issue when assignee_id is empty" -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/42031-fix-links-to-uploads-in-wikis.yml b/changelogs/unreleased/42031-fix-links-to-uploads-in-wikis.yml deleted file mode 100644 index 027cb414f23..00000000000 --- a/changelogs/unreleased/42031-fix-links-to-uploads-in-wikis.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix links to uploaded files on wiki pages -merge_request: 16499 -author: -type: fixed diff --git a/changelogs/unreleased/42046-fork-icon.yml b/changelogs/unreleased/42046-fork-icon.yml deleted file mode 100644 index def89ff7b08..00000000000 --- a/changelogs/unreleased/42046-fork-icon.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix giant fork icons on forks page -merge_request: 16474 -author: -type: fixed diff --git a/changelogs/unreleased/42206-permit-password-for-git-param.yml b/changelogs/unreleased/42206-permit-password-for-git-param.yml new file mode 100644 index 00000000000..563dd528ad5 --- /dev/null +++ b/changelogs/unreleased/42206-permit-password-for-git-param.yml @@ -0,0 +1,5 @@ +--- +title: Permits 'password_authentication_enabled_for_git' parameter for ApplicationSettingsController +merge_request: +author: +type: fixed diff --git a/changelogs/unreleased/42231-protected-branches-api-route-returns-404-for-branches-with-dots.yml b/changelogs/unreleased/42231-protected-branches-api-route-returns-404-for-branches-with-dots.yml new file mode 100644 index 00000000000..fbc589ea53d --- /dev/null +++ b/changelogs/unreleased/42231-protected-branches-api-route-returns-404-for-branches-with-dots.yml @@ -0,0 +1,5 @@ +--- +title: Fix protected branches API to accept name parameter with dot +merge_request: +author: +type: fixed diff --git a/changelogs/unreleased/ac-autodevopfix-kubectl-version.yml b/changelogs/unreleased/ac-autodevopfix-kubectl-version.yml deleted file mode 100644 index 0ceeb7ccee1..00000000000 --- a/changelogs/unreleased/ac-autodevopfix-kubectl-version.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Force Auto DevOps kubectl version to 1.8.6 -merge_request: 16218 -author: -type: fixed diff --git a/changelogs/unreleased/add-tcp-check-rake-task.yml b/changelogs/unreleased/add-tcp-check-rake-task.yml deleted file mode 100644 index a7c04bd0d55..00000000000 --- a/changelogs/unreleased/add-tcp-check-rake-task.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add a gitlab:tcp_check rake task -merge_request: 15759 -author: -type: added diff --git a/changelogs/unreleased/anchor-issue-references.yml b/changelogs/unreleased/anchor-issue-references.yml deleted file mode 100644 index 78896427417..00000000000 --- a/changelogs/unreleased/anchor-issue-references.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Fix false positive issue references in merge requests caused by header anchor - links. -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/api-domains-expose-project_id.yml b/changelogs/unreleased/api-domains-expose-project_id.yml deleted file mode 100644 index 22617ffe9b5..00000000000 --- a/changelogs/unreleased/api-domains-expose-project_id.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Expose project_id on /api/v4/pages/domains -merge_request: 16200 -author: Luc Didry -type: changed diff --git a/changelogs/unreleased/bump_mysql_gem.yml b/changelogs/unreleased/bump_mysql_gem.yml deleted file mode 100644 index 58166949d72..00000000000 --- a/changelogs/unreleased/bump_mysql_gem.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Bump mysql2 gem version from 0.4.5 to 0.4.10 -merge_request: -author: asaparov -type: other diff --git a/changelogs/unreleased/bvl-fork-public-project-to-private-namespace.yml b/changelogs/unreleased/bvl-fork-public-project-to-private-namespace.yml deleted file mode 100644 index b802625943d..00000000000 --- a/changelogs/unreleased/bvl-fork-public-project-to-private-namespace.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Allow forking a public project to a private group -merge_request: 16050 -author: -type: changed diff --git a/changelogs/unreleased/change-issues-closed-at-background-migration.yml b/changelogs/unreleased/change-issues-closed-at-background-migration.yml deleted file mode 100644 index 1c81c6a889e..00000000000 --- a/changelogs/unreleased/change-issues-closed-at-background-migration.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Use a background migration for issues.closed_at -merge_request: -author: -type: other diff --git a/changelogs/unreleased/changes-dropdown-ellipsis.yml b/changelogs/unreleased/changes-dropdown-ellipsis.yml deleted file mode 100644 index 7e3f378cc33..00000000000 --- a/changelogs/unreleased/changes-dropdown-ellipsis.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed chanages dropdown ellipsis positioning -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/conditionally-eager-load-event-target-authors.yml b/changelogs/unreleased/conditionally-eager-load-event-target-authors.yml deleted file mode 100644 index a5f1a958fa8..00000000000 --- a/changelogs/unreleased/conditionally-eager-load-event-target-authors.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Eager load event target authors whenever possible -merge_request: -author: -type: performance diff --git a/changelogs/unreleased/da-handle-hashed-storage-repos-using-repo-import-task.yml b/changelogs/unreleased/da-handle-hashed-storage-repos-using-repo-import-task.yml deleted file mode 100644 index 74a00d49ab3..00000000000 --- a/changelogs/unreleased/da-handle-hashed-storage-repos-using-repo-import-task.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Handle GitLab hashed storage repositories using the repo import task -merge_request: -author: -type: added diff --git a/changelogs/unreleased/delay-background-migrations.yml b/changelogs/unreleased/delay-background-migrations.yml deleted file mode 100644 index aa12591e7d2..00000000000 --- a/changelogs/unreleased/delay-background-migrations.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Run background migrations with a minimum interval -merge_request: -author: -type: changed diff --git a/changelogs/unreleased/disable-pages-on-jobs.yml b/changelogs/unreleased/disable-pages-on-jobs.yml deleted file mode 100644 index 629768efce1..00000000000 --- a/changelogs/unreleased/disable-pages-on-jobs.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Use simple Next/Prev paging for jobs to avoid large count queries on arbitrarily - large sets of historical jobs -merge_request: -author: -type: performance diff --git a/changelogs/unreleased/dm-diff-note-for-line-performance.yml b/changelogs/unreleased/dm-diff-note-for-line-performance.yml deleted file mode 100644 index cbc418ab103..00000000000 --- a/changelogs/unreleased/dm-diff-note-for-line-performance.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Improve performance of MR discussions on large diffs -merge_request: -author: -type: performance diff --git a/changelogs/unreleased/docs-add-why-do-i-get-signed-out-authentication-section.yml b/changelogs/unreleased/docs-add-why-do-i-get-signed-out-authentication-section.yml deleted file mode 100644 index bc245880ed0..00000000000 --- a/changelogs/unreleased/docs-add-why-do-i-get-signed-out-authentication-section.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add docs for why you might be signed out when using the Remember me token -merge_request: 15756 -author: -type: other diff --git a/changelogs/unreleased/feature-40842-provide-oracles-webgate-cookies-to-jira-requests.yml b/changelogs/unreleased/feature-40842-provide-oracles-webgate-cookies-to-jira-requests.yml deleted file mode 100644 index d5ff5bc4627..00000000000 --- a/changelogs/unreleased/feature-40842-provide-oracles-webgate-cookies-to-jira-requests.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Provide additional cookies to JIRA service requests to allow Oracle WebGates - Basic Auth -merge_request: -author: Stanislaw Wozniak -type: changed diff --git a/changelogs/unreleased/feature-api_runners_online.yml b/changelogs/unreleased/feature-api_runners_online.yml deleted file mode 100644 index 08f4dd16f28..00000000000 --- a/changelogs/unreleased/feature-api_runners_online.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add online and status attribute to runner api entity -merge_request: 11750 -author: -type: added diff --git a/changelogs/unreleased/fix-abuse-reports-link-url.yml b/changelogs/unreleased/fix-abuse-reports-link-url.yml deleted file mode 100644 index 44c26f35984..00000000000 --- a/changelogs/unreleased/fix-abuse-reports-link-url.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix abuse reports link url in admin area navbar -merge_request: 16068 -author: megos -type: fixed diff --git a/changelogs/unreleased/fix-activity-inline-event-line-height.yml b/changelogs/unreleased/fix-activity-inline-event-line-height.yml deleted file mode 100644 index 85e69567499..00000000000 --- a/changelogs/unreleased/fix-activity-inline-event-line-height.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix activity inline event line height on mobile -merge_request: 16121 -author: George Tsiolis -type: fixed diff --git a/changelogs/unreleased/fix-create-mr-from-issue-with-template.yml b/changelogs/unreleased/fix-create-mr-from-issue-with-template.yml deleted file mode 100644 index 8668aa18669..00000000000 --- a/changelogs/unreleased/fix-create-mr-from-issue-with-template.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Execute quick actions (if present) when creating MR from issue -merge_request: 15810 -author: -type: fixed diff --git a/changelogs/unreleased/fix-docs-help-shortcut.yml b/changelogs/unreleased/fix-docs-help-shortcut.yml deleted file mode 100644 index 8c172e44160..00000000000 --- a/changelogs/unreleased/fix-docs-help-shortcut.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix shortcut links on help page -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/fix-gb-fix-import-export-restoring-associations.yml b/changelogs/unreleased/fix-gb-fix-import-export-restoring-associations.yml deleted file mode 100644 index 58df0024d61..00000000000 --- a/changelogs/unreleased/fix-gb-fix-import-export-restoring-associations.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Fix missing references to pipeline objects when restoring project with import/export - feature -merge_request: 16221 -author: -type: fixed diff --git a/changelogs/unreleased/fix-last-push-event-widget-layout.yml b/changelogs/unreleased/fix-last-push-event-widget-layout.yml deleted file mode 100644 index ba5b115ca19..00000000000 --- a/changelogs/unreleased/fix-last-push-event-widget-layout.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Last push event widget width for fixed layout -merge_request: 15862 -author: George Tsiolis -type: fixed diff --git a/changelogs/unreleased/fix-move-2fa-disable-button.yml b/changelogs/unreleased/fix-move-2fa-disable-button.yml deleted file mode 100644 index bac98ad5148..00000000000 --- a/changelogs/unreleased/fix-move-2fa-disable-button.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Move 2FA disable button -merge_request: 16177 -author: George Tsiolis -type: fixed diff --git a/changelogs/unreleased/fix-onion-skin-reenter.yml b/changelogs/unreleased/fix-onion-skin-reenter.yml deleted file mode 100644 index 66b12c037b0..00000000000 --- a/changelogs/unreleased/fix-onion-skin-reenter.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix onion-skin re-entering state -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/fix-profile-settings-content-width.yml b/changelogs/unreleased/fix-profile-settings-content-width.yml deleted file mode 100644 index bf164dc587d..00000000000 --- a/changelogs/unreleased/fix-profile-settings-content-width.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Adjust content width for User Settings, GPG Keys -merge_request: 16093 -author: George Tsiolis -type: fixed diff --git a/changelogs/unreleased/fix-profile-settings-sidebar-heading.yml b/changelogs/unreleased/fix-profile-settings-sidebar-heading.yml deleted file mode 100644 index 75e0ea5612f..00000000000 --- a/changelogs/unreleased/fix-profile-settings-sidebar-heading.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Keep typographic hierarchy in User Settings -merge_request: 16090 -author: George Tsiolis -type: fixed diff --git a/changelogs/unreleased/fix-remove-unnecessary-sidebar-element-alignment.yml b/changelogs/unreleased/fix-remove-unnecessary-sidebar-element-alignment.yml deleted file mode 100644 index 24f6f62b934..00000000000 --- a/changelogs/unreleased/fix-remove-unnecessary-sidebar-element-alignment.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Remove unnecessary sidebar element realignment -merge_request: 16159 -author: George Tsiolis -type: fixed diff --git a/changelogs/unreleased/fix_build_count_in_pipeline_success_maild.yml b/changelogs/unreleased/fix_build_count_in_pipeline_success_maild.yml deleted file mode 100644 index c39bba62271..00000000000 --- a/changelogs/unreleased/fix_build_count_in_pipeline_success_maild.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: fix build count in pipeline success mail -merge_request: 15827 -author: Christiaan Van den Poel -type: fixed diff --git a/changelogs/unreleased/fj-40053-error-500-members-list.yml b/changelogs/unreleased/fj-40053-error-500-members-list.yml deleted file mode 100644 index 8c82950bd41..00000000000 --- a/changelogs/unreleased/fj-40053-error-500-members-list.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixing error 500 when member exist but not the user -merge_request: 15970 -author: -type: fixed diff --git a/changelogs/unreleased/fj-40279-normalize-ldap-dn-api.yml b/changelogs/unreleased/fj-40279-normalize-ldap-dn-api.yml deleted file mode 100644 index 3fd8b0eb988..00000000000 --- a/changelogs/unreleased/fj-40279-normalize-ldap-dn-api.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Normalizing Identity extern_uid when saving the record -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/fj-41477-fix-bug-wiki-last-version.yml b/changelogs/unreleased/fj-41477-fix-bug-wiki-last-version.yml deleted file mode 100644 index e4b1343876a..00000000000 --- a/changelogs/unreleased/fj-41477-fix-bug-wiki-last-version.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixing bug when wiki last version -merge_request: 16197 -author: -type: fixed diff --git a/changelogs/unreleased/fj-41598-fixing-request-mime-type.yml b/changelogs/unreleased/fj-41598-fixing-request-mime-type.yml deleted file mode 100644 index 85e4d78b2df..00000000000 --- a/changelogs/unreleased/fj-41598-fixing-request-mime-type.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixing rack request mime type when using rack attack -merge_request: 16427 -author: -type: fixed diff --git a/changelogs/unreleased/fj-41681-add-param-disable-commit-stats-api.yml b/changelogs/unreleased/fj-41681-add-param-disable-commit-stats-api.yml deleted file mode 100644 index dca4dec224c..00000000000 --- a/changelogs/unreleased/fj-41681-add-param-disable-commit-stats-api.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Added option to disable commits stats in the commit endpoint -merge_request: 16309 -author: -type: added diff --git a/changelogs/unreleased/index-namespaces-lower-name.yml b/changelogs/unreleased/index-namespaces-lower-name.yml deleted file mode 100644 index ef08b6d6755..00000000000 --- a/changelogs/unreleased/index-namespaces-lower-name.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add index on namespaces lower(name) for UsersController#exists -merge_request: -author: -type: performance diff --git a/changelogs/unreleased/issue-description-field-typo.yml b/changelogs/unreleased/issue-description-field-typo.yml deleted file mode 100644 index 9c4c179876d..00000000000 --- a/changelogs/unreleased/issue-description-field-typo.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed typo for issue description field declaration -merge_request: -author: Marcus Amargi -type: fixed diff --git a/changelogs/unreleased/issue_40500.yml b/changelogs/unreleased/issue_40500.yml deleted file mode 100644 index 35e8938fdad..00000000000 --- a/changelogs/unreleased/issue_40500.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix timeout when filtering issues by label -merge_request: -author: -type: performance diff --git a/changelogs/unreleased/issues-40986-get-participants-from-issues-mr-api.yml b/changelogs/unreleased/issues-40986-get-participants-from-issues-mr-api.yml deleted file mode 100644 index 4cac87b0cdb..00000000000 --- a/changelogs/unreleased/issues-40986-get-participants-from-issues-mr-api.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: 'API: get participants from merge_requests & issues' -merge_request: 16187 -author: Brent Greeff -type: added diff --git a/changelogs/unreleased/jej-backport-authorized-keys-to-ce.yml b/changelogs/unreleased/jej-backport-authorized-keys-to-ce.yml deleted file mode 100644 index 4386c631f59..00000000000 --- a/changelogs/unreleased/jej-backport-authorized-keys-to-ce.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Backport fast database lookup of SSH authorized_keys from EE -merge_request: 16014 -author: -type: added diff --git a/changelogs/unreleased/jej-lfs-rev-list-handles-non-utf-paths-41627.yml b/changelogs/unreleased/jej-lfs-rev-list-handles-non-utf-paths-41627.yml deleted file mode 100644 index 24f18c07ac5..00000000000 --- a/changelogs/unreleased/jej-lfs-rev-list-handles-non-utf-paths-41627.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Prevent RevList failing on non utf8 paths -merge_request: 16440 -author: -type: fixed diff --git a/changelogs/unreleased/jivl-activate-repo-cookie-preferences.yml b/changelogs/unreleased/jivl-activate-repo-cookie-preferences.yml deleted file mode 100644 index 778eaa84381..00000000000 --- a/changelogs/unreleased/jivl-activate-repo-cookie-preferences.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Added option to user preferences to enable the multi file editor -merge_request: 16056 -author: -type: added diff --git a/changelogs/unreleased/jivl-fix-import-project-url-bug.yml b/changelogs/unreleased/jivl-fix-import-project-url-bug.yml deleted file mode 100644 index 0d97b9c9a53..00000000000 --- a/changelogs/unreleased/jivl-fix-import-project-url-bug.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix import project url not updating project name -merge_request: 16120 -author: -type: fixed diff --git a/changelogs/unreleased/jramsay-4012-i18n-compare.yml b/changelogs/unreleased/jramsay-4012-i18n-compare.yml deleted file mode 100644 index ff15724be39..00000000000 --- a/changelogs/unreleased/jramsay-4012-i18n-compare.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add i18n helpers to branch comparison view -merge_request: 16031 -author: James Ramsay -type: added diff --git a/changelogs/unreleased/jramsay-41590-add-readme-case.yml b/changelogs/unreleased/jramsay-41590-add-readme-case.yml deleted file mode 100644 index 37b2bd44e0e..00000000000 --- a/changelogs/unreleased/jramsay-41590-add-readme-case.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix inconsistent downcase of filenames in prefilled `Add` commit messages -merge_request: 16232 -author: James Ramsay -type: fixed diff --git a/changelogs/unreleased/ldap_username_attributes.yml b/changelogs/unreleased/ldap_username_attributes.yml deleted file mode 100644 index 89bbca58fc9..00000000000 --- a/changelogs/unreleased/ldap_username_attributes.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Modify `LDAP::Person` to return username value based on attributes -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/lfs-badge.yml b/changelogs/unreleased/lfs-badge.yml deleted file mode 100644 index e4ed4d6741f..00000000000 --- a/changelogs/unreleased/lfs-badge.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Added badge to tree & blob views to indicate LFS tracked files -merge_request: -author: -type: added diff --git a/changelogs/unreleased/mk-fix-permanent-redirect-validation.yml b/changelogs/unreleased/mk-fix-permanent-redirect-validation.yml deleted file mode 100644 index 153b2ccc25c..00000000000 --- a/changelogs/unreleased/mk-fix-permanent-redirect-validation.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Prevent invalid Route path if path is unchanged -merge_request: 16397 -author: -type: fixed diff --git a/changelogs/unreleased/mk-no-op-delete-conflicting-redirects.yml b/changelogs/unreleased/mk-no-op-delete-conflicting-redirects.yml deleted file mode 100644 index 37fdb1df6df..00000000000 --- a/changelogs/unreleased/mk-no-op-delete-conflicting-redirects.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Prevent excessive DB load due to faulty DeleteConflictingRedirectRoutes background - migration -merge_request: 16205 -author: -type: fixed diff --git a/changelogs/unreleased/mr-status-box-update.yml b/changelogs/unreleased/mr-status-box-update.yml deleted file mode 100644 index 68265be16a1..00000000000 --- a/changelogs/unreleased/mr-status-box-update.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed merge request status badge not updating after merging -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/multiple-clusters-single-list.yml b/changelogs/unreleased/multiple-clusters-single-list.yml deleted file mode 100644 index 55743f3c00e..00000000000 --- a/changelogs/unreleased/multiple-clusters-single-list.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Present multiple clusters in a single list instead of a tabbed view -merge_request: 15669 -author: -type: changed diff --git a/changelogs/unreleased/optimize-issues-avoid-noop-empty-cache-updates2.yml b/changelogs/unreleased/optimize-issues-avoid-noop-empty-cache-updates2.yml deleted file mode 100644 index e0c3136be69..00000000000 --- a/changelogs/unreleased/optimize-issues-avoid-noop-empty-cache-updates2.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Treat empty markdown and html strings as valid cached text, not missing cache - that needs to be updated -merge_request: -author: -type: performance diff --git a/changelogs/unreleased/osw-introduce-merge-request-statistics.yml b/changelogs/unreleased/osw-introduce-merge-request-statistics.yml deleted file mode 100644 index fed7c2141fb..00000000000 --- a/changelogs/unreleased/osw-introduce-merge-request-statistics.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Cache merged and closed events data in merge_request_metrics table -merge_request: -author: -type: performance diff --git a/changelogs/unreleased/remove-incorrect-guidance.yml b/changelogs/unreleased/remove-incorrect-guidance.yml deleted file mode 100644 index eeb5745698f..00000000000 --- a/changelogs/unreleased/remove-incorrect-guidance.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Removed incorrect guidance stating blocked users will be removed from groups - and project as members -merge_request: 15947 -author: CesarApodaca -type: fixed diff --git a/changelogs/unreleased/remove-links-mr-empty-state.yml b/changelogs/unreleased/remove-links-mr-empty-state.yml deleted file mode 100644 index c666bc2c81d..00000000000 --- a/changelogs/unreleased/remove-links-mr-empty-state.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Remove related links in MR widget when empty state -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/remove-soft-removals.yml b/changelogs/unreleased/remove-soft-removals.yml deleted file mode 100644 index aa53d33e502..00000000000 --- a/changelogs/unreleased/remove-soft-removals.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Remove soft removals related code -merge_request: 15789 -author: -type: changed diff --git a/changelogs/unreleased/remove-tabindexes-from-tag-form.yml b/changelogs/unreleased/remove-tabindexes-from-tag-form.yml deleted file mode 100644 index a15bf2a7a4f..00000000000 --- a/changelogs/unreleased/remove-tabindexes-from-tag-form.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: removed tabindexes from tag form -merge_request: -author: Marcus Amargi -type: changed diff --git a/changelogs/unreleased/sh-add-schedule-pipeline-run-now.yml b/changelogs/unreleased/sh-add-schedule-pipeline-run-now.yml deleted file mode 100644 index 6d06f695f10..00000000000 --- a/changelogs/unreleased/sh-add-schedule-pipeline-run-now.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add button to run scheduled pipeline immediately -merge_request: -author: -type: added diff --git a/changelogs/unreleased/sh-catch-invalid-uri-markdown.yml b/changelogs/unreleased/sh-catch-invalid-uri-markdown.yml deleted file mode 100644 index 9b0233fe988..00000000000 --- a/changelogs/unreleased/sh-catch-invalid-uri-markdown.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Gracefully handle garbled URIs in Markdown -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/sh-fix-bare-import-hooks.yml b/changelogs/unreleased/sh-fix-bare-import-hooks.yml deleted file mode 100644 index deb6c62f738..00000000000 --- a/changelogs/unreleased/sh-fix-bare-import-hooks.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix hooks not being set up properly for bare import Rake task -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/sh-fix-mermaid-start-on-load-typo.yml b/changelogs/unreleased/sh-fix-mermaid-start-on-load-typo.yml deleted file mode 100644 index a2d4ade8e54..00000000000 --- a/changelogs/unreleased/sh-fix-mermaid-start-on-load-typo.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix Mermaid drawings not loading on some browsers -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/sh-make-kib-human.yml b/changelogs/unreleased/sh-make-kib-human.yml deleted file mode 100644 index c40bb34fa4a..00000000000 --- a/changelogs/unreleased/sh-make-kib-human.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Humanize the units of "Showing last X KiB of log" in job trace -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/sh-optimize-commit-stats.yml b/changelogs/unreleased/sh-optimize-commit-stats.yml deleted file mode 100644 index 8c1be1252fb..00000000000 --- a/changelogs/unreleased/sh-optimize-commit-stats.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Speed up generation of commit stats by using Rugged native methods -merge_request: -author: -type: performance diff --git a/changelogs/unreleased/sh-validate-path-project-import.yml b/changelogs/unreleased/sh-validate-path-project-import.yml deleted file mode 100644 index acad66c0ab2..00000000000 --- a/changelogs/unreleased/sh-validate-path-project-import.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Avoid leaving a push event empty if payload cannot be created -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/show-inline-edit-btn.yml b/changelogs/unreleased/show-inline-edit-btn.yml deleted file mode 100644 index 8cfe9b7d75a..00000000000 --- a/changelogs/unreleased/show-inline-edit-btn.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Move edit button to second row on issue page (and change it to a pencil icon) -merge_request: -author: -type: changed diff --git a/changelogs/unreleased/show_proper_labels_in_board_issue_sidebar_when_issue_is_closed.yml b/changelogs/unreleased/show_proper_labels_in_board_issue_sidebar_when_issue_is_closed.yml deleted file mode 100644 index c2ab34b20a5..00000000000 --- a/changelogs/unreleased/show_proper_labels_in_board_issue_sidebar_when_issue_is_closed.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: show None when issue is in closed list and no labels assigned -merge_request: 15976 -author: Christiaan Van den Poel -type: fixed diff --git a/changelogs/unreleased/sophie-h-gitlab-ce-patch-15.yml b/changelogs/unreleased/sophie-h-gitlab-ce-patch-15.yml deleted file mode 100644 index b5e3210c737..00000000000 --- a/changelogs/unreleased/sophie-h-gitlab-ce-patch-15.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Hide link to issues/MRs from labels list if issues/MRs are disabled. -merge_request: 15863 -author: Sophie Herold -type: fixed diff --git a/changelogs/unreleased/tc-correct-email-in-reply-to.yml b/changelogs/unreleased/tc-correct-email-in-reply-to.yml deleted file mode 100644 index 1c8043f6a5c..00000000000 --- a/changelogs/unreleased/tc-correct-email-in-reply-to.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Make mail notifications of discussion notes In-Reply-To of each other -merge_request: 14289 -author: -type: changed diff --git a/changelogs/unreleased/update-redis-rack.yml b/changelogs/unreleased/update-redis-rack.yml deleted file mode 100644 index 6e2e6e203b8..00000000000 --- a/changelogs/unreleased/update-redis-rack.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Update redis-rack to 2.0.4 -merge_request: -author: -type: other diff --git a/changelogs/unreleased/winh-modal-target-id.yml b/changelogs/unreleased/winh-modal-target-id.yml deleted file mode 100644 index f8d5b72be50..00000000000 --- a/changelogs/unreleased/winh-modal-target-id.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add id to modal.vue to support data-toggle="modal" -merge_request: 16189 -author: -type: other diff --git a/changelogs/unreleased/winh-translate-contributors-page-dates.yml b/changelogs/unreleased/winh-translate-contributors-page-dates.yml deleted file mode 100644 index 74801bbd86e..00000000000 --- a/changelogs/unreleased/winh-translate-contributors-page-dates.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Translate date ranges on contributors page -merge_request: 15846 -author: -type: changed diff --git a/doc/administration/auth/okta.md b/doc/administration/auth/okta.md index cb42b7743c5..664657650d4 100644 --- a/doc/administration/auth/okta.md +++ b/doc/administration/auth/okta.md @@ -144,7 +144,7 @@ Now that the Okta app is configured, it's time to enable it in GitLab. 1. [Reconfigure][reconf] or [restart] GitLab for Omnibus and installations from source respectively for the changes to take effect. -You might want to try this out on a incognito browser window. +You might want to try this out on an incognito browser window. ## Configuring groups diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md index 57e54815b68..2441ff85783 100644 --- a/doc/administration/container_registry.md +++ b/doc/administration/container_registry.md @@ -483,7 +483,7 @@ You can use GitLab as an auth endpoint and use a non-bundled Container Registry. 1. A certificate keypair is required for GitLab and the Container Registry to communicate securely. By default omnibus-gitlab will generate one keypair, which is saved to `/var/opt/gitlab/gitlab-rails/etc/gitlab-registry.key`. - When using an non-bundled Container Registry, you will need to supply a + When using a non-bundled Container Registry, you will need to supply a custom certificate key. To do that, add the following to `/etc/gitlab/gitlab.rb` diff --git a/doc/administration/high_availability/redis.md b/doc/administration/high_availability/redis.md index 0e92f7c5a34..fd2677996b1 100644 --- a/doc/administration/high_availability/redis.md +++ b/doc/administration/high_availability/redis.md @@ -154,7 +154,7 @@ who will take all the decisions to restore the service availability by: - Reconfigure the old **Master** and demote to **Slave** when it comes back online You must have at least `3` Redis Sentinel servers, and they need to -be each in a independent machine (that are believed to fail independently), +be each in an independent machine (that are believed to fail independently), ideally in different geographical areas. You can configure them in the same machines where you've configured the other diff --git a/doc/api/award_emoji.md b/doc/api/award_emoji.md index d6924741ee4..3f9542d6653 100644 --- a/doc/api/award_emoji.md +++ b/doc/api/award_emoji.md @@ -172,7 +172,7 @@ Parameters: | --------- | ---- | -------- | ----------- | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user | | `issue_iid` | integer | yes | The internal ID of an issue | -| `award_id` | integer | yes | The ID of a award_emoji | +| `award_id` | integer | yes | The ID of an award_emoji | ```bash curl --request DELETE --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/projects/1/issues/80/award_emoji/344 @@ -197,7 +197,7 @@ Parameters: | --------- | ---- | -------- | ----------- | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user | | `issue_iid` | integer | yes | The internal ID of an issue | -| `note_id` | integer | yes | The ID of an note | +| `note_id` | integer | yes | The ID of a note | ```bash @@ -323,7 +323,7 @@ Parameters: | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user | | `issue_iid` | integer | yes | The internal ID of an issue | | `note_id` | integer | yes | The ID of a note | -| `award_id` | integer | yes | The ID of a award_emoji | +| `award_id` | integer | yes | The ID of an award_emoji | ```bash curl --request DELETE --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/projects/1/issues/80/award_emoji/345 diff --git a/doc/api/group_milestones.md b/doc/api/group_milestones.md index a96fb3124fc..21d3ac73000 100644 --- a/doc/api/group_milestones.md +++ b/doc/api/group_milestones.md @@ -73,7 +73,7 @@ POST /groups/:id/milestones Parameters: - `id` (required) - The ID or [URL-encoded path of the group](README.md#namespaced-path-encoding) owned by the authenticated user -- `title` (required) - The title of an milestone +- `title` (required) - The title of a milestone - `description` (optional) - The description of the milestone - `due_date` (optional) - The due date of the milestone - `start_date` (optional) - The start date of the milestone diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index 22ccc6a46f3..2957a0a5f48 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -591,7 +591,7 @@ PUT /projects/:id/merge_requests/:merge_request_iid | `title` | string | no | Title of MR | | `assignee_id` | integer | no | The ID of the user to assign the merge request to. Set to `0` or provide an empty value to unassign all assignees. | | `milestone_id` | integer | no | The ID of a milestone to assign the merge request to. Set to `0` or provide an empty value to unassign a milestone.| -| `labels` | string | no | Comma-separated label names for an merge request. Set to an empty string to unassign all labels. | +| `labels` | string | no | Comma-separated label names for a merge request. Set to an empty string to unassign all labels. | | `description` | string | no | Description of MR | | `state_event` | string | no | New state (close/reopen) | | `remove_source_branch` | boolean | no | Flag indicating if a merge request should remove the source branch when merging | diff --git a/doc/api/milestones.md b/doc/api/milestones.md index d35e940d7b1..07e66f89443 100644 --- a/doc/api/milestones.md +++ b/doc/api/milestones.md @@ -70,7 +70,7 @@ POST /projects/:id/milestones Parameters: - `id` (required) - The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user -- `title` (required) - The title of an milestone +- `title` (required) - The title of a milestone - `description` (optional) - The description of the milestone - `due_date` (optional) - The due date of the milestone - `start_date` (optional) - The start date of the milestone diff --git a/doc/api/notes.md b/doc/api/notes.md index d02ef84d0bd..1b68bd99ce2 100644 --- a/doc/api/notes.md +++ b/doc/api/notes.md @@ -158,7 +158,7 @@ Parameters: - `id` (required) - The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user - `snippet_id` (required) - The ID of a project snippet -- `note_id` (required) - The ID of an snippet note +- `note_id` (required) - The ID of a snippet note ```json { diff --git a/doc/api/projects.md b/doc/api/projects.md index 5a403f7593a..46f5de5aa0e 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -982,7 +982,7 @@ Example response: ## Unarchive a project Unarchives the project if the user is either admin or the project owner of this project. This action is -idempotent, thus unarchiving an non-archived project will not change the project. +idempotent, thus unarchiving a non-archived project will not change the project. ``` POST /projects/:id/unarchive diff --git a/doc/ci/environments.md b/doc/ci/environments.md index c03e16b1b38..58c4a71cef9 100644 --- a/doc/ci/environments.md +++ b/doc/ci/environments.md @@ -455,7 +455,7 @@ Mappings are defined as entries in the root YAML array, and are identified by a - Literal periods (`.`) should be escaped as `\.`. - `public` - a string, starting and ending with `'`. - - Can include `\N` expressions to refer to capture groups in the `source` regular expression in order of their occurence, starting with `\1`. + - Can include `\N` expressions to refer to capture groups in the `source` regular expression in order of their occurrence, starting with `\1`. The public path for a source path is determined by finding the first `source` expression that matches it, and returning the corresponding `public` path, replacing the `\N` expressions with the values of the `()` capture groups if appropriate. diff --git a/doc/ci/examples/dast.md b/doc/ci/examples/dast.md index 16ff8d5bb3e..7bf647bbb8b 100644 --- a/doc/ci/examples/dast.md +++ b/doc/ci/examples/dast.md @@ -1,11 +1,12 @@ # Dynamic Application Security Testing with GitLab CI/CD -This example shows how to run [Dynamic Application Security Testing (DAST)](https://en.wikipedia.org/wiki/Dynamic_program_analysis) -on your project's source code by using GitLab CI/CD. +is using the popular open source tool [OWASP ZAProxy](https://github.com/zaproxy/zaproxy) +to perform an analysis on your running web application. -DAST is using the popular open source tool -[OWASP ZAProxy](https://github.com/zaproxy/zaproxy) to perform an analysis. +It can be very useful combined with [Review Apps](../review_apps/index.md). + +## Example All you need is a GitLab Runner with the Docker executor (the shared Runners on GitLab.com will work fine). You can then add a new job to `.gitlab-ci.yml`, @@ -14,22 +15,26 @@ called `dast`: ```yaml dast: image: owasp/zap2docker-stable + variables: + website: "https://example.com" script: - mkdir /zap/wrk/ - - /zap/zap-baseline.py -J gl-dast-report.json -t https://example.com || true + - /zap/zap-baseline.py -J gl-dast-report.json -t $website || true - cp /zap/wrk/gl-dast-report.json . artifacts: paths: [gl-dast-report.json] ``` -The above example will create a `dast` job in your CI pipeline and will allow -you to download and analyze the report artifact in JSON format. +The above example will create a `dast` job in your CI/CD pipeline which will run +the tests on the URL defined in the `website` variable (change it to use your +own) and finally write the results in the `gl-dast-report.json` file. You can +then download and analyze the report artifact in JSON format. TIP: **Tip:** Starting with [GitLab Enterprise Edition Ultimate][ee] 10.4, this information will be automatically extracted and shown right in the merge request widget. To do so, the CI job must be named `dast` and the artifact path must be `gl-dast-report.json`. -[Learn more on dynamic application security testing results shown in merge requests](https://docs.gitlab.com/ee/user/project/merge_requests/dast.html). +[Learn more about DAST results shown in merge requests](https://docs.gitlab.com/ee/user/project/merge_requests/dast.html). [ee]: https://about.gitlab.com/gitlab-ee/ diff --git a/doc/ci/examples/php.md b/doc/ci/examples/php.md index 6768a2e012f..a2ba29a4ee2 100644 --- a/doc/ci/examples/php.md +++ b/doc/ci/examples/php.md @@ -167,7 +167,7 @@ Finally, push to GitLab and let the tests begin! ### Test against different PHP versions in Shell builds The [phpenv][] project allows you to easily manage different versions of PHP -each with its own config. This is specially usefull when testing PHP projects +each with its own config. This is especially useful when testing PHP projects with the Shell executor. You will have to install it on your build machine under the `gitlab-runner` @@ -227,7 +227,7 @@ following in your `.gitlab-ci.yml`: ... # Composer stores all downloaded packages in the vendor/ directory. -# Do not use the following if the vendor/ directory is commited to +# Do not use the following if the vendor/ directory is committed to # your git repository. cache: paths: diff --git a/doc/ci/examples/test-and-deploy-python-application-to-heroku.md b/doc/ci/examples/test-and-deploy-python-application-to-heroku.md index a6ed1c54e16..a433cd5a5dd 100644 --- a/doc/ci/examples/test-and-deploy-python-application-to-heroku.md +++ b/doc/ci/examples/test-and-deploy-python-application-to-heroku.md @@ -42,7 +42,7 @@ production: This project has three jobs: 1. `test` - used to test Django application, 2. `staging` - used to automatically deploy staging environment every push to `master` branch -3. `production` - used to automatically deploy production environmnet for every created tag +3. `production` - used to automatically deploy production environment for every created tag ## Store API keys diff --git a/doc/ci/quick_start/README.md b/doc/ci/quick_start/README.md index f621bf07251..e504b81eae8 100644 --- a/doc/ci/quick_start/README.md +++ b/doc/ci/quick_start/README.md @@ -135,9 +135,9 @@ Clicking on it you will be directed to the jobs page for that specific commit.  -Notice that there are two jobs pending which are named after what we wrote in -`.gitlab-ci.yml`. The red triangle indicates that there is no Runner configured -yet for these jobs. +Notice that there is a pending job which is named after what we wrote in +`.gitlab-ci.yml`. "stuck" indicates that there is no Runner configured +yet for this job. The next step is to configure a Runner so that it picks the pending jobs. diff --git a/doc/ci/ssh_keys/README.md b/doc/ci/ssh_keys/README.md index b8df0bfba20..693c8e9ef18 100644 --- a/doc/ci/ssh_keys/README.md +++ b/doc/ci/ssh_keys/README.md @@ -194,7 +194,7 @@ before_script: ## ## You can optionally disable host key checking. Be aware that by adding that - ## you are suspectible to man-in-the-middle attacks. + ## you are susceptible to man-in-the-middle attacks. ## WARNING: Use this only with the Docker executor, if you use it with shell ## you will overwrite your user's SSH config. ## diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md index b9d4a2098ed..06f69938aae 100644 --- a/doc/ci/variables/README.md +++ b/doc/ci/variables/README.md @@ -87,7 +87,7 @@ future GitLab releases.** ## 9.0 Renaming -To follow conventions of naming across GitLab, and to futher move away from the +To follow conventions of naming across GitLab, and to further move away from the `build` term and toward `job` CI variables have been renamed for the 9.0 release. diff --git a/doc/development/automatic_ce_ee_merge.md b/doc/development/automatic_ce_ee_merge.md index 4b9791c95bc..5a784b6de06 100644 --- a/doc/development/automatic_ce_ee_merge.md +++ b/doc/development/automatic_ce_ee_merge.md @@ -61,7 +61,7 @@ against EE. 1. Tries to apply it to current EE `master` 1. If it applies cleanly, the job succeeds -In the case where the job fails, it means you should create a `ee-<ce_branch>` +In the case where the job fails, it means you should create an `ee-<ce_branch>` or `<ce_branch>-ee` branch, push it to EE and open a merge request against EE `master`. At this point if you retry the failing job in your CE merge request, it should diff --git a/doc/development/background_migrations.md b/doc/development/background_migrations.md index fd2b9d0e908..af2026c483e 100644 --- a/doc/development/background_migrations.md +++ b/doc/development/background_migrations.md @@ -123,7 +123,7 @@ roughly be as follows: scheduling jobs for newly created data. 1. In a post-deployment migration you'll need to ensure no jobs remain. To do so you can use `Gitlab::BackgroundMigration.steal` to process any remaining - jobs before continueing. + jobs before continuing. 1. Remove the old column. ## Example diff --git a/doc/development/doc_styleguide.md b/doc/development/doc_styleguide.md index f41d31797af..cfeeed2506d 100644 --- a/doc/development/doc_styleguide.md +++ b/doc/development/doc_styleguide.md @@ -420,7 +420,7 @@ the style below as a guide: In this case: - before each step list the installation method is declared in bold -- three dashes (`---`) are used to create an horizontal line and separate the +- three dashes (`---`) are used to create a horizontal line and separate the two methods - the code blocks are indented one or more spaces under the list item to render correctly diff --git a/doc/development/fe_guide/axios.md b/doc/development/fe_guide/axios.md index 1daa6758171..34fa684c5d6 100644 --- a/doc/development/fe_guide/axios.md +++ b/doc/development/fe_guide/axios.md @@ -56,7 +56,7 @@ To help us mock the responses we need we use [axios-mock-adapter][axios-mock-ada ### Mock poll requests on tests with axios -Because polling function requires an header object, we need to always include an object as the third argument: +Because polling function requires a header object, we need to always include an object as the third argument: ```javascript mock.onGet('/users').reply(200, { foo: 'bar' }, {}); diff --git a/doc/development/fe_guide/vue.md b/doc/development/fe_guide/vue.md index 6e9f18dd1c3..6c93c29124d 100644 --- a/doc/development/fe_guide/vue.md +++ b/doc/development/fe_guide/vue.md @@ -456,7 +456,7 @@ describe('Todos App', () => { }); ``` #### `mountComponent` helper -There is an helper in `spec/javascripts/helpers/vue_mount_component_helper.js` that allows you to mount a component with the given props: +There is a helper in `spec/javascripts/helpers/vue_mount_component_helper.js` that allows you to mount a component with the given props: ```javascript import Vue from 'vue'; diff --git a/doc/development/migration_style_guide.md b/doc/development/migration_style_guide.md index a235dd74909..243ac7f0c98 100644 --- a/doc/development/migration_style_guide.md +++ b/doc/development/migration_style_guide.md @@ -4,7 +4,7 @@ When writing migrations for GitLab, you have to take into account that these will be ran by hundreds of thousands of organizations of all sizes, some with many years of data in their database. -In addition, having to take a server offline for a a upgrade small or big is a +In addition, having to take a server offline for an upgrade small or big is a big burden for most organizations. For this reason it is important that your migrations are written carefully, can be applied online and adhere to the style guide below. diff --git a/doc/development/rake_tasks.md b/doc/development/rake_tasks.md index ceff57276d2..dc88ce1522c 100644 --- a/doc/development/rake_tasks.md +++ b/doc/development/rake_tasks.md @@ -8,7 +8,7 @@ Note that if your db user does not have advanced privileges you must create the bundle exec rake setup ``` -The `setup` task is a alias for `gitlab:setup`. +The `setup` task is an alias for `gitlab:setup`. This tasks calls `db:reset` to create the database, calls `add_limits_mysql` that adds limits to the database schema in case of a MySQL database and finally it calls `db:seed_fu` to seed the database. Note: `db:setup` calls `db:seed` but this does nothing. diff --git a/doc/development/testing_guide/best_practices.md b/doc/development/testing_guide/best_practices.md index edb8f372ea3..f5e8b4f146f 100644 --- a/doc/development/testing_guide/best_practices.md +++ b/doc/development/testing_guide/best_practices.md @@ -26,7 +26,6 @@ Here are some things to keep in mind regarding test performance: - Use `.method` to describe class methods and `#method` to describe instance methods. - Use `context` to test branching logic. -- Don't assert against the absolute value of a sequence-generated attribute (see [Gotchas](../gotchas.md#dont-assert-against-the-absolute-value-of-a-sequence-generated-attribute)). - Try to match the ordering of tests to the ordering within the class. - Try to follow the [Four-Phase Test][four-phase-test] pattern, using newlines to separate phases. diff --git a/doc/development/ux_guide/animation.md b/doc/development/ux_guide/animation.md index d190ee1b0ff..797390a6845 100644 --- a/doc/development/ux_guide/animation.md +++ b/doc/development/ux_guide/animation.md @@ -27,7 +27,7 @@ View the [interactive example](http://codepen.io/awhildy/full/GNyEvM/) here. ### Dropdowns -The dropdown menu should feel like it is appearing from the triggering element. Combining a position shift `400ms cubic-bezier(0.23, 1, 0.32, 1)` with a opacity animation `200ms linear` on the second half of the motion achieves this affect. +The dropdown menu should feel like it is appearing from the triggering element. Combining a position shift `400ms cubic-bezier(0.23, 1, 0.32, 1)` with an opacity animation `200ms linear` on the second half of the motion achieves this affect. View the [interactive example](http://codepen.io/awhildy/full/jVLJpb/) here. diff --git a/doc/development/ux_guide/components.md b/doc/development/ux_guide/components.md index d396964e7c1..012c64be79f 100644 --- a/doc/development/ux_guide/components.md +++ b/doc/development/ux_guide/components.md @@ -108,7 +108,7 @@ Primary buttons communicate the main call to action. There should only be one ca  #### Secondary -Secondary buttons are for alternative commands. They should be conveyed by a button with an stroke, and no background fill. +Secondary buttons are for alternative commands. They should be conveyed by a button with a stroke, and no background fill.  @@ -181,7 +181,7 @@ A count element is used in navigation contexts where it is helpful to indicate t ## Lists -Lists are used where ever there is a single column of information to display. Ths [issues list](https://gitlab.com/gitlab-org/gitlab-ce/issues) is an example of a important list in the GitLab UI. +Lists are used where ever there is a single column of information to display. Ths [issues list](https://gitlab.com/gitlab-org/gitlab-ce/issues) is an example of an important list in the GitLab UI. ### Types @@ -269,7 +269,7 @@ Modals are only used for having a conversation and confirmation with the user. T * Modals contain the header, body, and actions. * **Header(1):** The header title is a question instead of a descriptive phrase. * **Body(2):** The content in body should never be ambiguous and unclear. It provides specific information. - * **Actions(3):** Contains a affirmative action, a dismissive action, and an extra action. The order of actions from left to right: Dismissive action → Extra action → Affirmative action + * **Actions(3):** Contains an affirmative action, a dismissive action, and an extra action. The order of actions from left to right: Dismissive action → Extra action → Affirmative action * Confirmations regarding labels should keep labeling styling. * References to commits, branches, and tags should be **monospaced**. diff --git a/doc/development/ux_guide/copy.md b/doc/development/ux_guide/copy.md index af842da7f62..070efdc15b5 100644 --- a/doc/development/ux_guide/copy.md +++ b/doc/development/ux_guide/copy.md @@ -27,7 +27,7 @@ This means that, as a rule, copy should be very short. A long message or label i >**Example:**
Use `Add` instead of `Add issue` as a button label.
-Preferrably use context and placement of controls to make it obvious what clicking on them will do.
+Preferably use context and placement of controls to make it obvious what clicking on them will do.
---
diff --git a/doc/install/azure/index.md b/doc/install/azure/index.md index 9cc4b56c932..7afe338ae8b 100644 --- a/doc/install/azure/index.md +++ b/doc/install/azure/index.md @@ -178,7 +178,7 @@ address. Read [IP address types and allocation methods in Azure][Azure-IP-Addres At this stage you should have a running and fully operational VM. However, none of the services on your VM (e.g. GitLab) will be publicly accessible via the internet until you have opened up the -neccessary ports to enable access to those services. +necessary ports to enable access to those services. Ports are opened by adding _security rules_ to the **"Network security group"** (NSG) which our VM has been assigned to. If you followed the process above, then Azure will have automatically created @@ -436,4 +436,4 @@ Check out our other [Technical Articles][GitLab-Technical-Articles] or browse th [SSH]: https://en.wikipedia.org/wiki/Secure_Shell [PuTTY]: http://www.putty.org/ -[Using-SSH-In-Putty]: https://mediatemple.net/community/products/dv/204404604/using-ssh-in-putty-
\ No newline at end of file +[Using-SSH-In-Putty]: https://mediatemple.net/community/products/dv/204404604/using-ssh-in-putty- diff --git a/doc/install/installation.md b/doc/install/installation.md index b2acd5e78b5..18e29271d0f 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -431,7 +431,7 @@ GitLab Shell is an SSH access and repository management software developed speci **Note:** GitLab Shell application startup time can be greatly reduced by disabling RubyGems. This can be done in several manners: * Export `RUBYOPT=--disable-gems` environment variable for the processes -* Compile Ruby with `configure --disable-rubygems` to disable RubyGems by default. Not recommened for system-wide Ruby. +* Compile Ruby with `configure --disable-rubygems` to disable RubyGems by default. Not recommended for system-wide Ruby. * Omnibus GitLab [replaces the *shebang* line of the `gitlab-shell/bin/*` scripts](https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1707) ### Install gitlab-workhorse @@ -442,7 +442,7 @@ which is the recommended location. sudo -u git -H bundle exec rake "gitlab:workhorse:install[/home/git/gitlab-workhorse]" RAILS_ENV=production -You can specify a different Git repository by providing it as an extra paramter: +You can specify a different Git repository by providing it as an extra parameter: sudo -u git -H bundle exec rake "gitlab:workhorse:install[/home/git/gitlab-workhorse,https://example.com/gitlab-workhorse.git]" RAILS_ENV=production @@ -486,7 +486,7 @@ Make GitLab start on boot: # Fetch Gitaly source with Git and compile with Go sudo -u git -H bundle exec rake "gitlab:gitaly:install[/home/git/gitaly]" RAILS_ENV=production -You can specify a different Git repository by providing it as an extra paramter: +You can specify a different Git repository by providing it as an extra parameter: sudo -u git -H bundle exec rake "gitlab:gitaly:install[/home/git/gitaly,https://example.com/gitaly.git]" RAILS_ENV=production @@ -656,7 +656,7 @@ Checkout the [GitLab Runner section](https://about.gitlab.com/gitlab-ci/#gitlab- ### Adding your Trusted Proxies -If you are using a reverse proxy on an separate machine, you may want to add the +If you are using a reverse proxy on a separate machine, you may want to add the proxy to the trusted proxies list. Otherwise users will appear signed in from the proxy's IP address. diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index 6ad314647ee..764ee0ca72c 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -21,10 +21,10 @@ project in an easy and automatic way: 1. [Auto Code Quality](#auto-code-quality) 1. [Auto SAST (Static Application Security Testing)](#auto-sast) 1. [Auto SAST for Docker images](#auto-sast-for-docker-images) -1. [Auto DAST (Dynamic Application Security Testing)](#auto-dast) -1. [Auto Browser Performance Testing](#auto-browser-performance-testing) 1. [Auto Review Apps](#auto-review-apps) +1. [Auto DAST (Dynamic Application Security Testing)](#auto-dast) 1. [Auto Deploy](#auto-deploy) +1. [Auto Browser Performance Testing](#auto-browser-performance-testing) 1. [Auto Monitoring](#auto-monitoring) As Auto DevOps relies on many different components, it's good to have a basic @@ -229,6 +229,32 @@ check out. In GitLab Enterprise Edition Ultimate, any security warnings are also [shown in the merge request widget](https://docs.gitlab.com/ee/user/project/merge_requests/sast_docker.html). +### Auto Review Apps + +NOTE: **Note:** +This is an optional step, since many projects do not have a Kubernetes cluster +available. If the [prerequisites](#prerequisites) are not met, the job will +silently be skipped. + +CAUTION: **Caution:** +Your apps should *not* be manipulated outside of Helm (using Kubernetes directly.) +This can cause confusion with Helm not detecting the change, and subsequent +deploys with Auto DevOps can undo your changes. Also, if you change something +and want to undo it by deploying again, Helm may not detect that anything changed +in the first place, and thus not realize that it needs to re-apply the old config. + +[Review Apps][review-app] are temporary application environments based on the +branch's code so developers, designers, QA, product managers, and other +reviewers can actually see and interact with code changes as part of the review +process. Auto Review Apps create a Review App for each branch. + +The Review App will have a unique URL based on the project name, the branch +name, and a unique number, combined with the Auto DevOps base domain. For +example, `user-project-branch-1234.example.com`. A link to the Review App shows +up in the merge request widget for easy discovery. When the branch is deleted, +for example after the merge request is merged, the Review App will automatically +be deleted. + ### Auto DAST > Introduced in [GitLab Enterprise Edition Ultimate][ee] 10.4. @@ -256,32 +282,6 @@ Auto Browser Performance Testing utilizes the [Sitespeed.io container](https://h In GitLab Enterprise Edition Premium, performance differences between the source and target branches are [shown in the merge request widget](https://docs.gitlab.com/ee/user/project/merge_requests/browser_performance_testing.html). -### Auto Review Apps - -NOTE: **Note:** -This is an optional step, since many projects do not have a Kubernetes cluster -available. If the [prerequisites](#prerequisites) are not met, the job will -silently be skipped. - -CAUTION: **Caution:** -Your apps should *not* be manipulated outside of Helm (using Kubernetes directly.) -This can cause confusion with Helm not detecting the change, and subsequent -deploys with Auto DevOps can undo your changes. Also, if you change something -and want to undo it by deploying again, Helm may not detect that anything changed -in the first place, and thus not realize that it needs to re-apply the old config. - -[Review Apps][review-app] are temporary application environments based on the -branch's code so developers, designers, QA, product managers, and other -reviewers can actually see and interact with code changes as part of the review -process. Auto Review Apps create a Review App for each branch. - -The Review App will have a unique URL based on the project name, the branch -name, and a unique number, combined with the Auto DevOps base domain. For -example, `user-project-branch-1234.example.com`. A link to the Review App shows -up in the merge request widget for easy discovery. When the branch is deleted, -for example after the merge request is merged, the Review App will automatically -be deleted. - ### Auto Deploy NOTE: **Note:** diff --git a/doc/topics/git/how_to_install_git/index.md b/doc/topics/git/how_to_install_git/index.md index cdf61057449..7fb578e9ea8 100644 --- a/doc/topics/git/how_to_install_git/index.md +++ b/doc/topics/git/how_to_install_git/index.md @@ -14,7 +14,7 @@ This article will show you how to install Git on macOS, Ubuntu Linux and Windows Although it is easy to use the version of Git shipped with macOS or install the latest version of Git on macOS by downloading it from the project website, we recommend installing it via Homebrew to get access to -an extensive selection of dependancy managed libraries and applications. +an extensive selection of dependency managed libraries and applications. If you are sure you don't need access to any additional development libraries or don't have approximately 15gb of available disk space for Xcode and Homebrew diff --git a/doc/university/glossary/README.md b/doc/university/glossary/README.md index fbe7353c6ca..a9ccbf5a085 100644 --- a/doc/university/glossary/README.md +++ b/doc/university/glossary/README.md @@ -229,7 +229,7 @@ Our free on Premise solution with >100,000 users ### GitLab CI -Our own Continuos Integration [feature](https://about.gitlab.com/gitlab-ci/) that is shipped with each instance +Our own Continuous Integration [feature](https://about.gitlab.com/gitlab-ci/) that is shipped with each instance ### GitLab EE diff --git a/doc/university/high-availability/aws/README.md b/doc/university/high-availability/aws/README.md index ddc853afded..47ccd0e6dbc 100644 --- a/doc/university/high-availability/aws/README.md +++ b/doc/university/high-availability/aws/README.md @@ -147,7 +147,7 @@ change which will be helpful is the database name for which we can use ## ElastiCache EC is an in-memory hosted caching solution. Redis maintains its own -persistance and is used for certain types of application. +persistence and is used for certain types of application. Let's choose the ElastiCache service in the Database section from our AWS console. Now lets create a cache subnet group which will be very @@ -311,7 +311,7 @@ Here is a tricky part though, when adding subnets we need to associate public subnets instead of the private ones where our instances will actually live. -On the secruity group section let's create a new one named +On the security group section let's create a new one named `gitlab-loadbalancer-sec-group` and allow both HTTP ad HTTPS traffic from anywhere. diff --git a/doc/user/profile/account/two_factor_authentication.md b/doc/user/profile/account/two_factor_authentication.md index 590c3f862fb..d3a2a7dcd14 100644 --- a/doc/user/profile/account/two_factor_authentication.md +++ b/doc/user/profile/account/two_factor_authentication.md @@ -212,7 +212,7 @@ Sign in and re-enable two-factor authentication as soon as possible. For example, if a user is trying to access a GitLab instance from `first.host.xyz` and `second.host.xyz`: - The user logs in via `first.host.xyz` and registers their U2F key. - - The user logs out and attempts to log in via `first.host.xyz` - U2F authentication suceeds. + - The user logs out and attempts to log in via `first.host.xyz` - U2F authentication succeeds. - The user logs out and attempts to log in via `second.host.xyz` - U2F authentication fails, because the U2F key has only been registered on `first.host.xyz`. diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md index 130f7897b1a..e87b4403854 100644 --- a/doc/user/project/clusters/index.md +++ b/doc/user/project/clusters/index.md @@ -1,26 +1,28 @@ # Connecting GitLab with a Kubernetes cluster -> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/35954) in 10.1. +> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/35954) in GitLab 10.1. + +Connect your project to Google Kubernetes Engine (GKE) or an existing Kubernetes +cluster in a few steps. With a cluster associated to your project, you can use Review Apps, deploy your applications, run your pipelines, and much more, in an easy way. -Connect your project to Google Kubernetes Engine (GKE) or your own Kubernetes -cluster in a few steps. - -NOTE: **Note:** -The Cluster integration will eventually supersede the -[Kubernetes integration](../integrations/kubernetes.md). For the moment, -you can create only one cluster. +There are two options when adding a new cluster to your project; either associate +your account with Google Kubernetes Engine (GKE) so that you can [create new +clusters](#adding-and-creating-a-new-gke-cluster-via-gitlab) from within GitLab, +or provide the credentials to an [existing Kubernetes cluster](#adding-an-existing-kubernetes-cluster). ## Prerequisites -In order to be able to manage your GKE cluster through GitLab, the following -prerequisites must be met: +In order to be able to manage your Kubernetes cluster through GitLab, the +following prerequisites must be met. + +**For a cluster hosted on GKE:** - The [Google authentication integration](../../../integration/google.md) must be enabled in GitLab at the instance level. If that's not the case, ask your - administrator to enable it. + GitLab administrator to enable it. - Your associated Google account must have the right privileges to manage clusters on GKE. That would mean that a [billing account](https://cloud.google.com/billing/docs/how-to/manage-billing-account) @@ -31,41 +33,88 @@ prerequisites must be met: - You must have [Resource Manager API](https://cloud.google.com/resource-manager/) -If all of the above requirements are met, you can proceed to add a new GKE +**For an existing Kubernetes cluster:** + +- Since the cluster is already created, there are no prerequisites. + +--- + +If all of the above requirements are met, you can proceed to add a new Kubernetes cluster. -## Adding a cluster +## Adding and creating a new GKE cluster via GitLab + +NOTE: **Note:** +You need Master [permissions] and above to access the Clusters page. + +Before proceeding, make sure all [prerequisites](#prerequisites) are met. +To add a new cluster hosted on GKE to your project: + +1. Navigate to your project's **CI/CD > Clusters** page. +1. Click on **Add cluster**. +1. Click on **Create with GKE**. +1. Connect your Google account if you haven't done already by clicking the + **Sign in with Google** button. +1. Fill in the requested values: + - **Cluster name** (required) - The name you wish to give the cluster. + - **GCP project ID** (required) - The ID of the project you created in your GCP + console that will host the Kubernetes cluster. This must **not** be confused + with the project name. Learn more about [Google Cloud Platform projects](https://cloud.google.com/resource-manager/docs/creating-managing-projects). + - **Zone** - The [zone](https://cloud.google.com/compute/docs/regions-zones/) + under which the cluster will be created. + - **Number of nodes** - The number of nodes you wish the cluster to have. + - **Machine type** - The [machine type](https://cloud.google.com/compute/docs/machine-types) + of the Virtual Machine instance that the cluster will be based on. + - **Environment scope** - The [associated environment](#setting-the-environment-scope) to this cluster. +1. Finally, click the **Create cluster** button. + +After a few moments, your cluster should be created. If something goes wrong, +you will be notified. + +You can now proceed to install some pre-defined applications and then +enable the Cluster integration. + +## Adding an existing Kubernetes cluster NOTE: **Note:** -You need Master [permissions] and above to add a cluster. - -There are two options when adding a new cluster; either use Google Kubernetes -Engine (GKE) or provide the credentials to your own Kubernetes cluster. - -To add a new cluster: - -1. Navigate to your project's **CI/CD > Cluster** page -1. If you want to let GitLab create a cluster on GKE for you, go through the - following steps, otherwise skip to the next one. - 1. Click on **Create with GKE** - 1. Connect your Google account if you haven't done already by clicking the - **Sign in with Google** button - 1. Fill in the requested values: - - **Cluster name** (required) - The name you wish to give the cluster. - - **GCP project ID** (required) - The ID of the project you created in your GCP - console that will host the Kubernetes cluster. This must **not** be confused - with the project name. Learn more about [Google Cloud Platform projects](https://cloud.google.com/resource-manager/docs/creating-managing-projects). - - **Zone** - The [zone](https://cloud.google.com/compute/docs/regions-zones/) - under which the cluster will be created. - - **Number of nodes** - The number of nodes you wish the cluster to have. - - **Machine type** - The [machine type](https://cloud.google.com/compute/docs/machine-types) - of the Virtual Machine instance that the cluster will be based on. - - **Project namespace** - The unique namespace for this project. By default you - don't have to fill it in; by leaving it blank, GitLab will create one for you. -1. If you want to use your own existing Kubernetes cluster, click on - **Add an existing cluster** and fill in the details as described in the - [Kubernetes integration](../integrations/kubernetes.md) documentation. -1. Finally, click the **Create cluster** button +You need Master [permissions] and above to access the Clusters page. + +To add an existing Kubernetes cluster to your project: + +1. Navigate to your project's **CI/CD > Clusters** page. +1. Click on **Add cluster**. +1. Click on **Add an existing cluster** and fill in the details: + - **Cluster name** (required) - The name you wish to give the cluster. + - **Environment scope** (required)- The + [associated environment](#setting-the-environment-scope) to this cluster. + - **API URL** (required) - + It's the URL that GitLab uses to access the Kubernetes API. Kubernetes + exposes several APIs, we want the "base" URL that is common to all of them, + e.g., `https://kubernetes.example.com` rather than `https://kubernetes.example.com/api/v1`. + - **CA certificate** (optional) - + If the API is using a self-signed TLS certificate, you'll also need to include + the `ca.crt` contents here. + - **Token** - + GitLab authenticates against Kubernetes using service tokens, which are + scoped to a particular `namespace`. If you don't have a service token yet, + you can follow the + [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) + to create one. You can also view or create service tokens in the + [Kubernetes dashboard](https://kubernetes.io/docs/tasks/access-application-cluster/web-ui-dashboard/#config) + (under **Config > Secrets**). + - **Project namespace** (optional) - The following apply: + - By default you don't have to fill it in; by leaving it blank, GitLab will + create one for you. + - Each project should have a unique namespace. + - The project namespace is not necessarily the namespace of the secret, if + you're using a secret with broader permissions, like the secret from `default`. + - You should **not** use `default` as the project namespace. + - If you or someone created a secret specifically for the project, usually + with limited permissions, the secret's namespace and project namespace may + be the same. +1. Finally, click the **Create cluster** button. + +The Kubernetes service takes the following parameters: After a few moments, your cluster should be created. If something goes wrong, you will be notified. @@ -85,6 +134,91 @@ added directly to your configured cluster. Those applications are needed for | [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/) | 10.2+ | Ingress can provide load balancing, SSL termination, and name-based virtual hosting. It acts as a web proxy for your applications and is useful if you want to use [Auto DevOps](../../../topics/autodevops/index.md) or deploy your own web apps. | | [Prometheus](https://prometheus.io/docs/introduction/overview/) | 10.4+ | Prometheus is an open-source monitoring and alerting system useful to supervise your deployed applications | +## Setting the environment scope + +When adding more than one clusters, you need to differentiate them with an +environment scope. The environment scope associates clusters and +[environments](../../../ci/environments.md) in an 1:1 relationship similar to how the +[environment-specific variables](../../../ci/variables/README.md#limiting-environment-scopes-of-secret-variables) +work. + +The default environment scope is `*`, which means all jobs, regardless of their +environment, will use that cluster. Each scope can only be used by a single +cluster in a project, and a validation error will occur if otherwise. + +--- + +For example, let's say the following clusters exist in a project: + +| Cluster | Environment scope | +| ---------- | ------------------- | +| Development| `*` | +| Staging | `staging/*` | +| Production | `production/*` | + +And the following environments are set in [`.gitlab-ci.yml`](../../../ci/yaml/README.md): + +```yaml +stages: +- test +- deploy + +test: + stage: test + script: sh test + +deploy to staging: + stage: deploy + script: make deploy + environment: + name: staging/$CI_COMMIT_REF_NAME + url: https://staging.example.com/ + +deploy to production: + stage: deploy + script: make deploy + environment: + name: production/$CI_COMMIT_REF_NAME + url: https://example.com/ +``` + +The result will then be: + +- The development cluster will be used for the "test" job. +- The staging cluster will be used for the "deploy to staging" job. +- The production cluster will be used for the "deploy to production" job. + +## Multiple Kubernetes clusters + +> Introduced in [GitLab Enterprise Edition Premium][ee] 10.3. + +With GitLab EEP, you can associate more than one Kubernetes clusters to your +project. That way you can have different clusters for different environments, +like dev, staging, production, etc. + +To add another cluster, follow the same steps as described in [adding a +Kubernetes cluster](#adding-a-kubernetes-cluster) and make sure to +[set an environment scope](#setting-the-environment-scope) that will +differentiate the new cluster with the rest. + +## Deployment variables + +The Kubernetes cluster integration exposes the following +[deployment variables](../../../ci/variables/README.md#deployment-variables) in the +GitLab CI/CD build environment: + +- `KUBE_URL` - Equal to the API URL. +- `KUBE_TOKEN` - The Kubernetes token. +- `KUBE_NAMESPACE` - The Kubernetes namespace is auto-generated if not specified. + The default value is `<project_name>-<project_id>`. You can overwrite it to + use different one if needed, otherwise the `KUBE_NAMESPACE` variable will + receive the default value. +- `KUBE_CA_PEM_FILE` - Only present if a custom CA bundle was specified. Path + to a file containing PEM data. +- `KUBE_CA_PEM` (deprecated) - Only if a custom CA bundle was specified. Raw PEM data. +- `KUBECONFIG` - Path to a file containing `kubeconfig` for this deployment. + CA bundle would be embedded if specified. + ## Enabling or disabling the Cluster integration After you have successfully added your cluster information, you can enable the @@ -111,4 +245,62 @@ To remove the Cluster integration from your project, simply click on the **Remove integration** button. You will then be able to follow the procedure and [add a cluster](#adding-a-cluster) again. +## What you can get with the Kubernetes integration + +Here's what you can do with GitLab if you enable the Kubernetes integration. + +### Deploy Boards (EEP) + +> Available in [GitLab Enterprise Edition Premium][ee]. + +GitLab's Deploy Boards offer a consolidated view of the current health and +status of each CI [environment](../../../ci/environments.md) running on Kubernetes, +displaying the status of the pods in the deployment. Developers and other +teammates can view the progress and status of a rollout, pod by pod, in the +workflow they already use without any need to access Kubernetes. + +[> Read more about Deploy Boards](https://docs.gitlab.com/ee/user/project/deploy_boards.html) + +### Canary Deployments (EEP) + +> Available in [GitLab Enterprise Edition Premium][ee]. + +Leverage [Kubernetes' Canary deployments](https://kubernetes.io/docs/concepts/cluster-administration/manage-deployment/#canary-deployments) +and visualize your canary deployments right inside the Deploy Board, without +the need to leave GitLab. + +[> Read more about Canary Deployments](https://docs.gitlab.com/ee/user/project/canary_deployments.html) + +### Kubernetes monitoring + +Automatically detect and monitor Kubernetes metrics. Automatic monitoring of +[NGINX ingress](../integrations/prometheus_library/nginx.md) is also supported. + +[> Read more about Kubernetes monitoring](../integrations/prometheus_library/kubernetes.md) + +### Auto DevOps + +Auto DevOps automatically detects, builds, tests, deploys, and monitors your +applications. + +To make full use of Auto DevOps(Auto Deploy, Auto Review Apps, and Auto Monitoring) +you will need the Kubernetes project integration enabled. + +[> Read more about Auto DevOps](../../../topics/autodevops/index.md) + +### Web terminals + +NOTE: **Note:** +Introduced in GitLab 8.15. You must be the project owner or have `master` permissions +to use terminals. Support is limited to the first container in the +first pod of your environment. + +When enabled, the Kubernetes service adds [web terminal](../../../ci/environments.md#web-terminals) +support to your [environments](../../../ci/environments.md). This is based on the `exec` functionality found in +Docker and Kubernetes, so you get a new shell session within your existing +containers. To use this integration, you should deploy to Kubernetes using +the deployment variables above, ensuring any pods you create are labelled with +`app=$CI_ENVIRONMENT_SLUG`. GitLab will do the rest! + [permissions]: ../../permissions.md +[ee]: https://about.gitlab.com/gitlab-ee/ diff --git a/doc/user/project/integrations/emails_on_push.md b/doc/user/project/integrations/emails_on_push.md index 18109fc049c..c01da883562 100644 --- a/doc/user/project/integrations/emails_on_push.md +++ b/doc/user/project/integrations/emails_on_push.md @@ -10,7 +10,7 @@ In the _Recipients_ area, provide a list of emails separated by commas. You can configure any of the following settings depending on your preference. -+ **Push events** - Email will be triggered when a push event is recieved ++ **Push events** - Email will be triggered when a push event is received + **Tag push events** - Email will be triggered when a tag is created and pushed + **Send from committer** - Send notifications from the committer's email address if the domain is part of the domain GitLab is running on (e.g. `user@gitlab.com`). + **Disable code diffs** - Don't include possibly sensitive code diffs in notification body. diff --git a/doc/user/project/integrations/kubernetes.md b/doc/user/project/integrations/kubernetes.md index 710cf78e84f..543baaa81e1 100644 --- a/doc/user/project/integrations/kubernetes.md +++ b/doc/user/project/integrations/kubernetes.md @@ -2,11 +2,15 @@ last_updated: 2017-12-28 --- -CAUTION: **Warning:** -Kubernetes service integration has been deprecated in GitLab 10.3. If the service is active the cluster information still be editable, however we advised to disable and reconfigure the clusters using the new [Clusters](../clusters/index.md) page. If the service is inactive the fields will be uneditable. Read [GitLab 10.3 release post](https://about.gitlab.com/2017/12/22/gitlab-10-3-released/#kubernetes-integration-service) for more information. - # GitLab Kubernetes / OpenShift integration +CAUTION: **Warning:** +The Kubernetes service integration has been deprecated in GitLab 10.3. If the +service is active, the cluster information will still be editable, however we +advise to disable and reconfigure the clusters using the new +[Clusters](../clusters/index.md) page. If the service is inactive, the fields +will not be editable. Read [GitLab 10.3 release post](https://about.gitlab.com/2017/12/22/gitlab-10-3-released/#kubernetes-integration-service) for more information. + GitLab can be configured to interact with Kubernetes, or other systems using the Kubernetes API (such as OpenShift). diff --git a/doc/user/project/integrations/webhooks.md b/doc/user/project/integrations/webhooks.md index 82175c70e49..19df78f4140 100644 --- a/doc/user/project/integrations/webhooks.md +++ b/doc/user/project/integrations/webhooks.md @@ -316,7 +316,7 @@ X-Gitlab-Event: Issue Hook Triggered when a new comment is made on commits, merge requests, issues, and code snippets. The note data will be stored in `object_attributes` (e.g. `note`, `noteable_type`). The payload will also include information about the target of the comment. For example, -a comment on a issue will include the specific issue information under the `issue` key. +a comment on an issue will include the specific issue information under the `issue` key. Valid target types: 1. `commit` diff --git a/doc/user/project/issues/crosslinking_issues.md b/doc/user/project/issues/crosslinking_issues.md index 5cc7ea383ae..cc8988be36b 100644 --- a/doc/user/project/issues/crosslinking_issues.md +++ b/doc/user/project/issues/crosslinking_issues.md @@ -40,7 +40,7 @@ issues around that same idea. You do that as explained above, when [mentioning an issue from a commit message](#from-commit-messages). -When mentioning the issue "A" in a issue "B", the issue "A" will also +When mentioning the issue "A" in issue "B", the issue "A" will also display a notification in its tracker. The same is valid for mentioning issues in merge requests. diff --git a/doc/user/project/milestones/index.md b/doc/user/project/milestones/index.md index 20249926910..27832b0fa2b 100644 --- a/doc/user/project/milestones/index.md +++ b/doc/user/project/milestones/index.md @@ -52,7 +52,7 @@ special options available when filtering by milestone: The milestone sidebar shows percentage complete, start date and due date, issues, total issue weight, total issue time spent, and merge requests. -The percentage complete is calcualted as: Closed and merged merge requests plus all closed issues divided by +The percentage complete is calculated as: Closed and merged merge requests plus all closed issues divided by total merge requests and issues.  diff --git a/doc/user/project/new_ci_build_permissions_model.md b/doc/user/project/new_ci_build_permissions_model.md index 17dcd152363..15455a54627 100644 --- a/doc/user/project/new_ci_build_permissions_model.md +++ b/doc/user/project/new_ci_build_permissions_model.md @@ -91,7 +91,7 @@ to steal the tokens of other jobs. Since 9.0 [pipeline triggers][triggers] do support the new permission model. The new triggers do impersonate their associated user including their access -to projects and their project permissions. To migrate trigger to use new permisison +to projects and their project permissions. To migrate trigger to use new permission model use **Take ownership**. ## Before GitLab 8.12 diff --git a/doc/user/project/pages/introduction.md b/doc/user/project/pages/introduction.md index 3ab88948fbd..f52f66f518a 100644 --- a/doc/user/project/pages/introduction.md +++ b/doc/user/project/pages/introduction.md @@ -373,7 +373,7 @@ configuration. If the case of `404.html`, there are different scenarios. For example: - If you use project Pages (served under `/projectname/`) and try to access - `/projectname/non/exsiting_file`, GitLab Pages will try to serve first + `/projectname/non/existing_file`, GitLab Pages will try to serve first `/projectname/404.html`, and then `/404.html`. - If you use user/group Pages (served under `/`) and try to access `/non/existing_file` GitLab Pages will try to serve `/404.html`. diff --git a/lib/api/protected_branches.rb b/lib/api/protected_branches.rb index 614822509f0..c15c487deb4 100644 --- a/lib/api/protected_branches.rb +++ b/lib/api/protected_branches.rb @@ -2,7 +2,7 @@ module API class ProtectedBranches < Grape::API include PaginationParams - BRANCH_ENDPOINT_REQUIREMENTS = API::PROJECT_ENDPOINT_REQUIREMENTS.merge(branch: API::NO_SLASH_URL_PART_REGEX) + BRANCH_ENDPOINT_REQUIREMENTS = API::PROJECT_ENDPOINT_REQUIREMENTS.merge(name: API::NO_SLASH_URL_PART_REGEX) before { authorize_admin_project } diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index b89a38d187e..455c9902a0a 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -1317,6 +1317,10 @@ module Gitlab end # rubocop:enable Metrics/ParameterLists + def write_config(full_path:) + rugged.config['gitlab.fullpath'] = full_path if full_path.present? + end + def gitaly_repository Gitlab::GitalyClient::Util.repository(@storage, @relative_path, @gl_repository) end diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 31cd6bfe6e1..a584eb97cf5 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -427,7 +427,7 @@ namespace :gitlab do namespace :user do desc "GitLab | Check the integrity of a specific user's repositories" task :check_repos, [:username] => :environment do |t, args| - username = args[:username] || prompt("Check repository integrity for fsername? ".color(:blue)) + username = args[:username] || prompt("Check repository integrity for username? ".color(:blue)) user = User.find_by(username: username) if user repo_dirs = user.authorized_projects.map do |p| diff --git a/qa/qa/page/main/login.rb b/qa/qa/page/main/login.rb index 7b4c1603017..9cff2c5c317 100644 --- a/qa/qa/page/main/login.rb +++ b/qa/qa/page/main/login.rb @@ -19,15 +19,17 @@ module QA end def sign_in_using_credentials - if page.has_content?('Change your password') + using_wait_time 0 do + if page.has_content?('Change your password') + fill_in :user_password, with: Runtime::User.password + fill_in :user_password_confirmation, with: Runtime::User.password + click_button 'Change your password' + end + + fill_in :user_login, with: Runtime::User.name fill_in :user_password, with: Runtime::User.password - fill_in :user_password_confirmation, with: Runtime::User.password - click_button 'Change your password' + click_button 'Sign in' end - - fill_in :user_login, with: Runtime::User.name - fill_in :user_password, with: Runtime::User.password - click_button 'Sign in' end def self.path diff --git a/spec/controllers/admin/application_settings_controller_spec.rb b/spec/controllers/admin/application_settings_controller_spec.rb index 2565622f8df..cc1b1e5039e 100644 --- a/spec/controllers/admin/application_settings_controller_spec.rb +++ b/spec/controllers/admin/application_settings_controller_spec.rb @@ -51,6 +51,13 @@ describe Admin::ApplicationSettingsController do sign_in(admin) end + it 'updates the password_authentication_enabled_for_git setting' do + put :update, application_setting: { password_authentication_enabled_for_git: "0" } + + expect(response).to redirect_to(admin_application_settings_path) + expect(ApplicationSetting.current.password_authentication_enabled_for_git).to eq(false) + end + it 'updates the default_project_visibility for string value' do put :update, application_setting: { default_project_visibility: "20" } diff --git a/spec/controllers/projects/commits_controller_spec.rb b/spec/controllers/projects/commits_controller_spec.rb index 73fb90d73ec..55ed276f96b 100644 --- a/spec/controllers/projects/commits_controller_spec.rb +++ b/spec/controllers/projects/commits_controller_spec.rb @@ -41,15 +41,21 @@ describe Projects::CommitsController do context "when the ref name ends in .atom" do context "when the ref does not exist with the suffix" do - it "renders as atom" do + before do get(:show, namespace_id: project.namespace, project_id: project, id: "master.atom") + end + it "renders as atom" do expect(response).to be_success expect(response.content_type).to eq('application/atom+xml') end + + it 'renders summary with type=html' do + expect(response.body).to include('<summary type="html">') + end end context "when the ref exists with the suffix" do diff --git a/spec/javascripts/signin_tabs_memoizer_spec.js b/spec/javascripts/signin_tabs_memoizer_spec.js index c4f500788b2..b1b03ef1e09 100644 --- a/spec/javascripts/signin_tabs_memoizer_spec.js +++ b/spec/javascripts/signin_tabs_memoizer_spec.js @@ -53,6 +53,13 @@ import SigninTabsMemoizer from '~/pages/sessions/new/signin_tabs_memoizer'; expect(memo.readData()).toEqual('#standard'); }); + it('overrides last selected tab with hash tag when given', () => { + window.location.hash = '#ldap'; + createMemoizer(); + + expect(memo.readData()).toEqual('#ldap'); + }); + describe('class constructor', () => { beforeEach(() => { memo = createMemoizer(); diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js index 6042d7384d5..95c94e95e3a 100644 --- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js +++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js @@ -1,32 +1,47 @@ import Vue from 'vue'; -import autoMergeFailedComponent from '~/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed'; - -const mergeError = 'This is the merge error'; +import autoMergeFailedComponent from '~/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue'; +import eventHub from '~/vue_merge_request_widget/event_hub'; +import mountComponent from '../../../helpers/vue_mount_component_helper'; describe('MRWidgetAutoMergeFailed', () => { - describe('props', () => { - it('should have props', () => { - const mrProp = autoMergeFailedComponent.props.mr; + let vm; + const mergeError = 'This is the merge error'; - expect(mrProp.type instanceof Object).toBeTruthy(); - expect(mrProp.required).toBeTruthy(); + beforeEach(() => { + const Component = Vue.extend(autoMergeFailedComponent); + vm = mountComponent(Component, { + mr: { mergeError }, }); }); - describe('template', () => { - const Component = Vue.extend(autoMergeFailedComponent); - const vm = new Component({ - el: document.createElement('div'), - propsData: { - mr: { mergeError }, - }, - }); + afterEach(() => { + vm.$destroy(); + }); + + it('renders failed message', () => { + expect(vm.$el.textContent).toContain('This merge request failed to be merged automatically'); + }); + + it('renders merge error provided', () => { + expect(vm.$el.innerText).toContain(mergeError); + }); + + it('render refresh button', () => { + expect(vm.$el.querySelector('button').textContent.trim()).toEqual('Refresh'); + }); + + it('emits event and shows loading icon when button is clicked', (done) => { + spyOn(eventHub, '$emit'); + vm.$el.querySelector('button').click(); + + expect(eventHub.$emit.calls.argsFor(0)[0]).toEqual('MRWidgetUpdateRequested'); - it('should have correct elements', () => { - expect(vm.$el.classList.contains('mr-widget-body')).toBeTruthy(); - expect(vm.$el.querySelector('button').getAttribute('disabled')).toBeFalsy(); - expect(vm.$el.innerText).toContain('This merge request failed to be merged automatically'); - expect(vm.$el.innerText).toContain(mergeError); + Vue.nextTick(() => { + expect(vm.$el.querySelector('button').getAttribute('disabled')).toEqual('disabled'); + expect( + vm.$el.querySelector('button i').classList, + ).toContain('fa-spinner'); + done(); }); }); }); diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js index 9230b5874df..073f26cc78f 100644 --- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js +++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js @@ -170,14 +170,14 @@ describe('MRWidgetReadyToMerge', () => { expect(vm.iconClass).toEqual('success'); }); - it('shows x for failed status', () => { + it('shows warning icon for failed status', () => { vm.mr.hasCI = true; - expect(vm.iconClass).toEqual('failed'); + expect(vm.iconClass).toEqual('warning'); }); - it('shows x for merge not allowed', () => { + it('shows warning icon for merge not allowed', () => { vm.mr.hasCI = true; - expect(vm.iconClass).toEqual('failed'); + expect(vm.iconClass).toEqual('warning'); }); }); diff --git a/spec/requests/api/protected_branches_spec.rb b/spec/requests/api/protected_branches_spec.rb index 10e6a3c07c8..1d23e023bb6 100644 --- a/spec/requests/api/protected_branches_spec.rb +++ b/spec/requests/api/protected_branches_spec.rb @@ -80,6 +80,12 @@ describe API::ProtectedBranches do it_behaves_like 'protected branch' end + + context 'when protected branch contains a period' do + let(:protected_name) { 'my.feature' } + + it_behaves_like 'protected branch' + end end context 'when authenticated as a guest' do diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml index eec356b9f47..5ebad58e171 100644 --- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml @@ -42,6 +42,7 @@ stages: - build - test - review + - dast - staging - canary - production @@ -130,6 +131,23 @@ sast:container: artifacts: paths: [gl-sast-container-report.json] +dast: + stage: dast + allow_failure: true + image: owasp/zap2docker-stable + variables: + POSTGRES_DB: "false" + script: + - dast + artifacts: + paths: [gl-dast-report.json] + only: + refs: + - branches + kubernetes: active + except: + - master + review: stage: review script: @@ -270,8 +288,8 @@ production: docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.1 apk add -U wget ca-certificates docker pull ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG} - wget https://github.com/arminc/clair-scanner/releases/download/v6/clair-scanner_linux_386 - mv clair-scanner_linux_386 clair-scanner + wget https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64 + mv clair-scanner_linux_amd64 clair-scanner chmod +x clair-scanner touch clair-whitelist.yml ./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log -w clair-whitelist.yml ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG} || true @@ -327,6 +345,12 @@ production: replicas="$new_replicas" fi + if [[ "$CI_PROJECT_VISIBILITY" != "public" ]]; then + secret_name='gitlab-registry' + else + secret_name='' + fi + helm upgrade --install \ --wait \ --set service.enabled="$service_enabled" \ @@ -334,6 +358,7 @@ production: --set image.repository="$CI_APPLICATION_REPOSITORY" \ --set image.tag="$CI_APPLICATION_TAG" \ --set image.pullPolicy=IfNotPresent \ + --set image.secrets[0].name="$secret_name" \ --set application.track="$track" \ --set application.database_url="$DATABASE_URL" \ --set service.url="$CI_ENVIRONMENT_URL" \ @@ -462,6 +487,11 @@ production: } function create_secret() { + echo "Create secret..." + if [[ "$CI_PROJECT_VISIBILITY" == "public" ]]; then + return + fi + kubectl create secret -n "$KUBE_NAMESPACE" \ docker-registry gitlab-registry \ --docker-server="$CI_REGISTRY" \ @@ -471,6 +501,14 @@ production: -o yaml --dry-run | kubectl replace -n "$KUBE_NAMESPACE" --force -f - } + function dast() { + export CI_ENVIRONMENT_URL=$(cat environment_url.txt) + + mkdir /zap/wrk/ + /zap/zap-baseline.py -J gl-dast-report.json -t "$CI_ENVIRONMENT_URL" || true + cp /zap/wrk/gl-dast-report.json . + } + function performance() { export CI_ENVIRONMENT_URL=$(cat environment_url.txt) |