Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GitLab
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
projects.thm.de
GitLab
Commits
b5291f95
Commit
b5291f95
authored
Dec 15, 2015
by
Gabriel Mazetto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed Rubocop offenses
parent
d1f1c5c6
Changes
58
Hide whitespace changes
Inline
Side-by-side
Showing
58 changed files
with
155 additions
and
154 deletions
+155
-154
app/controllers/dashboard/snippets_controller.rb
app/controllers/dashboard/snippets_controller.rb
+2
-1
app/controllers/projects/notes_controller.rb
app/controllers/projects/notes_controller.rb
+1
-1
app/controllers/projects/protected_branches_controller.rb
app/controllers/projects/protected_branches_controller.rb
+1
-1
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+1
-1
app/helpers/external_wiki_helper.rb
app/helpers/external_wiki_helper.rb
+1
-1
app/helpers/gitlab_markdown_helper.rb
app/helpers/gitlab_markdown_helper.rb
+2
-1
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+3
-4
app/helpers/tree_helper.rb
app/helpers/tree_helper.rb
+1
-1
app/mailers/notify.rb
app/mailers/notify.rb
+1
-1
app/models/application_setting.rb
app/models/application_setting.rb
+6
-6
app/models/concerns/token_authenticatable.rb
app/models/concerns/token_authenticatable.rb
+2
-2
app/models/merge_request.rb
app/models/merge_request.rb
+1
-3
app/models/namespace.rb
app/models/namespace.rb
+2
-2
app/models/project.rb
app/models/project.rb
+5
-5
app/models/project_services/bamboo_service.rb
app/models/project_services/bamboo_service.rb
+2
-4
app/models/project_services/flowdock_service.rb
app/models/project_services/flowdock_service.rb
+1
-1
app/models/project_services/gemnasium_service.rb
app/models/project_services/gemnasium_service.rb
+1
-1
app/models/project_services/teamcity_service.rb
app/models/project_services/teamcity_service.rb
+3
-5
app/models/user.rb
app/models/user.rb
+3
-3
app/services/merge_requests/refresh_service.rb
app/services/merge_requests/refresh_service.rb
+1
-1
config/initializers/carrierwave.rb
config/initializers/carrierwave.rb
+5
-5
config/routes.rb
config/routes.rb
+1
-1
features/steps/explore/groups.rb
features/steps/explore/groups.rb
+4
-4
features/steps/explore/projects.rb
features/steps/explore/projects.rb
+6
-6
features/steps/groups.rb
features/steps/groups.rb
+1
-1
features/steps/profile/profile.rb
features/steps/profile/profile.rb
+1
-1
features/steps/project/project.rb
features/steps/project/project.rb
+1
-1
features/steps/project/source/browse_files.rb
features/steps/project/source/browse_files.rb
+6
-6
features/steps/shared/paths.rb
features/steps/shared/paths.rb
+4
-4
lib/api/entities.rb
lib/api/entities.rb
+1
-1
lib/gitlab/backend/shell.rb
lib/gitlab/backend/shell.rb
+1
-1
lib/gitlab/bitbucket_import/project_creator.rb
lib/gitlab/bitbucket_import/project_creator.rb
+2
-1
lib/gitlab/diff/file.rb
lib/gitlab/diff/file.rb
+2
-2
lib/gitlab/fogbugz_import/importer.rb
lib/gitlab/fogbugz_import/importer.rb
+1
-1
lib/gitlab/fogbugz_import/project_creator.rb
lib/gitlab/fogbugz_import/project_creator.rb
+2
-1
lib/gitlab/gitlab_import/project_creator.rb
lib/gitlab/gitlab_import/project_creator.rb
+2
-1
lib/gitlab/gitorious_import/project_creator.rb
lib/gitlab/gitorious_import/project_creator.rb
+2
-1
lib/gitlab/google_code_import/importer.rb
lib/gitlab/google_code_import/importer.rb
+3
-3
lib/gitlab/google_code_import/project_creator.rb
lib/gitlab/google_code_import/project_creator.rb
+2
-1
lib/gitlab/markdown/filter/markdown_filter.rb
lib/gitlab/markdown/filter/markdown_filter.rb
+1
-1
lib/gitlab/markdown/filter/table_of_contents_filter.rb
lib/gitlab/markdown/filter/table_of_contents_filter.rb
+1
-1
lib/rouge/formatters/html_gitlab.rb
lib/rouge/formatters/html_gitlab.rb
+1
-1
spec/factories.rb
spec/factories.rb
+2
-1
spec/features/security/group_access_spec.rb
spec/features/security/group_access_spec.rb
+2
-2
spec/helpers/groups_helper.rb
spec/helpers/groups_helper.rb
+1
-1
spec/models/ci/commit_spec.rb
spec/models/ci/commit_spec.rb
+2
-2
spec/models/key_spec.rb
spec/models/key_spec.rb
+1
-1
spec/models/project_services/hipchat_service_spec.rb
spec/models/project_services/hipchat_service_spec.rb
+10
-12
spec/models/project_services/slack_service/note_message_spec.rb
...odels/project_services/slack_service/note_message_spec.rb
+4
-4
spec/models/user_spec.rb
spec/models/user_spec.rb
+2
-2
spec/requests/api/merge_requests_spec.rb
spec/requests/api/merge_requests_spec.rb
+1
-1
spec/requests/api/services_spec.rb
spec/requests/api/services_spec.rb
+1
-1
spec/services/create_commit_builds_service_spec.rb
spec/services/create_commit_builds_service_spec.rb
+11
-11
spec/services/git_tag_push_service_spec.rb
spec/services/git_tag_push_service_spec.rb
+8
-8
spec/services/update_snippet_service_spec.rb
spec/services/update_snippet_service_spec.rb
+1
-1
spec/support/repo_helpers.rb
spec/support/repo_helpers.rb
+6
-6
spec/workers/repository_fork_worker_spec.rb
spec/workers/repository_fork_worker_spec.rb
+11
-9
spec/workers/stuck_ci_builds_worker_spec.rb
spec/workers/stuck_ci_builds_worker_spec.rb
+2
-2
No files found.
app/controllers/dashboard/snippets_controller.rb
View file @
b5291f95
class
Dashboard::SnippetsController
<
Dashboard
::
ApplicationController
def
index
@snippets
=
SnippetsFinder
.
new
.
execute
(
current_user
,
@snippets
=
SnippetsFinder
.
new
.
execute
(
current_user
,
filter: :by_user
,
user:
current_user
,
scope:
params
[
:scope
]
...
...
app/controllers/projects/notes_controller.rb
View file @
b5291f95
...
...
@@ -68,7 +68,7 @@ class Projects::NotesController < Projects::ApplicationController
data
=
{
author:
current_user
,
is_award:
true
,
note:
note_params
[
:note
].
gsub
(
":"
,
''
)
note:
note_params
[
:note
].
delete
(
":"
)
}
note
=
noteable
.
notes
.
find_by
(
data
)
...
...
app/controllers/projects/protected_branches_controller.rb
View file @
b5291f95
...
...
@@ -21,7 +21,7 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
if
protected_branch
&&
protected_branch
.
update_attributes
(
developers_can_push:
params
[
:developers_can_push
]
developers_can_push:
params
[
:developers_can_push
]
)
respond_to
do
|
format
|
...
...
app/helpers/application_helper.rb
View file @
b5291f95
...
...
@@ -61,7 +61,7 @@ module ApplicationHelper
options
[
:class
]
||=
''
options
[
:class
]
<<
' identicon'
bg_key
=
project
.
id
%
7
style
=
"background-color: #
#{
allowed_colors
.
values
[
bg_key
]
}
; color: #555"
style
=
"background-color: #
#{
allowed_colors
.
values
[
bg_key
]
}
; color: #555"
content_tag
(
:div
,
class:
options
[
:class
],
style:
style
)
do
project
.
name
[
0
,
1
].
upcase
...
...
app/helpers/external_wiki_helper.rb
View file @
b5291f95
module
ExternalWikiHelper
def
get_project_wiki_path
(
project
)
external_wiki_service
=
project
.
services
.
select
{
|
service
|
service
.
to_param
==
'external_wiki'
}.
first
find
{
|
service
|
service
.
to_param
==
'external_wiki'
}
if
external_wiki_service
.
present?
&&
external_wiki_service
.
active?
external_wiki_service
.
properties
[
'external_wiki_url'
]
else
...
...
app/helpers/gitlab_markdown_helper.rb
View file @
b5291f95
...
...
@@ -65,7 +65,8 @@ module GitlabMarkdownHelper
end
def
asciidoc
(
text
)
Gitlab
::
Asciidoc
.
render
(
text
,
Gitlab
::
Asciidoc
.
render
(
text
,
project:
@project
,
current_user:
(
current_user
if
defined?
(
current_user
)),
...
...
app/helpers/projects_helper.rb
View file @
b5291f95
...
...
@@ -330,10 +330,9 @@ module ProjectsHelper
def
filename_path
(
project
,
filename
)
if
project
&&
blob
=
project
.
repository
.
send
(
filename
)
namespace_project_blob_path
(
project
.
namespace
,
project
,
tree_join
(
project
.
default_branch
,
blob
.
name
)
project
.
namespace
,
project
,
tree_join
(
project
.
default_branch
,
blob
.
name
)
)
end
end
...
...
app/helpers/tree_helper.rb
View file @
b5291f95
...
...
@@ -79,7 +79,7 @@ module TreeHelper
part_path
=
File
.
join
(
part_path
,
part
)
unless
part_path
.
empty?
part_path
=
part
if
part_path
.
empty?
next
unless
parts
.
last
(
2
).
include?
(
part
)
if
parts
.
count
>
max_links
next
if
parts
.
count
>
max_links
&&
!
parts
.
last
(
2
).
include?
(
part
)
yield
(
part
,
tree_join
(
@ref
,
part_path
))
end
end
...
...
app/mailers/notify.rb
View file @
b5291f95
...
...
@@ -17,7 +17,7 @@ class Notify < BaseMailer
subject:
subject
,
body:
body
.
html_safe
,
content_type:
'text/html'
)
)
end
# Splits "gitlab.corp.company.com" up into "gitlab.corp.company.com",
...
...
app/models/application_setting.rb
View file @
b5291f95
...
...
@@ -126,12 +126,12 @@ class ApplicationSetting < ActiveRecord::Base
def
restricted_signup_domains_raw
=
(
values
)
self
.
restricted_signup_domains
=
[]
self
.
restricted_signup_domains
=
values
.
split
(
/\s*[,;]\s* # comma or semicolon, optionally surrounded by whitespace
| # or
\s # any whitespace character
| # or
[\r\n] # any number of newline characters
/x
)
/\s*[,;]\s* # comma or semicolon, optionally surrounded by whitespace
| # or
\s # any whitespace character
| # or
[\r\n] # any number of newline characters
/x
)
self
.
restricted_signup_domains
.
reject!
{
|
d
|
d
.
empty?
}
end
end
app/models/concerns/token_authenticatable.rb
View file @
b5291f95
...
...
@@ -13,7 +13,7 @@ module TokenAuthenticatable
@token_fields
<<
token_field
define_singleton_method
(
"find_by_
#{
token_field
}
"
)
do
|
token
|
where
(
token_field
=>
token
).
first
if
token
find_by
(
token_field
=>
token
)
if
token
end
define_method
(
"ensure_
#{
token_field
}
"
)
do
...
...
@@ -37,7 +37,7 @@ module TokenAuthenticatable
def
generate_token_for
(
token_field
)
loop
do
token
=
Devise
.
friendly_token
break
token
unless
self
.
class
.
unscoped
.
where
(
token_field
=>
token
).
first
break
token
unless
self
.
class
.
unscoped
.
find_by
(
token_field
=>
token
)
end
end
end
app/models/merge_request.rb
View file @
b5291f95
...
...
@@ -194,9 +194,7 @@ class MergeRequest < ActiveRecord::Base
similar_mrs
=
similar_mrs
.
where
(
'id not in (?)'
,
self
.
id
)
if
self
.
id
if
similar_mrs
.
any?
errors
.
add
:validate_branches
,
"Cannot Create: This merge request already exists:
#{
similar_mrs
.
pluck
(
:title
)
}
"
"Cannot Create: This merge request already exists:
#{
similar_mrs
.
pluck
(
:title
)
}
"
end
end
end
...
...
app/models/namespace.rb
View file @
b5291f95
...
...
@@ -45,7 +45,7 @@ class Namespace < ActiveRecord::Base
class
<<
self
def
by_path
(
path
)
where
(
'lower(path) = :value'
,
value:
path
.
downcase
).
first
find_by
(
'lower(path) = :value'
,
value:
path
.
downcase
)
end
# Case insensetive search for namespace by path or name
...
...
@@ -148,6 +148,6 @@ class Namespace < ActiveRecord::Base
end
def
find_fork_of
(
project
)
projects
.
joins
(
:forked_project_link
).
where
(
'forked_project_links.forked_from_project_id = ?'
,
project
.
id
).
first
projects
.
joins
(
:forked_project_link
).
find_by
(
'forked_project_links.forked_from_project_id = ?'
,
project
.
id
)
end
end
app/models/project.rb
View file @
b5291f95
...
...
@@ -265,7 +265,7 @@ class Project < ActiveRecord::Base
joins
(
:namespace
).
iwhere
(
'namespaces.path'
=>
namespace_path
)
projects
.
where
(
'projects.path'
=>
project_path
).
take
||
projects
.
find_by
(
'projects.path'
=>
project_path
)
||
projects
.
iwhere
(
'projects.path'
=>
project_path
).
take
end
...
...
@@ -450,7 +450,7 @@ class Project < ActiveRecord::Base
end
def
external_issue_tracker
@external_issues_tracker
||=
external_issues_trackers
.
select
(
&
:activated?
).
first
@external_issues_tracker
||=
external_issues_trackers
.
find
(
&
:activated?
)
end
def
can_have_issues_tracker_id?
...
...
@@ -496,7 +496,7 @@ class Project < ActiveRecord::Base
end
def
ci_service
@ci_service
||=
ci_services
.
select
(
&
:activated?
).
first
@ci_service
||=
ci_services
.
find
(
&
:activated?
)
end
def
avatar_type
...
...
@@ -547,7 +547,7 @@ class Project < ActiveRecord::Base
end
def
project_member_by_name_or_email
(
name
=
nil
,
email
=
nil
)
user
=
users
.
where
(
'name like ? or email like ?'
,
name
,
email
).
first
user
=
users
.
find_by
(
'name like ? or email like ?'
,
name
,
email
)
project_members
.
where
(
user:
user
)
if
user
end
...
...
@@ -722,7 +722,7 @@ class Project < ActiveRecord::Base
end
def
project_member
(
user
)
project_members
.
where
(
user_id:
user
).
first
project_members
.
find_by
(
user_id:
user
)
end
def
default_branch
...
...
app/models/project_services/bamboo_service.rb
View file @
b5291f95
...
...
@@ -27,12 +27,10 @@ class BambooService < CiService
validates
:build_key
,
presence:
true
,
if: :activated?
validates
:username
,
presence:
true
,
if:
->
(
service
)
{
service
.
password?
},
if: :activated?
if:
->
(
service
)
{
service
.
activated?
&&
service
.
password?
}
validates
:password
,
presence:
true
,
if:
->
(
service
)
{
service
.
username?
},
if: :activated?
if:
->
(
service
)
{
service
.
activated?
&&
service
.
username?
}
attr_accessor
:response
...
...
app/models/project_services/flowdock_service.rb
View file @
b5291f95
...
...
@@ -58,6 +58,6 @@ class FlowdockService < Service
repo_url:
"
#{
Gitlab
.
config
.
gitlab
.
url
}
/
#{
project
.
path_with_namespace
}
"
,
commit_url:
"
#{
Gitlab
.
config
.
gitlab
.
url
}
/
#{
project
.
path_with_namespace
}
/commit/%s"
,
diff_url:
"
#{
Gitlab
.
config
.
gitlab
.
url
}
/
#{
project
.
path_with_namespace
}
/compare/%s...%s"
,
)
)
end
end
app/models/project_services/gemnasium_service.rb
View file @
b5291f95
...
...
@@ -57,6 +57,6 @@ class GemnasiumService < Service
token:
token
,
api_key:
api_key
,
repo:
project
.
repository
.
path_to_repo
)
)
end
end
app/models/project_services/teamcity_service.rb
View file @
b5291f95
...
...
@@ -27,12 +27,10 @@ class TeamcityService < CiService
validates
:build_type
,
presence:
true
,
if: :activated?
validates
:username
,
presence:
true
,
if:
->
(
service
)
{
service
.
password?
},
if: :activated?
if:
->
(
service
)
{
service
.
activated?
&&
service
.
password?
}
validates
:password
,
presence:
true
,
if:
->
(
service
)
{
service
.
username?
},
if: :activated?
if:
->
(
service
)
{
service
.
activated?
&&
service
.
username?
}
attr_accessor
:response
...
...
@@ -147,6 +145,6 @@ class TeamcityService < CiService
'</build>'
,
headers:
{
'Content-type'
=>
'application/xml'
},
basic_auth:
auth
)
)
end
end
app/models/user.rb
View file @
b5291f95
...
...
@@ -220,9 +220,9 @@ class User < ActiveRecord::Base
def
find_for_database_authentication
(
warden_conditions
)
conditions
=
warden_conditions
.
dup
if
login
=
conditions
.
delete
(
:login
)
where
(
conditions
).
where
([
"lower(username) = :value OR lower(email) = :value"
,
{
value:
login
.
downcase
}]).
first
where
(
conditions
).
find_by
(
"lower(username) = :value OR lower(email) = :value"
,
value:
login
.
downcase
)
else
where
(
conditions
).
first
find_by
(
conditions
)
end
end
...
...
@@ -285,7 +285,7 @@ class User < ActiveRecord::Base
end
def
by_username_or_id
(
name_or_id
)
where
(
'users.username = ? OR users.id = ?'
,
name_or_id
.
to_s
,
name_or_id
.
to_i
).
first
find_by
(
'users.username = ? OR users.id = ?'
,
name_or_id
.
to_s
,
name_or_id
.
to_i
)
end
def
build_user
(
attrs
=
{})
...
...
app/services/merge_requests/refresh_service.rb
View file @
b5291f95
...
...
@@ -112,7 +112,7 @@ module MergeRequests
merge_requests_for_source_branch
.
each
do
|
merge_request
|
SystemNoteService
.
change_branch_presence
(
merge_request
,
merge_request
.
project
,
@current_user
,
merge_request
,
merge_request
.
project
,
@current_user
,
:source
,
@branch_name
,
presence
)
end
end
...
...
config/initializers/carrierwave.rb
View file @
b5291f95
...
...
@@ -31,11 +31,11 @@ if File.exists?(aws_file)
if
Rails
.
env
.
test?
Fog
.
mock!
connection
=
::
Fog
::
Storage
.
new
(
aws_access_key_id:
AWS_CONFIG
[
'access_key_id'
],
aws_secret_access_key:
AWS_CONFIG
[
'secret_access_key'
],
provider:
'AWS'
,
region:
AWS_CONFIG
[
'region'
]
)
aws_access_key_id:
AWS_CONFIG
[
'access_key_id'
],
aws_secret_access_key:
AWS_CONFIG
[
'secret_access_key'
],
provider:
'AWS'
,
region:
AWS_CONFIG
[
'region'
]
)
connection
.
directories
.
create
(
key:
AWS_CONFIG
[
'bucket'
])
end
end
config/routes.rb
View file @
b5291f95
...
...
@@ -441,7 +441,7 @@ Rails.application.routes.draw do
scope
do
post
(
'/create_dir/*id'
,
'/create_dir/*id'
,
to:
'tree#create_dir'
,
constraints:
{
id:
/.+/
},
as:
'create_dir'
...
...
features/steps/explore/groups.rb
View file @
b5291f95
...
...
@@ -75,18 +75,18 @@ class Spinach::Features::ExploreGroups < Spinach::FeatureSteps
name:
projectname
,
path:
"
#{
groupname
}
-
#{
projectname
}
"
,
visibility_level:
visibility_level
)
)
create
(
:issue
,
title:
"
#{
projectname
}
feature"
,
project:
project
)
)
create
(
:merge_request
,
title:
"
#{
projectname
}
feature implemented"
,
source_project:
project
,
target_project:
project
)
)
create
(
:closed_issue_event
,
project:
project
)
)
end
end
features/steps/explore/projects.rb
View file @
b5291f95
...
...
@@ -61,11 +61,11 @@ class Spinach::Features::ExploreProjects < Spinach::FeatureSteps
create
(
:issue
,
title:
"Bug"
,
project:
public_project
)
)
create
(
:issue
,
title:
"New feature"
,
project:
public_project
)
)
visit
namespace_project_issues_path
(
public_project
.
namespace
,
public_project
)
end
...
...
@@ -80,11 +80,11 @@ class Spinach::Features::ExploreProjects < Spinach::FeatureSteps
create
(
:issue
,
title:
"Internal Bug"
,
project:
internal_project
)
)
create
(
:issue
,
title:
"New internal feature"
,
project:
internal_project
)
)
visit
namespace_project_issues_path
(
internal_project
.
namespace
,
internal_project
)
end
...
...
@@ -104,7 +104,7 @@ class Spinach::Features::ExploreProjects < Spinach::FeatureSteps
title:
"Bug fix for public project"
,
source_project:
public_project
,
target_project:
public_project
,
)
)
end
step
'I should see list of merge requests for "Community" project'
do
...
...
@@ -121,7 +121,7 @@ class Spinach::Features::ExploreProjects < Spinach::FeatureSteps
title:
"Feature implemented"
,
source_project:
internal_project
,
target_project:
internal_project
)
)
end
step
'I should see list of merge requests for "Internal" project'
do
...
...
features/steps/groups.rb
View file @
b5291f95
...
...
@@ -85,7 +85,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
step
'I should see new group "Owned" avatar'
do
expect
(
owned_group
.
avatar
).
to
be_instance_of
AvatarUploader
expect
(
owned_group
.
avatar
.
url
).
to
eq
"/uploads/group/avatar/
#{
Group
.
find_by
(
name
:"Owned"
).
id
}
/banana_sample.gif"
expect
(
owned_group
.
avatar
.
url
).
to
eq
"/uploads/group/avatar/
#{
Group
.
find_by
(
name
:"Owned"
).
id
}
/banana_sample.gif"
end
step
'I should see the "Remove avatar" button'
do
...
...
features/steps/profile/profile.rb
View file @
b5291f95
...
...
@@ -34,7 +34,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
step
'I should see new avatar'
do
expect
(
@user
.
avatar
).
to
be_instance_of
AvatarUploader
expect
(
@user
.
avatar
.
url
).
to
eq
"/uploads/user/avatar/
#{
@user
.
id
}
/banana_sample.gif"
expect
(
@user
.
avatar
.
url
).
to
eq
"/uploads/user/avatar/
#{
@user
.
id
}
/banana_sample.gif"
end
step
'I should see the "Remove avatar" button'
do
...
...
features/steps/project/project.rb
View file @
b5291f95
...
...
@@ -37,7 +37,7 @@ class Spinach::Features::Project < Spinach::FeatureSteps
step
'I should see new project avatar'
do
expect
(
@project
.
avatar
).
to
be_instance_of
AvatarUploader
url
=
@project
.
avatar
.
url
expect
(
url
).
to
eq
"/uploads/project/avatar/
#{
@project
.
id
}
/banana_sample.gif"
expect
(
url
).
to
eq
"/uploads/project/avatar/
#{
@project
.
id
}
/banana_sample.gif"
end
step
'I should see the "Remove avatar" button'
do
...
...
features/steps/project/source/browse_files.rb
View file @
b5291f95
...
...
@@ -230,13 +230,13 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
end
step
'I am redirected to the new file'
do
expect
(
current_path
).
to
eq
(
namespace_project_blob_path
(
@project
.
namespace
,
@project
,
'master/'
+
new_file_name
))
expect
(
current_path
).
to
eq
(
namespace_project_blob_path
(
@project
.
namespace
,
@project
,
'master/'
+
new_file_name
))
end
step
'I am redirected to the new file with directory'
do
expect
(
current_path
).
to
eq
(
namespace_project_blob_path
(
@project
.
namespace
,
@project
,
'master/'
+
new_file_name_with_directory
))
expect
(
current_path
).
to
eq
(
namespace_project_blob_path
(
@project
.
namespace
,
@project
,
'master/'
+
new_file_name_with_directory
))
end
step
'I am redirected to the new merge request page'
do
...
...
@@ -244,8 +244,8 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
end
step
'I am redirected to the root directory'
do
expect
(
current_path
).
to
eq
(
namespace_project_tree_path
(
@project
.
namespace
,
@project
,
'master/'
))
expect
(
current_path
).
to
eq
(
namespace_project_tree_path
(
@project
.
namespace
,
@project
,
'master/'
))
end
step
"I don't see the permalink link"
do
...
...
features/steps/shared/paths.rb
View file @
b5291f95
...
...
@@ -212,8 +212,8 @@ module SharedPaths
end
step
'I visit a binary file in the repo'
do
visit
namespace_project_blob_path
(
@project
.
namespace
,
@project
,
File
.
join
(
root_ref
,
'files/images/logo-black.png'
))
visit
namespace_project_blob_path
(
@project
.
namespace
,
@project
,
File
.
join
(
root_ref
,
'files/images/logo-black.png'
))
end
step
"I visit my project's commits page"
do
...
...
@@ -316,8 +316,8 @@ module SharedPaths
end
step
'I am on the ".gitignore" edit file page'
do
expect
(
current_path
).
to
eq
(
namespace_project_edit_blob_path
(
@project
.
namespace
,
@project
,
File
.
join
(
root_ref
,
'.gitignore'
)))
expect
(
current_path
).
to
eq
(
namespace_project_edit_blob_path
(
@project
.
namespace
,
@project
,
File
.
join
(
root_ref
,
'.gitignore'
)))
end
step
'I visit project source page for "6d39438"'
do
...
...
lib/api/entities.rb
View file @
b5291f95
...
...
@@ -67,7 +67,7 @@ module API
expose
:shared_runners_enabled
expose
:creator_id
expose
:namespace
expose
:forked_from_project
,
using:
Entities
::
ForkedFromProject
,
if:
lambda
{
|
project
,
options
|
project
.
forked?
}
expose
:forked_from_project
,
using:
Entities
::
ForkedFromProject
,
if:
lambda
{
|
project
,
options
|
project
.
forked?
}
expose
:avatar_url
expose
:star_count
,
:forks_count
end
...
...
lib/gitlab/backend/shell.rb
View file @
b5291f95
...
...
@@ -2,7 +2,7 @@ module Gitlab
class
Shell
class
Error
<
StandardError
;
end
class
KeyAdder
<
Struct
.
new
(
:io
)
KeyAdder
=
Struct
.
new
(
:io
)
do
def
add_key
(
id
,
key
)
key
.
gsub!
(
/[[:space:]]+/
,
' '
).
strip!
io
.
puts
(
"
#{
id
}
\t
#{
key
}
"
)
...
...
lib/gitlab/bitbucket_import/project_creator.rb
View file @
b5291f95
...
...
@@ -11,7 +11,8 @@ module Gitlab
end
def
execute
project
=
::
Projects
::
CreateService
.
new
(
current_user
,
project
=
::
Projects
::
CreateService
.
new
(
current_user
,
name:
repo
[
"name"
],
path:
repo
[
"slug"
],
description:
repo
[
"description"
],
...
...
lib/gitlab/diff/file.rb
View file @
b5291f95
...
...
@@ -46,11 +46,11 @@ module Gitlab
end
def
added_lines
diff_lines
.
select
(
&
:added?
).
size
diff_lines
.
count
(
&
:added?
)
end
def
removed_lines
diff_lines
.
select
(
&
:removed?
).
size
diff_lines
.
count
(
&
:removed?
)
end
end
end
...
...
lib/gitlab/fogbugz_import/importer.rb
View file @
b5291f95
...
...
@@ -199,7 +199,7 @@ module Gitlab
s
=
s
.
gsub
(
/^#/
,
"
\\
#"
)
s
=
s
.
gsub
(
/^-/
,
"
\\
-"
)
s
=
s
.
gsub
(
"`"
,
"
\\
~"
)
s
=
s
.
gsub
(
"
\r
"
,
"
"
)
s
=
s
.
delete
(
"
\r
"
)
s
=
s
.
gsub
(
"
\n
"
,
"
\n
"
)
s
end
...
...
lib/gitlab/fogbugz_import/project_creator.rb
View file @
b5291f95
...
...
@@ -12,7 +12,8 @@ module Gitlab
end
def
execute
project
=
::
Projects
::
CreateService
.
new
(
current_user
,
project
=
::
Projects
::
CreateService
.
new
(
current_user
,
name:
repo
.
safe_name
,
path:
repo
.
path
,
namespace:
namespace
,
...
...
lib/gitlab/gitlab_import/project_creator.rb
View file @
b5291f95
...
...
@@ -11,7 +11,8 @@ module Gitlab
end
def
execute
project
=
::
Projects
::
CreateService
.
new
(
current_user
,
project
=
::
Projects
::
CreateService
.
new
(
current_user
,
name:
repo
[
"name"
],
path:
repo
[
"path"
],
description:
repo
[
"description"
],
...
...
lib/gitlab/gitorious_import/project_creator.rb
View file @
b5291f95
...
...
@@ -10,7 +10,8 @@ module Gitlab
end
def
execute
::
Projects
::
CreateService
.
new
(
current_user
,
::
Projects
::
CreateService
.
new
(
current_user
,
name:
repo
.
name
,
path:
repo
.
path
,
description:
repo
.
description
,
...
...
lib/gitlab/google_code_import/importer.rb
View file @
b5291f95
...
...
@@ -171,8 +171,6 @@ module Gitlab
when
/\AMilestone:/
"#fee3ff"
when
*
@closed_statuses
.
map
{
|
s
|
nice_status_name
(
s
)
}
"#cfcfcf"
when
"Status: New"
"#428bca"
when
"Status: Accepted"
...
...
@@ -199,6 +197,8 @@ module Gitlab
"#8e44ad"
when
"Type: Other"
"#7f8c8d"
when
*
@closed_statuses
.
map
{
|
s
|
nice_status_name
(
s
)
}
"#cfcfcf"
else
"#e2e2e2"
end
...
...
@@ -227,7 +227,7 @@ module Gitlab
s
=
s
.
gsub
(
"`"
,
"
\\
`"
)
# Carriage returns make me sad
s
=
s
.
gsub
(
"
\r
"
,
"
"
)
s
=
s
.
delete
(
"
\r
"
)
# Markdown ignores single newlines, but we need them as <br />.
s
=
s
.
gsub
(
"
\n
"
,
"
\n
"
)
...
...
lib/gitlab/google_code_import/project_creator.rb
View file @
b5291f95
...
...
@@ -11,7 +11,8 @@ module Gitlab
end
def
execute
project
=
::
Projects
::
CreateService
.
new
(
current_user
,
project
=
::
Projects
::
CreateService
.
new
(
current_user
,
name:
repo
.
name
,
path:
repo
.
name
,
description:
repo
.
summary
,
...
...
lib/gitlab/markdown/filter/markdown_filter.rb
View file @
b5291f95
...
...
@@ -3,7 +3,7 @@ module Gitlab
class
MarkdownFilter
<
HTML
::
Pipeline
::
TextFilter
def
initialize
(
text
,
context
=
nil
,
result
=
nil
)
super
text
,
context
,
result
@text
=
@text
.
gsub
"
\r
"
,
''
@text
=
@text
.
delete
"
\r
"
end
def
call
...
...
lib/gitlab/markdown/filter/table_of_contents_filter.rb
View file @
b5291f95
...
...
@@ -31,7 +31,7 @@ module Gitlab