Merge branch 'update-gitlab-styles' into 'master'
Update gitlab-styles to 2.5.1 See merge request gitlab-org/gitlab-ce!24336
This commit is contained in:
commit
08a320aac5
7 changed files with 17 additions and 12 deletions
|
@ -282,7 +282,7 @@ GEM
|
|||
gitlab-markup (1.6.5)
|
||||
gitlab-sidekiq-fetcher (0.4.0)
|
||||
sidekiq (~> 5)
|
||||
gitlab-styles (2.4.1)
|
||||
gitlab-styles (2.5.1)
|
||||
rubocop (~> 0.54.0)
|
||||
rubocop-gitlab-security (~> 0.1.0)
|
||||
rubocop-rspec (~> 1.19)
|
||||
|
|
5
changelogs/unreleased/update-gitlab-styles.yml
Normal file
5
changelogs/unreleased/update-gitlab-styles.yml
Normal file
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Update gitlab-styles to 2.5.1
|
||||
merge_request: 24336
|
||||
author: Jasper Maes
|
||||
type: other
|
|
@ -55,7 +55,7 @@ describe OmniauthCallbacksController, type: :controller do
|
|||
|
||||
context 'when a redirect url is stored' do
|
||||
it 'redirects with fragment' do
|
||||
post provider, nil, { user_return_to: '/fake/url' }
|
||||
post provider, session: { user_return_to: '/fake/url' }
|
||||
|
||||
expect(response).to redirect_to('/fake/url#L101')
|
||||
end
|
||||
|
@ -63,7 +63,7 @@ describe OmniauthCallbacksController, type: :controller do
|
|||
|
||||
context 'when a redirect url with a fragment is stored' do
|
||||
it 'redirects with the new fragment' do
|
||||
post provider, nil, { user_return_to: '/fake/url#replaceme' }
|
||||
post provider, session: { user_return_to: '/fake/url#replaceme' }
|
||||
|
||||
expect(response).to redirect_to('/fake/url#L101')
|
||||
end
|
||||
|
|
|
@ -1086,9 +1086,9 @@ describe Projects::IssuesController do
|
|||
end
|
||||
|
||||
def import_csv
|
||||
post :import_csv, namespace_id: project.namespace.to_param,
|
||||
project_id: project.to_param,
|
||||
file: file
|
||||
post :import_csv, params: { namespace_id: project.namespace.to_param,
|
||||
project_id: project.to_param,
|
||||
file: file }
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -332,7 +332,7 @@ describe 'Dashboard Todos' do
|
|||
it 'links to the pipelines for the merge request' do
|
||||
href = pipelines_project_merge_request_path(project, todo.target)
|
||||
|
||||
expect(page).to have_link "merge request #{todo.target.to_reference(full: true)}", href
|
||||
expect(page).to have_link "merge request #{todo.target.to_reference(full: true)}", href: href
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -13,9 +13,9 @@ describe 'help/instance_configuration' do
|
|||
it 'has links to several sections' do
|
||||
render
|
||||
|
||||
expect(rendered).to have_link(nil, '#ssh-host-keys-fingerprints') if ssh_settings.any?
|
||||
expect(rendered).to have_link(nil, '#gitlab-pages')
|
||||
expect(rendered).to have_link(nil, '#gitlab-ci')
|
||||
expect(rendered).to have_link(nil, href: '#ssh-host-keys-fingerprints') if ssh_settings.any?
|
||||
expect(rendered).to have_link(nil, href: '#gitlab-pages')
|
||||
expect(rendered).to have_link(nil, href: '#gitlab-ci')
|
||||
end
|
||||
|
||||
it 'has several sections' do
|
||||
|
|
|
@ -54,9 +54,9 @@ describe 'projects/commit/show.html.haml' do
|
|||
end
|
||||
|
||||
it 'shows that it is in the context of a merge request' do
|
||||
merge_request_url = diffs_project_merge_request_url(project, merge_request, commit_id: commit.id)
|
||||
merge_request_url = diffs_project_merge_request_path(project, merge_request, commit_id: commit.id)
|
||||
expect(rendered).to have_content("This commit is part of merge request")
|
||||
expect(rendered).to have_link(merge_request.to_reference, merge_request_url)
|
||||
expect(rendered).to have_link(merge_request.to_reference, href: merge_request_url)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue