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
path: root/app
diff options
context:
space:
mode:
authorMark Lapierre <mlapierre@gitlab.com>2019-09-12 06:25:13 +0300
committerMark Lapierre <mlapierre@gitlab.com>2019-09-12 06:25:13 +0300
commit615d6bea9585c80a86947ee3e871112781be733f (patch)
tree7144a376685b784109f355c84aa196f1093e59e6 /app
parentfc01371fbe5cf37b21f3926508c2e58ee44e6323 (diff)
parent5e79e74fa58caeeee7539b3ffee5e3ce23142d9f (diff)
Merge branch 'qa-wiki-ssh-spec' into 'master'
CE backport of E2E Test wiki SSH push to Geo primary node See merge request gitlab-org/gitlab-ce!32885
Diffstat (limited to 'app')
-rw-r--r--app/views/profiles/keys/_key_table.html.haml2
-rw-r--r--app/views/projects/wikis/show.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/profiles/keys/_key_table.html.haml b/app/views/profiles/keys/_key_table.html.haml
index 4a6d8a1870d..8b862522645 100644
--- a/app/views/profiles/keys/_key_table.html.haml
+++ b/app/views/profiles/keys/_key_table.html.haml
@@ -1,7 +1,7 @@
- is_admin = local_assigns.fetch(:admin, false)
- if @keys.any?
- %ul.content-list
+ %ul.content-list{ data: { qa_selector: 'ssh_keys_list' } }
= render partial: 'profiles/keys/key', collection: @keys, locals: { is_admin: is_admin }
- else
%p.settings-message.text-center
diff --git a/app/views/projects/wikis/show.html.haml b/app/views/projects/wikis/show.html.haml
index 51b7f2dd4b4..ebd99cf8605 100644
--- a/app/views/projects/wikis/show.html.haml
+++ b/app/views/projects/wikis/show.html.haml
@@ -26,7 +26,7 @@
= (s_("WikiHistoricalPage|You can view the %{most_recent_link} or browse the %{history_link}.") % { most_recent_link: most_recent_link, history_link: history_link }).html_safe
.prepend-top-default.append-bottom-default
- .md.md-file
+ .md.md-file{ data: { qa_selector: 'wiki_page_content' } }
= render_wiki_content(@page)
= render 'sidebar'