diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 15:09:39 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 15:09:39 +0000 |
| commit | dc889678d1de8c09310b2f8f9742bb6c78a6f1a4 (patch) | |
| tree | 70945aa6721a271fc8057efa13c3216a03fbac45 | |
| parent | cd52759ee33051b8ad7b88b02ba7954e4fad7018 (diff) | |
| download | gitlab-ce-dc889678d1de8c09310b2f8f9742bb6c78a6f1a4.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
106 files changed, 891 insertions, 528 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 4daab8e4c1f..3ef28e02e9d 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -80,6 +80,9 @@ - "{,ee/}{app,bin,config,db,haml_lint,lib,locale,public,scripts,symbol,vendor}/**/*" - "doc/api/graphql/reference/*" # Files in this folder are auto-generated +.frontend-dependency-patterns: &frontend-dependency-patterns + - "{package.json,yarn.lock}" + .qa-patterns: &qa-patterns - ".dockerignore" - "qa/**/*" @@ -270,6 +273,9 @@ rules: - <<: *if-master-refs when: on_success + - <<: *if-merge-request + changes: *frontend-dependency-patterns + when: on_success ################ # Memory rules # diff --git a/app/assets/javascripts/boards/components/board_list.vue b/app/assets/javascripts/boards/components/board_list.vue index 4a64d9e04f2..c4e2c398d45 100644 --- a/app/assets/javascripts/boards/components/board_list.vue +++ b/app/assets/javascripts/boards/components/board_list.vue @@ -1,7 +1,6 @@ <script> import { Sortable, MultiDrag } from 'sortablejs'; import { GlLoadingIcon } from '@gitlab/ui'; -import _ from 'underscore'; import boardNewIssue from './board_new_issue.vue'; import boardCard from './board_card.vue'; import eventHub from '../eventhub'; @@ -266,11 +265,12 @@ export default { * same list or the other list. Don't remove items if it's same list. */ const isSameList = toList && toList.id === this.list.id; - if (toList && !isSameList && boardsStore.shouldRemoveIssue(this.list, toList)) { const issues = items.map(item => this.list.findIssue(Number(item.dataset.issueId))); - - if (_.compact(issues).length && !boardsStore.issuesAreContiguous(this.list, issues)) { + if ( + issues.filter(Boolean).length && + !boardsStore.issuesAreContiguous(this.list, issues) + ) { const indexes = []; const ids = this.list.issues.map(i => i.id); issues.forEach(issue => { diff --git a/app/assets/javascripts/boards/components/boards_selector.vue b/app/assets/javascripts/boards/components/boards_selector.vue index 8b44ccfd276..fbf487357a5 100644 --- a/app/assets/javascripts/boards/components/boards_selector.vue +++ b/app/assets/javascripts/boards/components/boards_selector.vue @@ -1,5 +1,5 @@ <script> -import { throttle } from 'underscore'; +import { throttle } from 'lodash'; import { GlLoadingIcon, GlSearchBoxByType, diff --git a/app/assets/javascripts/boards/components/issue_card_inner.vue b/app/assets/javascripts/boards/components/issue_card_inner.vue index 00da039c235..daaa12c096b 100644 --- a/app/assets/javascripts/boards/components/issue_card_inner.vue +++ b/app/assets/javascripts/boards/components/issue_card_inner.vue @@ -1,5 +1,5 @@ <script> -import _ from 'underscore'; +import { sortBy } from 'lodash'; import { mapState } from 'vuex'; import { GlLabel, GlTooltipDirective } from '@gitlab/ui'; import issueCardInner from 'ee_else_ce/boards/mixins/issue_card_inner'; @@ -100,10 +100,7 @@ export default { return !groupId ? referencePath.split('#')[0] : null; }, orderedLabels() { - return _.chain(this.issue.labels) - .filter(this.isNonListLabel) - .sortBy('title') - .value(); + return sortBy(this.issue.labels.filter(this.isNonListLabel), 'title'); }, helpLink() { return boardsStore.scopedLabels.helpLink; diff --git a/app/assets/javascripts/boards/components/project_select.vue b/app/assets/javascripts/boards/components/project_select.vue index 4a50b1e2efc..30f1e843e7b 100644 --- a/app/assets/javascripts/boards/components/project_select.vue +++ b/app/assets/javascripts/boards/components/project_select.vue @@ -1,6 +1,6 @@ <script> import $ from 'jquery'; -import _ from 'underscore'; +import { escape } from 'lodash'; import { GlLoadingIcon } from '@gitlab/ui'; import Icon from '~/vue_shared/components/icon.vue'; import { __ } from '~/locale'; @@ -83,7 +83,7 @@ export default { }" data-project-name="${project.name}" data-project-name-with-namespace="${ project.name_with_namespace }"> - ${_.escape(project.name_with_namespace)} + ${escape(project.name_with_namespace)} </a> </li> `; diff --git a/app/assets/javascripts/boards/stores/boards_store.js b/app/assets/javascripts/boards/stores/boards_store.js index 528dc4ed68e..e5447080e37 100644 --- a/app/assets/javascripts/boards/stores/boards_store.js +++ b/app/assets/javascripts/boards/stores/boards_store.js @@ -2,7 +2,7 @@ /* global List */ import $ from 'jquery'; -import _ from 'underscore'; +import { sortBy } from 'lodash'; import Vue from 'vue'; import Cookies from 'js-cookie'; import BoardsStoreEE from 'ee_else_ce/boards/stores/boards_store_ee'; @@ -76,8 +76,7 @@ const boardsStore = { }, addList(listObj) { const list = new List(listObj); - this.state.lists = _.sortBy([...this.state.lists, list], 'position'); - + this.state.lists = sortBy([...this.state.lists, list], 'position'); return list; }, new(listObj) { @@ -90,7 +89,7 @@ const boardsStore = { // Remove any new issues from the backlog // as they will be visible in the new list list.issues.forEach(backlogList.removeIssue.bind(backlogList)); - this.state.lists = _.sortBy(this.state.lists, 'position'); + this.state.lists = sortBy(this.state.lists, 'position'); }) .catch(() => { // https://gitlab.com/gitlab-org/gitlab-foss/issues/30821 @@ -194,10 +193,9 @@ const boardsStore = { moveMultipleIssuesToList({ listFrom, listTo, issues, newIndex }) { const issueTo = issues.map(issue => listTo.findIssue(issue.id)); - const issueLists = _.flatten(issues.map(issue => issue.getLists())); + const issueLists = issues.map(issue => issue.getLists()).flat(); const listLabels = issueLists.map(list => list.label); - - const hasMoveableIssues = _.compact(issueTo).length > 0; + const hasMoveableIssues = issueTo.filter(Boolean).length > 0; if (!hasMoveableIssues) { // Check if target list assignee is already present in this issue diff --git a/app/assets/javascripts/clusters/clusters_bundle.js b/app/assets/javascripts/clusters/clusters_bundle.js index d35dca7b939..dc1328a2236 100644 --- a/app/assets/javascripts/clusters/clusters_bundle.js +++ b/app/assets/javascripts/clusters/clusters_bundle.js @@ -315,10 +315,13 @@ export default class Clusters { this.checkForNewInstalls(prevApplicationMap, this.store.state.applications); this.updateContainer(prevStatus, this.store.state.status, this.store.state.statusReason); - this.toggleIngressDomainHelpText( - prevApplicationMap[INGRESS], - this.store.state.applications[INGRESS], - ); + + if (this.ingressDomainHelpText) { + this.toggleIngressDomainHelpText( + prevApplicationMap[INGRESS], + this.store.state.applications[INGRESS], + ); + } } showToken() { diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index 685fc939c9a..9058f1c0141 100644 --- a/app/assets/javascripts/clusters/components/applications.vue +++ b/app/assets/javascripts/clusters/components/applications.vue @@ -263,7 +263,6 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity <template> <section id="cluster-applications"> - <h4>{{ s__('ClusterIntegration|Applications') }}</h4> <p class="append-bottom-0"> {{ s__(`ClusterIntegration|Choose which applications to install on your Kubernetes cluster. diff --git a/app/assets/javascripts/ide/lib/themes/white.js b/app/assets/javascripts/ide/lib/themes/white.js index 273bc783fc6..f06458d8a16 100644 --- a/app/assets/javascripts/ide/lib/themes/white.js +++ b/app/assets/javascripts/ide/lib/themes/white.js @@ -1,12 +1,146 @@ +const BOLD = 'bold'; +const ITALIC = 'italic'; +const BOLD_ITALIC = 'bold italic'; +const UNDERLINE = 'underline'; + export default { base: 'vs', - inherit: true, - rules: [], + inherit: false, + rules: [ + // Standard theme defaults and overrides based on VS theme + // https://github.com/Microsoft/vscode/blob/master/src/vs/editor/standalone/common/themes.ts + // License: MIT (https://github.com/microsoft/vscode/blob/master/LICENSE.txt) + { token: '', foreground: '2e2e2e', background: 'ffffff' }, + { token: 'keyword.css', fontStyle: BOLD, foreground: '999999' }, + { token: 'keyword.less', fontStyle: BOLD, foreground: '999999' }, + { token: 'keyword.scss', fontStyle: BOLD, foreground: '999999' }, + { token: 'keyword.md', fontStyle: BOLD, foreground: '800080' }, + + { token: 'variable', foreground: '008080' }, + { token: 'variable.md', foreground: 'dd1144' }, + { token: 'variable.predefined', foreground: '008080' }, + { token: 'number', foreground: '009999' }, + { token: 'number.hex', foreground: '3030c0' }, + + { token: 'type.identifier.ts', foreground: '445588', fontStyle: BOLD }, + { token: 'type.identifier.swift', foreground: '445588', fontStyle: BOLD }, + { token: 'type.identifier.kt', foreground: '445588', fontStyle: BOLD }, + { token: 'type.identifier.perl', foreground: '2e2e2e', fontStyle: BOLD }, + + { token: 'tag', foreground: '000080' }, + { token: 'tag.class', foreground: '445588', fontStyle: BOLD }, + { token: 'tag.css', foreground: '445588', fontStyle: BOLD }, + { token: 'tag.less', foreground: '445588', fontStyle: BOLD }, + { token: 'tag.scss', foreground: '445588', fontStyle: BOLD }, + { token: 'tag.id.jade', foreground: '445588' }, + { token: 'tag.class.jade', foreground: '445588' }, + { token: 'meta.scss', foreground: '800000' }, + { token: 'metatag', foreground: 'e00000' }, + { token: 'metatag.content.html', foreground: 'e00000' }, + { token: 'metatag.html', foreground: '808080' }, + { token: 'metatag.xml', foreground: '808080' }, + { token: 'metatag.php', fontStyle: BOLD }, + + { token: 'key', foreground: '863b00' }, + { token: 'key.ini', foreground: '008080' }, + { token: 'string.key.json', foreground: '2e2e2e' }, + { token: 'string.value.json', foreground: 'dd1144' }, + { token: 'string.link.md', foreground: 'aa0000' }, + + { token: 'attribute.name', foreground: '008080' }, + { token: 'attribute.name.css', foreground: '2e2e2e' }, + { token: 'attribute.name.json', foreground: '2e2e2e' }, + { token: 'attribute.name.scss', foreground: '2e2e2e' }, + { token: 'attribute.name.less', foreground: '2e2e2e' }, + { token: 'attribute.value', foreground: 'dd1144' }, + { token: 'attribute.value.css', foreground: '0086b3' }, + { token: 'attribute.value.hex', foreground: '0086b3' }, + { token: 'attribute.value.number', foreground: '009999' }, + { token: 'attribute.value.unit', foreground: '009999' }, + { token: 'attribute.value.xml', foreground: 'dd1144' }, + { token: 'attribute.value.html', foreground: 'dd1144' }, + { token: 'attribute.value.md', foreground: 'aa0000' }, + + { token: 'string', foreground: 'dd1144' }, + { token: 'string.target', foreground: 'aa0000' }, + { token: 'string.sql', foreground: 'dd1144' }, + + { token: 'keyword.flow', foreground: '2e2e2e', fontStyle: BOLD }, + { token: 'keyword.st', foreground: '445588', fontStyle: BOLD }, + { token: 'variable.st', foreground: '445588', fontStyle: BOLD }, + { token: 'type.st', foreground: '445588', fontStyle: BOLD }, + + { token: 'operator.scss', foreground: '666666' }, + { token: 'operator.sql', foreground: '2e2e2e', fontStyle: BOLD }, + { token: 'operator.swift', foreground: '666666' }, + { token: 'predefined.sql', foreground: '2e2e2e', fontStyle: BOLD }, + + // GitHub theme based on https://github.com/brijeshb42/monaco-themes/blob/master/themes/GitHub.json + // Customized for Web IDE + // License: MIT (https://github.com/brijeshb42/monaco-themes/blob/master/LICENSE) + { token: 'comment', foreground: '999988', fontStyle: ITALIC }, + { token: 'comment.block.preprocessor', foreground: '999999', fontStyle: BOLD }, + { token: 'comment.documentation', foreground: '999999', fontStyle: BOLD_ITALIC }, + { token: 'comment.block.documentation', foreground: '999999', fontStyle: BOLD_ITALIC }, + { token: 'invalid.illegal', foreground: 'aa0000', background: 'e3d2d2' }, + { token: 'keyword', fontStyle: BOLD, foreground: '2e2e2e' }, + { token: 'storage', fontStyle: BOLD }, + { token: 'keyword.operator', fontStyle: BOLD }, + { token: 'constant.language', fontStyle: BOLD }, + { token: 'support.constant', fontStyle: BOLD }, + { token: 'storage.type', foreground: '445588', fontStyle: BOLD }, + { token: 'support.type', foreground: '445588', fontStyle: BOLD }, + { token: 'entity.other.attribute-name', foreground: '008080' }, + { token: 'variable.other', foreground: '0086b3' }, + { token: 'variable.language', foreground: '999999' }, + { token: 'entity.name.type', foreground: '445588', fontStyle: BOLD }, + { token: 'entity.other.inherited-class', foreground: '445588', fontStyle: BOLD }, + { token: 'support.class', foreground: '445588', fontStyle: BOLD }, + { token: 'variable.other.constant', foreground: '008080' }, + { token: 'constant.character.entity', foreground: '800080' }, + { token: 'entity.name.exception', foreground: 'aa0000' }, + { token: 'entity.name.function', foreground: 'aa0000' }, + { token: 'support.function', foreground: 'aa0000' }, + { token: 'keyword.other.name-of-parameter', foreground: 'aa0000' }, + { token: 'entity.name.section', foreground: '666666' }, + { token: 'entity.name.tag', foreground: '000080' }, + { token: 'variable.parameter', foreground: '008080' }, + { token: 'support.variable', foreground: '008080' }, + { token: 'constant.numeric', foreground: '009999' }, + { token: 'constant.other', foreground: '009999' }, + { token: 'constant.character', foreground: 'dd1144' }, + { token: 'string.regexp', foreground: '009926' }, + { token: 'constant.other.symbol', foreground: '990073' }, + { token: 'punctuation', fontStyle: BOLD }, + { token: 'markup.deleted', foreground: '000000', background: 'ffdddd' }, + { token: 'markup.italic', fontStyle: ITALIC }, + { token: 'markup.error', foreground: 'aa0000' }, + { token: 'markup.heading.1', foreground: '999999' }, + { token: 'markup.inserted', foreground: '000000', background: 'ddffdd' }, + { token: 'markup.output', foreground: '808080' }, + { token: 'markup.raw', foreground: '808080' }, + { token: 'markup.prompt', foreground: '666666' }, + { token: 'markup.bold', fontStyle: BOLD }, + { token: 'markup.heading', foreground: '999999' }, + { token: 'markup.traceback', foreground: 'aa0000' }, + { token: 'markup.underline', fontStyle: UNDERLINE }, + { token: 'meta.diff.range', foreground: '999999', background: 'eaf2f5' }, + { token: 'meta.diff.index', foreground: '999999', background: 'eaf2f5' }, + { token: 'meta.separator', foreground: '999999', background: 'eaf2f5' }, + { token: 'meta.diff.header.from-file', foreground: '999999', background: 'ffdddd' }, + { token: 'meta.diff.header.to-file', foreground: '999999', background: 'ddffdd' }, + { token: 'meta.link', foreground: '4183c4' }, + ], colors: { - 'editorLineNumber.foreground': '#CCCCCC', - 'diffEditor.insertedTextBackground': '#A0F5B420', - 'diffEditor.removedTextBackground': '#f9d7dc20', + 'editor.foreground': '#2e2e2e', 'editor.selectionBackground': '#aad6f8', + 'editor.lineHighlightBackground': '#fffeeb', + 'editorCursor.foreground': '#666666', + 'editorWhitespace.foreground': '#bbbbbb', + + 'editorLineNumber.foreground': '#cccccc', + 'diffEditor.insertedTextBackground': '#a0f5b420', + 'diffEditor.removedTextBackground': '#f9d7dc20', 'editorIndentGuide.activeBackground': '#cccccc', }, }; diff --git a/app/assets/javascripts/releases/components/evidence_block.vue b/app/assets/javascripts/releases/components/evidence_block.vue index edbea33f1d1..0c51fffc96c 100644 --- a/app/assets/javascripts/releases/components/evidence_block.vue +++ b/app/assets/javascripts/releases/components/evidence_block.vue @@ -67,7 +67,7 @@ export default { </template> </expand-button> <clipboard-button - :title="__('Copy commit SHA')" + :title="__('Copy evidence SHA')" :text="sha" css-class="btn-default btn-transparent btn-clipboard" /> diff --git a/app/assets/javascripts/releases/components/release_block.vue b/app/assets/javascripts/releases/components/release_block.vue index f2cc36e38bb..61cd22dc161 100644 --- a/app/assets/javascripts/releases/components/release_block.vue +++ b/app/assets/javascripts/releases/components/release_block.vue @@ -93,7 +93,10 @@ export default { <release-block-header :release="release" /> <div class="card-body"> <div v-if="shouldRenderMilestoneInfo"> - <release-block-milestone-info :milestones="milestones" /> + <release-block-milestone-info + :milestones="milestones" + :open-issues-path="release._links.issuesUrl" + /> <hr class="mb-3 mt-0" /> </div> diff --git a/app/assets/javascripts/releases/components/release_block_assets.vue b/app/assets/javascripts/releases/components/release_block_assets.vue index 06b7f97a8de..f4b92416e47 100644 --- a/app/assets/javascripts/releases/components/release_block_assets.vue +++ b/app/assets/javascripts/releases/components/release_block_assets.vue @@ -34,7 +34,7 @@ export default { <ul v-if="assets.links.length" class="pl-0 mb-0 prepend-top-8 list-unstyled js-assets-list"> <li v-for="link in assets.links" :key="link.name" class="append-bottom-8"> - <gl-link v-gl-tooltip.bottom :title="__('Download asset')" :href="link.url"> + <gl-link v-gl-tooltip.bottom :title="__('Download asset')" :href="link.directAssetUrl"> <icon name="package" class="align-middle append-right-4 align-text-bottom" /> {{ link.name }} <span v-if="link.external">{{ __('(external source)') }}</span> diff --git a/app/assets/javascripts/releases/components/release_block_milestone_info.vue b/app/assets/javascripts/releases/components/release_block_milestone_info.vue index 50accf6b679..d9fbd2884b7 100644 --- a/app/assets/javascripts/releases/components/release_block_milestone_info.vue +++ b/app/assets/javascripts/releases/components/release_block_milestone_info.vue @@ -1,10 +1,15 @@ <script> -import { GlProgressBar, GlLink, GlBadge, GlButton, GlTooltipDirective } from '@gitlab/ui'; +import { + GlProgressBar, + GlLink, + GlBadge, + GlButton, + GlTooltipDirective, + GlSprintf, +} from '@gitlab/ui'; import { __, n__, sprintf } from '~/locale'; import { MAX_MILESTONES_TO_DISPLAY } from '../constants'; - -/** Sums the values of an array. For use with Array.reduce. */ -const sumReducer = (acc, curr) => acc + curr; +import { sum } from 'lodash'; export default { name: 'ReleaseBlockMilestoneInfo', @@ -13,6 +18,7 @@ export default { GlLink, GlBadge, GlButton, + GlSprintf, }, directives: { GlTooltip: GlTooltipDirective, @@ -22,6 +28,16 @@ export default { type: Array, required: true, }, + openIssuesPath: { + type: String, + required: false, + default: '', + }, + closedIssuesPath: { + type: String, + required: false, + default: '', + }, }, data() { return { @@ -42,14 +58,14 @@ export default { allIssueStats() { return this.milestones.map(m => m.issueStats || {}); }, - openIssuesCount() { - return this.allIssueStats.map(stats => stats.opened || 0).reduce(sumReducer); + totalIssuesCount() { + return sum(this.allIssueStats.map(stats => stats.total || 0)); }, closedIssuesCount() { - return this.allIssueStats.map(stats => stats.closed || 0).reduce(sumReducer); + return sum(this.allIssueStats.map(stats => stats.closed || 0)); }, - totalIssuesCount() { - return this.openIssuesCount + this.closedIssuesCount; + openIssuesCount() { + return this.totalIssuesCount - this.closedIssuesCount; }, milestoneLabelText() { return n__('Milestone', 'Milestones', this.milestones.length); @@ -130,7 +146,27 @@ export default { {{ __('Issues') }} <gl-badge pill variant="light" class="font-weight-bold">{{ totalIssuesCount }}</gl-badge> </span> - {{ issueCountsText }} + <div class="d-flex"> + <gl-link v-if="openIssuesPath" ref="openIssuesLink" :href="openIssuesPath"> + <gl-sprintf :message="__('Open: %{openIssuesCount}')"> + <template #openIssuesCount>{{ openIssuesCount }}</template> + </gl-sprintf> + </gl-link> + <span v-else ref="openIssuesText"> + {{ sprintf(__('Open: %{openIssuesCount}'), { openIssuesCount }) }} + </span> + + <span class="mx-1">•</span> + + <gl-link v-if="closedIssuesPath" ref="closedIssuesLink" :href="closedIssuesPath"> + <gl-sprintf :message="__('Closed: %{closedIssuesCount}')"> + <template #closedIssuesCount>{{ closedIssuesCount }}</template> + </gl-sprintf> + </gl-link> + <span v-else ref="closedIssuesText"> + {{ sprintf(__('Closed: %{closedIssuesCount}'), { closedIssuesCount }) }} + </span> + </div> </div> </div> </template> diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 8cb8fd6dd4c..3c03c387dba 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -307,7 +307,7 @@ class ApplicationController < ActionController::Base if current_user && current_user.requires_ldap_check? return unless current_user.try_obtain_ldap_lease - unless Gitlab::Auth::LDAP::Access.allowed?(current_user) + unless Gitlab::Auth::Ldap::Access.allowed?(current_user) sign_out current_user flash[:alert] = _("Access denied for your LDAP account.") redirect_to new_user_session_path diff --git a/app/controllers/concerns/snippets_actions.rb b/app/controllers/concerns/snippets_actions.rb index f80e891a558..a18cdd58abb 100644 --- a/app/controllers/concerns/snippets_actions.rb +++ b/app/controllers/concerns/snippets_actions.rb @@ -30,9 +30,9 @@ module SnippetsActions end def check_repository_error - repository_error = snippet.errors.delete(:repository) + repository_errors = Array(snippet.errors.delete(:repository)) - flash.now[:alert] = repository_error if repository_error - recaptcha_check_with_fallback(repository_error.nil?) { render :edit } + flash.now[:alert] = repository_errors.first if repository_errors.present? + recaptcha_check_with_fallback(repository_errors.empty?) { render :edit } end end diff --git a/app/controllers/ldap/omniauth_callbacks_controller.rb b/app/controllers/ldap/omniauth_callbacks_controller.rb index 71a88bf3395..8e4d8f3d21b 100644 --- a/app/controllers/ldap/omniauth_callbacks_controller.rb +++ b/app/controllers/ldap/omniauth_callbacks_controller.rb @@ -4,9 +4,9 @@ class Ldap::OmniauthCallbacksController < OmniauthCallbacksController extend ::Gitlab::Utils::Override def self.define_providers! - return unless Gitlab::Auth::LDAP::Config.sign_in_enabled? + return unless Gitlab::Auth::Ldap::Config.sign_in_enabled? - Gitlab::Auth::LDAP::Config.available_servers.each do |server| + Gitlab::Auth::Ldap::Config.available_servers.each do |server| alias_method server['provider_name'], :ldap end end @@ -14,9 +14,9 @@ class Ldap::OmniauthCallbacksController < OmniauthCallbacksController # We only find ourselves here # if the authentication to LDAP was successful. def ldap - return unless Gitlab::Auth::LDAP::Config.sign_in_enabled? + return unless Gitlab::Auth::Ldap::Config.sign_in_enabled? - sign_in_user_flow(Gitlab::Auth::LDAP::User) + sign_in_user_flow(Gitlab::Auth::Ldap::User) end define_providers! diff --git a/app/controllers/projects/releases_controller.rb b/app/controllers/projects/releases_controller.rb index d1f4b2653c5..7d6b38dd243 100644 --- a/app/controllers/projects/releases_controller.rb +++ b/app/controllers/projects/releases_controller.rb @@ -6,7 +6,7 @@ class Projects::ReleasesController < Projects::ApplicationController before_action :release, only: %i[edit show update downloads] before_action :authorize_read_release! before_action do - push_frontend_feature_flag(:release_issue_summary, project) + push_frontend_feature_flag(:release_issue_summary, project, default_enabled: true) push_frontend_feature_flag(:release_evidence_collection, project, default_enabled: true) push_frontend_feature_flag(:release_show_page, project, default_enabled: true) end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 01c23ce9db7..2d1c1eeeea0 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -273,8 +273,8 @@ class SessionsController < Devise::SessionsController def ldap_servers @ldap_servers ||= begin - if Gitlab::Auth::LDAP::Config.sign_in_enabled? - Gitlab::Auth::LDAP::Config.available_servers + if Gitlab::Auth::Ldap::Config.sign_in_enabled? + Gitlab::Auth::Ldap::Config.available_servers else [] end diff --git a/app/helpers/auth_helper.rb b/app/helpers/auth_helper.rb index 1f15ac42260..26d73007e65 100644 --- a/app/helpers/auth_helper.rb +++ b/app/helpers/auth_helper.rb @@ -5,11 +5,11 @@ module AuthHelper LDAP_PROVIDER = /\Aldap/.freeze def ldap_enabled? - Gitlab::Auth::LDAP::Config.enabled? + Gitlab::Auth::Ldap::Config.enabled? end def ldap_sign_in_enabled? - Gitlab::Auth::LDAP::Config.sign_in_enabled? + Gitlab::Auth::Ldap::Config.sign_in_enabled? end def omniauth_enabled? diff --git a/app/helpers/clusters_helper.rb b/app/helpers/clusters_helper.rb index 80bf765f3a4..21bd2ff9e32 100644 --- a/app/helpers/clusters_helper.rb +++ b/app/helpers/clusters_helper.rb @@ -26,11 +26,38 @@ module ClustersHelper end end + def render_cluster_info_tab_content(tab, expanded) + case tab + when 'environments' + render_if_exists 'clusters/clusters/environments' + when 'health' + render_if_exists 'clusters/clusters/health' + when 'apps' + render 'applications' + when 'settings' + render 'advanced_settings_container' + else + render('details', expanded: expanded) + end + end + def has_rbac_enabled?(cluster) return cluster.platform_kubernetes_rbac? if cluster.platform_kubernetes cluster.provider.has_rbac_enabled? end + + def project_cluster?(cluster) + cluster.cluster_type.in?('project_type') + end + + def cluster_created?(cluster) + !cluster.status_name.in?(%i/scheduled creating/) + end + + def can_admin_cluster?(user, cluster) + can?(user, :admin_cluster, cluster) + end end ClustersHelper.prepend_if_ee('EE::ClustersHelper') diff --git a/app/models/identity.rb b/app/models/identity.rb index cb7fd553255..40d9f856abf 100644 --- a/app/models/identity.rb +++ b/app/models/identity.rb @@ -25,7 +25,7 @@ class Identity < ApplicationRecord def self.normalize_uid(provider, uid) if Gitlab::Auth::OAuth::Provider.ldap_provider?(provider) - Gitlab::Auth::LDAP::Person.normalize_dn(uid) + Gitlab::Auth::Ldap::Person.normalize_dn(uid) else uid.to_s end diff --git a/app/models/project_import_state.rb b/app/models/project_import_state.rb index b79e3554926..cdb034e58fa 100644 --- a/app/models/project_import_state.rb +++ b/app/models/project_import_state.rb @@ -98,6 +98,10 @@ class ProjectImportState < ApplicationRecord Gitlab::SidekiqStatus.set(jid, StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION) end + + def self.jid_by(project_id:, status:) + select(:jid).with_status(status).find_by(project_id: project_id) + end end ProjectImportState.prepend_if_ee('EE::ProjectImportState') diff --git a/app/models/user.rb b/app/models/user.rb index b0db21b2d1c..d1a30c6a5c8 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1562,7 +1562,7 @@ class User < ApplicationRecord def read_only_attribute?(attribute) if Feature.enabled?(:ldap_readonly_attributes, default_enabled: true) - enabled = Gitlab::Auth::LDAP::Config.enabled? + enabled = Gitlab::Auth::Ldap::Config.enabled? read_only = attribute.to_sym.in?(UserSyncedAttributesMetadata::SYNCABLE_ATTRIBUTES) return true if enabled && read_only diff --git a/app/views/admin/application_settings/_signin.html.haml b/app/views/admin/application_settings/_signin.html.haml index 0e45301b598..007cd343339 100644 --- a/app/views/admin/application_settings/_signin.html.haml +++ b/app/views/admin/application_settings/_signin.html.haml @@ -16,7 +16,7 @@ Password authentication enabled for Git over HTTP(S) .form-text.text-muted When disabled, a Personal Access Token - - if Gitlab::Auth::LDAP::Config.enabled? + - if Gitlab::Auth::Ldap::Config.enabled? or LDAP password must be used to authenticate. - if omniauth_enabled? && button_based_providers.any? diff --git a/app/views/clusters/clusters/_advanced_settings_container.html.haml b/app/views/clusters/clusters/_advanced_settings_container.html.haml new file mode 100644 index 00000000000..8aae9bfa462 --- /dev/null +++ b/app/views/clusters/clusters/_advanced_settings_container.html.haml @@ -0,0 +1,6 @@ +- if can_admin_cluster?(current_user, @cluster) + .settings.expanded.border-0.m-0 + %p + = s_('ClusterIntegration|Advanced options on this Kubernetes cluster’s integration') + .settings-content#advanced-settings-section + = render 'clusters/clusters/advanced_settings' diff --git a/app/views/clusters/clusters/_advanced_settings_tab.html.haml b/app/views/clusters/clusters/_advanced_settings_tab.html.haml new file mode 100644 index 00000000000..b491a64e43d --- /dev/null +++ b/app/views/clusters/clusters/_advanced_settings_tab.html.haml @@ -0,0 +1,6 @@ +- active = params[:tab] == 'settings' + +- if can_admin_cluster?(current_user, @cluster) + %li.nav-item{ role: 'presentation' } + %a#cluster-settings-tab.nav-link{ class: active_when(active), href: clusterable.cluster_path(@cluster.id, params: {tab: 'settings'}) } + %span= _('Advanced Settings') diff --git a/app/views/clusters/clusters/_applications.html.haml b/app/views/clusters/clusters/_applications.html.haml new file mode 100644 index 00000000000..f83a414a0aa --- /dev/null +++ b/app/views/clusters/clusters/_applications.html.haml @@ -0,0 +1 @@ +.cluster-applications-table#js-cluster-applications diff --git a/app/views/clusters/clusters/_applications_tab.html.haml b/app/views/clusters/clusters/_applications_tab.html.haml new file mode 100644 index 00000000000..e1455b0f60a --- /dev/null +++ b/app/views/clusters/clusters/_applications_tab.html.haml @@ -0,0 +1,5 @@ +- active = params[:tab] == 'apps' + +%li.nav-item{ role: 'presentation' } + %a#cluster-apps-tab.nav-link.qa-applications{ class: active_when(active), href: clusterable.cluster_path(@cluster.id, params: {tab: 'apps'}) } + %span= _('Applications') diff --git a/app/views/clusters/clusters/_configure.html.haml b/app/views/clusters/clusters/_configure.html.haml deleted file mode 100644 index 4ce00c67866..00000000000 --- a/app/views/clusters/clusters/_configure.html.haml +++ /dev/null @@ -1,26 +0,0 @@ -%section#cluster-integration - - unless @cluster.status_name.in? %i/scheduled creating/ - = render 'form' - -- unless @cluster.status_name.in? %i/scheduled creating/ - = render_if_exists 'projects/clusters/prometheus_graphs' - - .cluster-applications-table#js-cluster-applications - - %section.settings#js-cluster-details{ class: ('expanded' if expanded) } - .settings-header - %h4= s_('ClusterIntegration|Kubernetes cluster details') - %button.btn.js-settings-toggle{ type: 'button' } - = expanded ? _('Collapse') : _('Expand') - %p= s_('ClusterIntegration|See and edit the details for your Kubernetes cluster') - .settings-content - = render 'clusters/platforms/kubernetes/form', cluster: @cluster, platform: @cluster.platform_kubernetes, update_cluster_url_path: clusterable.cluster_path(@cluster) - - %section.settings.no-animate#js-cluster-advanced-settings{ class: ('expanded' if expanded) } - .settings-header - %h4= _('Advanced settings') - %button.btn.js-settings-toggle{ type: 'button' } - = expanded ? _('Collapse') : _('Expand') - %p= s_("ClusterIntegration|Advanced options on this Kubernetes cluster's integration") - .settings-content#advanced-settings-section - = render 'advanced_settings' diff --git a/app/views/clusters/clusters/_details.html.haml b/app/views/clusters/clusters/_details.html.haml new file mode 100644 index 00000000000..fb0a1aaebc4 --- /dev/null +++ b/app/views/clusters/clusters/_details.html.haml @@ -0,0 +1,11 @@ +%section#cluster-integration + = render 'gitlab_integration_form' + + %section.settings.no-animate{ class: ('expanded' if expanded) } + .settings-header + %h4= s_('ClusterIntegration|Provider details') + %button.btn.js-settings-toggle{ type: 'button' } + = expanded ? _('Collapse') : _('Expand') + %p= s_('ClusterIntegration|See and edit the details for your Kubernetes cluster') + .settings-content + = render 'provider_details_form', cluster: @cluster, platform: @cluster.platform_kubernetes, update_cluster_url_path: clusterable.cluster_path(@cluster) diff --git a/app/views/clusters/clusters/_details_tab.html.haml b/app/views/clusters/clusters/_details_tab.html.haml new file mode 100644 index 00000000000..564c5103d34 --- /dev/null +++ b/app/views/clusters/clusters/_details_tab.html.haml @@ -0,0 +1,5 @@ +- active = params[:tab] == 'details' || !params[:tab].present? + +%li.nav-item{ role: 'presentation' } + %a#cluster-details-tab.nav-link.qa-details{ class: active_when(active), href: clusterable.cluster_path(@cluster.id, params: {tab: 'details'}) } + %span= _('Details') diff --git a/app/views/clusters/clusters/_form.html.haml b/app/views/clusters/clusters/_gitlab_integration_form.html.haml index 40fc7d110fc..2489f78b403 100644 --- a/app/views/clusters/clusters/_form.html.haml +++ b/app/views/clusters/clusters/_gitlab_integration_form.html.haml @@ -1,11 +1,12 @@ -= form_for @cluster, url: clusterable.cluster_path(@cluster), as: :cluster, html: { class: 'cluster_integration_form' } do |field| += form_for @cluster, url: clusterable.cluster_path(@cluster), as: :cluster, html: { class: 'js-cluster-integration-form' } do |field| = form_errors(@cluster) .form-group - %h5= s_('ClusterIntegration|Integration status') - %label.append-bottom-0.js-cluster-enable-toggle-area - = render "shared/buttons/project_feature_toggle", is_checked: @cluster.enabled?, label: s_("ClusterIntegration|Toggle Kubernetes cluster"), disabled: !can?(current_user, :update_cluster, @cluster), data: { qa_selector: 'integration_status_toggle' } do - = field.hidden_field :enabled, { class: 'js-project-feature-toggle-input'} - .form-text.text-muted= s_('ClusterIntegration|Enable or disable GitLab\'s connection to your Kubernetes cluster.') + .d-flex.align-items-center + %h4.pr-2.m-0 + = s_('ClusterIntegration|GitLab Integration') + %label.append-bottom-0.js-cluster-enable-toggle-area{ title: s_('ClusterIntegration|Enable or disable GitLab\'s connection to your Kubernetes cluster.'), data: { toggle: 'tooltip', container: 'body' } } + = render "shared/buttons/project_feature_toggle", is_checked: @cluster.enabled?, label: s_("ClusterIntegration|Toggle Kubernetes cluster"), disabled: !can?(current_user, :update_cluster, @cluster), data: { qa_selector: 'integration_status_toggle' } do + = field.hidden_field :enabled, { class: 'js-project-feature-toggle-input'} .form-group %h5= s_('ClusterIntegration|Environment scope') @@ -17,7 +18,8 @@ - environment_scope_url = help_page_path('user/project/clusters/index', anchor: 'base-domain') - environment_scope_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: environment_scope_url } .form-text.text-muted - %code * + %code + = _('*') = s_("ClusterIntegration| is the default environment scope for this cluster. This means that all jobs, regardless of their environment, will use this cluster. %{environment_scope_start}More information%{environment_scope_end}").html_safe % { environment_scope_start: environment_scope_start, environment_scope_end: '</a>'.html_safe } .form-group @@ -29,7 +31,8 @@ = s_('ClusterIntegration|Specifying a domain will allow you to use Auto Review Apps and Auto Deploy stages for %{auto_devops_start}Auto DevOps%{auto_devops_end}. The domain should have a wildcard DNS configured matching the domain.').html_safe % { auto_devops_start: auto_devops_start, auto_devops_end: '</a>'.html_safe } %span{ :class => ["js-ingress-domain-help-text", ("hide" unless @cluster.application_ingress_external_ip.present?)] } = s_('ClusterIntegration|Alternatively') - %code{ :class => "js-ingress-domain-snippet" } #{@cluster.application_ingress_external_ip}.nip.io + %code{ :class => "js-ingress-domain-snippet" } + = s_('ClusterIntegration|%{external_ip}.nip.io').html_safe % { external_ip: @cluster.application_ingress_external_ip } = s_('ClusterIntegration| can be used instead of a custom domain.') - custom_domain_url = help_page_path('user/clusters/applications.md', anchor: 'pointing-your-dns-at-the-external-endpoint') - custom_domain_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: custom_domain_url } diff --git a/app/views/clusters/platforms/kubernetes/_form.html.haml b/app/views/clusters/clusters/_provider_details_form.html.haml index 41701b5614a..dd7d6182e3c 100644 --- a/app/views/clusters/platforms/kubernetes/_form.html.haml +++ b/app/views/clusters/clusters/_provider_details_form.html.haml @@ -1,4 +1,4 @@ -= bootstrap_form_for cluster, url: update_cluster_url_path, html: { class: 'gl-show-field-errors' }, += bootstrap_form_for cluster, url: update_cluster_url_path, html: { class: 'js-provider-details gl-show-field-errors' }, as: :cluster do |field| - copy_name_btn = clipboard_button(text: cluster.name, title: s_('ClusterIntegration|Copy Kubernetes cluster name'), class: 'input-group-text btn-default') if cluster.read_only_kubernetes_platform_fields? diff --git a/app/views/clusters/clusters/show.html.haml b/app/views/clusters/clusters/show.html.haml index e1f011a3225..4aa5b6af636 100644 --- a/app/views/clusters/clusters/show.html.haml +++ b/app/views/clusters/clusters/show.html.haml @@ -5,8 +5,6 @@ - manage_prometheus_path = edit_project_service_path(@cluster.project, 'prometheus') if @project - cluster_environments_path = clusterable.environments_cluster_path(@cluster) -- expanded = expanded_by_default? - - status_path = clusterable.cluster_status_cluster_path(@cluster.id, format: :json) if can?(current_user, :admin_cluster, @cluster) .edit-cluster-form.js-edit-cluster-form{ data: { status_path: status_path, install_helm_path: clusterable.install_applications_cluster_path(@cluster, :helm), @@ -44,7 +42,19 @@ %h4= @cluster.name = render 'banner' - - if cluster_environments_path.present? - = render_if_exists 'clusters/clusters/cluster_environments', expanded: expanded - - else - = render 'configure', expanded: expanded + - if cluster_created?(@cluster) + .js-toggle-container + %ul.nav-links.mobile-separator.nav.nav-tabs{ role: 'tablist' } + = render 'details_tab' + = render_if_exists 'clusters/clusters/environments_tab' + = render_if_exists 'clusters/clusters/health_tab' + = render 'applications_tab' + = render 'advanced_settings_tab' + + .tab-content.py-3 + .tab-pane.active{ role: 'tabpanel' } + = render_cluster_info_tab_content(params[:tab], expanded_by_default?) + + + + diff --git a/app/workers/gitlab/github_import/advance_stage_worker.rb b/app/workers/gitlab/github_import/advance_stage_worker.rb index 8c379be2ae4..8fbf88a1762 100644 --- a/app/workers/gitlab/github_import/advance_stage_worker.rb +++ b/app/workers/gitlab/github_import/advance_stage_worker.rb @@ -8,15 +8,12 @@ module Gitlab # stage. class AdvanceStageWorker # rubocop:disable Scalability/IdempotentWorker include ApplicationWorker + include ::Gitlab::Import::AdvanceStage sidekiq_options dead: false feature_category :importers - INTERVAL = 30.seconds.to_i - - # The number of seconds to wait (while blocking the thread) before - # continuing to the next waiter. - BLOCKING_WAIT_TIME = 5 + private # The known importer stages and their corresponding Sidekiq workers. STAGES = { @@ -26,49 +23,9 @@ module Gitlab finish: Stage::FinishImportWorker }.freeze - # project_id - The ID of the project being imported. - # waiters - A Hash mapping Gitlab::JobWaiter keys to the number of - # remaining jobs. - # next_stage - The name of the next stage to start when all jobs have been - # completed. - def perform(project_id, waiters, next_stage) - return unless import_state = find_import_state(project_id) - - new_waiters = wait_for_jobs(waiters) - - if new_waiters.empty? - # We refresh the import JID here so workers importing individual - # resources (e.g. notes) don't have to do this all the time, reducing - # the pressure on Redis. We _only_ do this once all jobs are done so - # we don't get stuck forever if one or more jobs failed to notify the - # JobWaiter. - import_state.refresh_jid_expiration - - STAGES.fetch(next_stage.to_sym).perform_async(project_id) - else - self.class.perform_in(INTERVAL, project_id, new_waiters, next_stage) - end - end - - def wait_for_jobs(waiters) - waiters.each_with_object({}) do |(key, remaining), new_waiters| - waiter = JobWaiter.new(remaining, key) - - # We wait for a brief moment of time so we don't reschedule if we can - # complete the work fast enough. - waiter.wait(BLOCKING_WAIT_TIME) - - next unless waiter.jobs_remaining.positive? - - new_waiters[waiter.key] = waiter.jobs_remaining - end - end - - # rubocop: disable CodeReuse/ActiveRecord - def find_import_state(project_id) - ProjectImportState.select(:jid).with_status(:started).find_by(project_id: project_id) + def next_stage_worker(next_stage) + STAGES.fetch(next_stage.to_sym) end - # rubocop: enable CodeReuse/ActiveRecord end end end diff --git a/app/workers/gitlab/import/advance_stage.rb b/app/workers/gitlab/import/advance_stage.rb new file mode 100644 index 00000000000..5c836413ae3 --- /dev/null +++ b/app/workers/gitlab/import/advance_stage.rb @@ -0,0 +1,61 @@ +# frozen_string_literal: true + +module Gitlab + module Import + module AdvanceStage + INTERVAL = 30.seconds.to_i + + # The number of seconds to wait (while blocking the thread) before + # continuing to the next waiter. + BLOCKING_WAIT_TIME = 5 + + # project_id - The ID of the project being imported. + # waiters - A Hash mapping Gitlab::JobWaiter keys to the number of + # remaining jobs. + # next_stage - The name of the next stage to start when all jobs have been + # completed. + def perform(project_id, waiters, next_stage) + return unless import_state = find_import_state(project_id) + + new_waiters = wait_for_jobs(waiters) + + if new_waiters.empty? + # We refresh the import JID here so workers importing individual + # resources (e.g. notes) don't have to do this all the time, reducing + # the pressure on Redis. We _only_ do this once all jobs are done so + # we don't get stuck forever if one or more jobs failed to notify the + # JobWaiter. + import_state.refresh_jid_expiration + + next_stage_worker(next_stage).perform_async(project_id) + else + self.class.perform_in(INTERVAL, project_id, new_waiters, next_stage) + end + end + + def wait_for_jobs(waiters) + waiters.each_with_object({}) do |(key, remaining), new_waiters| + waiter = JobWaiter.new(remaining, key) + + # We wait for a brief moment of time so we don't reschedule if we can + # complete the work fast enough. + waiter.wait(BLOCKING_WAIT_TIME) + + next unless waiter.jobs_remaining.positive? + + new_waiters[waiter.key] = waiter.jobs_remaining + end + end + + def find_import_state(project_id) + ProjectImportState.jid_by(project_id: project_id, status: :started) + end + + private + + def next_stage_worker(next_stage) + raise NotImplementedError + end + end + end +end diff --git a/app/workers/post_receive.rb b/app/workers/post_receive.rb index 05b6d6d570c..5178fabb2d8 100644 --- a/app/workers/post_receive.rb +++ b/app/workers/post_receive.rb @@ -77,11 +77,6 @@ class PostReceive # rubocop:disable Scalability/IdempotentWorker return false unless user - # We can remove once we implement multi-file snippets - # https://gitlab.com/gitlab-org/gitlab/-/issues/39269 - blob = snippet.blobs.first - snippet.update(file_name: blob.path, content: blob.data) if blob - # At the moment, we only expires the repository caches. # In the future we might need to call ProjectCacheWorker # (or the custom class we create) to update the snippet diff --git a/changelogs/unreleased/201931-white-syntax-highlighting-theme-for-web-ide.yml b/changelogs/unreleased/201931-white-syntax-highlighting-theme-for-web-ide.yml new file mode 100644 index 00000000000..ee11d6b374a --- /dev/null +++ b/changelogs/unreleased/201931-white-syntax-highlighting-theme-for-web-ide.yml @@ -0,0 +1,5 @@ +--- +title: Fix White syntax highlighting theme in Monaco to closely match the Pygments theme. +merge_request: 25966 +author: +type: fixed diff --git a/changelogs/unreleased/209002-change-evidence-sha-clipboard-button-hover-text.yml b/changelogs/unreleased/209002-change-evidence-sha-clipboard-button-hover-text.yml new file mode 100644 index 00000000000..42cda8ff0c2 --- /dev/null +++ b/changelogs/unreleased/209002-change-evidence-sha-clipboard-button-hover-text.yml @@ -0,0 +1,5 @@ +--- +title: Fix evidence SHA clipboard hover text. +merge_request: 26608 +author: Gilang Gumilar +type: fixed diff --git a/changelogs/unreleased/27300-expose-filepath-url-on-ui.yml b/changelogs/unreleased/27300-expose-filepath-url-on-ui.yml new file mode 100644 index 00000000000..2027e27ef81 --- /dev/null +++ b/changelogs/unreleased/27300-expose-filepath-url-on-ui.yml @@ -0,0 +1,5 @@ +--- +title: Expose assets filepath URL on UI +merge_request: 25635 +author: +type: added diff --git a/changelogs/unreleased/cluster-info-tabs.yml b/changelogs/unreleased/cluster-info-tabs.yml new file mode 100644 index 00000000000..bc62195596f --- /dev/null +++ b/changelogs/unreleased/cluster-info-tabs.yml @@ -0,0 +1,5 @@ +--- +title: Split cluster info page into tabs +merge_request: 25940 +author: +type: changed diff --git a/changelogs/unreleased/fj-fix-snippet-update-error-message.yml b/changelogs/unreleased/fj-fix-snippet-update-error-message.yml new file mode 100644 index 00000000000..dbf1c0b2919 --- /dev/null +++ b/changelogs/unreleased/fj-fix-snippet-update-error-message.yml @@ -0,0 +1,5 @@ +--- +title: Fix bug displaying snippet update error +merge_request: 27082 +author: +type: fixed diff --git a/changelogs/unreleased/nfriend-enable-issues-summary.yml b/changelogs/unreleased/nfriend-enable-issues-summary.yml new file mode 100644 index 00000000000..45a816ac198 --- /dev/null +++ b/changelogs/unreleased/nfriend-enable-issues-summary.yml @@ -0,0 +1,5 @@ +--- +title: Add issue summary to Release blocks on the Releases page +merge_request: 27032 +author: +type: added diff --git a/config/initializers/8_devise.rb b/config/initializers/8_devise.rb index 6ed56598e15..3daddb10b29 100644 --- a/config/initializers/8_devise.rb +++ b/config/initializers/8_devise.rb @@ -226,9 +226,9 @@ Devise.setup do |config| manager.failure_app = Gitlab::DeviseFailure end - if Gitlab::Auth::LDAP::Config.enabled? - Gitlab::Auth::LDAP::Config.providers.each do |provider| - ldap_config = Gitlab::Auth::LDAP::Config.new(provider) + if Gitlab::Auth::Ldap::Config.enabled? + Gitlab::Auth::Ldap::Config.providers.each do |provider| + ldap_config = Gitlab::Auth::Ldap::Config.new(provider) config.omniauth(provider, ldap_config.omniauth_options) end end diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 0e4cb88b50f..a2720ab9986 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -1,6 +1,6 @@ -if Gitlab::Auth::LDAP::Config.enabled? +if Gitlab::Auth::Ldap::Config.enabled? module OmniAuth::Strategies - Gitlab::Auth::LDAP::Config.available_servers.each do |server| + Gitlab::Auth::Ldap::Config.available_servers.each do |server| # do not redeclare LDAP next if server['provider_name'] == 'ldap' diff --git a/config/routes/user.rb b/config/routes/user.rb index fe7a0aa3233..9db3a71a270 100644 --- a/config/routes/user.rb +++ b/config/routes/user.rb @@ -10,9 +10,9 @@ def override_omniauth(provider, controller, path_prefix = '/users/auth') end # Use custom controller for LDAP omniauth callback -if Gitlab::Auth::LDAP::Config.sign_in_enabled? +if Gitlab::Auth::Ldap::Config.sign_in_enabled? devise_scope :user do - Gitlab::Auth::LDAP::Config.available_servers.each do |server| + Gitlab::Auth::Ldap::Config.available_servers.each do |server| override_omniauth(server['provider_name'], 'ldap/omniauth_callbacks') end end diff --git a/doc/administration/auth/ldap-ee.md b/doc/administration/auth/ldap-ee.md index 3220831ea87..c5e4bee3c58 100644 --- a/doc/administration/auth/ldap-ee.md +++ b/doc/administration/auth/ldap-ee.md @@ -493,7 +493,7 @@ step of the sync. 1. Run a group sync for this particular group. ```ruby - EE::Gitlab::Auth::LDAP::Sync::Group.execute_all_providers(group) + EE::Gitlab::Auth::Ldap::Sync::Group.execute_all_providers(group) ``` 1. Look through the output of the sync. See [example log output](#example-log-output) @@ -503,11 +503,11 @@ step of the sync. run the following query: ```ruby - adapter = Gitlab::Auth::LDAP::Adapter.new('ldapmain') # If `main` is the LDAP provider - ldap_group = EE::Gitlab::Auth::LDAP::Group.find_by_cn('group_cn_here', adapter) + adapter = Gitlab::Auth::Ldap::Adapter.new('ldapmain') # If `main` is the LDAP provider + ldap_group = EE::Gitlab::Auth::Ldap::Group.find_by_cn('group_cn_here', adapter) # Output - => #<EE::Gitlab::Auth::LDAP::Group:0x007fcbdd0bb6d8 + => #<EE::Gitlab::Auth::Ldap::Group:0x007fcbdd0bb6d8 ``` 1. Query the LDAP group's member DNs and see if the user's DN is in the list. diff --git a/doc/administration/high_availability/README.md b/doc/administration/high_availability/README.md index 9b5cabae39a..b7ac9916ea3 100644 --- a/doc/administration/high_availability/README.md +++ b/doc/administration/high_availability/README.md @@ -9,8 +9,8 @@ ensure that they are scalable and highly available. While these needs can be tac individually, they typically go hand in hand: a performant scalable environment will have availability by default, as its components are separated and pooled. -On this page, we present recommendations for setups based on the number -of users you expect. For larger setups we give several recommended +On this page, we present a maturity model for a progression from simple to complex +GitLab installations as your GitLab usage evolves. For larger setups we give several recommended architectures based on experience with GitLab.com and internal scale testing that aim to achieve the right balance between both scalability and availability. @@ -20,9 +20,60 @@ watch [this 1 hour Q&A](https://www.youtube.com/watch?v=uCU8jdYzpac) with [John Northrup](https://gitlab.com/northrup), and live questions coming in from some of our customers. +## Maturity levels + +### Level 1: Single-node Omnibus installation + +This solution is appropriate for many teams that have a single server at their disposal. With automatic backup of the GitLab repositories, configuration, and the database, this can be an optimal solution if you don't have strict availability requirements. + +This configuration is supported in [GitLab Starter, Premium and Ultimate](https://about.gitlab.com/pricing/). + +References: + +- [Installation Docs](../../install/README.html) +- [Backup/Restore Docs](https://docs.gitlab.com/omnibus/settings/backups.html#backup-and-restore-omnibus-gitlab-configuration) + +### Level 2: Multiple application servers + +By separating components you can see a number of advantages compared to a single-node setup. Namely, you can: + +- Increase the number of users +- Enable zero-downtime upgrades +- Increase availability + +Additional application nodes will handle frontend traffic, with a load balancer in front to distribute traffic across those nodes. Meanwhile, each application node connects to a shared file server and database systems on the back end. This way, if one of the application servers fails, the workflow is not interrupted. + +This configuration is supported in [GitLab Starter, Premium and Ultimate](https://about.gitlab.com/pricing/). + +References: + +- [High Availability Reference Architectures](#reference-architectures), without HA components + +### Level 3: Highly Available + +By adding automatic failover for database systems, we can enable higher uptime with an additional layer of complexity. + +This configuration is supported in [GitLab Premium and Ultimate](https://about.gitlab.com/pricing/). + +References: + +- [High Availability Reference Architectures](#reference-architectures) + +### Level 4: GitLab Geo + +GitLab Geo allows you to replicate your GitLab instance to other geographical locations as a read-only fully operational instance that can also be promoted in case of disaster. + +This configuration is supported in [GitLab Premium and Ultimate](https://about.gitlab.com/pricing/). + +References: + +- [Geo Documentation](../../gitlab-geo/README.html) +- [GitLab Geo with a highly available configuration](../geo/replication/high_availability.html) + ## Recommended setups based on number of users - 1 - 1000 Users: A single-node [Omnibus](https://docs.gitlab.com/omnibus/) setup with frequent backups. Refer to the [requirements page](../../install/requirements.md) for further details of the specs you will require. +- 1000 - 10000 Users: A scaled environment based on one of our [Reference Architectures](#reference-architectures), without the HA components applied. This can be a reasonable step towards a fully HA environment. - 2000 - 50000+ Users: A scaled HA environment based on one of our [Reference Architectures](#reference-architectures) below. ## GitLab components and configuration instructions diff --git a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md index 16eb3269ef0..2bb2e13511c 100644 --- a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md +++ b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md @@ -626,7 +626,7 @@ EE::Gitlab::LDAP::Sync::Group.execute_all_providers(group) # Run a GroupSync for a single group (10.6+) group = Group.find_by(name: 'my_gitlab_group') -EE::Gitlab::Auth::LDAP::Sync::Group.execute_all_providers(group) +EE::Gitlab::Auth::Ldap::Sync::Group.execute_all_providers(group) # Query an LDAP group directly (10.6-) adapter = Gitlab::LDAP::Adapter.new('ldapmain') # If `main` is the LDAP provider @@ -635,20 +635,20 @@ ldap_group.member_dns ldap_group.member_uids # Query an LDAP group directly (10.6+) -adapter = Gitlab::Auth::LDAP::Adapter.new('ldapmain') # If `main` is the LDAP provider -ldap_group = EE::Gitlab::Auth::LDAP::Group.find_by_cn('group_cn_here', adapter) +adapter = Gitlab::Auth::Ldap::Adapter.new('ldapmain') # If `main` is the LDAP provider +ldap_group = EE::Gitlab::Auth::Ldap::Group.find_by_cn('group_cn_here', adapter) ldap_group.member_dns ldap_group.member_uids # Lookup a particular user (10.6+) # This could expose potential errors connecting to and/or querying LDAP that may seem to # fail silently in the GitLab UI -adapter = Gitlab::Auth::LDAP::Adapter.new('ldapmain') # If `main` is the LDAP provider -user = Gitlab::Auth::LDAP::Person.find_by_uid('<username>',adapter) +adapter = Gitlab::Auth::Ldap::Adapter.new('ldapmain') # If `main` is the LDAP provider +user = Gitlab::Auth::Ldap::Person.find_by_uid('<username>',adapter) # Query the LDAP server directly (10.6+) ## For an example, see https://gitlab.com/gitlab-org/gitlab/blob/master/ee/lib/ee/gitlab/auth/ldap/adapter.rb -adapter = Gitlab::Auth::LDAP::Adapter.new('ldapmain') +adapter = Gitlab::Auth::Ldap::Adapter.new('ldapmain') options = { # the :base is required # use adapter.config.base for the base or .group_base for the group_base diff --git a/doc/ci/merge_request_pipelines/index.md b/doc/ci/merge_request_pipelines/index.md index 448525efbde..d1749924ad3 100644 --- a/doc/ci/merge_request_pipelines/index.md +++ b/doc/ci/merge_request_pipelines/index.md @@ -188,7 +188,7 @@ External users could steal secret variables from the parent project by modifying We're discussing a secure solution of running pipelines for merge requests that are submitted from forked projects, -see [the issue about the permission extension](https://gitlab.com/gitlab-org/gitlab-foss/issues/23902). +see [the issue about the permission extension](https://gitlab.com/gitlab-org/gitlab/-/issues/11934). ## Additional predefined variables diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb index 1329357d0b8..c16c2ce96de 100644 --- a/lib/gitlab/auth.rb +++ b/lib/gitlab/auth.rb @@ -88,7 +88,7 @@ module Gitlab else # If no user is provided, try LDAP. # LDAP users are only authenticated via LDAP - authenticators << Gitlab::Auth::LDAP::Authentication + authenticators << Gitlab::Auth::Ldap::Authentication end authenticators.compact! @@ -134,7 +134,7 @@ module Gitlab end def authenticate_using_internal_or_ldap_password? - Gitlab::CurrentSettings.password_authentication_enabled_for_git? || Gitlab::Auth::LDAP::Config.enabled? + Gitlab::CurrentSettings.password_authentication_enabled_for_git? || Gitlab::Auth::Ldap::Config.enabled? end def service_request_check(login, password, project) diff --git a/lib/gitlab/auth/ldap/access.rb b/lib/gitlab/auth/ldap/access.rb index 940b802be7e..98eec0e4a7b 100644 --- a/lib/gitlab/auth/ldap/access.rb +++ b/lib/gitlab/auth/ldap/access.rb @@ -6,14 +6,14 @@ # module Gitlab module Auth - module LDAP + module Ldap class Access - prepend_if_ee('::EE::Gitlab::Auth::LDAP::Access') # rubocop: disable Cop/InjectEnterpriseEditionModule + prepend_if_ee('::EE::Gitlab::Auth::Ldap::Access') # rubocop: disable Cop/InjectEnterpriseEditionModule attr_reader :provider, :user, :ldap_identity def self.open(user, &block) - Gitlab::Auth::LDAP::Adapter.open(user.ldap_identity.provider) do |adapter| + Gitlab::Auth::Ldap::Adapter.open(user.ldap_identity.provider) do |adapter| block.call(self.new(user, adapter)) end end @@ -50,7 +50,7 @@ module Gitlab end # Block user in GitLab if they were blocked in AD - if Gitlab::Auth::LDAP::Person.disabled_via_active_directory?(ldap_identity.extern_uid, adapter) + if Gitlab::Auth::Ldap::Person.disabled_via_active_directory?(ldap_identity.extern_uid, adapter) block_user(user, 'is disabled in Active Directory') false else @@ -62,7 +62,7 @@ module Gitlab block_user(user, 'does not exist anymore') false end - rescue LDAPConnectionError + rescue LdapConnectionError false end @@ -73,11 +73,11 @@ module Gitlab private def adapter - @adapter ||= Gitlab::Auth::LDAP::Adapter.new(provider) + @adapter ||= Gitlab::Auth::Ldap::Adapter.new(provider) end def ldap_config - Gitlab::Auth::LDAP::Config.new(provider) + Gitlab::Auth::Ldap::Config.new(provider) end def ldap_user @@ -87,7 +87,7 @@ module Gitlab end def find_ldap_user - Gitlab::Auth::LDAP::Person.find_by_dn(ldap_identity.extern_uid, adapter) + Gitlab::Auth::Ldap::Person.find_by_dn(ldap_identity.extern_uid, adapter) end def block_user(user, reason) diff --git a/lib/gitlab/auth/ldap/adapter.rb b/lib/gitlab/auth/ldap/adapter.rb index 356579ef402..c5ec4e1981b 100644 --- a/lib/gitlab/auth/ldap/adapter.rb +++ b/lib/gitlab/auth/ldap/adapter.rb @@ -2,9 +2,9 @@ module Gitlab module Auth - module LDAP + module Ldap class Adapter - prepend_if_ee('::EE::Gitlab::Auth::LDAP::Adapter') # rubocop: disable Cop/InjectEnterpriseEditionModule + prepend_if_ee('::EE::Gitlab::Auth::Ldap::Adapter') # rubocop: disable Cop/InjectEnterpriseEditionModule SEARCH_RETRY_FACTOR = [1, 1, 2, 3].freeze MAX_SEARCH_RETRIES = Rails.env.test? ? 1 : SEARCH_RETRY_FACTOR.size.freeze @@ -18,7 +18,7 @@ module Gitlab end def self.config(provider) - Gitlab::Auth::LDAP::Config.new(provider) + Gitlab::Auth::Ldap::Config.new(provider) end def initialize(provider, ldap = nil) @@ -27,7 +27,7 @@ module Gitlab end def config - Gitlab::Auth::LDAP::Config.new(provider) + Gitlab::Auth::Ldap::Config.new(provider) end def users(fields, value, limit = nil) @@ -75,7 +75,7 @@ module Gitlab renew_connection_adapter retry else - raise LDAPConnectionError, error_message + raise LdapConnectionError, error_message end end @@ -91,13 +91,13 @@ module Gitlab end entries.map do |entry| - Gitlab::Auth::LDAP::Person.new(entry, provider) + Gitlab::Auth::Ldap::Person.new(entry, provider) end end def user_options(fields, value, limit) options = { - attributes: Gitlab::Auth::LDAP::Person.ldap_attributes(config), + attributes: Gitlab::Auth::Ldap::Person.ldap_attributes(config), base: config.base } diff --git a/lib/gitlab/auth/ldap/auth_hash.rb b/lib/gitlab/auth/ldap/auth_hash.rb index 83fdc8a8c76..5435355f136 100644 --- a/lib/gitlab/auth/ldap/auth_hash.rb +++ b/lib/gitlab/auth/ldap/auth_hash.rb @@ -4,10 +4,10 @@ # module Gitlab module Auth - module LDAP + module Ldap class AuthHash < Gitlab::Auth::OAuth::AuthHash def uid - @uid ||= Gitlab::Auth::LDAP::Person.normalize_dn(super) + @uid ||= Gitlab::Auth::Ldap::Person.normalize_dn(super) end def username @@ -42,7 +42,7 @@ module Gitlab end def ldap_config - @ldap_config ||= Gitlab::Auth::LDAP::Config.new(self.provider) + @ldap_config ||= Gitlab::Auth::Ldap::Config.new(self.provider) end end end diff --git a/lib/gitlab/auth/ldap/authentication.rb b/lib/gitlab/auth/ldap/authentication.rb index 174e81dd603..d9964f237b1 100644 --- a/lib/gitlab/auth/ldap/authentication.rb +++ b/lib/gitlab/auth/ldap/authentication.rb @@ -8,10 +8,10 @@ module Gitlab module Auth - module LDAP + module Ldap class Authentication < Gitlab::Auth::OAuth::Authentication def self.login(login, password) - return unless Gitlab::Auth::LDAP::Config.enabled? + return unless Gitlab::Auth::Ldap::Config.enabled? return unless login.present? && password.present? # return found user that was authenticated by first provider for given login credentials @@ -22,7 +22,7 @@ module Gitlab end def self.providers - Gitlab::Auth::LDAP::Config.providers + Gitlab::Auth::Ldap::Config.providers end def login(login, password) @@ -33,7 +33,7 @@ module Gitlab ) return unless result - @user = Gitlab::Auth::LDAP::User.find_by_uid_and_provider(result.dn, provider) + @user = Gitlab::Auth::Ldap::User.find_by_uid_and_provider(result.dn, provider) end def adapter @@ -41,7 +41,7 @@ module Gitlab end def config - Gitlab::Auth::LDAP::Config.new(provider) + Gitlab::Auth::Ldap::Config.new(provider) end def user_filter(login) diff --git a/lib/gitlab/auth/ldap/config.rb b/lib/gitlab/auth/ldap/config.rb index 4bc0ceedae7..709cd0d787a 100644 --- a/lib/gitlab/auth/ldap/config.rb +++ b/lib/gitlab/auth/ldap/config.rb @@ -3,9 +3,9 @@ # Load a specific server configuration module Gitlab module Auth - module LDAP + module Ldap class Config - prepend_if_ee('::EE::Gitlab::Auth::LDAP::Config') # rubocop: disable Cop/InjectEnterpriseEditionModule + prepend_if_ee('::EE::Gitlab::Auth::Ldap::Config') # rubocop: disable Cop/InjectEnterpriseEditionModule NET_LDAP_ENCRYPTION_METHOD = { simple_tls: :simple_tls, diff --git a/lib/gitlab/auth/ldap/dn.rb b/lib/gitlab/auth/ldap/dn.rb index 0b496da784d..ea88dedadf5 100644 --- a/lib/gitlab/auth/ldap/dn.rb +++ b/lib/gitlab/auth/ldap/dn.rb @@ -21,7 +21,7 @@ # class also helps take care of that. module Gitlab module Auth - module LDAP + module Ldap class DN FormatError = Class.new(StandardError) MalformedError = Class.new(FormatError) diff --git a/lib/gitlab/auth/ldap/ldap_connection_error.rb b/lib/gitlab/auth/ldap/ldap_connection_error.rb index d0e5f24d203..13b0d29e104 100644 --- a/lib/gitlab/auth/ldap/ldap_connection_error.rb +++ b/lib/gitlab/auth/ldap/ldap_connection_error.rb @@ -2,8 +2,8 @@ module Gitlab module Auth - module LDAP - LDAPConnectionError = Class.new(StandardError) + module Ldap + LdapConnectionError = Class.new(StandardError) end end end diff --git a/lib/gitlab/auth/ldap/person.rb b/lib/gitlab/auth/ldap/person.rb index 88ec22aa75c..430f94a9a28 100644 --- a/lib/gitlab/auth/ldap/person.rb +++ b/lib/gitlab/auth/ldap/person.rb @@ -2,9 +2,9 @@ module Gitlab module Auth - module LDAP + module Ldap class Person - prepend_if_ee('::EE::Gitlab::Auth::LDAP::Person') # rubocop: disable Cop/InjectEnterpriseEditionModule + prepend_if_ee('::EE::Gitlab::Auth::Ldap::Person') # rubocop: disable Cop/InjectEnterpriseEditionModule # Active Directory-specific LDAP filter that checks if bit 2 of the # userAccountControl attribute is set. @@ -45,8 +45,8 @@ module Gitlab end def self.normalize_dn(dn) - ::Gitlab::Auth::LDAP::DN.new(dn).to_normalized_s - rescue ::Gitlab::Auth::LDAP::DN::FormatError => e + ::Gitlab::Auth::Ldap::DN.new(dn).to_normalized_s + rescue ::Gitlab::Auth::Ldap::DN::FormatError => e Rails.logger.info("Returning original DN \"#{dn}\" due to error during normalization attempt: #{e.message}") # rubocop:disable Gitlab/RailsLogger dn @@ -57,8 +57,8 @@ module Gitlab # 1. Excess spaces are stripped # 2. The string is downcased (for case-insensitivity) def self.normalize_uid(uid) - ::Gitlab::Auth::LDAP::DN.normalize_value(uid) - rescue ::Gitlab::Auth::LDAP::DN::FormatError => e + ::Gitlab::Auth::Ldap::DN.normalize_value(uid) + rescue ::Gitlab::Auth::Ldap::DN::FormatError => e Rails.logger.info("Returning original UID \"#{uid}\" due to error during normalization attempt: #{e.message}") # rubocop:disable Gitlab/RailsLogger uid @@ -103,7 +103,7 @@ module Gitlab attr_reader :entry def config - @config ||= Gitlab::Auth::LDAP::Config.new(provider) + @config ||= Gitlab::Auth::Ldap::Config.new(provider) end # Using the LDAP attributes configuration, find and return the first diff --git a/lib/gitlab/auth/ldap/user.rb b/lib/gitlab/auth/ldap/user.rb index 3b68230e193..df14e5fc3dc 100644 --- a/lib/gitlab/auth/ldap/user.rb +++ b/lib/gitlab/auth/ldap/user.rb @@ -8,10 +8,10 @@ # module Gitlab module Auth - module LDAP + module Ldap class User < Gitlab::Auth::OAuth::User extend ::Gitlab::Utils::Override - prepend_if_ee('::EE::Gitlab::Auth::LDAP::User') # rubocop: disable Cop/InjectEnterpriseEditionModule + prepend_if_ee('::EE::Gitlab::Auth::Ldap::User') # rubocop: disable Cop/InjectEnterpriseEditionModule class << self # rubocop: disable CodeReuse/ActiveRecord @@ -46,7 +46,7 @@ module Gitlab end def allowed? - Gitlab::Auth::LDAP::Access.allowed?(gl_user) + Gitlab::Auth::Ldap::Access.allowed?(gl_user) end def valid_sign_in? @@ -54,11 +54,11 @@ module Gitlab end def ldap_config - Gitlab::Auth::LDAP::Config.new(auth_hash.provider) + Gitlab::Auth::Ldap::Config.new(auth_hash.provider) end def auth_hash=(auth_hash) - @auth_hash = Gitlab::Auth::LDAP::AuthHash.new(auth_hash) + @auth_hash = Gitlab::Auth::Ldap::AuthHash.new(auth_hash) end end end diff --git a/lib/gitlab/auth/o_auth/provider.rb b/lib/gitlab/auth/o_auth/provider.rb index 4d6b95ecd1b..f0811098b15 100644 --- a/lib/gitlab/auth/o_auth/provider.rb +++ b/lib/gitlab/auth/o_auth/provider.rb @@ -18,7 +18,7 @@ module Gitlab authenticator = case provider when /^ldap/ - Gitlab::Auth::LDAP::Authentication + Gitlab::Auth::Ldap::Authentication when 'database' Gitlab::Auth::Database::Authentication end @@ -60,8 +60,8 @@ module Gitlab def self.config_for(name) name = name.to_s if ldap_provider?(name) - if Gitlab::Auth::LDAP::Config.valid_provider?(name) - Gitlab::Auth::LDAP::Config.new(name).options + if Gitlab::Auth::Ldap::Config.valid_provider?(name) + Gitlab::Auth::Ldap::Config.new(name).options else nil end diff --git a/lib/gitlab/auth/o_auth/user.rb b/lib/gitlab/auth/o_auth/user.rb index 300181025a4..df595da1536 100644 --- a/lib/gitlab/auth/o_auth/user.rb +++ b/lib/gitlab/auth/o_auth/user.rb @@ -111,7 +111,7 @@ module Gitlab def find_or_build_ldap_user return unless ldap_person - user = Gitlab::Auth::LDAP::User.find_by_uid_and_provider(ldap_person.dn, ldap_person.provider) + user = Gitlab::Auth::Ldap::User.find_by_uid_and_provider(ldap_person.dn, ldap_person.provider) if user log.info "LDAP account found for user #{user.username}. Building new #{auth_hash.provider} identity." return user @@ -141,8 +141,8 @@ module Gitlab return @ldap_person if defined?(@ldap_person) # Look for a corresponding person with same uid in any of the configured LDAP providers - Gitlab::Auth::LDAP::Config.providers.each do |provider| - adapter = Gitlab::Auth::LDAP::Adapter.new(provider) + Gitlab::Auth::Ldap::Config.providers.each do |provider| + adapter = Gitlab::Auth::Ldap::Adapter.new(provider) @ldap_person = find_ldap_person(auth_hash, adapter) break if @ldap_person end @@ -150,15 +150,15 @@ module Gitlab end def find_ldap_person(auth_hash, adapter) - Gitlab::Auth::LDAP::Person.find_by_uid(auth_hash.uid, adapter) || - Gitlab::Auth::LDAP::Person.find_by_email(auth_hash.uid, adapter) || - Gitlab::Auth::LDAP::Person.find_by_dn(auth_hash.uid, adapter) - rescue Gitlab::Auth::LDAP::LDAPConnectionError + Gitlab::Auth::Ldap::Person.find_by_uid(auth_hash.uid, adapter) || + Gitlab::Auth::Ldap::Person.find_by_email(auth_hash.uid, adapter) || + Gitlab::Auth::Ldap::Person.find_by_dn(auth_hash.uid, adapter) + rescue Gitlab::Auth::Ldap::LdapConnectionError nil end def ldap_config - Gitlab::Auth::LDAP::Config.new(ldap_person.provider) if ldap_person + Gitlab::Auth::Ldap::Config.new(ldap_person.provider) if ldap_person end def needs_blocking? diff --git a/lib/gitlab/user_access.rb b/lib/gitlab/user_access.rb index fda2985307e..5e0a4faeba8 100644 --- a/lib/gitlab/user_access.rb +++ b/lib/gitlab/user_access.rb @@ -33,7 +33,7 @@ module Gitlab return false unless can_access_git? if user.requires_ldap_check? && user.try_obtain_ldap_lease - return false unless Gitlab::Auth::LDAP::Access.allowed?(user) + return false unless Gitlab::Auth::Ldap::Access.allowed?(user) end true diff --git a/lib/system_check/ldap_check.rb b/lib/system_check/ldap_check.rb index 938026424ed..3d71edbc256 100644 --- a/lib/system_check/ldap_check.rb +++ b/lib/system_check/ldap_check.rb @@ -6,7 +6,7 @@ module SystemCheck set_name 'LDAP:' def multi_check - if Gitlab::Auth::LDAP::Config.enabled? + if Gitlab::Auth::Ldap::Config.enabled? # Only show up to 100 results because LDAP directories can be very big. # This setting only affects the `rake gitlab:check` script. limit = ENV['LDAP_CHECK_LIMIT'] @@ -21,13 +21,13 @@ module SystemCheck private def check_ldap(limit) - servers = Gitlab::Auth::LDAP::Config.providers + servers = Gitlab::Auth::Ldap::Config.providers servers.each do |server| $stdout.puts "Server: #{server}" begin - Gitlab::Auth::LDAP::Adapter.open(server) do |adapter| + Gitlab::Auth::Ldap::Adapter.open(server) do |adapter| check_ldap_auth(adapter) $stdout.puts "LDAP users with access to your GitLab server (only showing the first #{limit} results)" diff --git a/lib/tasks/gitlab/cleanup.rake b/lib/tasks/gitlab/cleanup.rake index 63f5d7f2740..c26aa848d5a 100644 --- a/lib/tasks/gitlab/cleanup.rake +++ b/lib/tasks/gitlab/cleanup.rake @@ -13,7 +13,7 @@ namespace :gitlab do print "#{user.name} (#{user.ldap_identity.extern_uid}) ..." - if Gitlab::Auth::LDAP::Access.allowed?(user) + if Gitlab::Auth::Ldap::Access.allowed?(user) puts " [OK]".color(:green) else if block_flag diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 4f079323f4a..3f578730eb8 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -1550,13 +1550,13 @@ msgstr "" msgid "Advanced" msgstr "" -msgid "Advanced permissions, Large File Storage and Two-Factor authentication settings." +msgid "Advanced Settings" msgstr "" -msgid "Advanced search functionality" +msgid "Advanced permissions, Large File Storage and Two-Factor authentication settings." msgstr "" -msgid "Advanced settings" +msgid "Advanced search functionality" msgstr "" msgid "After a successful password update you will be redirected to login screen." @@ -3991,6 +3991,9 @@ msgstr "" msgid "Closed this %{quick_action_target}." msgstr "" +msgid "Closed: %{closedIssuesCount}" +msgstr "" + msgid "Closes this %{quick_action_target}." msgstr "" @@ -4021,6 +4024,9 @@ msgstr "" msgid "ClusterIntegration|%{appList} was successfully installed on your Kubernetes cluster" msgstr "" +msgid "ClusterIntegration|%{external_ip}.nip.io" +msgstr "" + msgid "ClusterIntegration|%{title} uninstalled successfully." msgstr "" @@ -4057,7 +4063,7 @@ msgstr "" msgid "ClusterIntegration|Adding an integration will share the cluster across all projects." msgstr "" -msgid "ClusterIntegration|Advanced options on this Kubernetes cluster's integration" +msgid "ClusterIntegration|Advanced options on this Kubernetes cluster’s integration" msgstr "" msgid "ClusterIntegration|All data not committed to GitLab will be deleted and cannot be restored." @@ -4093,9 +4099,6 @@ msgstr "" msgid "ClusterIntegration|Any running pipelines will be canceled." msgstr "" -msgid "ClusterIntegration|Applications" -msgstr "" - msgid "ClusterIntegration|Apply for credit" msgstr "" @@ -4147,9 +4150,6 @@ msgstr "" msgid "ClusterIntegration|Cluster being created" msgstr "" -msgid "ClusterIntegration|Cluster health" -msgstr "" - msgid "ClusterIntegration|Cluster management project (alpha)" msgstr "" @@ -4342,7 +4342,7 @@ msgstr "" msgid "ClusterIntegration|If you do not wish to delete all associated GitLab resources, you can simply remove the integration." msgstr "" -msgid "ClusterIntegration|In order to view the health of your cluster, you must first install Prometheus below." +msgid "ClusterIntegration|In order to view the health of your cluster, you must first install Prometheus in the Applications tab." msgstr "" msgid "ClusterIntegration|Ingress" @@ -4366,9 +4366,6 @@ msgstr "" msgid "ClusterIntegration|Integrate Kubernetes cluster automation" msgstr "" -msgid "ClusterIntegration|Integration status" -msgstr "" - msgid "ClusterIntegration|Issuer Email" msgstr "" @@ -4405,9 +4402,6 @@ msgstr "" msgid "ClusterIntegration|Kubernetes cluster" msgstr "" -msgid "ClusterIntegration|Kubernetes cluster details" -msgstr "" - msgid "ClusterIntegration|Kubernetes cluster is being created..." msgstr "" @@ -4558,6 +4552,9 @@ msgstr "" msgid "ClusterIntegration|Prometheus is an open-source monitoring system with %{gitlabIntegrationLink} to monitor deployed applications." msgstr "" +msgid "ClusterIntegration|Provider details" +msgstr "" + msgid "ClusterIntegration|Provision Role ARN" msgstr "" @@ -5570,6 +5567,9 @@ msgstr "" msgid "Copy commit SHA" msgstr "" +msgid "Copy evidence SHA" +msgstr "" + msgid "Copy file contents" msgstr "" @@ -5630,9 +5630,6 @@ msgstr "" msgid "Could not create group" msgstr "" -msgid "Could not create issue" -msgstr "" - msgid "Could not create project" msgstr "" @@ -5642,9 +5639,6 @@ msgstr "" msgid "Could not delete chat nickname %{chat_name}." msgstr "" -msgid "Could not fetch projects" -msgstr "" - msgid "Could not find design" msgstr "" @@ -7840,6 +7834,9 @@ msgstr "" msgid "Epics|Something went wrong while creating child epics." msgstr "" +msgid "Epics|Something went wrong while creating issue." +msgstr "" + msgid "Epics|Something went wrong while fetching child epics." msgstr "" @@ -10288,6 +10285,9 @@ msgstr "" msgid "Header message" msgstr "" +msgid "Health" +msgstr "" + msgid "Health Check" msgstr "" @@ -13178,6 +13178,9 @@ msgstr "" msgid "No licenses found." msgstr "" +msgid "No matches found" +msgstr "" + msgid "No matching labels" msgstr "" @@ -13636,6 +13639,9 @@ msgstr "" msgid "Open source software to collaborate on code" msgstr "" +msgid "Open: %{openIssuesCount}" +msgstr "" + msgid "Open: %{open} • Closed: %{closed}" msgstr "" @@ -18320,6 +18326,9 @@ msgstr "" msgid "Something went wrong while fetching projects" msgstr "" +msgid "Something went wrong while fetching projects." +msgstr "" + msgid "Something went wrong while fetching related merge requests." msgstr "" diff --git a/qa/qa/page/project/operations/kubernetes/show.rb b/qa/qa/page/project/operations/kubernetes/show.rb index b639f867593..46fddfa6078 100644 --- a/qa/qa/page/project/operations/kubernetes/show.rb +++ b/qa/qa/page/project/operations/kubernetes/show.rb @@ -10,17 +10,35 @@ module QA element :ingress_ip_address, 'id="ingress-endpoint"' # rubocop:disable QA/ElementWithPattern end - view 'app/views/clusters/clusters/_form.html.haml' do + view 'app/views/clusters/clusters/_gitlab_integration_form.html.haml' do element :integration_status_toggle, required: true element :base_domain_field, required: true element :save_changes_button, required: true end + view 'app/views/clusters/clusters/_details_tab.html.haml' do + element :details, required: true + end + + view 'app/views/clusters/clusters/_applications_tab.html.haml' do + element :applications, required: true + end + view 'app/assets/javascripts/clusters/components/application_row.vue' do element :install_button element :uninstall_button end + def open_details + has_element?(:details, wait: 30) + click_element :details + end + + def open_applications + has_element?(:applications, wait: 30) + click_element :applications + end + def install!(application_name) within_element(application_name) do has_element?(:install_button, application: application_name, wait: 30) diff --git a/qa/qa/resource/kubernetes_cluster.rb b/qa/qa/resource/kubernetes_cluster.rb index 1930e0465b2..7306acfe2a4 100644 --- a/qa/qa/resource/kubernetes_cluster.rb +++ b/qa/qa/resource/kubernetes_cluster.rb @@ -38,6 +38,9 @@ module QA # We must wait a few seconds for permissions to be set up correctly for new cluster sleep 10 + # Open applications tab + show.open_applications + # Helm must be installed before everything else show.install!(:helm) show.await_installed(:helm) @@ -52,6 +55,8 @@ module QA if @install_ingress populate(:ingress_ip) + + show.open_details show.set_domain("#{ingress_ip}.nip.io") show.save_domain end diff --git a/scripts/utils.sh b/scripts/utils.sh index 7eae9531f74..5d52ca0b40a 100644 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -57,97 +57,3 @@ function echoinfo() { printf "\033[0;33m%s\n\033[0m" "${1}" >&2; fi } - -function get_job_id() { - local job_name="${1}" - local query_string="${2:+&${2}}" - local api_token="${API_TOKEN-${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}}" - if [ -z "${api_token}" ]; then - echoerr "Please provide an API token with \$API_TOKEN or \$GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN." - return - fi - - local max_page=3 - local page=1 - - while true; do - local url="https://gitlab.com/api/v4/projects/${CI_PROJECT_ID}/pipelines/${CI_PIPELINE_ID}/jobs?per_page=100&page=${page}${query_string}" - echoinfo "GET ${url}" - - local job_id - job_id=$(curl --silent --show-error --header "PRIVATE-TOKEN: ${api_token}" "${url}" | jq "map(select(.name == \"${job_name}\")) | map(.id) | last") - [[ "${job_id}" == "null" && "${page}" -lt "$max_page" ]] || break - - let "page++" - done - - if [[ "${job_id}" == "" ]]; then - echoerr "The '${job_name}' job ID couldn't be retrieved!" - else - echoinfo "The '${job_name}' job ID is ${job_id}" - echo "${job_id}" - fi -} - -function play_job() { - local job_name="${1}" - local job_id - job_id=$(get_job_id "${job_name}" "scope=manual"); - if [ -z "${job_id}" ]; then return; fi - - local api_token="${API_TOKEN-${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}}" - if [ -z "${api_token}" ]; then - echoerr "Please provide an API token with \$API_TOKEN or \$GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN." - return - fi - - local url="https://gitlab.com/api/v4/projects/${CI_PROJECT_ID}/jobs/${job_id}/play" - echoinfo "POST ${url}" - - local job_url - job_url=$(curl --silent --show-error --request POST --header "PRIVATE-TOKEN: ${api_token}" "${url}" | jq ".web_url") - echoinfo "Manual job '${job_name}' started at: ${job_url}" -} - -function wait_for_job_to_be_done() { - local job_name="${1}" - local query_string="${2}" - local job_id - job_id=$(get_job_id "${job_name}" "${query_string}") - if [ -z "${job_id}" ]; then return; fi - - local api_token="${API_TOKEN-${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}}" - if [ -z "${api_token}" ]; then - echoerr "Please provide an API token with \$API_TOKEN or \$GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN." - return - fi - - echoinfo "Waiting for the '${job_name}' job to finish..." - - local url="https://gitlab.com/api/v4/projects/${CI_PROJECT_ID}/jobs/${job_id}" - echoinfo "GET ${url}" - - # In case the job hasn't finished yet. Keep trying until the job times out. - local interval=30 - local elapsed_seconds=0 - while true; do - local job_status - job_status=$(curl --silent --show-error --header "PRIVATE-TOKEN: ${api_token}" "${url}" | jq ".status" | sed -e s/\"//g) - [[ "${job_status}" == "pending" || "${job_status}" == "running" ]] || break - - printf "." - let "elapsed_seconds+=interval" - sleep ${interval} - done - - local elapsed_minutes=$((elapsed_seconds / 60)) - echoinfo "Waited '${job_name}' for ${elapsed_minutes} minutes." - - if [[ "${job_status}" == "failed" ]]; then - echoerr "The '${job_name}' failed." - elif [[ "${job_status}" == "manual" ]]; then - echoinfo "The '${job_name}' is manual." - else - echoinfo "The '${job_name}' passed." - fi -} diff --git a/spec/controllers/projects/releases_controller_spec.rb b/spec/controllers/projects/releases_controller_spec.rb index 58fb2a95ce6..ca073c520cd 100644 --- a/spec/controllers/projects/releases_controller_spec.rb +++ b/spec/controllers/projects/releases_controller_spec.rb @@ -200,6 +200,46 @@ describe Projects::ReleasesController do context 'GET #downloads' do subject do + get :downloads, params: { namespace_id: project.namespace, project_id: project, tag: tag, filepath: filepath } + end + + before do + sign_in(user) + end + + let(:release) { create(:release, project: project, tag: tag ) } + let!(:link) { create(:release_link, release: release, name: 'linux-amd64 binaries', filepath: '/binaries/linux-amd64', url: 'https://downloads.example.com/bin/gitlab-linux-amd64') } + let(:tag) { 'v11.9.0-rc2' } + + context 'valid filepath' do + let(:filepath) { CGI.escape('/binaries/linux-amd64') } + + it 'redirects to the asset direct link' do + subject + + expect(response).to redirect_to('https://downloads.example.com/bin/gitlab-linux-amd64') + end + + it 'redirects with a status of 302' do + subject + + expect(response).to have_gitlab_http_status(:redirect) + end + end + + context 'invalid filepath' do + let(:filepath) { CGI.escape('/binaries/win32') } + + it 'is not found' do + subject + + expect(response).to have_gitlab_http_status(:not_found) + end + end + end + + context 'GET #downloads' do + subject do get :downloads, params: { namespace_id: project.namespace, project_id: project, diff --git a/spec/features/clusters/cluster_detail_page_spec.rb b/spec/features/clusters/cluster_detail_page_spec.rb index 437e7f18c48..28d6c10f04f 100644 --- a/spec/features/clusters/cluster_detail_page_spec.rb +++ b/spec/features/clusters/cluster_detail_page_spec.rb @@ -17,7 +17,7 @@ describe 'Clusterable > Show page' do it 'allow the user to set domain' do visit cluster_path - within '#cluster-integration' do + within '.js-cluster-integration-form' do fill_in('cluster_base_domain', with: 'test.com') click_on 'Save changes' end @@ -34,7 +34,7 @@ describe 'Clusterable > Show page' do end it 'shows help text with the domain as an alternative to custom domain' do - within '#cluster-integration' do + within '.js-cluster-integration-form' do expect(find(cluster_ingress_help_text_selector)).not_to match_css(hide_modifier_selector) end end @@ -44,7 +44,7 @@ describe 'Clusterable > Show page' do it 'alternative to custom domain is not shown' do visit cluster_path - within '#cluster-integration' do + within '.js-cluster-integration-form' do expect(find(cluster_ingress_help_text_selector)).to match_css(hide_modifier_selector) end end @@ -63,7 +63,7 @@ describe 'Clusterable > Show page' do end it 'is not able to edit the name, API url, CA certificate nor token' do - within('#js-cluster-details') do + within('.js-provider-details') do cluster_name_field = find('.cluster-name') api_url_field = find('#cluster_platform_kubernetes_attributes_api_url') ca_certificate_field = find('#cluster_platform_kubernetes_attributes_ca_cert') @@ -77,6 +77,8 @@ describe 'Clusterable > Show page' do end it 'displays GKE information' do + click_link 'Advanced Settings' + within('#advanced-settings-section') do expect(page).to have_content('Google Kubernetes Engine') expect(page).to have_content('Manage your Kubernetes cluster by visiting') @@ -91,7 +93,7 @@ describe 'Clusterable > Show page' do end it 'is able to edit the name, API url, CA certificate and token' do - within('#js-cluster-details') do + within('.js-provider-details') do cluster_name_field = find('#cluster_name') api_url_field = find('#cluster_platform_kubernetes_attributes_api_url') ca_certificate_field = find('#cluster_platform_kubernetes_attributes_ca_cert') @@ -105,6 +107,8 @@ describe 'Clusterable > Show page' do end it 'does not display GKE information' do + click_link 'Advanced Settings' + within('#advanced-settings-section') do expect(page).not_to have_content('Google Kubernetes Engine') expect(page).not_to have_content('Manage your Kubernetes cluster by visiting') diff --git a/spec/features/clusters/installing_applications_shared_examples.rb b/spec/features/clusters/installing_applications_shared_examples.rb index ff44ce46213..8710e05e5cc 100644 --- a/spec/features/clusters/installing_applications_shared_examples.rb +++ b/spec/features/clusters/installing_applications_shared_examples.rb @@ -17,6 +17,12 @@ shared_examples "installing applications on a cluster" do context 'when cluster is created' do let(:cluster) { create(:cluster, :provided_by_gcp, *cluster_factory_args) } + before do + page.within('.js-edit-cluster-form') do + click_link 'Applications' + end + end + it 'user can install applications' do wait_for_requests @@ -29,6 +35,7 @@ shared_examples "installing applications on a cluster" do context 'when user installs Helm' do before do allow(ClusterInstallAppWorker).to receive(:perform_async) + wait_for_requests page.within('.js-cluster-application-row-helm') do page.find(:css, '.js-cluster-application-install-button').click diff --git a/spec/features/groups/clusters/user_spec.rb b/spec/features/groups/clusters/user_spec.rb index ceec50e4f58..e9ef66e31a2 100644 --- a/spec/features/groups/clusters/user_spec.rb +++ b/spec/features/groups/clusters/user_spec.rb @@ -34,7 +34,7 @@ describe 'User Cluster', :js do it 'user sees a cluster details page' do subject - expect(page).to have_content('Kubernetes cluster integration') + expect(page).to have_content('GitLab Integration') expect(page.find_field('cluster[name]').value).to eq('dev-cluster') expect(page.find_field('cluster[platform_kubernetes_attributes][api_url]').value) .to have_content('http://example.com') @@ -93,7 +93,7 @@ describe 'User Cluster', :js do context 'when user disables the cluster' do before do page.find(:css, '.js-cluster-enable-toggle-area .js-project-feature-toggle').click - page.within('#cluster-integration') { click_button 'Save changes' } + page.within('.js-cluster-integration-form') { click_button 'Save changes' } end it 'user sees the successful message' do @@ -105,7 +105,7 @@ describe 'User Cluster', :js do before do fill_in 'cluster_name', with: 'my-dev-cluster' fill_in 'cluster_platform_kubernetes_attributes_token', with: 'new-token' - page.within('#js-cluster-details') { click_button 'Save changes' } + page.within('.js-provider-details') { click_button 'Save changes' } end it 'user sees the successful message' do @@ -117,6 +117,7 @@ describe 'User Cluster', :js do context 'when user destroys the cluster' do before do + click_link 'Advanced Settings' click_button 'Remove integration and resources' fill_in 'confirm_cluster_name_input', with: cluster.name click_button 'Remove integration' diff --git a/spec/features/projects/clusters/gcp_spec.rb b/spec/features/projects/clusters/gcp_spec.rb index 56ee2819bdb..df786cf0818 100644 --- a/spec/features/projects/clusters/gcp_spec.rb +++ b/spec/features/projects/clusters/gcp_spec.rb @@ -119,7 +119,7 @@ describe 'Gcp Cluster', :js, :do_not_mock_admin_mode do context 'when user disables the cluster' do before do page.find(:css, '.js-cluster-enable-toggle-area .js-project-feature-toggle').click - page.within('#cluster-integration') { click_button 'Save changes' } + page.within('.js-cluster-integration-form') { click_button 'Save changes' } end it 'user sees the successful message' do @@ -130,7 +130,7 @@ describe 'Gcp Cluster', :js, :do_not_mock_admin_mode do context 'when user changes cluster parameters' do before do fill_in 'cluster_platform_kubernetes_attributes_namespace', with: 'my-namespace' - page.within('#js-cluster-details') { click_button 'Save changes' } + page.within('.js-provider-details') { click_button 'Save changes' } end it 'user sees the successful message' do @@ -141,6 +141,7 @@ describe 'Gcp Cluster', :js, :do_not_mock_admin_mode do context 'when user destroys the cluster' do before do + click_link 'Advanced Settings' click_button 'Remove integration and resources' fill_in 'confirm_cluster_name_input', with: cluster.name click_button 'Remove integration' diff --git a/spec/features/projects/clusters/user_spec.rb b/spec/features/projects/clusters/user_spec.rb index 38efcf758e1..79676927fa2 100644 --- a/spec/features/projects/clusters/user_spec.rb +++ b/spec/features/projects/clusters/user_spec.rb @@ -41,7 +41,7 @@ describe 'User Cluster', :js do it 'user sees a cluster details page' do subject - expect(page).to have_content('Kubernetes cluster integration') + expect(page).to have_content('GitLab Integration') expect(page.find_field('cluster[name]').value).to eq('dev-cluster') expect(page.find_field('cluster[platform_kubernetes_attributes][api_url]').value) .to have_content('http://example.com') @@ -79,7 +79,7 @@ describe 'User Cluster', :js do context 'when user disables the cluster' do before do page.find(:css, '.js-cluster-enable-toggle-area .js-project-feature-toggle').click - page.within('#cluster-integration') { click_button 'Save changes' } + page.within('.js-cluster-integration-form') { click_button 'Save changes' } end it 'user sees the successful message' do @@ -91,7 +91,7 @@ describe 'User Cluster', :js do before do fill_in 'cluster_name', with: 'my-dev-cluster' fill_in 'cluster_platform_kubernetes_attributes_namespace', with: 'my-namespace' - page.within('#js-cluster-details') { click_button 'Save changes' } + page.within('.js-provider-details') { click_button 'Save changes' } end it 'user sees the successful message' do @@ -103,6 +103,7 @@ describe 'User Cluster', :js do context 'when user destroys the cluster' do before do + click_link 'Advanced Settings' click_button 'Remove integration and resources' fill_in 'confirm_cluster_name_input', with: cluster.name click_button 'Remove integration' diff --git a/spec/features/projects/releases/user_views_releases_spec.rb b/spec/features/projects/releases/user_views_releases_spec.rb index 4507d90576b..a4ba81ffeb9 100644 --- a/spec/features/projects/releases/user_views_releases_spec.rb +++ b/spec/features/projects/releases/user_views_releases_spec.rb @@ -24,16 +24,31 @@ describe 'User views releases', :js do context 'when there is a link as an asset' do let!(:release_link) { create(:release_link, release: release, url: url ) } let(:url) { "#{project.web_url}/-/jobs/1/artifacts/download" } + let(:direct_asset_link) { Gitlab::Routing.url_helpers.project_release_url(project, release) << release_link.filepath } it 'sees the link' do visit project_releases_path(project) page.within('.js-assets-list') do - expect(page).to have_link release_link.name, href: release_link.url + expect(page).to have_link release_link.name, href: direct_asset_link expect(page).not_to have_content('(external source)') end end + context 'when there is a link redirect' do + let!(:release_link) { create(:release_link, release: release, name: 'linux-amd64 binaries', filepath: '/binaries/linux-amd64', url: url) } + let(:url) { "#{project.web_url}/-/jobs/1/artifacts/download" } + + it 'sees the link' do + visit project_releases_path(project) + + page.within('.js-assets-list') do + expect(page).to have_link release_link.name, href: direct_asset_link + expect(page).not_to have_content('(external source)') + end + end + end + context 'when url points to external resource' do let(:url) { 'http://google.com/download' } diff --git a/spec/features/projects/snippets/user_updates_snippet_spec.rb b/spec/features/projects/snippets/user_updates_snippet_spec.rb index 0c3438575ba..f9628b37089 100644 --- a/spec/features/projects/snippets/user_updates_snippet_spec.rb +++ b/spec/features/projects/snippets/user_updates_snippet_spec.rb @@ -38,7 +38,7 @@ describe 'Projects > Snippets > User updates a snippet' do end it 'renders edit page and displays the error' do - expect(page).to have_content('Error updating the snippet') + expect(page.find('.flash-container span').text).to eq('Error updating the snippet') expect(page).to have_content('Edit Snippet') end end diff --git a/spec/features/snippets/user_edits_snippet_spec.rb b/spec/features/snippets/user_edits_snippet_spec.rb index 706758164b2..b003e50aab7 100644 --- a/spec/features/snippets/user_edits_snippet_spec.rb +++ b/spec/features/snippets/user_edits_snippet_spec.rb @@ -71,7 +71,7 @@ describe 'User edits snippet', :js do end it 'renders edit page and displays the error' do - expect(page).to have_content('Error updating the snippet') + expect(page.find('.flash-container span').text).to eq('Error updating the snippet') expect(page).to have_content('Edit Snippet') end end diff --git a/spec/frontend/releases/components/evidence_block_spec.js b/spec/frontend/releases/components/evidence_block_spec.js index fb62f4a3bfe..c76a0e04dce 100644 --- a/spec/frontend/releases/components/evidence_block_spec.js +++ b/spec/frontend/releases/components/evidence_block_spec.js @@ -67,7 +67,7 @@ describe('Evidence Block', () => { }); it('renders the correct hover text', () => { - expect(wrapper.find(ClipboardButton).attributes('title')).toBe('Copy commit SHA'); + expect(wrapper.find(ClipboardButton).attributes('title')).toBe('Copy evidence SHA'); }); it('copies the sha', () => { diff --git a/spec/frontend/releases/components/release_block_milestone_info_spec.js b/spec/frontend/releases/components/release_block_milestone_info_spec.js index 10f5db96b31..0e79c45b337 100644 --- a/spec/frontend/releases/components/release_block_milestone_info_spec.js +++ b/spec/frontend/releases/components/release_block_milestone_info_spec.js @@ -10,11 +10,9 @@ describe('Release block milestone info', () => { let wrapper; let milestones; - const factory = milestonesProp => { + const factory = props => { wrapper = mount(ReleaseBlockMilestoneInfo, { - propsData: { - milestones: milestonesProp, - }, + propsData: props, }); return wrapper.vm.$nextTick(); @@ -26,6 +24,7 @@ describe('Release block milestone info', () => { afterEach(() => { wrapper.destroy(); + wrapper = null; }); const milestoneProgressBarContainer = () => wrapper.find('.js-milestone-progress-bar-container'); @@ -33,7 +32,7 @@ describe('Release block milestone info', () => { const issuesContainer = () => wrapper.find('.js-issues-container'); describe('with default props', () => { - beforeEach(() => factory(milestones)); + beforeEach(() => factory({ milestones })); it('renders the correct percentage', () => { expect(milestoneProgressBarContainer().text()).toContain('41% complete'); @@ -102,7 +101,7 @@ describe('Release block milestone info', () => { .map(m => m.title) .join(' • '); - return factory(lotsOfMilestones); + return factory({ milestones: lotsOfMilestones }); }); const clickShowMoreFewerButton = () => { @@ -153,12 +152,12 @@ describe('Release block milestone info', () => { ...m, issueStats: { ...m.issueStats, - opened: 0, + total: 0, closed: 0, }, })); - return factory(milestones); + return factory({ milestones }); }); expectAllZeros(); @@ -171,9 +170,72 @@ describe('Release block milestone info', () => { issueStats: undefined, })); - return factory(milestones); + return factory({ milestones }); }); expectAllZeros(); }); + + describe('Issue links', () => { + const findOpenIssuesLink = () => wrapper.find({ ref: 'openIssuesLink' }); + const findOpenIssuesText = () => wrapper.find({ ref: 'openIssuesText' }); + const findClosedIssuesLink = () => wrapper.find({ ref: 'closedIssuesLink' }); + const findClosedIssuesText = () => wrapper.find({ ref: 'closedIssuesText' }); + + describe('when openIssuePath is provided', () => { + const openIssuesPath = '/path/to/open/issues'; + + beforeEach(() => { + return factory({ milestones, openIssuesPath }); + }); + + it('renders the open issues as a link', () => { + expect(findOpenIssuesLink().exists()).toBe(true); + expect(findOpenIssuesText().exists()).toBe(false); + }); + + it('renders the open issues link with the correct href', () => { + expect(findOpenIssuesLink().attributes().href).toBe(openIssuesPath); + }); + }); + + describe('when openIssuePath is not provided', () => { + beforeEach(() => { + return factory({ milestones }); + }); + + it('renders the open issues as plain text', () => { + expect(findOpenIssuesLink().exists()).toBe(false); + expect(findOpenIssuesText().exists()).toBe(true); + }); + }); + + describe('when closedIssuePath is provided', () => { + const closedIssuesPath = '/path/to/closed/issues'; + + beforeEach(() => { + return factory({ milestones, closedIssuesPath }); + }); + + it('renders the closed issues as a link', () => { + expect(findClosedIssuesLink().exists()).toBe(true); + expect(findClosedIssuesText().exists()).toBe(false); + }); + + it('renders the closed issues link with the correct href', () => { + expect(findClosedIssuesLink().attributes().href).toBe(closedIssuesPath); + }); + }); + + describe('when closedIssuePath is not provided', () => { + beforeEach(() => { + return factory({ milestones }); + }); + + it('renders the closed issues as plain text', () => { + expect(findClosedIssuesLink().exists()).toBe(false); + expect(findClosedIssuesText().exists()).toBe(true); + }); + }); + }); }); diff --git a/spec/frontend/releases/components/release_block_spec.js b/spec/frontend/releases/components/release_block_spec.js index 227998b0271..7ea2379ea35 100644 --- a/spec/frontend/releases/components/release_block_spec.js +++ b/spec/frontend/releases/components/release_block_spec.js @@ -92,7 +92,7 @@ describe('Release block', () => { expect(wrapper.findAll('.js-assets-list li').length).toEqual(release.assets.links.length); expect(wrapper.find('.js-assets-list li a').attributes().href).toEqual( - first(release.assets.links).url, + first(release.assets.links).directAssetUrl, ); expect(wrapper.find('.js-assets-list li a').text()).toContain( diff --git a/spec/frontend/releases/mock_data.js b/spec/frontend/releases/mock_data.js index c2d3f00550a..85e6bab71ba 100644 --- a/spec/frontend/releases/mock_data.js +++ b/spec/frontend/releases/mock_data.js @@ -12,7 +12,7 @@ export const milestones = [ start_date: '2019-08-31', web_url: 'http://0.0.0.0:3001/root/release-test/-/milestones/2', issue_stats: { - opened: 14, + total: 33, closed: 19, }, }, @@ -29,7 +29,7 @@ export const milestones = [ start_date: '2019-08-19', web_url: 'http://0.0.0.0:3001/root/release-test/-/milestones/1', issue_stats: { - opened: 18, + total: 21, closed: 3, }, }, @@ -96,6 +96,7 @@ export const release = { id: 1, name: 'my link', url: 'https://google.com', + direct_asset_url: 'https://redirected.google.com', external: true, }, { @@ -103,6 +104,7 @@ export const release = { name: 'my second link', url: 'https://gitlab.com/gitlab-org/gitlab-foss/-/jobs/artifacts/v11.6.0-rc4/download?job=rspec-mysql+41%2F50', + direct_asset_url: 'https://redirected.google.com', external: false, }, ], diff --git a/spec/helpers/auth_helper_spec.rb b/spec/helpers/auth_helper_spec.rb index 073ce581741..1764a2bbc3c 100644 --- a/spec/helpers/auth_helper_spec.rb +++ b/spec/helpers/auth_helper_spec.rb @@ -56,7 +56,7 @@ describe AuthHelper do describe 'any_form_based_providers_enabled?' do before do - allow(Gitlab::Auth::LDAP::Config).to receive(:enabled?).and_return(true) + allow(Gitlab::Auth::Ldap::Config).to receive(:enabled?).and_return(true) end it 'detects form-based providers' do diff --git a/spec/lib/gitlab/auth/ldap/access_spec.rb b/spec/lib/gitlab/auth/ldap/access_spec.rb index f9eb4a30190..2f691429541 100644 --- a/spec/lib/gitlab/auth/ldap/access_spec.rb +++ b/spec/lib/gitlab/auth/ldap/access_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Auth::LDAP::Access do +describe Gitlab::Auth::Ldap::Access do include LdapHelpers let(:user) { create(:omniauth_user) } @@ -64,7 +64,7 @@ describe Gitlab::Auth::LDAP::Access do context 'and the user is disabled via active directory' do before do - allow(Gitlab::Auth::LDAP::Person).to receive(:disabled_via_active_directory?).and_return(true) + allow(Gitlab::Auth::Ldap::Person).to receive(:disabled_via_active_directory?).and_return(true) end it 'returns false' do @@ -90,7 +90,7 @@ describe Gitlab::Auth::LDAP::Access do context 'and has no disabled flag in active directory' do before do - allow(Gitlab::Auth::LDAP::Person).to receive(:disabled_via_active_directory?).and_return(false) + allow(Gitlab::Auth::Ldap::Person).to receive(:disabled_via_active_directory?).and_return(false) end it { is_expected.to be_truthy } @@ -135,8 +135,8 @@ describe Gitlab::Auth::LDAP::Access do context 'without ActiveDirectory enabled' do before do - allow(Gitlab::Auth::LDAP::Config).to receive(:enabled?).and_return(true) - allow_next_instance_of(Gitlab::Auth::LDAP::Config) do |instance| + allow(Gitlab::Auth::Ldap::Config).to receive(:enabled?).and_return(true) + allow_next_instance_of(Gitlab::Auth::Ldap::Config) do |instance| allow(instance).to receive(:active_directory).and_return(false) end end diff --git a/spec/lib/gitlab/auth/ldap/adapter_spec.rb b/spec/lib/gitlab/auth/ldap/adapter_spec.rb index 54486913b72..34853acdd0f 100644 --- a/spec/lib/gitlab/auth/ldap/adapter_spec.rb +++ b/spec/lib/gitlab/auth/ldap/adapter_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Auth::LDAP::Adapter do +describe Gitlab::Auth::Ldap::Adapter do include LdapHelpers let(:ldap) { double(:ldap) } @@ -138,7 +138,7 @@ describe Gitlab::Auth::LDAP::Adapter do it 'as many times as MAX_SEARCH_RETRIES' do expect(ldap).to receive(:search).exactly(3).times - expect { subject }.to raise_error(Gitlab::Auth::LDAP::LDAPConnectionError) + expect { subject }.to raise_error(Gitlab::Auth::Ldap::LdapConnectionError) end context 'when no more retries' do @@ -147,11 +147,11 @@ describe Gitlab::Auth::LDAP::Adapter do end it 'raises the exception' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::LDAPConnectionError) + expect { subject }.to raise_error(Gitlab::Auth::Ldap::LdapConnectionError) end it 'logs the error' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::LDAPConnectionError) + expect { subject }.to raise_error(Gitlab::Auth::Ldap::LdapConnectionError) expect(Rails.logger).to have_received(:warn).with( "LDAP search raised exception Net::LDAP::Error: some error") end @@ -161,6 +161,6 @@ describe Gitlab::Auth::LDAP::Adapter do end def ldap_attributes - Gitlab::Auth::LDAP::Person.ldap_attributes(Gitlab::Auth::LDAP::Config.new('ldapmain')) + Gitlab::Auth::Ldap::Person.ldap_attributes(Gitlab::Auth::Ldap::Config.new('ldapmain')) end end diff --git a/spec/lib/gitlab/auth/ldap/auth_hash_spec.rb b/spec/lib/gitlab/auth/ldap/auth_hash_spec.rb index f1050b9f830..7bc92d0abea 100644 --- a/spec/lib/gitlab/auth/ldap/auth_hash_spec.rb +++ b/spec/lib/gitlab/auth/ldap/auth_hash_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Auth::LDAP::AuthHash do +describe Gitlab::Auth::Ldap::AuthHash do include LdapHelpers let(:auth_hash) do @@ -58,7 +58,7 @@ describe Gitlab::Auth::LDAP::AuthHash do end before do - allow_next_instance_of(Gitlab::Auth::LDAP::Config) do |instance| + allow_next_instance_of(Gitlab::Auth::Ldap::Config) do |instance| allow(instance).to receive(:attributes).and_return(attributes) end end diff --git a/spec/lib/gitlab/auth/ldap/authentication_spec.rb b/spec/lib/gitlab/auth/ldap/authentication_spec.rb index ebaf8383ce5..1f8b1474539 100644 --- a/spec/lib/gitlab/auth/ldap/authentication_spec.rb +++ b/spec/lib/gitlab/auth/ldap/authentication_spec.rb @@ -2,15 +2,15 @@ require 'spec_helper' -describe Gitlab::Auth::LDAP::Authentication do +describe Gitlab::Auth::Ldap::Authentication do let(:dn) { 'uid=John Smith, ou=People, dc=example, dc=com' } - let(:user) { create(:omniauth_user, extern_uid: Gitlab::Auth::LDAP::Person.normalize_dn(dn)) } + let(:user) { create(:omniauth_user, extern_uid: Gitlab::Auth::Ldap::Person.normalize_dn(dn)) } let(:login) { 'john' } let(:password) { 'password' } describe 'login' do before do - allow(Gitlab::Auth::LDAP::Config).to receive(:enabled?).and_return(true) + allow(Gitlab::Auth::Ldap::Config).to receive(:enabled?).and_return(true) end it "finds the user if authentication is successful" do @@ -48,7 +48,7 @@ describe Gitlab::Auth::LDAP::Authentication do end it "fails if ldap is disabled" do - allow(Gitlab::Auth::LDAP::Config).to receive(:enabled?).and_return(false) + allow(Gitlab::Auth::Ldap::Config).to receive(:enabled?).and_return(false) expect(described_class.login(login, password)).to be_falsey end diff --git a/spec/lib/gitlab/auth/ldap/config_spec.rb b/spec/lib/gitlab/auth/ldap/config_spec.rb index e4a90d4018d..0967c45d36b 100644 --- a/spec/lib/gitlab/auth/ldap/config_spec.rb +++ b/spec/lib/gitlab/auth/ldap/config_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Auth::LDAP::Config do +describe Gitlab::Auth::Ldap::Config do include LdapHelpers let(:config) { described_class.new('ldapmain') } diff --git a/spec/lib/gitlab/auth/ldap/dn_spec.rb b/spec/lib/gitlab/auth/ldap/dn_spec.rb index 63656efba29..7aaffa52ae4 100644 --- a/spec/lib/gitlab/auth/ldap/dn_spec.rb +++ b/spec/lib/gitlab/auth/ldap/dn_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Auth::LDAP::DN do +describe Gitlab::Auth::Ldap::DN do using RSpec::Parameterized::TableSyntax describe '#normalize_value' do @@ -15,7 +15,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { 'John Smith,' } it 'raises MalformedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::MalformedError, 'DN string ended unexpectedly') + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::MalformedError, 'DN string ended unexpectedly') end end @@ -23,7 +23,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { '#aa aa' } it 'raises MalformedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::MalformedError, "Expected the end of an attribute value, but got \"a\"") + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::MalformedError, "Expected the end of an attribute value, but got \"a\"") end end @@ -31,7 +31,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { '#aaXaaa' } it 'raises MalformedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::MalformedError, "Expected the first character of a hex pair, but got \"X\"") + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::MalformedError, "Expected the first character of a hex pair, but got \"X\"") end end @@ -39,7 +39,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { '#aaaYaa' } it 'raises MalformedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::MalformedError, "Expected the second character of a hex pair, but got \"Y\"") + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::MalformedError, "Expected the second character of a hex pair, but got \"Y\"") end end @@ -47,7 +47,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { '"Sebasti\\cX\\a1n"' } it 'raises MalformedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::MalformedError, "Expected the second character of a hex pair inside a double quoted value, but got \"X\"") + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::MalformedError, "Expected the second character of a hex pair inside a double quoted value, but got \"X\"") end end @@ -55,7 +55,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { '"James' } it 'raises MalformedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::MalformedError, 'DN string ended unexpectedly') + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::MalformedError, 'DN string ended unexpectedly') end end @@ -63,7 +63,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { 'J\ames' } it 'raises MalformedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::MalformedError, 'Invalid escaped hex code "\am"') + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::MalformedError, 'Invalid escaped hex code "\am"') end end @@ -71,7 +71,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { 'foo\\' } it 'raises MalformedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::MalformedError, 'DN string ended unexpectedly') + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::MalformedError, 'DN string ended unexpectedly') end end end @@ -88,7 +88,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { 'uid=john smith+telephonenumber=+1 555-555-5555,ou=people,dc=example,dc=com' } it 'raises UnsupportedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::UnsupportedError) + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::UnsupportedError) end end @@ -97,7 +97,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { 'uid = John Smith + telephoneNumber = + 1 555-555-5555 , ou = People,dc=example,dc=com' } it 'raises UnsupportedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::UnsupportedError) + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::UnsupportedError) end end @@ -105,7 +105,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { 'uid = John Smith + telephoneNumber = +1 555-555-5555 , ou = People,dc=example,dc=com' } it 'raises UnsupportedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::UnsupportedError) + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::UnsupportedError) end end end @@ -117,7 +117,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { 'uid=John Smith,' } it 'raises MalformedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::MalformedError, 'DN string ended unexpectedly') + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::MalformedError, 'DN string ended unexpectedly') end end @@ -125,7 +125,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { '0.9.2342.19200300.100.1.25=#aa aa' } it 'raises MalformedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::MalformedError, "Expected the end of an attribute value, but got \"a\"") + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::MalformedError, "Expected the end of an attribute value, but got \"a\"") end end @@ -133,7 +133,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { '0.9.2342.19200300.100.1.25=#aaXaaa' } it 'raises MalformedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::MalformedError, "Expected the first character of a hex pair, but got \"X\"") + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::MalformedError, "Expected the first character of a hex pair, but got \"X\"") end end @@ -141,7 +141,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { '0.9.2342.19200300.100.1.25=#aaaYaa' } it 'raises MalformedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::MalformedError, "Expected the second character of a hex pair, but got \"Y\"") + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::MalformedError, "Expected the second character of a hex pair, but got \"Y\"") end end @@ -149,7 +149,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { 'uid="Sebasti\\cX\\a1n"' } it 'raises MalformedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::MalformedError, "Expected the second character of a hex pair inside a double quoted value, but got \"X\"") + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::MalformedError, "Expected the second character of a hex pair inside a double quoted value, but got \"X\"") end end @@ -157,7 +157,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { 'John' } it 'raises MalformedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::MalformedError, 'DN string ended unexpectedly') + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::MalformedError, 'DN string ended unexpectedly') end end @@ -165,7 +165,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { 'cn="James' } it 'raises MalformedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::MalformedError, 'DN string ended unexpectedly') + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::MalformedError, 'DN string ended unexpectedly') end end @@ -173,7 +173,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { 'cn=J\ames' } it 'raises MalformedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::MalformedError, 'Invalid escaped hex code "\am"') + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::MalformedError, 'Invalid escaped hex code "\am"') end end @@ -181,7 +181,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { 'cn=\\' } it 'raises MalformedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::MalformedError, 'DN string ended unexpectedly') + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::MalformedError, 'DN string ended unexpectedly') end end @@ -189,7 +189,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { '1.2.d=Value' } it 'raises MalformedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::MalformedError, 'Unrecognized RDN OID attribute type name character "d"') + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::MalformedError, 'Unrecognized RDN OID attribute type name character "d"') end end @@ -197,7 +197,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { 'd1.2=Value' } it 'raises MalformedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::MalformedError, 'Unrecognized RDN attribute type name character "."') + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::MalformedError, 'Unrecognized RDN attribute type name character "."') end end @@ -205,7 +205,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { ' -uid=John Smith' } it 'raises MalformedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::MalformedError, 'Unrecognized first character of an RDN attribute type name "-"') + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::MalformedError, 'Unrecognized first character of an RDN attribute type name "-"') end end @@ -213,7 +213,7 @@ describe Gitlab::Auth::LDAP::DN do let(:given) { 'uid\\=john' } it 'raises MalformedError' do - expect { subject }.to raise_error(Gitlab::Auth::LDAP::DN::MalformedError, 'Unrecognized RDN attribute type name character "\\"') + expect { subject }.to raise_error(Gitlab::Auth::Ldap::DN::MalformedError, 'Unrecognized RDN attribute type name character "\\"') end end end diff --git a/spec/lib/gitlab/auth/ldap/person_spec.rb b/spec/lib/gitlab/auth/ldap/person_spec.rb index 985732e69f9..e90917cfce1 100644 --- a/spec/lib/gitlab/auth/ldap/person_spec.rb +++ b/spec/lib/gitlab/auth/ldap/person_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Auth::LDAP::Person do +describe Gitlab::Auth::Ldap::Person do include LdapHelpers let(:entry) { ldap_user_entry('john.doe') } @@ -61,7 +61,7 @@ describe Gitlab::Auth::LDAP::Person do } } ) - config = Gitlab::Auth::LDAP::Config.new('ldapmain') + config = Gitlab::Auth::Ldap::Config.new('ldapmain') ldap_attributes = described_class.ldap_attributes(config) expect(ldap_attributes).to match_array(%w(dn uid cn mail memberof)) diff --git a/spec/lib/gitlab/auth/ldap/user_spec.rb b/spec/lib/gitlab/auth/ldap/user_spec.rb index 071d687b2bf..867633e54df 100644 --- a/spec/lib/gitlab/auth/ldap/user_spec.rb +++ b/spec/lib/gitlab/auth/ldap/user_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Auth::LDAP::User do +describe Gitlab::Auth::Ldap::User do include LdapHelpers let(:ldap_user) { described_class.new(auth_hash) } diff --git a/spec/lib/gitlab/auth/o_auth/user_spec.rb b/spec/lib/gitlab/auth/o_auth/user_spec.rb index 022a544395e..62b83ff8b88 100644 --- a/spec/lib/gitlab/auth/o_auth/user_spec.rb +++ b/spec/lib/gitlab/auth/o_auth/user_spec.rb @@ -22,7 +22,7 @@ describe Gitlab::Auth::OAuth::User do } } end - let(:ldap_user) { Gitlab::Auth::LDAP::Person.new(Net::LDAP::Entry.new, 'ldapmain') } + let(:ldap_user) { Gitlab::Auth::Ldap::Person.new(Net::LDAP::Entry.new, 'ldapmain') } describe '#persisted?' do let!(:existing_user) { create(:omniauth_user, extern_uid: 'my-uid', provider: 'my-provider') } @@ -230,7 +230,7 @@ describe Gitlab::Auth::OAuth::User do context "and no account for the LDAP user" do before do - allow(Gitlab::Auth::LDAP::Person).to receive(:find_by_uid).and_return(ldap_user) + allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_uid).and_return(ldap_user) oauth_user.save end @@ -269,7 +269,7 @@ describe Gitlab::Auth::OAuth::User do let!(:existing_user) { create(:omniauth_user, name: 'John Doe', email: 'john@example.com', extern_uid: dn, provider: 'ldapmain', username: 'john') } it "adds the omniauth identity to the LDAP account" do - allow(Gitlab::Auth::LDAP::Person).to receive(:find_by_uid).and_return(ldap_user) + allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_uid).and_return(ldap_user) oauth_user.save @@ -290,8 +290,8 @@ describe Gitlab::Auth::OAuth::User do context 'when an LDAP person is not found by uid' do it 'tries to find an LDAP person by email and adds the omniauth identity to the user' do - allow(Gitlab::Auth::LDAP::Person).to receive(:find_by_uid).and_return(nil) - allow(Gitlab::Auth::LDAP::Person).to receive(:find_by_email).and_return(ldap_user) + allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_uid).and_return(nil) + allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_email).and_return(ldap_user) oauth_user.save @@ -301,9 +301,9 @@ describe Gitlab::Auth::OAuth::User do context 'when also not found by email' do it 'tries to find an LDAP person by DN and adds the omniauth identity to the user' do - allow(Gitlab::Auth::LDAP::Person).to receive(:find_by_uid).and_return(nil) - allow(Gitlab::Auth::LDAP::Person).to receive(:find_by_email).and_return(nil) - allow(Gitlab::Auth::LDAP::Person).to receive(:find_by_dn).and_return(ldap_user) + allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_uid).and_return(nil) + allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_email).and_return(nil) + allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_dn).and_return(ldap_user) oauth_user.save @@ -344,7 +344,7 @@ describe Gitlab::Auth::OAuth::User do context 'and no account for the LDAP user' do it 'creates a user favoring the LDAP username and strips email domain' do - allow(Gitlab::Auth::LDAP::Person).to receive(:find_by_uid).and_return(ldap_user) + allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_uid).and_return(ldap_user) oauth_user.save @@ -356,7 +356,7 @@ describe Gitlab::Auth::OAuth::User do context "and no corresponding LDAP person" do before do - allow(Gitlab::Auth::LDAP::Person).to receive(:find_by_uid).and_return(nil) + allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_uid).and_return(nil) end include_examples "to verify compliance with allow_single_sign_on" @@ -405,13 +405,13 @@ describe Gitlab::Auth::OAuth::User do allow(ldap_user).to receive(:username) { uid } allow(ldap_user).to receive(:email) { ['johndoe@example.com', 'john2@example.com'] } allow(ldap_user).to receive(:dn) { dn } - allow(Gitlab::Auth::LDAP::Person).to receive(:find_by_uid).and_return(ldap_user) + allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_uid).and_return(ldap_user) end context "and no account for the LDAP user" do context 'dont block on create (LDAP)' do before do - allow_next_instance_of(Gitlab::Auth::LDAP::Config) do |instance| + allow_next_instance_of(Gitlab::Auth::Ldap::Config) do |instance| allow(instance).to receive_messages(block_auto_created_users: false) end end @@ -425,7 +425,7 @@ describe Gitlab::Auth::OAuth::User do context 'block on create (LDAP)' do before do - allow_next_instance_of(Gitlab::Auth::LDAP::Config) do |instance| + allow_next_instance_of(Gitlab::Auth::Ldap::Config) do |instance| allow(instance).to receive_messages(block_auto_created_users: true) end end @@ -443,7 +443,7 @@ describe Gitlab::Auth::OAuth::User do context 'dont block on create (LDAP)' do before do - allow_next_instance_of(Gitlab::Auth::LDAP::Config) do |instance| + allow_next_instance_of(Gitlab::Auth::Ldap::Config) do |instance| allow(instance).to receive_messages(block_auto_created_users: false) end end @@ -457,7 +457,7 @@ describe Gitlab::Auth::OAuth::User do context 'block on create (LDAP)' do before do - allow_next_instance_of(Gitlab::Auth::LDAP::Config) do |instance| + allow_next_instance_of(Gitlab::Auth::Ldap::Config) do |instance| allow(instance).to receive_messages(block_auto_created_users: true) end end @@ -503,7 +503,7 @@ describe Gitlab::Auth::OAuth::User do context 'dont block on create (LDAP)' do before do - allow_next_instance_of(Gitlab::Auth::LDAP::Config) do |instance| + allow_next_instance_of(Gitlab::Auth::Ldap::Config) do |instance| allow(instance).to receive_messages(block_auto_created_users: false) end end @@ -517,7 +517,7 @@ describe Gitlab::Auth::OAuth::User do context 'block on create (LDAP)' do before do - allow_next_instance_of(Gitlab::Auth::LDAP::Config) do |instance| + allow_next_instance_of(Gitlab::Auth::Ldap::Config) do |instance| allow(instance).to receive_messages(block_auto_created_users: true) end end @@ -806,7 +806,7 @@ describe Gitlab::Auth::OAuth::User do end it 'returns nil' do - adapter = Gitlab::Auth::LDAP::Adapter.new('ldapmain') + adapter = Gitlab::Auth::Ldap::Adapter.new('ldapmain') hash = OmniAuth::AuthHash.new(uid: 'whatever', provider: 'ldapmain') expect(oauth_user.send(:find_ldap_person, hash, adapter)).to be_nil diff --git a/spec/lib/gitlab/auth/saml/user_spec.rb b/spec/lib/gitlab/auth/saml/user_spec.rb index 4c400636ddf..55d2f22b923 100644 --- a/spec/lib/gitlab/auth/saml/user_spec.rb +++ b/spec/lib/gitlab/auth/saml/user_spec.rb @@ -19,7 +19,7 @@ describe Gitlab::Auth::Saml::User do email: 'john@mail.com' } end - let(:ldap_user) { Gitlab::Auth::LDAP::Person.new(Net::LDAP::Entry.new, 'ldapmain') } + let(:ldap_user) { Gitlab::Auth::Ldap::Person.new(Net::LDAP::Entry.new, 'ldapmain') } describe '#save' do before do @@ -161,10 +161,10 @@ describe Gitlab::Auth::Saml::User do allow(ldap_user).to receive(:username) { uid } allow(ldap_user).to receive(:email) { %w(john@mail.com john2@example.com) } allow(ldap_user).to receive(:dn) { dn } - allow(Gitlab::Auth::LDAP::Adapter).to receive(:new).and_return(adapter) - allow(Gitlab::Auth::LDAP::Person).to receive(:find_by_uid).with(uid, adapter).and_return(ldap_user) - allow(Gitlab::Auth::LDAP::Person).to receive(:find_by_dn).with(dn, adapter).and_return(ldap_user) - allow(Gitlab::Auth::LDAP::Person).to receive(:find_by_email).with('john@mail.com', adapter).and_return(ldap_user) + allow(Gitlab::Auth::Ldap::Adapter).to receive(:new).and_return(adapter) + allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_uid).with(uid, adapter).and_return(ldap_user) + allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_dn).with(dn, adapter).and_return(ldap_user) + allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_email).with('john@mail.com', adapter).and_return(ldap_user) end context 'and no account for the LDAP user' do @@ -212,10 +212,10 @@ describe Gitlab::Auth::Saml::User do nil_types = uid_types - [uid_type] nil_types.each do |type| - allow(Gitlab::Auth::LDAP::Person).to receive(:"find_by_#{type}").and_return(nil) + allow(Gitlab::Auth::Ldap::Person).to receive(:"find_by_#{type}").and_return(nil) end - allow(Gitlab::Auth::LDAP::Person).to receive(:"find_by_#{uid_type}").and_return(ldap_user) + allow(Gitlab::Auth::Ldap::Person).to receive(:"find_by_#{uid_type}").and_return(ldap_user) end it 'adds the omniauth identity to the LDAP account' do @@ -282,7 +282,7 @@ describe Gitlab::Auth::Saml::User do it 'adds the LDAP identity to the existing SAML user' do create(:omniauth_user, email: 'john@mail.com', extern_uid: dn, provider: 'saml', username: 'john') - allow(Gitlab::Auth::LDAP::Person).to receive(:find_by_uid).with(dn, adapter).and_return(ldap_user) + allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_uid).with(dn, adapter).and_return(ldap_user) local_hash = OmniAuth::AuthHash.new(uid: dn, provider: provider, info: info_hash) local_saml_user = described_class.new(local_hash) diff --git a/spec/lib/gitlab/auth_spec.rb b/spec/lib/gitlab/auth_spec.rb index 209ba68ccbc..e0c1f830165 100644 --- a/spec/lib/gitlab/auth_spec.rb +++ b/spec/lib/gitlab/auth_spec.rb @@ -590,23 +590,23 @@ describe Gitlab::Auth, :use_clean_rails_memory_store_caching do context "with ldap enabled" do before do - allow(Gitlab::Auth::LDAP::Config).to receive(:enabled?).and_return(true) + allow(Gitlab::Auth::Ldap::Config).to receive(:enabled?).and_return(true) end it "tries to autheticate with db before ldap" do - expect(Gitlab::Auth::LDAP::Authentication).not_to receive(:login) + expect(Gitlab::Auth::Ldap::Authentication).not_to receive(:login) expect(gl_auth.find_with_user_password(username, password)).to eq(user) end it "does not find user by using ldap as fallback to for authentication" do - expect(Gitlab::Auth::LDAP::Authentication).to receive(:login).and_return(nil) + expect(Gitlab::Auth::Ldap::Authentication).to receive(:login).and_return(nil) expect(gl_auth.find_with_user_password('ldap_user', 'password')).to be_nil end it "find new user by using ldap as fallback to for authentication" do - expect(Gitlab::Auth::LDAP::Authentication).to receive(:login).and_return(user) + expect(Gitlab::Auth::Ldap::Authentication).to receive(:login).and_return(user) expect(gl_auth.find_with_user_password('ldap_user', 'password')).to eq(user) end @@ -623,7 +623,7 @@ describe Gitlab::Auth, :use_clean_rails_memory_store_caching do context "with ldap enabled" do before do - allow(Gitlab::Auth::LDAP::Config).to receive(:enabled?).and_return(true) + allow(Gitlab::Auth::Ldap::Config).to receive(:enabled?).and_return(true) end it "does not find non-ldap user by valid login/password" do diff --git a/spec/lib/gitlab/bare_repository_import/repository_spec.rb b/spec/lib/gitlab/bare_repository_import/repository_spec.rb index 0607e2232a1..d2ecb1869fc 100644 --- a/spec/lib/gitlab/bare_repository_import/repository_spec.rb +++ b/spec/lib/gitlab/bare_repository_import/repository_spec.rb @@ -54,16 +54,15 @@ describe ::Gitlab::BareRepositoryImport::Repository do end context 'hashed storage' do - let(:gitlab_shell) { Gitlab::Shell.new } - let(:repository_storage) { 'default' } - let(:root_path) { Gitlab.config.repositories.storages[repository_storage].legacy_disk_path } let(:hash) { '6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b' } let(:hashed_path) { "@hashed/6b/86/6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b" } + let(:root_path) { TestEnv.repos_path } let(:repo_path) { File.join(root_path, "#{hashed_path}.git") } let(:wiki_path) { File.join(root_path, "#{hashed_path}.wiki.git") } before do - gitlab_shell.create_repository(repository_storage, hashed_path, 'group/project') + TestEnv.create_bare_repository(repo_path) + Gitlab::GitalyClient::StorageSettings.allow_disk_access do repository = Rugged::Repository.new(repo_path) repository.config['gitlab.fullpath'] = 'to/repo' @@ -71,7 +70,7 @@ describe ::Gitlab::BareRepositoryImport::Repository do end after do - gitlab_shell.remove_repository(repository_storage, hashed_path) + FileUtils.rm_rf(repo_path) end subject { described_class.new(root_path, repo_path) } diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb index a9d7beb0fea..d3daa7c0260 100644 --- a/spec/lib/gitlab/git/repository_spec.rb +++ b/spec/lib/gitlab/git/repository_spec.rb @@ -500,11 +500,11 @@ describe Gitlab::Git::Repository, :seed_helper do subject { new_repository.fetch_repository_as_mirror(repository) } before do - Gitlab::Shell.new.create_repository('default', 'my_project', 'group/project') + new_repository.create_repository end after do - Gitlab::Shell.new.remove_repository('default', 'my_project') + new_repository.remove end it 'fetches a repository as a mirror remote' do diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index b8abe698639..39a31801720 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -4197,7 +4197,7 @@ describe User, :do_not_mock_admin_mode do describe '#read_only_attribute?' do context 'when LDAP server is enabled' do before do - allow(Gitlab::Auth::LDAP::Config).to receive(:enabled?).and_return(true) + allow(Gitlab::Auth::Ldap::Config).to receive(:enabled?).and_return(true) end %i[name email location].each do |attribute| diff --git a/spec/requests/git_http_spec.rb b/spec/requests/git_http_spec.rb index 381ad45d477..183a3545cf2 100644 --- a/spec/requests/git_http_spec.rb +++ b/spec/requests/git_http_spec.rb @@ -639,8 +639,8 @@ describe 'Git HTTP requests' do context 'when LDAP is configured' do before do - allow(Gitlab::Auth::LDAP::Config).to receive(:enabled?).and_return(true) - allow_any_instance_of(Gitlab::Auth::LDAP::Authentication) + allow(Gitlab::Auth::Ldap::Config).to receive(:enabled?).and_return(true) + allow_any_instance_of(Gitlab::Auth::Ldap::Authentication) .to receive(:login).and_return(nil) end @@ -862,8 +862,8 @@ describe 'Git HTTP requests' do before do allow(Gitlab::Auth::OAuth::Provider).to receive(:enabled?).and_return(true) - allow_any_instance_of(Gitlab::Auth::LDAP::Authentication).to receive(:login).and_return(nil) - allow_any_instance_of(Gitlab::Auth::LDAP::Authentication).to receive(:login).with(user.username, user.password).and_return(user) + allow_any_instance_of(Gitlab::Auth::Ldap::Authentication).to receive(:login).and_return(nil) + allow_any_instance_of(Gitlab::Auth::Ldap::Authentication).to receive(:login).with(user.username, user.password).and_return(user) end it_behaves_like 'pulls require Basic HTTP Authentication' diff --git a/spec/services/projects/create_service_spec.rb b/spec/services/projects/create_service_spec.rb index c5c16130edc..3c9914e2a89 100644 --- a/spec/services/projects/create_service_spec.rb +++ b/spec/services/projects/create_service_spec.rb @@ -6,7 +6,6 @@ describe Projects::CreateService, '#execute' do include ExternalAuthorizationServiceHelpers include GitHelpers - let(:gitlab_shell) { Gitlab::Shell.new } let(:user) { create :user } let(:opts) do { @@ -264,8 +263,6 @@ describe Projects::CreateService, '#execute' do end context 'when another repository already exists on disk' do - let(:repository_storage) { 'default' } - let(:opts) do { name: 'Existing', @@ -274,13 +271,15 @@ describe Projects::CreateService, '#execute' do end context 'with legacy storage' do + let(:fake_repo_path) { File.join(TestEnv.repos_path, user.namespace.full_path, 'existing.git') } + before do stub_application_setting(hashed_storage_enabled: false) - gitlab_shell.create_repository(repository_storage, "#{user.namespace.full_path}/existing", 'group/project') + TestEnv.create_bare_repository(fake_repo_path) end after do - gitlab_shell.remove_repository(repository_storage, "#{user.namespace.full_path}/existing") + FileUtils.rm_rf(fake_repo_path) end it 'does not allow to create a project when path matches existing repository on disk' do @@ -305,17 +304,15 @@ describe Projects::CreateService, '#execute' do context 'with hashed storage' do let(:hash) { '6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b' } let(:hashed_path) { '@hashed/6b/86/6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b' } + let(:fake_repo_path) { File.join(TestEnv.repos_path, "#{hashed_path}.git") } before do allow(Digest::SHA2).to receive(:hexdigest) { hash } - end - - before do - gitlab_shell.create_repository(repository_storage, hashed_path, 'group/project') + TestEnv.create_bare_repository(fake_repo_path) end after do - gitlab_shell.remove_repository(repository_storage, hashed_path) + FileUtils.rm_rf(fake_repo_path) end it 'does not allow to create a project when path matches existing repository on disk' do diff --git a/spec/services/projects/fork_service_spec.rb b/spec/services/projects/fork_service_spec.rb index cbf7a135c41..4e5f10b3947 100644 --- a/spec/services/projects/fork_service_spec.rb +++ b/spec/services/projects/fork_service_spec.rb @@ -4,7 +4,6 @@ require 'spec_helper' describe Projects::ForkService do include ProjectForksHelper - include Gitlab::ShellAdapter shared_examples 'forks count cache refresh' do it 'flushes the forks count cache of the source project', :clean_gitlab_redis_cache do @@ -135,17 +134,16 @@ describe Projects::ForkService do end context 'repository in legacy storage already exists' do - let(:repository_storage) { 'default' } - let(:repository_storage_path) { Gitlab.config.repositories.storages[repository_storage].legacy_disk_path } + let(:fake_repo_path) { File.join(TestEnv.repos_path, @to_user.namespace.full_path, "#{@from_project.path}.git") } let(:params) { { namespace: @to_user.namespace } } before do stub_application_setting(hashed_storage_enabled: false) - gitlab_shell.create_repository(repository_storage, "#{@to_user.namespace.full_path}/#{@from_project.path}", "#{@to_user.namespace.full_path}/#{@from_project.path}") + TestEnv.create_bare_repository(fake_repo_path) end after do - gitlab_shell.remove_repository(repository_storage, "#{@to_user.namespace.full_path}/#{@from_project.path}") + FileUtils.rm_rf(fake_repo_path) end subject { fork_project(@from_project, @to_user, params) } diff --git a/spec/services/projects/transfer_service_spec.rb b/spec/services/projects/transfer_service_spec.rb index fe31dafdd03..f17ddb22d22 100644 --- a/spec/services/projects/transfer_service_spec.rb +++ b/spec/services/projects/transfer_service_spec.rb @@ -5,7 +5,6 @@ require 'spec_helper' describe Projects::TransferService do include GitHelpers - let(:gitlab_shell) { Gitlab::Shell.new } let(:user) { create(:user) } let(:group) { create(:group) } let(:project) { create(:project, :repository, :legacy_storage, namespace: user.namespace) } @@ -104,7 +103,7 @@ describe Projects::TransferService do it 'rolls back repo location' do attempt_project_transfer - expect(gitlab_shell.repository_exists?(project.repository_storage, "#{project.disk_path}.git")).to be(true) + expect(project.repository.raw.exists?).to be(true) expect(original_path).to eq current_path end @@ -172,21 +171,18 @@ describe Projects::TransferService do end context 'namespace which contains orphan repository with same projects path name' do - let(:repository_storage) { 'default' } - let(:repository_storage_path) { Gitlab.config.repositories.storages[repository_storage].legacy_disk_path } + let(:fake_repo_path) { File.join(TestEnv.repos_path, group.full_path, "#{project.path}.git") } before do group.add_owner(user) - unless gitlab_shell.create_repository(repository_storage, "#{group.full_path}/#{project.path}", project.full_path) - raise 'failed to add repository' - end + TestEnv.create_bare_repository(fake_repo_path) @result = transfer_project(project, user, group) end after do - gitlab_shell.remove_repository(repository_storage, "#{group.full_path}/#{project.path}") + FileUtils.rm_rf(fake_repo_path) end it { expect(@result).to eq false } diff --git a/spec/services/projects/update_service_spec.rb b/spec/services/projects/update_service_spec.rb index 8b5b6e5ac4e..ce9765a36ba 100644 --- a/spec/services/projects/update_service_spec.rb +++ b/spec/services/projects/update_service_spec.rb @@ -12,7 +12,6 @@ describe Projects::UpdateService do end describe '#execute' do - let(:gitlab_shell) { Gitlab::Shell.new } let(:admin) { create(:admin) } context 'when changing visibility level' do @@ -303,18 +302,17 @@ describe Projects::UpdateService do end context 'when renaming a project' do - let(:repository_storage) { 'default' } - let(:repository_storage_path) { Gitlab.config.repositories.storages[repository_storage].legacy_disk_path } + let(:fake_repo_path) { File.join(TestEnv.repos_path, user.namespace.full_path, 'existing.git') } context 'with legacy storage' do let(:project) { create(:project, :legacy_storage, :repository, creator: user, namespace: user.namespace) } before do - gitlab_shell.create_repository(repository_storage, "#{user.namespace.full_path}/existing", user.namespace.full_path) + TestEnv.create_bare_repository(fake_repo_path) end after do - gitlab_shell.remove_repository(repository_storage, "#{user.namespace.full_path}/existing") + FileUtils.rm_rf(fake_repo_path) end it 'does not allow renaming when new path matches existing repository on disk' do diff --git a/spec/support/helpers/ldap_helpers.rb b/spec/support/helpers/ldap_helpers.rb index 0549c56c753..8154e3a4fc9 100644 --- a/spec/support/helpers/ldap_helpers.rb +++ b/spec/support/helpers/ldap_helpers.rb @@ -2,14 +2,14 @@ module LdapHelpers def ldap_adapter(provider = 'ldapmain', ldap = double(:ldap)) - ::Gitlab::Auth::LDAP::Adapter.new(provider, ldap) + ::Gitlab::Auth::Ldap::Adapter.new(provider, ldap) end def user_dn(uid) "uid=#{uid},ou=users,dc=example,dc=com" end - # Accepts a hash of Gitlab::Auth::LDAP::Config keys and values. + # Accepts a hash of Gitlab::Auth::Ldap::Config keys and values. # # Example: # stub_ldap_config( @@ -17,7 +17,7 @@ module LdapHelpers # admin_group: 'my-admin-group' # ) def stub_ldap_config(messages) - allow_any_instance_of(::Gitlab::Auth::LDAP::Config).to receive_messages(messages) + allow_any_instance_of(::Gitlab::Auth::Ldap::Config).to receive_messages(messages) end def stub_ldap_setting(messages) @@ -28,29 +28,29 @@ module LdapHelpers # `entry` to simulate when an LDAP person is not found # # Example: - # adapter = ::Gitlab::Auth::LDAP::Adapter.new('ldapmain', double(:ldap)) + # adapter = ::Gitlab::Auth::Ldap::Adapter.new('ldapmain', double(:ldap)) # ldap_user_entry = ldap_user_entry('john_doe') # # stub_ldap_person_find_by_uid('john_doe', ldap_user_entry, adapter) def stub_ldap_person_find_by_uid(uid, entry, provider = 'ldapmain') - return_value = ::Gitlab::Auth::LDAP::Person.new(entry, provider) if entry.present? + return_value = ::Gitlab::Auth::Ldap::Person.new(entry, provider) if entry.present? - allow(::Gitlab::Auth::LDAP::Person) + allow(::Gitlab::Auth::Ldap::Person) .to receive(:find_by_uid).with(uid, any_args).and_return(return_value) end def stub_ldap_person_find_by_dn(entry, provider = 'ldapmain') - person = ::Gitlab::Auth::LDAP::Person.new(entry, provider) if entry.present? + person = ::Gitlab::Auth::Ldap::Person.new(entry, provider) if entry.present? - allow(::Gitlab::Auth::LDAP::Person) + allow(::Gitlab::Auth::Ldap::Person) .to receive(:find_by_dn) .and_return(person) end def stub_ldap_person_find_by_email(email, entry, provider = 'ldapmain') - person = ::Gitlab::Auth::LDAP::Person.new(entry, provider) if entry.present? + person = ::Gitlab::Auth::Ldap::Person.new(entry, provider) if entry.present? - allow(::Gitlab::Auth::LDAP::Person) + allow(::Gitlab::Auth::Ldap::Person) .to receive(:find_by_email) .with(email, anything) .and_return(person) @@ -66,8 +66,8 @@ module LdapHelpers end def raise_ldap_connection_error - allow_any_instance_of(Gitlab::Auth::LDAP::Adapter) - .to receive(:ldap_search).and_raise(Gitlab::Auth::LDAP::LDAPConnectionError) + allow_any_instance_of(Gitlab::Auth::Ldap::Adapter) + .to receive(:ldap_search).and_raise(Gitlab::Auth::Ldap::LdapConnectionError) end end diff --git a/spec/support/shared_contexts/controllers/ldap_omniauth_callbacks_controller_shared_context.rb b/spec/support/shared_contexts/controllers/ldap_omniauth_callbacks_controller_shared_context.rb index 4426d3af908..8635c9a8ff9 100644 --- a/spec/support/shared_contexts/controllers/ldap_omniauth_callbacks_controller_shared_context.rb +++ b/spec/support/shared_contexts/controllers/ldap_omniauth_callbacks_controller_shared_context.rb @@ -30,7 +30,7 @@ RSpec.shared_context 'Ldap::OmniauthCallbacksController' do @original_env_config_omniauth_auth = mock_auth_hash(provider.to_s, uid, user.email) stub_omniauth_provider(provider, context: request) - allow(Gitlab::Auth::LDAP::Access).to receive(:allowed?).and_return(valid_login?) + allow(Gitlab::Auth::Ldap::Access).to receive(:allowed?).and_return(valid_login?) end after do diff --git a/spec/tasks/gitlab/check_rake_spec.rb b/spec/tasks/gitlab/check_rake_spec.rb index b3c8ca03aec..e3e2a22add9 100644 --- a/spec/tasks/gitlab/check_rake_spec.rb +++ b/spec/tasks/gitlab/check_rake_spec.rb @@ -68,8 +68,8 @@ describe 'check.rake' do context 'when LDAP is not enabled' do it 'does not attempt to bind or search for users' do - expect(Gitlab::Auth::LDAP::Config).not_to receive(:providers) - expect(Gitlab::Auth::LDAP::Adapter).not_to receive(:open) + expect(Gitlab::Auth::Ldap::Config).not_to receive(:providers) + expect(Gitlab::Auth::Ldap::Adapter).not_to receive(:open) subject end @@ -80,12 +80,12 @@ describe 'check.rake' do let(:adapter) { ldap_adapter('ldapmain', ldap) } before do - allow(Gitlab::Auth::LDAP::Config) + allow(Gitlab::Auth::Ldap::Config) .to receive_messages( enabled?: true, providers: ['ldapmain'] ) - allow(Gitlab::Auth::LDAP::Adapter).to receive(:open).and_yield(adapter) + allow(Gitlab::Auth::Ldap::Adapter).to receive(:open).and_yield(adapter) allow(adapter).to receive(:users).and_return([]) end diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb index 2a2d0f5a857..ac17919d7f0 100644 --- a/spec/workers/post_receive_spec.rb +++ b/spec/workers/post_receive_spec.rb @@ -421,24 +421,6 @@ describe PostReceive do perform end end - - it 'updates the snippet db information' do - blob = snippet.blobs.first - - expect(snippet).to receive(:update).with(file_name: blob.path, content: blob.data) - - perform - end - - context 'when snippet does not have any blob' do - it 'does not update snippet db information' do - allow(snippet).to receive(:blobs).and_return([]) - - expect(snippet).not_to receive(:update) - - perform - end - end end end |