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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
gitlab-ce
Commits
5352ec2e
Commit
5352ec2e
authored
Mar 07, 2016
by
Zeger-Jan van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix denting and spec
parent
dfb96ed8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
CHANGELOG
CHANGELOG
+1
-1
app/controllers/concerns/continue_params.rb
app/controllers/concerns/continue_params.rb
+1
-1
spec/controllers/projects/imports_controller_spec.rb
spec/controllers/projects/imports_controller_spec.rb
+2
-2
No files found.
CHANGELOG
View file @
5352ec2e
...
@@ -29,6 +29,7 @@ v 8.6.0 (unreleased)
...
@@ -29,6 +29,7 @@ v 8.6.0 (unreleased)
- Add main language of a project in the list of projects (Tiago Botelho)
- Add main language of a project in the list of projects (Tiago Botelho)
- Add ability to show archived projects on dashboard, explore and group pages
- Add ability to show archived projects on dashboard, explore and group pages
- Move group activity to separate page
- Move group activity to separate page
- Continue parameters are checked to ensure redirection goes to the same instance
v 8.5.5
v 8.5.5
- Ensure removing a project removes associated Todo entries
- Ensure removing a project removes associated Todo entries
...
@@ -45,7 +46,6 @@ v 8.5.3
...
@@ -45,7 +46,6 @@ v 8.5.3
- Show commit message in JIRA mention comment
- Show commit message in JIRA mention comment
- Makes issue page and merge request page usable on mobile browsers.
- Makes issue page and merge request page usable on mobile browsers.
- Improved UI for profile settings
- Improved UI for profile settings
- Continue parameters are checked to ensure redirection goes to the same instance
v 8.5.2
v 8.5.2
- Fix sidebar overlapping content when screen width was below 1200px
- Fix sidebar overlapping content when screen width was below 1200px
...
...
app/controllers/concerns/continue_params.rb
View file @
5352ec2e
...
@@ -5,7 +5,7 @@ module ContinueParams
...
@@ -5,7 +5,7 @@ module ContinueParams
continue_params
=
params
[
:continue
]
continue_params
=
params
[
:continue
]
return
nil
unless
continue_params
return
nil
unless
continue_params
continue_params
=
continue_params
.
permit
(
:to
,
:notice
,
:notice_now
)
continue_params
=
continue_params
.
permit
(
:to
,
:notice
,
:notice_now
)
return
unless
continue_params
[
:to
]
&&
continue_params
[
:to
].
start_with?
(
'/'
)
return
unless
continue_params
[
:to
]
&&
continue_params
[
:to
].
start_with?
(
'/'
)
continue_params
continue_params
...
...
spec/controllers/projects/imports_controller_spec.rb
View file @
5352ec2e
...
@@ -19,7 +19,7 @@ describe Projects::ImportsController do
...
@@ -19,7 +19,7 @@ describe Projects::ImportsController do
end
end
it
'sets flash.now if params is present'
do
it
'sets flash.now if params is present'
do
get
:show
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
.
to_param
,
continue:
{
notice_now:
'Started'
}
get
:show
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
.
to_param
,
continue:
{
to:
'/'
,
notice_now:
'Started'
}
expect
(
flash
.
now
[
:notice
]).
to
eq
'Started'
expect
(
flash
.
now
[
:notice
]).
to
eq
'Started'
end
end
...
@@ -45,7 +45,7 @@ describe Projects::ImportsController do
...
@@ -45,7 +45,7 @@ describe Projects::ImportsController do
end
end
it
'sets flash.now if params is present'
do
it
'sets flash.now if params is present'
do
get
:show
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
.
to_param
,
continue:
{
notice_now:
'In progress'
}
get
:show
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
.
to_param
,
continue:
{
to:
'/'
,
notice_now:
'In progress'
}
expect
(
flash
.
now
[
:notice
]).
to
eq
'In progress'
expect
(
flash
.
now
[
:notice
]).
to
eq
'In progress'
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