diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-06 06:08:08 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-06 06:08:08 +0000 |
| commit | 9dadb12cf28c6f4ec1fa70f460c04c63fe368f5d (patch) | |
| tree | 4823190e62b574128d198c1b7b18e9d2b62a7036 /app | |
| parent | 6e11ac78e99b33c23fa785c02be9fc21c513b04e (diff) | |
| download | gitlab-ce-9dadb12cf28c6f4ec1fa70f460c04c63fe368f5d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
4 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/pages/projects/forks/new/components/fork_form.vue b/app/assets/javascripts/pages/projects/forks/new/components/fork_form.vue index 701bf0c1e1d..f92a40e057f 100644 --- a/app/assets/javascripts/pages/projects/forks/new/components/fork_form.vue +++ b/app/assets/javascripts/pages/projects/forks/new/components/fork_form.vue @@ -329,7 +329,7 @@ export default { </div> <p class="gl-mt-n5 gl-text-gray-500"> - {{ s__('ForkProject|Want to house several dependent projects under the same namespace?') }} + {{ s__('ForkProject|Want to organize several dependent projects under the same namespace?') }} <gl-link :href="newGroupPath" target="_blank"> {{ s__('ForkProject|Create a group') }} </gl-link> diff --git a/app/assets/javascripts/projects/new/components/app.vue b/app/assets/javascripts/projects/new/components/app.vue index 476d6466cbb..59ca393fe92 100644 --- a/app/assets/javascripts/projects/new/components/app.vue +++ b/app/assets/javascripts/projects/new/components/app.vue @@ -16,7 +16,7 @@ const PANELS = [ selector: '#blank-project-pane', title: s__('ProjectsNew|Create blank project'), description: s__( - 'ProjectsNew|Create a blank project to house your files, plan your work, and collaborate on code, among other things.', + 'ProjectsNew|Create a blank project to store your files, plan your work, and collaborate on code, among other things.', ), illustration: blankProjectIllustration, }, diff --git a/app/assets/javascripts/surveys/merge_request_experience/app.vue b/app/assets/javascripts/surveys/merge_request_experience/app.vue index fe71ca635c9..5b1d9be9563 100644 --- a/app/assets/javascripts/surveys/merge_request_experience/app.vue +++ b/app/assets/javascripts/surveys/merge_request_experience/app.vue @@ -92,7 +92,7 @@ export default { > <template #default="{ dismiss }"> <aside - class="gl-fixed gl-bottom-0 gl-right-0 gl-z-index-200 gl-p-5" + class="gl-fixed gl-bottom-0 gl-right-0 gl-z-index-9999 gl-p-5" :aria-label="$options.i18n.survey" > <transition name="survey-slide-up"> diff --git a/app/views/projects/_new_project_fields.html.haml b/app/views/projects/_new_project_fields.html.haml index 36504e2312d..891860698e7 100644 --- a/app/views/projects/_new_project_fields.html.haml +++ b/app/views/projects/_new_project_fields.html.haml @@ -35,7 +35,7 @@ - if current_user.can_create_group? .form-text.text-muted - link_start_group_path = '<a href="%{path}">' % { path: new_group_path } - - project_tip = s_('ProjectsNew|Want to house several dependent projects under the same namespace? %{link_start}Create a group.%{link_end}') % { link_start: link_start_group_path, link_end: '</a>' } + - project_tip = s_('ProjectsNew|Want to organize several dependent projects under the same namespace? %{link_start}Create a group.%{link_end}') % { link_start: link_start_group_path, link_end: '</a>' } = project_tip.html_safe = render Pajamas::AlertComponent.new(alert_options: { class: "gl-mb-4 gl-display-none js-user-readme-repo" }, dismissible: false, |