Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
854deae4
Commit
854deae4
authored
Dec 02, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Brefer "Directory" over "Dir", "Files" over "Code
parent
59c3ec4e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
8 deletions
+9
-8
app/helpers/commits_helper.rb
app/helpers/commits_helper.rb
+2
-2
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+3
-2
features/steps/project/source/browse_files.rb
features/steps/project/source/browse_files.rb
+4
-4
No files found.
app/helpers/commits_helper.rb
View file @
854deae4
...
@@ -109,7 +109,7 @@ module CommitsHelper
...
@@ -109,7 +109,7 @@ module CommitsHelper
)
)
elsif
@path
.
present?
elsif
@path
.
present?
return
link_to
(
return
link_to
(
"Browse Dir »"
,
"Browse Dir
ectory
»"
,
namespace_project_tree_path
(
project
.
namespace
,
project
,
namespace_project_tree_path
(
project
.
namespace
,
project
,
tree_join
(
commit
.
id
,
@path
)),
tree_join
(
commit
.
id
,
@path
)),
class:
"pull-right"
class:
"pull-right"
...
@@ -117,7 +117,7 @@ module CommitsHelper
...
@@ -117,7 +117,7 @@ module CommitsHelper
end
end
end
end
link_to
(
link_to
(
"Browse
Code
»"
,
"Browse
Files
»"
,
namespace_project_tree_path
(
project
.
namespace
,
project
,
commit
),
namespace_project_tree_path
(
project
.
namespace
,
project
,
commit
),
class:
"pull-right"
class:
"pull-right"
)
)
...
...
app/views/projects/commit/_commit_box.html.haml
View file @
854deae4
...
@@ -13,8 +13,9 @@
...
@@ -13,8 +13,9 @@
-
unless
@commit
.
parents
.
length
>
1
-
unless
@commit
.
parents
.
length
>
1
%li
=
link_to
"Email Patches"
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
,
format: :patch
)
%li
=
link_to
"Email Patches"
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
,
format: :patch
)
%li
=
link_to
"Plain Diff"
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
,
format: :diff
)
%li
=
link_to
"Plain Diff"
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
,
format: :diff
)
=
link_to
namespace_project_tree_path
(
@project
.
namespace
,
@project
,
@commit
),
class:
"btn btn-primary btn-grouped"
do
=
link_to
namespace_project_tree_path
(
@project
.
namespace
,
@project
,
@commit
),
class:
"btn btn-grouped"
do
%span
Browse Code »
=
icon
(
'files-o'
)
Browse Files
%div
%div
%p
%p
...
...
features/steps/project/source/browse_files.rb
View file @
854deae4
...
@@ -192,7 +192,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
...
@@ -192,7 +192,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
end
end
step
'I see Browse dir link'
do
step
'I see Browse dir link'
do
expect
(
page
).
to
have_link
'Browse Dir »'
expect
(
page
).
to
have_link
'Browse Dir
ectory
»'
expect
(
page
).
not_to
have_link
'Browse Code »'
expect
(
page
).
not_to
have_link
'Browse Code »'
end
end
...
@@ -204,13 +204,13 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
...
@@ -204,13 +204,13 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
step
'I see Browse file link'
do
step
'I see Browse file link'
do
expect
(
page
).
to
have_link
'Browse File »'
expect
(
page
).
to
have_link
'Browse File »'
expect
(
page
).
not_to
have_link
'Browse
Code
»'
expect
(
page
).
not_to
have_link
'Browse
Files
»'
end
end
step
'I see Browse code link'
do
step
'I see Browse code link'
do
expect
(
page
).
to
have_link
'Browse
Code
»'
expect
(
page
).
to
have_link
'Browse
Files
»'
expect
(
page
).
not_to
have_link
'Browse File »'
expect
(
page
).
not_to
have_link
'Browse File »'
expect
(
page
).
not_to
have_link
'Browse Dir »'
expect
(
page
).
not_to
have_link
'Browse Dir
ectory
»'
end
end
step
'I click on Permalink'
do
step
'I click on Permalink'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment