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
Boxiang Sun
gitlab-ce
Commits
16dcf356
Commit
16dcf356
authored
Jul 28, 2015
by
GitLab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix style points
To make Rubocop and Douwe happy
parent
6912f21e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
8 deletions
+7
-8
lib/gitlab/backend/grack_auth.rb
lib/gitlab/backend/grack_auth.rb
+1
-7
lib/gitlab/backend/shell_env.rb
lib/gitlab/backend/shell_env.rb
+6
-1
No files found.
lib/gitlab/backend/grack_auth.rb
View file @
16dcf356
...
@@ -180,13 +180,7 @@ module Grack
...
@@ -180,13 +180,7 @@ module Grack
end
end
def
render_grack_auth_ok
def
render_grack_auth_ok
if
@user
.
present?
[
200
,
{
"Content-Type"
=>
"application/json"
},
[
JSON
.
dump
({
'GL_ID'
=>
Gitlab
::
ShellEnv
.
gl_id
(
@user
)
})]]
gl_id
=
Gitlab
::
ShellEnv
.
gl_id
(
@user
)
else
gl_id
=
''
end
[
200
,
{
"Content-Type"
=>
"application/json"
},
[
JSON
.
dump
({
'GL_ID'
=>
gl_id
})]]
end
end
def
render_not_found
def
render_not_found
...
...
lib/gitlab/backend/shell_env.rb
View file @
16dcf356
...
@@ -17,7 +17,12 @@ module Gitlab
...
@@ -17,7 +17,12 @@ module Gitlab
end
end
def
gl_id
(
user
)
def
gl_id
(
user
)
"user-
#{
user
.
id
}
"
if
user
.
present?
"user-
#{
user
.
id
}
"
else
# This empty string is used in the render_grack_auth_ok method
""
end
end
end
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