diff options
| author | Denys Mishunov <dmishunov@gitlab.com> | 2019-08-27 11:59:59 +0200 |
|---|---|---|
| committer | Mark Chao <mchao@gitlab.com> | 2019-09-11 17:43:29 +0800 |
| commit | d3d274911f15f7013f3b0f08f5c9790a91c02ba6 (patch) | |
| tree | 6939f8f9af4f3bab62138b17bd9d3f1ddb159a73 /app/views/layouts/nav/sidebar/_admin.html.haml | |
| parent | 1ba9f029e89e99a245a201c21a98f4f79dc7b302 (diff) | |
| download | gitlab-ce-13533-elastic-search-1-ce.tar.gz | |
CE port of 13533-elastic-search-113533-elastic-search-1-ce
Moved Elasticsearch menu item to top menu
Moved the item out of "Settings/Integrations" into the separate entity
with two subitems:
- GitLab index
- Settings
as part of the move to the dedicated Elasticsearch panel.
Elasticsearch: GitLab Index admin page
Migrate feature spec
Fixing feature tests
Added a changelog entry
Fixed Elasticsearch translations
Making linting for MD happy
Introduction of input-xs/sm classes
Pajamas assumes several sizes of the inputs that are not in gitlab yet.
This commit introduces the two smallest input widths (input-xs and
input-sm) that are part of the Admin -> Elastissearch form.
Diffstat (limited to 'app/views/layouts/nav/sidebar/_admin.html.haml')
| -rw-r--r-- | app/views/layouts/nav/sidebar/_admin.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml index f76268bc29b..2f9ad8a70e6 100644 --- a/app/views/layouts/nav/sidebar/_admin.html.haml +++ b/app/views/layouts/nav/sidebar/_admin.html.haml @@ -170,6 +170,8 @@ = render_if_exists 'layouts/nav/ee/admin/geo_sidebar' + = render_if_exists 'layouts/nav/sidebar/elasticsearch_link' + = nav_link(controller: :deploy_keys) do = link_to admin_deploy_keys_path do .nav-icon-container |