diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 12:09:18 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 12:09:18 +0000 |
| commit | b7c735c8ac11b8182807070fc6f84f2606e15427 (patch) | |
| tree | e74b4d25abb8bbf23546f001dd94515e2840a3a3 /app/views | |
| parent | 221b529789f4090341a825695aeb49b8df6dd11d (diff) | |
| download | gitlab-ce-b7c735c8ac11b8182807070fc6f84f2606e15427.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/groups/settings/_permissions.html.haml | 1 | ||||
| -rw-r--r-- | app/views/shared/_service_settings.html.haml | 6 | ||||
| -rw-r--r-- | app/views/shared/snippets/_snippet.html.haml | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/app/views/groups/settings/_permissions.html.haml b/app/views/groups/settings/_permissions.html.haml index 016a9c8e054..1ddaa855e62 100644 --- a/app/views/groups/settings/_permissions.html.haml +++ b/app/views/groups/settings/_permissions.html.haml @@ -37,6 +37,7 @@ = render 'groups/settings/project_creation_level', f: f, group: @group = render 'groups/settings/subgroup_creation_level', f: f, group: @group = render 'groups/settings/two_factor_auth', f: f + = render_if_exists 'groups/personal_access_token_expiration_policy', f: f, group: @group = render_if_exists 'groups/member_lock_setting', f: f, group: @group = f.submit _('Save changes'), class: 'btn btn-success prepend-top-default js-dirty-submit', data: { qa_selector: 'save_permissions_changes_button' } diff --git a/app/views/shared/_service_settings.html.haml b/app/views/shared/_service_settings.html.haml index aeda7ea9909..3da4b77b5eb 100644 --- a/app/views/shared/_service_settings.html.haml +++ b/app/views/shared/_service_settings.html.haml @@ -8,11 +8,7 @@ = markdown @service.help .service-settings - - if @service.show_active_box? - .form-group.row - = form.label :active, "Active", class: "col-form-label col-sm-2" - .col-sm-10 - = form.check_box :active, checked: @service.active || @service.new_record?, disabled: disable_fields_service?(@service) + .js-vue-integration-settings{ data: { show_active: @service.show_active_box?.to_s, activated: (@service.active || @service.new_record?).to_s, disabled: disable_fields_service?(@service).to_s } } - if @service.configurable_events.present? .form-group.row diff --git a/app/views/shared/snippets/_snippet.html.haml b/app/views/shared/snippets/_snippet.html.haml index 9e038854c59..3fea2c1e3fc 100644 --- a/app/views/shared/snippets/_snippet.html.haml +++ b/app/views/shared/snippets/_snippet.html.haml @@ -1,5 +1,6 @@ - link_project = local_assigns.fetch(:link_project, false) - notes_count = @noteable_meta_data[snippet.id].user_notes_count +- file_name = snippet_file_name(snippet) %li.snippet-row.py-3 = image_tag avatar_icon_for_user(snippet.author), class: "avatar s40 d-none d-sm-block", alt: '' @@ -7,10 +8,10 @@ .title = link_to gitlab_snippet_path(snippet) do = snippet.title - - if snippet.file_name.present? + - if file_name.present? %span.snippet-filename.d-none.d-sm-inline-block.ml-2 = sprite_icon('doc-code', size: 16, css_class: 'file-icon align-text-bottom') - = snippet.file_name + = file_name %ul.controls %li |