Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/assets/javascripts/releases/list/components/release_block.vue4
-rw-r--r--app/assets/stylesheets/framework/header.scss5
-rw-r--r--app/assets/stylesheets/framework/selects.scss2
-rw-r--r--app/controllers/projects/releases_controller.rb2
-rw-r--r--app/helpers/merge_requests_helper.rb10
-rw-r--r--app/models/merge_request.rb20
-rw-r--r--app/presenters/release_presenter.rb3
-rw-r--r--app/views/layouts/header/_current_user_dropdown.html.haml2
-rw-r--r--app/views/projects/merge_requests/_mr_title.html.haml5
-rw-r--r--changelogs/unreleased/37000-reduce-start-a-trial-emoji-rocket-size.yml5
-rw-r--r--changelogs/unreleased/fix-padding-in-project-settings-members.yml5
-rw-r--r--lib/gitlab/danger/teammate.rb2
-rw-r--r--spec/frontend/releases/list/components/release_block_spec.js6
-rw-r--r--spec/helpers/merge_requests_helper_spec.rb25
-rw-r--r--spec/lib/gitlab/danger/teammate_spec.rb14
-rw-r--r--spec/presenters/release_presenter_spec.rb8
16 files changed, 65 insertions, 53 deletions
diff --git a/app/assets/javascripts/releases/list/components/release_block.vue b/app/assets/javascripts/releases/list/components/release_block.vue
index a09ee41ac67..2ae6b1a595f 100644
--- a/app/assets/javascripts/releases/list/components/release_block.vue
+++ b/app/assets/javascripts/releases/list/components/release_block.vue
@@ -82,9 +82,7 @@ export default {
return n__('Milestone', 'Milestones', this.release.milestones.length);
},
shouldShowEditButton() {
- return Boolean(
- this.glFeatures.releaseEditPage && this.release._links && this.release._links.edit_url,
- );
+ return Boolean(this.release._links && this.release._links.edit_url);
},
shouldShowEvidence() {
return this.glFeatures.releaseEvidenceCollection;
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 1195e467192..5ae4f72de56 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -552,6 +552,11 @@
svg {
vertical-align: text-top;
}
+
+ a.trial-link gl-emoji {
+ font-size: $gl-font-size;
+ vertical-align: baseline;
+ }
}
}
diff --git a/app/assets/stylesheets/framework/selects.scss b/app/assets/stylesheets/framework/selects.scss
index 2289f0a7011..bd0134a82d3 100644
--- a/app/assets/stylesheets/framework/selects.scss
+++ b/app/assets/stylesheets/framework/selects.scss
@@ -118,7 +118,7 @@
background: none;
.select2-search-field input {
- padding: 5px $gl-padding / 2;
+ padding: 5px $gl-input-padding;
height: auto;
font-family: inherit;
font-size: inherit;
diff --git a/app/controllers/projects/releases_controller.rb b/app/controllers/projects/releases_controller.rb
index c91d3133648..a9a264183b3 100644
--- a/app/controllers/projects/releases_controller.rb
+++ b/app/controllers/projects/releases_controller.rb
@@ -6,7 +6,6 @@ class Projects::ReleasesController < Projects::ApplicationController
before_action :release, only: %i[edit update]
before_action :authorize_read_release!
before_action do
- push_frontend_feature_flag(:release_edit_page, project, default_enabled: true)
push_frontend_feature_flag(:release_issue_summary, project)
push_frontend_feature_flag(:release_evidence_collection, project)
end
@@ -44,7 +43,6 @@ class Projects::ReleasesController < Projects::ApplicationController
private
def authorize_update_release!
- access_denied! unless Feature.enabled?(:release_edit_page, project, default_enabled: true)
access_denied! unless can?(current_user, :update_release, release)
end
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index b8f6458b499..899ab70d1aa 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -27,6 +27,16 @@ module MergeRequestsHelper
classes.join(' ')
end
+ def state_name_with_icon(merge_request)
+ if merge_request.merged?
+ [_("Merged"), "git-merge"]
+ elsif merge_request.closed?
+ [_("Closed"), "close"]
+ else
+ [_("Open"), "issue-open-m"]
+ end
+ end
+
def ci_build_details_path(merge_request)
build_url = merge_request.source_project.ci_service.build_page(merge_request.diff_head_sha, merge_request.source_branch)
return unless build_url
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 46ec98e3ffb..e92042d1056 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -1149,26 +1149,6 @@ class MergeRequest < ApplicationRecord
actual_head_pipeline.environments
end
- def state_human_name
- if merged?
- "Merged"
- elsif closed?
- "Closed"
- else
- "Open"
- end
- end
-
- def state_icon_name
- if merged?
- "git-merge"
- elsif closed?
- "close"
- else
- "issue-open-m"
- end
- end
-
def fetch_ref!
target_project.repository.fetch_source_branch!(source_project.repository, source_branch, ref_path)
end
diff --git a/app/presenters/release_presenter.rb b/app/presenters/release_presenter.rb
index 65034158a06..b38bbc8d96c 100644
--- a/app/presenters/release_presenter.rb
+++ b/app/presenters/release_presenter.rb
@@ -58,7 +58,6 @@ class ReleasePresenter < Gitlab::View::Presenter::Delegated
end
def release_edit_page_available?
- ::Feature.enabled?(:release_edit_page, project, default_enabled: true) &&
- can?(current_user, :update_release, release)
+ can?(current_user, :update_release, release)
end
end
diff --git a/app/views/layouts/header/_current_user_dropdown.html.haml b/app/views/layouts/header/_current_user_dropdown.html.haml
index d15f0ae3228..88803f982e8 100644
--- a/app/views/layouts/header/_current_user_dropdown.html.haml
+++ b/app/views/layouts/header/_current_user_dropdown.html.haml
@@ -20,7 +20,7 @@
= link_to s_("CurrentUser|Profile"), current_user, class: 'profile-link', data: { user: current_user.username }
- if current_user_menu?(:start_trial)
%li
- %a.profile-link{ href: trials_link_url }
+ %a.trial-link{ href: trials_link_url }
= s_("CurrentUser|Start a Gold trial")
= emoji_icon('rocket')
- if current_user_menu?(:settings)
diff --git a/app/views/projects/merge_requests/_mr_title.html.haml b/app/views/projects/merge_requests/_mr_title.html.haml
index 92e34b3ceda..552f8dc173a 100644
--- a/app/views/projects/merge_requests/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/_mr_title.html.haml
@@ -1,5 +1,6 @@
- can_update_merge_request = can?(current_user, :update_merge_request, @merge_request)
- can_reopen_merge_request = can?(current_user, :reopen_merge_request, @merge_request)
+- state_human_name, state_icon_name = state_name_with_icon(@merge_request)
- if @merge_request.closed_without_fork?
.alert.alert-danger
@@ -8,9 +9,9 @@
.detail-page-header
.detail-page-header-body
.issuable-status-box.status-box{ class: status_box_class(@merge_request) }
- = sprite_icon(@merge_request.state_icon_name, size: 16, css_class: 'd-block d-sm-none')
+ = sprite_icon(state_icon_name, size: 16, css_class: 'd-block d-sm-none')
%span.d-none.d-sm-block
- = @merge_request.state_human_name
+ = state_human_name
.issuable-meta
- if @merge_request.discussion_locked?
diff --git a/changelogs/unreleased/37000-reduce-start-a-trial-emoji-rocket-size.yml b/changelogs/unreleased/37000-reduce-start-a-trial-emoji-rocket-size.yml
new file mode 100644
index 00000000000..5a30c7fa431
--- /dev/null
+++ b/changelogs/unreleased/37000-reduce-start-a-trial-emoji-rocket-size.yml
@@ -0,0 +1,5 @@
+---
+title: Reduce start a trial rocket emoji size
+merge_request: 20579
+author:
+type: changed
diff --git a/changelogs/unreleased/fix-padding-in-project-settings-members.yml b/changelogs/unreleased/fix-padding-in-project-settings-members.yml
new file mode 100644
index 00000000000..f77821ce83a
--- /dev/null
+++ b/changelogs/unreleased/fix-padding-in-project-settings-members.yml
@@ -0,0 +1,5 @@
+---
+title: Fix multi select input padding in project and group user select
+merge_request: 20520
+author: Kevin Lee
+type: fixed
diff --git a/lib/gitlab/danger/teammate.rb b/lib/gitlab/danger/teammate.rb
index e96f5177195..55476cd9789 100644
--- a/lib/gitlab/danger/teammate.rb
+++ b/lib/gitlab/danger/teammate.rb
@@ -63,7 +63,7 @@ module Gitlab
def has_capability?(project, category, kind, labels)
case category
when :test
- area = role[/Test Automation Engineer(?:.*?, (\w+))/, 1]
+ area = role[/Software Engineer in Test(?:.*?, (\w+))/, 1]
area && labels.any?("devops::#{area.downcase}") if kind == :reviewer
when :engineering_productivity
diff --git a/spec/frontend/releases/list/components/release_block_spec.js b/spec/frontend/releases/list/components/release_block_spec.js
index 5b589aaabe8..056835bdaf2 100644
--- a/spec/frontend/releases/list/components/release_block_spec.js
+++ b/spec/frontend/releases/list/components/release_block_spec.js
@@ -30,7 +30,6 @@ describe('Release block', () => {
},
provide: {
glFeatures: {
- releaseEditPage: true,
releaseIssueSummary: true,
...featureFlags,
},
@@ -180,11 +179,6 @@ describe('Release block', () => {
});
});
- it('does not render an edit button if the releaseEditPage feature flag is disabled', () =>
- factory(releaseClone, { releaseEditPage: false }).then(() => {
- expect(editButton().exists()).toBe(false);
- }));
-
it('does not render the milestone list if no milestones are associated to the release', () => {
delete releaseClone.milestones;
diff --git a/spec/helpers/merge_requests_helper_spec.rb b/spec/helpers/merge_requests_helper_spec.rb
index 695d1520897..6bd567eab57 100644
--- a/spec/helpers/merge_requests_helper_spec.rb
+++ b/spec/helpers/merge_requests_helper_spec.rb
@@ -26,6 +26,31 @@ describe MergeRequestsHelper do
end
end
+ describe '#state_name_with_icon' do
+ using RSpec::Parameterized::TableSyntax
+
+ let(:merge_request) { MergeRequest.new }
+
+ where(:state, :expected_name, :expected_icon) do
+ :merged? | 'Merged' | 'git-merge'
+ :closed? | 'Closed' | 'close'
+ :opened? | 'Open' | 'issue-open-m'
+ end
+
+ with_them do
+ before do
+ allow(merge_request).to receive(state).and_return(true)
+ end
+
+ it 'returns name and icon' do
+ name, icon = helper.state_name_with_icon(merge_request)
+
+ expect(name).to eq(expected_name)
+ expect(icon).to eq(expected_icon)
+ end
+ end
+ end
+
describe '#format_mr_branch_names' do
describe 'within the same project' do
let(:merge_request) { create(:merge_request) }
diff --git a/spec/lib/gitlab/danger/teammate_spec.rb b/spec/lib/gitlab/danger/teammate_spec.rb
index 35edfa08a63..bf6152ff3c2 100644
--- a/spec/lib/gitlab/danger/teammate_spec.rb
+++ b/spec/lib/gitlab/danger/teammate_spec.rb
@@ -33,8 +33,8 @@ describe Gitlab::Danger::Teammate do
context 'when labels contain devops::create and the category is test' do
let(:labels) { ['devops::create'] }
- context 'when role is Test Automation Engineer, Create' do
- let(:role) { 'Test Automation Engineer, Create' }
+ context 'when role is Software Engineer in Test, Create' do
+ let(:role) { 'Software Engineer in Test, Create' }
it '#reviewer? returns true' do
expect(subject.reviewer?(project, :test, labels)).to be_truthy
@@ -45,7 +45,7 @@ describe Gitlab::Danger::Teammate do
end
context 'when hyperlink is mangled in the role' do
- let(:role) { '<a href="#">Test Automation Engineer</a>, Create' }
+ let(:role) { '<a href="#">Software Engineer in Test</a>, Create' }
it '#reviewer? returns true' do
expect(subject.reviewer?(project, :test, labels)).to be_truthy
@@ -53,16 +53,16 @@ describe Gitlab::Danger::Teammate do
end
end
- context 'when role is Test Automation Engineer' do
- let(:role) { 'Test Automation Engineer' }
+ context 'when role is Software Engineer in Test' do
+ let(:role) { 'Software Engineer in Test' }
it '#reviewer? returns false' do
expect(subject.reviewer?(project, :test, labels)).to be_falsey
end
end
- context 'when role is Test Automation Engineer, Manage' do
- let(:role) { 'Test Automation Engineer, Manage' }
+ context 'when role is Software Engineer in Test, Manage' do
+ let(:role) { 'Software Engineer in Test, Manage' }
it '#reviewer? returns false' do
expect(subject.reviewer?(project, :test, labels)).to be_falsey
diff --git a/spec/presenters/release_presenter_spec.rb b/spec/presenters/release_presenter_spec.rb
index 7ab454c4ff0..2f978b0a036 100644
--- a/spec/presenters/release_presenter_spec.rb
+++ b/spec/presenters/release_presenter_spec.rb
@@ -90,14 +90,6 @@ describe ReleasePresenter do
is_expected.to match /#{edit_project_release_url(project, release)}/
end
- context 'when release_edit_page feature flag is disabled' do
- before do
- stub_feature_flags(release_edit_page: false)
- end
-
- it { is_expected.to be_nil }
- end
-
context 'when a user is not allowed to update a release' do
let(:presenter) { described_class.new(release, current_user: guest) }
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-01 00:56:12 +0300