diff options
19 files changed, 73 insertions, 63 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 5af0c835385..17025670488 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -221,11 +221,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo def ci_environments_status environments = if ci_environments_status_on_merge_result? - if Feature.enabled?(:deployment_merge_requests_widget, @project) - EnvironmentStatus.for_deployed_merge_request(@merge_request, current_user) - else - EnvironmentStatus.after_merge_request(@merge_request, current_user) - end + EnvironmentStatus.for_deployed_merge_request(@merge_request, current_user) else EnvironmentStatus.for_merge_request(@merge_request, current_user) end diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index a89fea4b7b8..9a5c5f274a0 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -143,7 +143,7 @@ module SearchHelper # Autocomplete results for the current project, if it's defined def project_autocomplete - if @project && @project.repository.exists? && @project.repository.root_ref + if @project && @project.repository.root_ref ref = @ref || @project.repository.root_ref [ diff --git a/app/models/project.rb b/app/models/project.rb index 6858d03098c..c7c2a9e34fb 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1514,7 +1514,7 @@ class Project < ApplicationRecord end def default_branch - @default_branch ||= repository.root_ref if repository.exists? + @default_branch ||= repository.root_ref end def reload_default_branch diff --git a/app/workers/deployments/finished_worker.rb b/app/workers/deployments/finished_worker.rb index bab197a82ff..6196b032f63 100644 --- a/app/workers/deployments/finished_worker.rb +++ b/app/workers/deployments/finished_worker.rb @@ -10,17 +10,9 @@ module Deployments def perform(deployment_id) if (deploy = Deployment.find_by_id(deployment_id)) - link_merge_requests(deploy) + LinkMergeRequestsService.new(deploy).execute deploy.execute_hooks end end - - def link_merge_requests(deployment) - unless Feature.enabled?(:deployment_merge_requests, deployment.project) - return - end - - LinkMergeRequestsService.new(deployment).execute - end end end diff --git a/changelogs/unreleased/remove-deployment-feature-flags.yml b/changelogs/unreleased/remove-deployment-feature-flags.yml new file mode 100644 index 00000000000..c93b9d792e5 --- /dev/null +++ b/changelogs/unreleased/remove-deployment-feature-flags.yml @@ -0,0 +1,5 @@ +--- +title: Track deployed merge requests using GitLab environments and deployments +merge_request: +author: +type: added diff --git a/doc/ci/runners/README.md b/doc/ci/runners/README.md index 5ed4616bd0a..466c6f96d81 100644 --- a/doc/ci/runners/README.md +++ b/doc/ci/runners/README.md @@ -68,7 +68,7 @@ You can only register a shared Runner if you are an admin of the GitLab instance Shared Runners are enabled by default as of GitLab 8.2, but can be disabled with the **Disable shared Runners** button which is present under each project's -**Settings ➔ CI/CD** page. Previous versions of GitLab defaulted shared +**Settings > CI/CD** page. Previous versions of GitLab defaulted shared Runners to disabled. ## Registering a specific Runner @@ -402,7 +402,7 @@ different places. To view the IP address of a shared Runner you must have admin access to the GitLab instance. To determine this: -1. Visit **Admin Area ➔ Overview ➔ Runners** +1. Visit **Admin Area > Overview > Runners** 1. Look for the Runner in the table and you should see a column for "IP Address"  @@ -411,7 +411,7 @@ the GitLab instance. To determine this: You can find the IP address of a Runner for a specific project by: -1. Visit your project's **Settings ➔ CI/CD** +1. Visit your project's **Settings > CI/CD** 1. Find the Runner and click on it's ID which links you to the details page 1. On the details page you should see a row for "IP Address" diff --git a/doc/user/admin_area/monitoring/health_check.md b/doc/user/admin_area/monitoring/health_check.md index dbcd737e477..fe38c350f19 100644 --- a/doc/user/admin_area/monitoring/health_check.md +++ b/doc/user/admin_area/monitoring/health_check.md @@ -141,7 +141,7 @@ This check is being exempt from Rack Attack. > Access token has been deprecated in GitLab 9.4 in favor of [IP whitelist](#ip-whitelist). An access token needs to be provided while accessing the probe endpoints. The current -accepted token can be found under the **Admin Area ➔ Monitoring ➔ Health check** +accepted token can be found under the **Admin Area > Monitoring > Health check** (`admin/health_check`) page of your GitLab instance.  diff --git a/doc/user/profile/personal_access_tokens.md b/doc/user/profile/personal_access_tokens.md index 980a7d5968d..09825bd5ff8 100644 --- a/doc/user/profile/personal_access_tokens.md +++ b/doc/user/profile/personal_access_tokens.md @@ -6,15 +6,13 @@ type: concepts, howto > [Introduced][ce-3749] in GitLab 8.8. -Personal access tokens are the preferred way for third party applications and scripts to -authenticate with the [GitLab API][api], if using [OAuth2](../../api/oauth2.md) is not practical. +If you're unable to use [OAuth2](../../api/oauth2.md), you can use a personal access token to authenticate with the [GitLab API][api]. -You can also use personal access tokens to authenticate against Git over HTTP or SSH. They must be used when you have [Two-Factor Authentication (2FA)][2fa] enabled. Authenticate with a token in place of your password. +You can also use personal access tokens with Git to authenticate over HTTP or SSH. Personal access tokens are required when [Two-Factor Authentication (2FA)][2fa] is enabled. In both cases, you can authenticate with a token in place of your password. -To make [authenticated requests to the API][usage], use either the `private_token` parameter or the `Private-Token` header. +Personal access tokens expire on the date you define, at midnight UTC. -The expiration of personal access tokens happens on the date you define, -at midnight UTC. +For examples of how you can use a personal access token to authenticate with the API, see the following section from our [API Docs](../../api/README.md#personal-access-tokens). ## Creating a personal access token diff --git a/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml index 6f270897d93..f86d74cf5ee 100644 --- a/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml @@ -49,6 +49,9 @@ dependency_scanning: DS_PYTHON_VERSION \ DS_PIP_VERSION \ DS_PIP_DEPENDENCY_PATH \ + GEMNASIUM_DB_LOCAL_PATH \ + GEMNASIUM_DB_REMOTE_URL \ + GEMNASIUM_DB_REF_NAME \ PIP_INDEX_URL \ PIP_EXTRA_INDEX_URL \ PIP_REQUIREMENTS_FILE \ diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 002ab228c2d..186e395872c 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -12498,9 +12498,6 @@ msgstr "" msgid "Only project members will be imported. Group members will be skipped." msgstr "" -msgid "Only these extensions are supported: %{extension_list}" -msgstr "" - msgid "Only users with an email address in this domain can be added to the group.<br>Example: <code>gitlab.com</code>. Some common domains are not allowed. %{read_more_link}." msgstr "" @@ -21716,6 +21713,9 @@ msgstr "" msgid "disabled" msgstr "" +msgid "does not have a supported extension. Only %{extension_list} are supported" +msgstr "" + msgid "done" msgstr "" diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/login_via_oauth_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/login_via_oauth_spec.rb index 4fd80c353fb..a118176eb8a 100644 --- a/qa/qa/specs/features/browser_ui/1_manage/login/login_via_oauth_spec.rb +++ b/qa/qa/specs/features/browser_ui/1_manage/login/login_via_oauth_spec.rb @@ -1,8 +1,7 @@ # frozen_string_literal: true module QA - # Failure issue: https://gitlab.com/gitlab-org/gitlab/issues/36305 - context 'Manage', :orchestrated, :oauth, :skip do + context 'Manage', :orchestrated, :oauth do describe 'OAuth login' do it 'User logs in to GitLab with GitHub OAuth' do Runtime::Browser.visit(:gitlab, Page::Main::Login) diff --git a/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb b/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb index d315bac2ffd..74e2f51cf28 100644 --- a/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb +++ b/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb @@ -1,8 +1,7 @@ # frozen_string_literal: true module QA - # https://gitlab.com/gitlab-org/gitlab/issues/38315 - context 'Performance bar', :quarantine do + context 'Performance bar' do context 'when logged in as an admin user', :requires_admin do before do Flow::Login.sign_in_as_admin diff --git a/qa/qa/vendor/github/page/login.rb b/qa/qa/vendor/github/page/login.rb index 8dd79148043..4675e33b514 100644 --- a/qa/qa/vendor/github/page/login.rb +++ b/qa/qa/vendor/github/page/login.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true require 'capybara/dsl' +require 'benchmark' module QA module Vendor @@ -13,9 +14,15 @@ module QA click_on 'Sign in' Support::Retrier.retry_until(raise_on_failure: true, sleep_interval: 35) do - otp = OnePassword::CLI.new.otp + fresh_otp = nil - fill_in 'otp', with: otp + time = Benchmark.realtime do + fresh_otp = OnePassword::CLI.instance.fresh_otp + end + + QA::Runtime::Logger.info("Returned fresh_otp: #{fresh_otp} in #{time} seconds") + + fill_in 'otp', with: fresh_otp click_on 'Verify' diff --git a/qa/qa/vendor/one_password/cli.rb b/qa/qa/vendor/one_password/cli.rb index 3cb69391783..cf8b7f8a4f9 100644 --- a/qa/qa/vendor/one_password/cli.rb +++ b/qa/qa/vendor/one_password/cli.rb @@ -1,9 +1,13 @@ # frozen_string_literal: true +require 'benchmark' + module QA module Vendor module OnePassword class CLI + include Singleton + def initialize @email = QA::Runtime::Env.gitlab_qa_1p_email @password = QA::Runtime::Env.gitlab_qa_1p_password @@ -11,14 +15,39 @@ module QA @github_uuid = QA::Runtime::Env.gitlab_qa_1p_github_uuid end - def otp - `#{op_path} get totp #{@github_uuid} --session=#{session_token}`.to_i + def fresh_otp + otps = [] + + # Fetches a fresh OTP and returns it only after op provides the same OTP twice + # An OTP is valid for 30 seconds so 70 attempts with 0.5 interval would ensure we complete 1 cycle + Support::Retrier.retry_until(max_attempts: 70, sleep_interval: 0.5) do + otps << fetch_otp + otps.size >= 3 && otps[-1] == otps[-2] && otps[-1] != otps[-3] + end + + otps.last end private + def fetch_otp + result = nil + + time = Benchmark.realtime do + result = `#{op_path} get totp #{@github_uuid} --session=#{session_token}`.to_i + end + + QA::Runtime::Logger.info("Fetched OTP: #{result} in: #{time} seconds") + + result + end + + # OP session tokens are valid for 30 minutes. We are caching the session token here and this is fine currently + # as we just have one test that is not expected to go over 30 minutes. + # But note that if we add more tests that use this class, we might need to add a mechanism to invalidate + # the cache after 30 minutes or if the session_token is rejected by op CLI. def session_token - `echo '#{@password}' | #{op_path} signin gitlab.1password.com #{@email} #{@secret} --output=raw --shorthand=gitlab_qa` + @session_token ||= `echo '#{@password}' | #{op_path} signin gitlab.1password.com #{@email} #{@secret} --output=raw --shorthand=gitlab_qa` end def op_path diff --git a/qa/qa/vendor/one_password/darwin/op b/qa/qa/vendor/one_password/darwin/op Binary files differindex 0f646522834..be7a3721b14 100755 --- a/qa/qa/vendor/one_password/darwin/op +++ b/qa/qa/vendor/one_password/darwin/op diff --git a/qa/qa/vendor/one_password/linux/op b/qa/qa/vendor/one_password/linux/op Binary files differindex 47ce87731be..47e79d7c599 100755 --- a/qa/qa/vendor/one_password/linux/op +++ b/qa/qa/vendor/one_password/linux/op diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 3b7d8adb8e5..2476cf43678 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -1289,19 +1289,6 @@ describe Projects::MergeRequestsController do get_ci_environments_status(environment_target: 'merge_commit') end - context 'when the deployment_merge_requests_widget feature flag is disabled' do - it 'uses the deployments retrieved using CI builds' do - stub_feature_flags(deployment_merge_requests_widget: false) - - expect(EnvironmentStatus) - .to receive(:after_merge_request) - .with(merge_request, user) - .and_call_original - - get_ci_environments_status(environment_target: 'merge_commit') - end - end - def get_ci_environments_status(extra_params = {}) params = { namespace_id: merge_request.project.namespace.to_param, diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index 661cbd14427..38f3777c902 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -1331,6 +1331,13 @@ describe Repository do repository.root_ref end + it 'returns nil if the repository does not exist' do + repository = create(:project).repository + + expect(repository).not_to be_exists + expect(repository.root_ref).to be_nil + end + it_behaves_like 'asymmetric cached method', :root_ref end diff --git a/spec/workers/deployments/finished_worker_spec.rb b/spec/workers/deployments/finished_worker_spec.rb index f0e3439fdfa..2961ff599c3 100644 --- a/spec/workers/deployments/finished_worker_spec.rb +++ b/spec/workers/deployments/finished_worker_spec.rb @@ -49,17 +49,5 @@ describe Deployments::FinishedWorker do expect(ProjectServiceWorker).not_to have_received(:perform_async) end - - context 'when the tracking of merge requests is disabled' do - it 'does not track the deployed merge requests' do - stub_feature_flags(deployment_merge_requests: false) - - deployment = create(:deployment) - - expect(Deployments::LinkMergeRequestsService).not_to receive(:new) - - worker.perform(deployment.id) - end - end end end |