BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
c888e73b
Unverified
Commit
c888e73b
authored
Feb 23, 2018
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor methods inline
parent
73c4c995
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
blob_helper.rb
app/helpers/blob_helper.rb
+6
-6
_tree_header.html.haml
app/views/projects/tree/_tree_header.html.haml
+1
-1
blob_helper_spec.rb
spec/helpers/blob_helper_spec.rb
+1
-1
No files found.
app/helpers/blob_helper.rb
View file @
c888e73b
...
...
@@ -16,6 +16,10 @@ module BlobHelper
options
[
:link_opts
])
end
def
ide_edit_path
(
project
=
@project
,
ref
=
@ref
,
path
=
@path
,
options
=
{})
"
#{
ide_path
}
/project
#{
edit_blob_path
(
project
,
ref
,
path
,
options
)
}
"
end
def
edit_blob_button
(
project
=
@project
,
ref
=
@ref
,
path
=
@path
,
options
=
{})
return
unless
blob
=
readable_blob
(
options
,
path
,
project
,
ref
)
...
...
@@ -29,10 +33,6 @@ module BlobHelper
ref
)
end
def
display_modify_blob?
(
blob
,
project
,
ref
)
!
current_user
||
(
current_user
&&
can_modify_blob?
(
blob
,
project
,
ref
))
end
def
ide_edit_button
(
project
=
@project
,
ref
=
@ref
,
path
=
@path
,
options
=
{})
return
unless
show_new_ide?
return
unless
blob
=
readable_blob
(
options
,
path
,
project
,
ref
)
...
...
@@ -42,7 +42,7 @@ module BlobHelper
edit_button_tag
(
blob
,
common_classes
,
_
(
'Web IDE'
),
"
#{
ide_path
}
/project
#{
edit_blob_path
(
project
,
ref
,
path
,
options
)
}
"
,
ide_edit_path
(
project
,
ref
,
path
,
options
)
,
project
,
ref
)
end
...
...
@@ -335,7 +335,7 @@ module BlobHelper
edit_disabled_button_tag
(
text
,
common_classes
)
# This condition only applies to users who are logged in
# Web IDE (Beta) requires the user to have this feature enabled
elsif
display_modify_blob?
(
blob
,
project
,
ref
)
elsif
!
current_user
||
(
current_user
&&
can_modify_blob?
(
blob
,
project
,
ref
)
)
edit_link_tag
(
text
,
edit_path
,
common_classes
)
elsif
current_user
&&
can?
(
current_user
,
:fork_project
,
project
)
edit_fork_button_tag
(
common_classes
,
project
,
text
,
edit_blob_fork_params
(
edit_path
))
...
...
app/views/projects/tree/_tree_header.html.haml
View file @
c888e73b
...
...
@@ -74,7 +74,7 @@
.tree-controls
-
if
show_new_ide?
=
succeed
" "
do
=
link_to
"
#{
ide_path
}
/project
#{
edit_blob_path
(
@project
,
@id
,
@path
,
{
}
)}"
,
class:
'btn btn-default'
do
=
link_to
ide_edit_path
(
@project
,
@id
)
,
class:
'btn btn-default'
do
=
_
(
'Web IDE'
)
=
link_to
s_
(
'Commits|History'
),
project_commits_path
(
@project
,
@id
),
class:
'btn'
...
...
spec/helpers/blob_helper_spec.rb
View file @
c888e73b
...
...
@@ -74,7 +74,7 @@ describe BlobHelper do
end
end
describe
"#edit_blob_
element
"
do
describe
"#edit_blob_
link
"
do
let
(
:namespace
)
{
create
(
:namespace
,
name:
'gitlab'
)}
let
(
:project
)
{
create
(
:project
,
:repository
,
namespace:
namespace
)
}
...
...
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