mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-19 17:46:07 +10:00
Merge branch 'go-to-nav'
This commit is contained in:
@@ -21,6 +21,7 @@ v 8.2.0 (unreleased)
|
||||
- Add "New file" link to dropdown on project page
|
||||
- Include commit logs in project search
|
||||
- Add "added", "modified" and "removed" properties to commit object in webhook
|
||||
- Rename "Back to" links to "Go to" because its not always a case it point to place user come from
|
||||
|
||||
v 8.1.1
|
||||
- Fix cloning Wiki repositories via HTTP (Stan Hu)
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
%ul.nav.nav-sidebar
|
||||
= nav_link do
|
||||
= link_to root_path, title: 'Back to dashboard', data: {placement: 'right'}, class: 'back-link' do
|
||||
= link_to root_path, title: 'Go to dashboard', data: {placement: 'right'}, class: 'back-link' do
|
||||
= icon('caret-square-o-left fw')
|
||||
%span
|
||||
Back to dashboard
|
||||
Go to dashboard
|
||||
|
||||
%li.separate-item
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
%ul.nav.nav-sidebar
|
||||
= nav_link do
|
||||
= link_to group_path(@group), title: 'Back to group', data: {placement: 'right'}, class: 'back-link' do
|
||||
= link_to group_path(@group), title: 'Go to group', data: {placement: 'right'}, class: 'back-link' do
|
||||
= icon('caret-square-o-left fw')
|
||||
%span
|
||||
Back to group
|
||||
Go to group
|
||||
|
||||
%li.separate-item
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
%ul.nav.nav-sidebar
|
||||
= nav_link do
|
||||
= link_to root_path, title: 'Back to dashboard', data: {placement: 'right'}, class: 'back-link' do
|
||||
= link_to root_path, title: 'Go to dashboard', data: {placement: 'right'}, class: 'back-link' do
|
||||
= icon('caret-square-o-left fw')
|
||||
%span
|
||||
Back to dashboard
|
||||
Go to dashboard
|
||||
|
||||
%li.separate-item
|
||||
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
%ul.nav.nav-sidebar
|
||||
- if @project.group
|
||||
= nav_link do
|
||||
= link_to group_path(@project.group), title: 'Back to group', data: {placement: 'right'}, class: 'back-link' do
|
||||
= link_to group_path(@project.group), title: 'Go to group', data: {placement: 'right'}, class: 'back-link' do
|
||||
= icon('caret-square-o-left fw')
|
||||
%span
|
||||
Back to group
|
||||
Go to group
|
||||
- else
|
||||
= nav_link do
|
||||
= link_to root_path, title: 'Back to dashboard', data: {placement: 'right'}, class: 'back-link' do
|
||||
= link_to root_path, title: 'Go to dashboard', data: {placement: 'right'}, class: 'back-link' do
|
||||
= icon('caret-square-o-left fw')
|
||||
%span
|
||||
Back to dashboard
|
||||
Go to dashboard
|
||||
|
||||
%li.separate-item
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
%ul.nav.nav-sidebar
|
||||
= nav_link do
|
||||
= link_to project_path(@project), title: 'Back to project', data: {placement: 'right'}, class: 'back-link' do
|
||||
= link_to project_path(@project), title: 'Go to project', data: {placement: 'right'}, class: 'back-link' do
|
||||
= icon('caret-square-o-left fw')
|
||||
%span
|
||||
Back to project
|
||||
Go to project
|
||||
|
||||
%li.separate-item
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
|
||||
include Select2Helper
|
||||
|
||||
step 'I should see back to dashboard button' do
|
||||
expect(page).to have_content 'Back to dashboard'
|
||||
expect(page).to have_content 'Go to dashboard'
|
||||
end
|
||||
|
||||
step 'gitlab user "Mike"' do
|
||||
|
||||
@@ -124,11 +124,11 @@ class Spinach::Features::Project < Spinach::FeatureSteps
|
||||
end
|
||||
|
||||
step 'I should see back to dashboard button' do
|
||||
expect(page).to have_content 'Back to dashboard'
|
||||
expect(page).to have_content 'Go to dashboard'
|
||||
end
|
||||
|
||||
step 'I should see back to group button' do
|
||||
expect(page).to have_content 'Back to group'
|
||||
expect(page).to have_content 'Go to group'
|
||||
end
|
||||
|
||||
step 'I click notifications drop down button' do
|
||||
|
||||
@@ -46,7 +46,7 @@ module SharedProjectTab
|
||||
|
||||
step 'the active main tab should be Settings' do
|
||||
page.within '.nav-sidebar' do
|
||||
expect(page).to have_content('Back to project')
|
||||
expect(page).to have_content('Go to project')
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user