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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
e4d26966
Commit
e4d26966
authored
Jan 11, 2016
by
Rubén Dávila
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix broken specs. #2406
parent
f0b7dcba
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
app/helpers/blob_helper.rb
app/helpers/blob_helper.rb
+2
-4
spec/routing/project_routing_spec.rb
spec/routing/project_routing_spec.rb
+2
-2
No files found.
app/helpers/blob_helper.rb
View file @
e4d26966
...
@@ -47,8 +47,7 @@ module BlobHelper
...
@@ -47,8 +47,7 @@ module BlobHelper
notice:
edit_in_new_fork_notice
,
notice:
edit_in_new_fork_notice
,
notice_now:
edit_in_new_fork_notice_now
notice_now:
edit_in_new_fork_notice_now
}
}
fork_path
=
namespace_project_forks_path
(
project
.
namespace
,
project
,
namespace_key:
current_user
.
namespace
.
id
,
fork_path
=
namespace_project_forks_path
(
project
.
namespace
,
project
,
namespace_key:
current_user
.
namespace
.
id
,
continue:
continue_params
)
continue:
continue_params
)
link_to
"Edit"
,
fork_path
,
class:
'btn btn-small'
,
method: :post
link_to
"Edit"
,
fork_path
,
class:
'btn btn-small'
,
method: :post
end
end
...
@@ -73,8 +72,7 @@ module BlobHelper
...
@@ -73,8 +72,7 @@ module BlobHelper
notice:
edit_in_new_fork_notice
+
" Try to
#{
action
}
this file again."
,
notice:
edit_in_new_fork_notice
+
" Try to
#{
action
}
this file again."
,
notice_now:
edit_in_new_fork_notice_now
notice_now:
edit_in_new_fork_notice_now
}
}
fork_path
=
namespace_project_forks_path
(
project
.
namespace
,
project
,
namespace_key:
current_user
.
namespace
.
id
,
fork_path
=
namespace_project_forks_path
(
project
.
namespace
,
project
,
namespace_key:
current_user
.
namespace
.
id
,
continue:
continue_params
)
continue:
continue_params
)
link_to
label
,
fork_path
,
class:
"btn btn-
#{
btn_class
}
"
,
method: :post
link_to
label
,
fork_path
,
class:
"btn btn-
#{
btn_class
}
"
,
method: :post
end
end
...
...
spec/routing/project_routing_spec.rb
View file @
e4d26966
...
@@ -496,11 +496,11 @@ end
...
@@ -496,11 +496,11 @@ end
describe
Projects
::
ForksController
,
'routing'
do
describe
Projects
::
ForksController
,
'routing'
do
it
'to #new'
do
it
'to #new'
do
expect
(
get
(
'/gitlab/gitlabhq/fork/new'
)).
to
route_to
(
'projects/forks#new'
,
namespace_id:
'gitlab'
,
project_id:
'gitlabhq'
)
expect
(
get
(
'/gitlab/gitlabhq/fork
s
/new'
)).
to
route_to
(
'projects/forks#new'
,
namespace_id:
'gitlab'
,
project_id:
'gitlabhq'
)
end
end
it
'to #create'
do
it
'to #create'
do
expect
(
post
(
'/gitlab/gitlabhq/fork'
)).
to
route_to
(
'projects/forks#create'
,
namespace_id:
'gitlab'
,
project_id:
'gitlabhq'
)
expect
(
post
(
'/gitlab/gitlabhq/fork
s
'
)).
to
route_to
(
'projects/forks#create'
,
namespace_id:
'gitlab'
,
project_id:
'gitlabhq'
)
end
end
end
end
...
...
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