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
48726e9d
Commit
48726e9d
authored
May 25, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated failing tests
parent
8b40a774
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
10 deletions
+7
-10
app/assets/stylesheets/pages/commits.scss
app/assets/stylesheets/pages/commits.scss
+2
-2
app/helpers/button_helper.rb
app/helpers/button_helper.rb
+2
-2
app/helpers/commits_helper.rb
app/helpers/commits_helper.rb
+0
-3
features/steps/project/source/browse_files.rb
features/steps/project/source/browse_files.rb
+3
-3
No files found.
app/assets/stylesheets/pages/commits.scss
View file @
48726e9d
...
@@ -10,8 +10,8 @@
...
@@ -10,8 +10,8 @@
.commit-header
{
.commit-header
{
padding
:
5px
10px
;
padding
:
5px
10px
;
background-color
:
$background-color
;
background-color
:
$background-color
;
border-
top
:
1px
solid
$border-color
;
border-
bottom
:
1px
solid
#eee
;
border-bottom
:
1px
solid
$border-color
;
border-bottom
:
1px
solid
#eee
;
font-size
:
14px
;
font-size
:
14px
;
&
:first-child
{
&
:first-child
{
...
...
app/helpers/button_helper.rb
View file @
48726e9d
...
@@ -14,10 +14,10 @@ module ButtonHelper
...
@@ -14,10 +14,10 @@ module ButtonHelper
# # => "<button class='...' data-clipboard-target='div#foo'>...</button>"
# # => "<button class='...' data-clipboard-target='div#foo'>...</button>"
#
#
# See http://clipboardjs.com/#usage
# See http://clipboardjs.com/#usage
def
clipboard_button
(
data
=
{}
,
css_class:
'btn-clipboard'
)
def
clipboard_button
(
data
=
{})
content_tag
:button
,
content_tag
:button
,
icon
(
'clipboard'
),
icon
(
'clipboard'
),
class:
"btn
#{
css_class
}
"
,
class:
"btn"
,
data:
data
,
data:
data
,
type: :button
type: :button
end
end
...
...
app/helpers/commits_helper.rb
View file @
48726e9d
...
@@ -20,10 +20,7 @@ module CommitsHelper
...
@@ -20,10 +20,7 @@ module CommitsHelper
options
=
options
.
merge
(
source: :author
)
options
=
options
.
merge
(
source: :author
)
user
=
commit
.
send
(
options
[
:source
])
user
=
commit
.
send
(
options
[
:source
])
source_name
=
clean
(
commit
.
send
"
#{
options
[
:source
]
}
_name"
.
to_sym
)
source_email
=
clean
(
commit
.
send
"
#{
options
[
:source
]
}
_email"
.
to_sym
)
source_email
=
clean
(
commit
.
send
"
#{
options
[
:source
]
}
_email"
.
to_sym
)
person_name
=
user
.
try
(
:name
)
||
source_name
person_email
=
user
.
try
(
:email
)
||
source_email
person_email
=
user
.
try
(
:email
)
||
source_email
image_tag
(
avatar_icon
(
person_email
,
options
[
:size
]),
class:
"avatar
#{
"s
#{
options
[
:size
]
}
"
if
options
[
:size
]
}
"
,
width:
options
[
:size
],
alt:
""
)
image_tag
(
avatar_icon
(
person_email
,
options
[
:size
]),
class:
"avatar
#{
"s
#{
options
[
:size
]
}
"
if
options
[
:size
]
}
"
,
width:
options
[
:size
],
alt:
""
)
...
...
features/steps/project/source/browse_files.rb
View file @
48726e9d
...
@@ -202,8 +202,8 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
...
@@ -202,8 +202,8 @@ 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 Directory
»
'
expect
(
page
).
to
have_link
'Browse Directory'
expect
(
page
).
not_to
have_link
'Browse Code
»
'
expect
(
page
).
not_to
have_link
'Browse Code'
end
end
step
'I click on readme file'
do
step
'I click on readme file'
do
...
@@ -219,7 +219,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
...
@@ -219,7 +219,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
step
'I see Browse code link'
do
step
'I see Browse code link'
do
expect
(
page
).
to
have_link
'Browse Files'
expect
(
page
).
to
have_link
'Browse Files'
expect
(
page
).
not_to
have_link
'Browse Directory
»
'
expect
(
page
).
not_to
have_link
'Browse Directory'
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