diff options
| author | Jennie Louie <jlouie@gitlab.com> | 2019-09-09 22:59:58 -0700 |
|---|---|---|
| committer | Jennie Louie <jlouie@gitlab.com> | 2019-09-10 10:12:53 -0700 |
| commit | 5e79e74fa58caeeee7539b3ffee5e3ce23142d9f (patch) | |
| tree | 488cab7f2352ba2dc842fb5b915f71abc61b173d /app | |
| parent | 2b06f6157bb0d36ca2714c9ddbb08e636fd4a390 (diff) | |
| download | gitlab-ce-qa-wiki-ssh-spec.tar.gz | |
Update qa resources and pages for Geo wiki specqa-wiki-ssh-spec
Add qa selectors to wiki show and ssh keys page
Add method to wiki push resource to find ssh_uri
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/profiles/keys/_key_table.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/wikis/show.html.haml | 2 |
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' |