diff options
| -rw-r--r-- | app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/utilities.scss | 10 | ||||
| -rw-r--r-- | doc/administration/troubleshooting/group_saml_scim.md | 4 | ||||
| -rw-r--r-- | doc/administration/troubleshooting/img/okta_setting_username.png | bin | 0 -> 69815 bytes | |||
| -rw-r--r-- | doc/user/group/saml_sso/scim_setup.md | 7 | ||||
| -rw-r--r-- | locale/gitlab.pot | 24 | ||||
| -rw-r--r-- | spec/features/boards/sidebar_due_date_spec.rb | 46 | ||||
| -rw-r--r-- | spec/features/issues/issue_sidebar_spec.rb | 29 | ||||
| -rw-r--r-- | spec/features/issues/user_edits_issue_spec.rb | 4 | ||||
| -rw-r--r-- | spec/support/shared_examples/features/sidebar/sidebar_due_date_shared_examples.rb | 30 | ||||
| -rw-r--r-- | spec/support/shared_examples/features/sidebar_shared_examples.rb | 4 |
11 files changed, 80 insertions, 80 deletions
diff --git a/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue b/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue index d5bdf274d9f..404bcc3122a 100644 --- a/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue +++ b/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue @@ -154,7 +154,7 @@ export default { }; }, dataTestId() { - return this.dateType === dateTypes.start ? 'start-date' : 'due-date'; + return this.dateType === dateTypes.start ? 'sidebar-start-date' : 'sidebar-due-date'; }, }, methods: { diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss index a8110d15d8e..2623de80fe9 100644 --- a/app/assets/stylesheets/utilities.scss +++ b/app/assets/stylesheets/utilities.scss @@ -226,6 +226,16 @@ $gl-line-height-42: px-to-rem(42px); max-height: none !important; } +// Will be moved to @gitlab/ui in https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1655 +.gl-max-w-62 { + max-width: $grid-size * 62; +} + +// Will be moved to @gitlab/ui in https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1655 +.gl-max-w-26 { + max-width: $grid-size * 26; +} + .gl-max-w-50p { max-width: 50%; } diff --git a/doc/administration/troubleshooting/group_saml_scim.md b/doc/administration/troubleshooting/group_saml_scim.md index 9e9ef492ebd..d052688363c 100644 --- a/doc/administration/troubleshooting/group_saml_scim.md +++ b/doc/administration/troubleshooting/group_saml_scim.md @@ -72,6 +72,10 @@ Self-managed instance example:  +Setting the username for the newly provisioned users when assigning them the SCIM app: + + + ## OneLogin Application details: diff --git a/doc/administration/troubleshooting/img/okta_setting_username.png b/doc/administration/troubleshooting/img/okta_setting_username.png Binary files differnew file mode 100644 index 00000000000..c413b9d3a27 --- /dev/null +++ b/doc/administration/troubleshooting/img/okta_setting_username.png diff --git a/doc/user/group/saml_sso/scim_setup.md b/doc/user/group/saml_sso/scim_setup.md index f17de6dcf8d..2651bcb9e12 100644 --- a/doc/user/group/saml_sso/scim_setup.md +++ b/doc/user/group/saml_sso/scim_setup.md @@ -115,12 +115,7 @@ configuration. Otherwise, the Okta SCIM app may not work properly. 1. Sign in to Okta. 1. Ensure you are in the Admin section by selecting the **Admin** button located in the top right. The admin button is not visible from the admin page. - - NOTE: - If you're using the Developer Console, select **Developer Console** in the top - bar and then select **Classic UI**. Otherwise, you may not see the buttons described in the following steps: - -1. In the **Application** tab, select **Add Application**. +1. In the **Application** tab, select **Browse App Catalog**. 1. Search for **GitLab**, find and select on the 'GitLab' application. 1. On the GitLab application overview page, select **Add**. 1. Under **Application Visibility** select both checkboxes. Currently the GitLab application does not support SAML authentication so the icon should not be shown to users. diff --git a/locale/gitlab.pot b/locale/gitlab.pot index d725ee4d57e..7349b90e68c 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -4353,9 +4353,15 @@ msgstr[1] "" msgid "ApprovalRule|%{firstLabel} +%{numberOfAdditionalLabels} more" msgstr "" +msgid "ApprovalRule|A merge request author collaborating with a merge request approver" +msgstr "" + msgid "ApprovalRule|Add approvers" msgstr "" +msgid "ApprovalRule|Add required approvers to improve your code review process" +msgstr "" + msgid "ApprovalRule|All scanners" msgstr "" @@ -4386,6 +4392,9 @@ msgstr "" msgid "ApprovalRule|Approvers" msgstr "" +msgid "ApprovalRule|Assign approvers by area of expertise." +msgstr "" + msgid "ApprovalRule|Confirmed" msgstr "" @@ -4395,6 +4404,15 @@ msgstr "" msgid "ApprovalRule|Examples: QA, Security." msgstr "" +msgid "ApprovalRule|Increase your organization’s code quality." +msgstr "" + +msgid "ApprovalRule|Learn more about merge request approval." +msgstr "" + +msgid "ApprovalRule|Let GitLab designate eligible approvers based on the files changed." +msgstr "" + msgid "ApprovalRule|Name" msgstr "" @@ -4419,6 +4437,9 @@ msgstr "" msgid "ApprovalRule|Previously detected" msgstr "" +msgid "ApprovalRule|Reduce the overall time to merge." +msgstr "" + msgid "ApprovalRule|Resolved" msgstr "" @@ -4446,6 +4467,9 @@ msgstr "" msgid "ApprovalRule|Target branch" msgstr "" +msgid "ApprovalRule|Try it for free" +msgstr "" + msgid "ApprovalRule|Vulnerabilities allowed" msgstr "" diff --git a/spec/features/boards/sidebar_due_date_spec.rb b/spec/features/boards/sidebar_due_date_spec.rb deleted file mode 100644 index 141c574ffec..00000000000 --- a/spec/features/boards/sidebar_due_date_spec.rb +++ /dev/null @@ -1,46 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -RSpec.describe 'Project issue boards sidebar due date', :js do - include BoardHelpers - - let_it_be(:user) { create(:user) } - let_it_be(:project) { create(:project, :public) } - let_it_be(:issue) { create(:issue, project: project, relative_position: 1) } - let_it_be(:board) { create(:board, project: project) } - let_it_be(:list) { create(:list, board: board, position: 0) } - - let(:card) { find('.board:nth-child(1)').first('.board-card') } - - around do |example| - freeze_time { example.run } - end - - before do - project.add_maintainer(user) - - sign_in(user) - - visit project_board_path(project, board) - wait_for_requests - end - - context 'due date' do - it 'updates due date' do - click_card(card) - - page.within('[data-testid="sidebar-due-date"]') do - today = Date.today.day - - click_button 'Edit' - - click_button today.to_s - - wait_for_requests - - expect(page).to have_content(today.to_s(:medium)) - end - end - end -end diff --git a/spec/features/issues/issue_sidebar_spec.rb b/spec/features/issues/issue_sidebar_spec.rb index 08a9e9bab42..9da6694c681 100644 --- a/spec/features/issues/issue_sidebar_spec.rb +++ b/spec/features/issues/issue_sidebar_spec.rb @@ -11,7 +11,6 @@ RSpec.describe 'Issue Sidebar' do let_it_be(:label) { create(:label, project: project, title: 'bug') } let_it_be(:issue) { create(:labeled_issue, project: project, labels: [label]) } let_it_be(:mock_date) { Date.today.at_beginning_of_month + 2.days } - let_it_be(:issue_with_due_date) { create(:issue, project: project, due_date: mock_date) } let_it_be(:xss_label) { create(:label, project: project, title: '<script>alert("xss");</script>') } before do @@ -201,30 +200,6 @@ RSpec.describe 'Issue Sidebar' do end end - context 'due date widget', :js do - let(:due_date_value) { find('[data-testid="due-date"] [data-testid="sidebar-date-value"]') } - - context 'when no due date exists' do - before do - visit_issue(project, issue) - end - - it "displays 'None'" do - expect(due_date_value.text).to have_content 'None' - end - end - - context 'when due date exists' do - before do - visit_issue(project, issue_with_due_date) - end - - it "displays the due date" do - expect(due_date_value.text).to have_content mock_date.strftime('%b %-d, %Y') - end - end - end - context 'as an allowed user' do before do project.add_developer(user) @@ -262,6 +237,10 @@ RSpec.describe 'Issue Sidebar' do it_behaves_like 'milestone sidebar widget' end + context 'editing issue due date', :js do + it_behaves_like 'date sidebar widget' + end + context 'editing issue labels', :js do before do issue.update!(labels: [label]) diff --git a/spec/features/issues/user_edits_issue_spec.rb b/spec/features/issues/user_edits_issue_spec.rb index 10b0082f65a..a036a9a5bbc 100644 --- a/spec/features/issues/user_edits_issue_spec.rb +++ b/spec/features/issues/user_edits_issue_spec.rb @@ -417,7 +417,7 @@ RSpec.describe "Issues > User edits issue", :js do it 'adds due date to issue' do date = Date.today.at_beginning_of_month + 2.days - page.within '[data-testid="due-date"]' do + page.within '[data-testid="sidebar-due-date"]' do click_button 'Edit' page.within '.pika-single' do click_button date.day @@ -432,7 +432,7 @@ RSpec.describe "Issues > User edits issue", :js do it 'removes due date from issue' do date = Date.today.at_beginning_of_month + 2.days - page.within '[data-testid="due-date"]' do + page.within '[data-testid="sidebar-due-date"]' do click_button 'Edit' page.within '.pika-single' do diff --git a/spec/support/shared_examples/features/sidebar/sidebar_due_date_shared_examples.rb b/spec/support/shared_examples/features/sidebar/sidebar_due_date_shared_examples.rb new file mode 100644 index 00000000000..345dfbce423 --- /dev/null +++ b/spec/support/shared_examples/features/sidebar/sidebar_due_date_shared_examples.rb @@ -0,0 +1,30 @@ +# frozen_string_literal: true + +RSpec.shared_examples 'date sidebar widget' do + context 'editing due date' do + let(:due_date_value) { find('[data-testid="sidebar-due-date"] [data-testid="sidebar-date-value"]') } + + around do |example| + freeze_time { example.run } + end + + it 'displays "None" when there is no due date' do + expect(due_date_value.text).to have_content 'None' + end + + it 'updates due date' do + page.within('[data-testid="sidebar-due-date"]') do + today = Date.today.day + + click_button 'Edit' + + click_button today.to_s + + wait_for_requests + + expect(page).to have_content(today.to_s(:medium)) + expect(due_date_value.text).to have_content Time.current.strftime('%b %-d, %Y') + end + end + end +end diff --git a/spec/support/shared_examples/features/sidebar_shared_examples.rb b/spec/support/shared_examples/features/sidebar_shared_examples.rb index 653fb266eb9..615f568420e 100644 --- a/spec/support/shared_examples/features/sidebar_shared_examples.rb +++ b/spec/support/shared_examples/features/sidebar_shared_examples.rb @@ -46,6 +46,10 @@ RSpec.shared_examples 'issue boards sidebar' do it_behaves_like 'milestone sidebar widget' end + context 'editing issue due date', :js do + it_behaves_like 'date sidebar widget' + end + context 'in notifications subscription' do it 'displays notifications toggle', :aggregate_failures do page.within('[data-testid="sidebar-notifications"]') do |
