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
Léo-Paul Géneau
gitlab-ce
Commits
e7a6d17b
Commit
e7a6d17b
authored
May 18, 2016
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix some styling offender
parent
c337e748
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
app/controllers/omniauth_callbacks_controller.rb
app/controllers/omniauth_callbacks_controller.rb
+1
-1
app/models/ci/build.rb
app/models/ci/build.rb
+2
-2
app/models/project.rb
app/models/project.rb
+2
-2
No files found.
app/controllers/omniauth_callbacks_controller.rb
View file @
e7a6d17b
...
@@ -97,7 +97,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
...
@@ -97,7 +97,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
handle_signup_error
handle_signup_error
end
end
def
handle_service_ticket
provider
,
ticket
def
handle_service_ticket
(
provider
,
ticket
)
Gitlab
::
OAuth
::
Session
.
create
provider
,
ticket
Gitlab
::
OAuth
::
Session
.
create
provider
,
ticket
session
[
:service_tickets
]
||=
{}
session
[
:service_tickets
]
||=
{}
session
[
:service_tickets
][
provider
]
=
ticket
session
[
:service_tickets
][
provider
]
=
ticket
...
...
app/models/ci/build.rb
View file @
e7a6d17b
...
@@ -285,8 +285,8 @@ module Ci
...
@@ -285,8 +285,8 @@ module Ci
project
.
runners_token
project
.
runners_token
end
end
def
valid_token?
token
def
valid_token?
(
token
)
project
.
valid_runners_token?
token
project
.
valid_runners_token?
(
token
)
end
end
def
can_be_served?
(
runner
)
def
can_be_served?
(
runner
)
...
...
app/models/project.rb
View file @
e7a6d17b
...
@@ -947,13 +947,13 @@ class Project < ActiveRecord::Base
...
@@ -947,13 +947,13 @@ class Project < ActiveRecord::Base
shared_runners_enabled?
&&
Ci
::
Runner
.
shared
.
active
.
any?
(
&
block
)
shared_runners_enabled?
&&
Ci
::
Runner
.
shared
.
active
.
any?
(
&
block
)
end
end
def
valid_runners_token?
token
def
valid_runners_token?
(
token
)
self
.
runners_token
&&
ActiveSupport
::
SecurityUtils
.
variable_size_secure_compare
(
token
,
self
.
runners_token
)
self
.
runners_token
&&
ActiveSupport
::
SecurityUtils
.
variable_size_secure_compare
(
token
,
self
.
runners_token
)
end
end
# TODO (ayufan): For now we use runners_token (backward compatibility)
# TODO (ayufan): For now we use runners_token (backward compatibility)
# In 8.4 every build will have its own individual token valid for time of build
# In 8.4 every build will have its own individual token valid for time of build
def
valid_build_token?
token
def
valid_build_token?
(
token
)
self
.
builds_enabled?
&&
self
.
runners_token
&&
ActiveSupport
::
SecurityUtils
.
variable_size_secure_compare
(
token
,
self
.
runners_token
)
self
.
builds_enabled?
&&
self
.
runners_token
&&
ActiveSupport
::
SecurityUtils
.
variable_size_secure_compare
(
token
,
self
.
runners_token
)
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