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
96a3f0e0
Commit
96a3f0e0
authored
Feb 04, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rubocop issues
parent
9b140b22
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
9 deletions
+9
-9
app/controllers/projects/group_links_controller.rb
app/controllers/projects/group_links_controller.rb
+0
-1
app/models/appearance.rb
app/models/appearance.rb
+7
-4
app/models/project.rb
app/models/project.rb
+1
-1
lib/gitlab/ldap/access.rb
lib/gitlab/ldap/access.rb
+0
-2
lib/gitlab/satellite/merge_action.rb
lib/gitlab/satellite/merge_action.rb
+1
-1
No files found.
app/controllers/projects/group_links_controller.rb
View file @
96a3f0e0
...
...
@@ -21,4 +21,3 @@ class Projects::GroupLinksController < Projects::ApplicationController
redirect_to
project_group_links_path
(
project
)
end
end
app/models/appearance.rb
View file @
96a3f0e0
...
...
@@ -2,10 +2,13 @@ class Appearance < ActiveRecord::Base
validates
:title
,
presence:
true
validates
:description
,
presence:
true
validates
:logo
,
file_size:
{
maximum:
1000
.
kilobytes
.
to_i
}
validates
:dark_logo
,
file_size:
{
maximum:
1000
.
kilobytes
.
to_i
},
presence:
true
,
if: :light_logo?
validates
:light_logo
,
file_size:
{
maximum:
1000
.
kilobytes
.
to_i
},
presence:
true
,
if: :dark_logo?
validates
:dark_logo
,
file_size:
{
maximum:
1000
.
kilobytes
.
to_i
},
presence:
true
,
if: :light_logo?
validates
:light_logo
,
file_size:
{
maximum:
1000
.
kilobytes
.
to_i
},
presence:
true
,
if: :dark_logo?
mount_uploader
:logo
,
AttachmentUploader
mount_uploader
:dark_logo
,
AttachmentUploader
...
...
app/models/project.rb
View file @
96a3f0e0
...
...
@@ -386,7 +386,7 @@ class Project < ActiveRecord::Base
@ci_service
||=
ci_services
.
select
(
&
:activated?
).
first
end
def
jira_tracker?
def
jira_tracker?
issues_tracker
.
to_param
==
'jira'
end
...
...
lib/gitlab/ldap/access.rb
View file @
96a3f0e0
...
...
@@ -180,5 +180,3 @@ module Gitlab
end
end
end
lib/gitlab/satellite/merge_action.rb
View file @
96a3f0e0
...
...
@@ -159,7 +159,7 @@ module Gitlab
# git push remote master
def
rebase_in_satellite!
(
repo
)
update_satellite_source_and_target!
(
repo
)
repo
.
git
.
checkout
(
default_options
({
b:
true
}),
merge_request
.
source_branch
,
"source/
#{
merge_request
.
source_branch
}
"
)
repo
.
git
.
checkout
(
default_options
({
b:
true
}),
merge_request
.
source_branch
,
"source/
#{
merge_request
.
source_branch
}
"
)
output
,
status
=
popen
(
%W(git pull --rebase origin
#{
merge_request
.
target_branch
}
)
,
repo
.
working_dir
)
if
status
==
0
...
...
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