diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-02 15:10:15 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-02 15:10:15 +0300 |
commit | bdf5d637dab13620c56063c628274746182196ad (patch) | |
tree | ac85f7fd0a998f0edd373adebf5a71f8714e9c2b /app/views | |
parent | 0c178b535cda98a248e136ba5128f0d903edb17d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/admin/hooks/_form.html.haml | 4 | ||||
-rw-r--r-- | app/views/admin/users/_user_detail.html.haml | 7 | ||||
-rw-r--r-- | app/views/jira_connect/subscriptions/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/layouts/_matomo.html.haml | 2 | ||||
-rw-r--r-- | app/views/layouts/jira_connect.html.haml | 1 | ||||
-rw-r--r-- | app/views/notify/request_review_merge_request_email.html.haml | 2 | ||||
-rw-r--r-- | app/views/notify/request_review_merge_request_email.text.erb | 1 | ||||
-rw-r--r-- | app/views/projects/environments/index.html.haml | 1 |
8 files changed, 12 insertions, 8 deletions
diff --git a/app/views/admin/hooks/_form.html.haml b/app/views/admin/hooks/_form.html.haml index e6abd8ff85a..ecaf7b9b38c 100644 --- a/app/views/admin/hooks/_form.html.haml +++ b/app/views/admin/hooks/_form.html.haml @@ -2,10 +2,10 @@ .form-group = form.label :url, _('URL'), class: 'label-bold' - = form.text_field :url, class: 'form-control' + = form.text_field :url, class: 'form-control gl-form-input' .form-group = form.label :token, _('Secret Token'), class: 'label-bold' - = form.text_field :token, class: 'form-control' + = form.text_field :token, class: 'form-control gl-form-input' %p.form-text.text-muted= _('Use this token to validate received payloads') .form-group = form.label :url, _('Trigger'), class: 'label-bold' diff --git a/app/views/admin/users/_user_detail.html.haml b/app/views/admin/users/_user_detail.html.haml index 3bafd1cb396..05e387e6479 100644 --- a/app/views/admin/users/_user_detail.html.haml +++ b/app/views/admin/users/_user_detail.html.haml @@ -9,9 +9,10 @@ = render 'admin/users/user_listing_note', user: user - user_badges_in_admin_section(user).each do |badge| - - css_badge = "badge badge-#{badge[:variant]}" if badge[:variant].present? - %span{ class: css_badge } - = badge[:text] + - css_badge = "badge gl-badge sm badge-pill badge-#{badge[:variant]}" if badge[:variant].present? + %span.px-1.py-1 + %span{ class: css_badge } + = badge[:text] .row-second-line.str-truncated-100 = mail_to user.email, user.email, class: 'text-secondary' diff --git a/app/views/jira_connect/subscriptions/index.html.haml b/app/views/jira_connect/subscriptions/index.html.haml index 3f6c8941896..a549ed3540b 100644 --- a/app/views/jira_connect/subscriptions/index.html.haml +++ b/app/views/jira_connect/subscriptions/index.html.haml @@ -45,7 +45,7 @@ %tr %td= subscription.namespace.full_path %td= subscription.created_at - %td= link_to 'Remove', jira_connect_subscription_path(subscription), class: 'remove-subscription' + %td= link_to 'Remove', jira_connect_subscription_path(subscription), class: 'js-jira-connect-remove-subscription' - else %h4.empty-subscriptions No linked namespaces diff --git a/app/views/layouts/_matomo.html.haml b/app/views/layouts/_matomo.html.haml index fcd3156a162..ef7c3a62902 100644 --- a/app/views/layouts/_matomo.html.haml +++ b/app/views/layouts/_matomo.html.haml @@ -1,9 +1,11 @@ <!-- Matomo --> +- matomo_disable_cookies = extra_config.has_key?('matomo_disable_cookies') && extra_config.matomo_disable_cookies = javascript_tag do :plain var _paq = window._paq = window._paq || []; _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); + #{matomo_disable_cookies ? '_paq.push(["disableCookies"])' : ""}; (function() { var u="//#{extra_config.matomo_url}/"; _paq.push(['setTrackerUrl', u+'matomo.php']); diff --git a/app/views/layouts/jira_connect.html.haml b/app/views/layouts/jira_connect.html.haml index d996b3387a3..da45d84a83b 100644 --- a/app/views/layouts/jira_connect.html.haml +++ b/app/views/layouts/jira_connect.html.haml @@ -9,7 +9,6 @@ = yield :page_specific_styles = javascript_include_tag 'https://connect-cdn.atl-paas.net/all.js' - = javascript_include_tag 'https://unpkg.com/jquery@3.3.1/dist/jquery.min.js' = Gon::Base.render_data(nonce: content_security_policy_nonce) = yield :head %body diff --git a/app/views/notify/request_review_merge_request_email.html.haml b/app/views/notify/request_review_merge_request_email.html.haml new file mode 100644 index 00000000000..d1f72f6529a --- /dev/null +++ b/app/views/notify/request_review_merge_request_email.html.haml @@ -0,0 +1,2 @@ +%p + #{sanitize_name(@updated_by.name)} requested a new review on #{merge_request_reference_link(@merge_request)}. diff --git a/app/views/notify/request_review_merge_request_email.text.erb b/app/views/notify/request_review_merge_request_email.text.erb new file mode 100644 index 00000000000..9ab15332c51 --- /dev/null +++ b/app/views/notify/request_review_merge_request_email.text.erb @@ -0,0 +1 @@ +<%= sanitize_name(@updated_by.name) %> requested a new review on <%= merge_request_reference_link(@merge_request) %>. diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml index 067c987e721..5da9c25b780 100644 --- a/app/views/projects/environments/index.html.haml +++ b/app/views/projects/environments/index.html.haml @@ -6,5 +6,4 @@ "can-create-environment" => can?(current_user, :create_environment, @project).to_s, "new-environment-path" => new_project_environment_path(@project), "help-page-path" => help_page_path("ci/environments/index.md"), - "deploy-boards-help-path" => help_page_path("user/project/deploy_boards", anchor: "enabling-deploy-boards"), "project-path" => @project.full_path } } |