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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
7aa40b33
Commit
7aa40b33
authored
Feb 13, 2017
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rubocop violations
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
a50741de
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
10 additions
and
13 deletions
+10
-13
app/helpers/kerberos_spnego_helper.rb
app/helpers/kerberos_spnego_helper.rb
+1
-1
app/models/environment.rb
app/models/environment.rb
+1
-1
app/models/geo_node.rb
app/models/geo_node.rb
+1
-1
app/models/project.rb
app/models/project.rb
+1
-1
app/models/repository.rb
app/models/repository.rb
+2
-5
app/services/issues/create_service.rb
app/services/issues/create_service.rb
+1
-1
db/migrate/20160812054342_add_group_id_columns_to_protected_branch_access_levels.rb
...add_group_id_columns_to_protected_branch_access_levels.rb
+2
-2
db/migrate/20160916101334_add_approver_groups.rb
db/migrate/20160916101334_add_approver_groups.rb
+1
-1
No files found.
app/helpers/kerberos_spnego_helper.rb
View file @
7aa40b33
...
...
@@ -46,7 +46,7 @@ module KerberosSpnegoHelper
return
unless
krb_principal
identity
=
::
Identity
.
find_by
(
provider: :kerberos
,
extern_uid:
krb_principal
)
identity
.
user
if
identity
identity
&
.
user
end
# The Kerberos backend will translate spnego_token into a Kerberos
...
...
app/models/environment.rb
View file @
7aa40b33
...
...
@@ -126,7 +126,7 @@ class Environment < ActiveRecord::Base
return
unless
available?
stop!
stop_action
.
play
(
current_user
)
if
stop_action
stop_action
&
.
play
(
current_user
)
end
def
actions_for
(
environment
)
...
...
app/models/geo_node.rb
View file @
7aa40b33
...
...
@@ -95,7 +95,7 @@ class GeoNode < ActiveRecord::Base
end
def
update_dependents_attributes
self
.
geo_node_key
.
title
=
"Geo node:
#{
self
.
url
}
"
if
self
.
geo_node_key
self
.
geo_node_key
&
.
title
=
"Geo node:
#{
self
.
url
}
"
if
self
.
primary?
self
.
oauth_application
=
nil
...
...
app/models/project.rb
View file @
7aa40b33
...
...
@@ -508,7 +508,7 @@ class Project < ActiveRecord::Base
def
reset_cache_and_import_attrs
ProjectCacheWorker
.
perform_async
(
self
.
id
)
self
.
import_data
&
.
destroy
if
!
mirror?
self
.
import_data
&
.
destroy
unless
mirror?
end
def
import_url
=
(
value
)
...
...
app/models/repository.rb
View file @
7aa40b33
...
...
@@ -943,11 +943,8 @@ class Repository
raise
'Invalid merge target'
if
our_commit
.
nil?
raise
'Invalid merge source'
if
their_commit
.
nil?
GitOperationService
.
new
(
user
,
self
).
with_branch
(
target_branch
)
do
|
start_commit
|
if
merge_request
merge_request
.
update
(
in_progress_merge_commit_sha:
their_commit
.
oid
)
end
GitOperationService
.
new
(
user
,
self
).
with_branch
(
target_branch
)
do
|
start_commit
|
merge_request
&
.
update
(
in_progress_merge_commit_sha:
their_commit
.
oid
)
their_commit
.
oid
end
...
...
app/services/issues/create_service.rb
View file @
7aa40b33
...
...
@@ -15,7 +15,7 @@ module Issues
def
before_create
(
issuable
)
if
@recaptcha_verified
spam_log
=
current_user
.
spam_logs
.
find_by
(
id:
@spam_log_id
,
title:
issuable
.
title
)
spam_log
.
update!
(
recaptcha_verified:
true
)
if
spam_log
spam_log
&
.
update!
(
recaptcha_verified:
true
)
else
issuable
.
spam
=
spam_service
.
check
(
@api
)
issuable
.
spam_log
=
spam_service
.
spam_log
...
...
db/migrate/20160812054342_add_group_id_columns_to_protected_branch_access_levels.rb
View file @
7aa40b33
...
...
@@ -20,9 +20,9 @@ class AddGroupIdColumnsToProtectedBranchAccessLevels < ActiveRecord::Migration
def
change
add_column
:protected_branch_merge_access_levels
,
:group_id
,
:integer
add_foreign_key
:protected_branch_merge_access_levels
,
:namespaces
,
column: :group_id
add_foreign_key
:protected_branch_merge_access_levels
,
:namespaces
,
column: :group_id
# rubocop: disable Migration/AddConcurrentForeignKey
add_column
:protected_branch_push_access_levels
,
:group_id
,
:integer
add_foreign_key
:protected_branch_push_access_levels
,
:namespaces
,
column: :group_id
add_foreign_key
:protected_branch_push_access_levels
,
:namespaces
,
column: :group_id
# rubocop: disable Migration/AddConcurrentForeignKey
end
end
db/migrate/20160916101334_add_approver_groups.rb
View file @
7aa40b33
...
...
@@ -20,6 +20,6 @@ class AddApproverGroups < ActiveRecord::Migration
t
.
index
:group_id
end
add_foreign_key
:approver_groups
,
:namespaces
,
column: :group_id
,
on_delete: :cascade
add_foreign_key
:approver_groups
,
:namespaces
,
column: :group_id
,
on_delete: :cascade
# rubocop: disable Migration/AddConcurrentForeignKey
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