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
bae0a060
Commit
bae0a060
authored
May 10, 2017
by
Kamil Trzciński
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'enforce-current-user-usage-on-entities' into 'master'
Make all Serializers receive `current_user` instead `user` [CE] See merge request !11254
parents
cb2f739d
368bf99e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
deployments_controller.rb
app/controllers/projects/deployments_controller.rb
+1
-1
No files found.
app/controllers/projects/deployments_controller.rb
View file @
bae0a060
...
@@ -6,7 +6,7 @@ class Projects::DeploymentsController < Projects::ApplicationController
...
@@ -6,7 +6,7 @@ class Projects::DeploymentsController < Projects::ApplicationController
deployments
=
environment
.
deployments
.
reorder
(
created_at: :desc
)
deployments
=
environment
.
deployments
.
reorder
(
created_at: :desc
)
deployments
=
deployments
.
where
(
'created_at > ?'
,
params
[
:after
].
to_time
)
if
params
[
:after
]
&
.
to_time
deployments
=
deployments
.
where
(
'created_at > ?'
,
params
[
:after
].
to_time
)
if
params
[
:after
]
&
.
to_time
render
json:
{
deployments:
DeploymentSerializer
.
new
(
user:
@current_user
,
project:
project
)
render
json:
{
deployments:
DeploymentSerializer
.
new
(
project:
project
)
.
represent_concise
(
deployments
)
}
.
represent_concise
(
deployments
)
}
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