Commit a52302b5 authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch 'bye-bye-ui' into 'master'

Removes an old UI page that's no-longer needed

See merge request gitlab-org/gitlab!38277
parents ec247475 afeb47ad
...@@ -113,7 +113,6 @@ linters: ...@@ -113,7 +113,6 @@ linters:
- "app/views/help/instance_configuration.html.haml" - "app/views/help/instance_configuration.html.haml"
- "app/views/help/instance_configuration/_gitlab_ci.html.haml" - "app/views/help/instance_configuration/_gitlab_ci.html.haml"
- "app/views/help/instance_configuration/_gitlab_pages.html.haml" - "app/views/help/instance_configuration/_gitlab_pages.html.haml"
- "app/views/help/ui.html.haml"
- "app/views/import/bitbucket/status.html.haml" - "app/views/import/bitbucket/status.html.haml"
- "app/views/import/bitbucket_server/status.html.haml" - "app/views/import/bitbucket_server/status.html.haml"
- "app/views/invites/show.html.haml" - "app/views/invites/show.html.haml"
......
This diff is collapsed.
---
title: Removes the old UI page
merge_request: 38277
author:
type: other
get 'help' => 'help#index' get 'help' => 'help#index'
get 'help/shortcuts' => 'help#shortcuts' get 'help/shortcuts' => 'help#shortcuts'
get 'help/ui' => 'help#ui'
get 'help/instance_configuration' => 'help#instance_configuration' get 'help/instance_configuration' => 'help#instance_configuration'
get 'help/*path' => 'help#show', as: :help_page get 'help/*path' => 'help#show', as: :help_page
...@@ -25590,9 +25590,6 @@ msgstr "" ...@@ -25590,9 +25590,6 @@ msgstr ""
msgid "U2F only works with HTTPS-enabled websites. Contact your administrator for more details." msgid "U2F only works with HTTPS-enabled websites. Contact your administrator for more details."
msgstr "" msgstr ""
msgid "UI Development Kit"
msgstr ""
msgid "URL" msgid "URL"
msgstr "" msgstr ""
......
...@@ -159,15 +159,6 @@ RSpec.describe HelpController do ...@@ -159,15 +159,6 @@ RSpec.describe HelpController do
end end
end end
describe 'GET #ui' do
context 'for UI Development Kit' do
it 'renders found' do
get :ui
expect(response).to have_gitlab_http_status(:ok)
end
end
end
def stub_readme(content) def stub_readme(content)
expect(File).to receive(:read).and_return(content) expect(File).to receive(:read).and_return(content)
end end
......
...@@ -115,7 +115,6 @@ end ...@@ -115,7 +115,6 @@ end
# help GET /help(.:format) help#index # help GET /help(.:format) help#index
# help_page GET /help/*path(.:format) help#show # help_page GET /help/*path(.:format) help#show
# help_shortcuts GET /help/shortcuts(.:format) help#shortcuts # help_shortcuts GET /help/shortcuts(.:format) help#shortcuts
# help_ui GET /help/ui(.:format) help#ui
RSpec.describe HelpController, "routing" do RSpec.describe HelpController, "routing" do
it "to #index" do it "to #index" do
expect(get("/help")).to route_to('help#index') expect(get("/help")).to route_to('help#index')
...@@ -131,9 +130,6 @@ RSpec.describe HelpController, "routing" do ...@@ -131,9 +130,6 @@ RSpec.describe HelpController, "routing" do
expect(get(path)).to route_to('help#show', expect(get(path)).to route_to('help#show',
path: 'workflow/protected_branches/protected_branches1', path: 'workflow/protected_branches/protected_branches1',
format: 'png') format: 'png')
path = '/help/ui'
expect(get(path)).to route_to('help#ui')
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment