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
9e211091
Commit
9e211091
authored
Jul 01, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable Style/EmptyLines cop, remove redundant ones
parent
b2273559
Changes
162
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
162 changed files
with
1 addition
and
238 deletions
+1
-238
.rubocop.yml
.rubocop.yml
+1
-1
app/controllers/admin/hooks_controller.rb
app/controllers/admin/hooks_controller.rb
+0
-1
app/controllers/confirmations_controller.rb
app/controllers/confirmations_controller.rb
+0
-1
app/controllers/import/base_controller.rb
app/controllers/import/base_controller.rb
+0
-1
app/controllers/import/fogbugz_controller.rb
app/controllers/import/fogbugz_controller.rb
+0
-2
app/controllers/import/gitorious_controller.rb
app/controllers/import/gitorious_controller.rb
+0
-1
app/controllers/import/google_code_controller.rb
app/controllers/import/google_code_controller.rb
+0
-2
app/controllers/invites_controller.rb
app/controllers/invites_controller.rb
+0
-1
app/controllers/projects/issues_controller.rb
app/controllers/projects/issues_controller.rb
+0
-1
app/controllers/projects/network_controller.rb
app/controllers/projects/network_controller.rb
+0
-1
app/controllers/projects/wikis_controller.rb
app/controllers/projects/wikis_controller.rb
+0
-1
app/helpers/emails_helper.rb
app/helpers/emails_helper.rb
+0
-1
app/helpers/issuables_helper.rb
app/helpers/issuables_helper.rb
+0
-1
app/helpers/search_helper.rb
app/helpers/search_helper.rb
+0
-1
app/models/concerns/issuable.rb
app/models/concerns/issuable.rb
+0
-1
app/models/members/project_member.rb
app/models/members/project_member.rb
+0
-1
app/models/project_services/bugzilla_service.rb
app/models/project_services/bugzilla_service.rb
+0
-2
app/models/project_services/custom_issue_tracker_service.rb
app/models/project_services/custom_issue_tracker_service.rb
+0
-2
app/models/project_services/drone_ci_service.rb
app/models/project_services/drone_ci_service.rb
+0
-1
app/models/project_services/issue_tracker_service.rb
app/models/project_services/issue_tracker_service.rb
+0
-1
app/models/project_services/jira_service.rb
app/models/project_services/jira_service.rb
+0
-1
app/models/project_services/redmine_service.rb
app/models/project_services/redmine_service.rb
+0
-1
app/models/repository.rb
app/models/repository.rb
+0
-1
app/models/user.rb
app/models/user.rb
+0
-1
app/services/create_release_service.rb
app/services/create_release_service.rb
+0
-1
app/services/issues/base_service.rb
app/services/issues/base_service.rb
+0
-1
app/services/merge_requests/base_service.rb
app/services/merge_requests/base_service.rb
+0
-1
app/services/merge_requests/merge_when_build_succeeds_service.rb
...vices/merge_requests/merge_when_build_succeeds_service.rb
+0
-1
app/services/milestones/destroy_service.rb
app/services/milestones/destroy_service.rb
+0
-1
app/services/projects/download_service.rb
app/services/projects/download_service.rb
+0
-1
app/services/projects/import_export/export_service.rb
app/services/projects/import_export/export_service.rb
+0
-1
app/services/system_note_service.rb
app/services/system_note_service.rb
+0
-1
app/services/update_release_service.rb
app/services/update_release_service.rb
+0
-1
app/services/wiki_pages/base_service.rb
app/services/wiki_pages/base_service.rb
+0
-1
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+0
-4
config/routes.rb
config/routes.rb
+0
-2
features/steps/dashboard/new_project.rb
features/steps/dashboard/new_project.rb
+0
-1
features/steps/explore/projects.rb
features/steps/explore/projects.rb
+0
-3
features/steps/project/archived.rb
features/steps/project/archived.rb
+0
-1
features/steps/project/issues/issues.rb
features/steps/project/issues/issues.rb
+0
-5
features/steps/project/project_find_file.rb
features/steps/project/project_find_file.rb
+0
-1
features/steps/shared/issuable.rb
features/steps/shared/issuable.rb
+0
-1
features/steps/snippet_search.rb
features/steps/snippet_search.rb
+0
-1
lib/api/award_emoji.rb
lib/api/award_emoji.rb
+0
-1
lib/api/branches.rb
lib/api/branches.rb
+0
-2
lib/api/builds.rb
lib/api/builds.rb
+0
-1
lib/api/milestones.rb
lib/api/milestones.rb
+0
-1
lib/api/project_hooks.rb
lib/api/project_hooks.rb
+0
-1
lib/api/project_members.rb
lib/api/project_members.rb
+0
-1
lib/api/projects.rb
lib/api/projects.rb
+0
-2
lib/api/services.rb
lib/api/services.rb
+0
-1
lib/banzai/filter/image_link_filter.rb
lib/banzai/filter/image_link_filter.rb
+0
-1
lib/banzai/filter/wiki_link_filter.rb
lib/banzai/filter/wiki_link_filter.rb
+0
-1
lib/banzai/pipeline/full_pipeline.rb
lib/banzai/pipeline/full_pipeline.rb
+0
-1
lib/ci/charts.rb
lib/ci/charts.rb
+0
-1
lib/disable_email_interceptor.rb
lib/disable_email_interceptor.rb
+0
-1
lib/gitlab/asciidoc.rb
lib/gitlab/asciidoc.rb
+0
-1
lib/gitlab/backend/grack_auth.rb
lib/gitlab/backend/grack_auth.rb
+0
-1
lib/gitlab/diff/parser.rb
lib/gitlab/diff/parser.rb
+0
-1
lib/gitlab/import_export/importer.rb
lib/gitlab/import_export/importer.rb
+0
-1
lib/gitlab/import_export/members_mapper.rb
lib/gitlab/import_export/members_mapper.rb
+0
-1
lib/gitlab/import_export/project_creator.rb
lib/gitlab/import_export/project_creator.rb
+0
-1
lib/gitlab/import_export/project_tree_restorer.rb
lib/gitlab/import_export/project_tree_restorer.rb
+0
-1
lib/gitlab/import_export/reader.rb
lib/gitlab/import_export/reader.rb
+0
-2
lib/gitlab/import_export/relation_factory.rb
lib/gitlab/import_export/relation_factory.rb
+0
-1
lib/gitlab/import_export/shared.rb
lib/gitlab/import_export/shared.rb
+0
-1
lib/gitlab/import_export/uploads_saver.rb
lib/gitlab/import_export/uploads_saver.rb
+0
-1
lib/gitlab/import_export/version_checker.rb
lib/gitlab/import_export/version_checker.rb
+0
-1
lib/gitlab/import_export/version_saver.rb
lib/gitlab/import_export/version_saver.rb
+0
-1
lib/gitlab/import_sources.rb
lib/gitlab/import_sources.rb
+0
-2
lib/gitlab/lfs/response.rb
lib/gitlab/lfs/response.rb
+0
-1
lib/gitlab/other_markup.rb
lib/gitlab/other_markup.rb
+0
-1
lib/gitlab/regex.rb
lib/gitlab/regex.rb
+0
-6
lib/gitlab/saml/auth_hash.rb
lib/gitlab/saml/auth_hash.rb
+0
-2
lib/gitlab/saml/config.rb
lib/gitlab/saml/config.rb
+0
-2
lib/gitlab/saml/user.rb
lib/gitlab/saml/user.rb
+0
-1
lib/uploaded_file.rb
lib/uploaded_file.rb
+0
-1
spec/controllers/application_controller_spec.rb
spec/controllers/application_controller_spec.rb
+0
-1
spec/controllers/profiles/accounts_controller_spec.rb
spec/controllers/profiles/accounts_controller_spec.rb
+0
-1
spec/controllers/projects/branches_controller_spec.rb
spec/controllers/projects/branches_controller_spec.rb
+0
-2
spec/controllers/projects/forks_controller_spec.rb
spec/controllers/projects/forks_controller_spec.rb
+0
-2
spec/controllers/projects/labels_controller_spec.rb
spec/controllers/projects/labels_controller_spec.rb
+0
-1
spec/controllers/projects/merge_requests_controller_spec.rb
spec/controllers/projects/merge_requests_controller_spec.rb
+0
-2
spec/controllers/projects/repositories_controller_spec.rb
spec/controllers/projects/repositories_controller_spec.rb
+0
-1
spec/controllers/projects/tree_controller_spec.rb
spec/controllers/projects/tree_controller_spec.rb
+0
-1
spec/controllers/projects_controller_spec.rb
spec/controllers/projects_controller_spec.rb
+0
-3
spec/controllers/users_controller_spec.rb
spec/controllers/users_controller_spec.rb
+0
-1
spec/features/admin/admin_hooks_spec.rb
spec/features/admin/admin_hooks_spec.rb
+0
-2
spec/features/dashboard/user_filters_projects_spec.rb
spec/features/dashboard/user_filters_projects_spec.rb
+0
-1
spec/features/gitlab_flavored_markdown_spec.rb
spec/features/gitlab_flavored_markdown_spec.rb
+0
-2
spec/features/groups/members/owner_manages_access_requests_spec.rb
...ures/groups/members/owner_manages_access_requests_spec.rb
+0
-1
spec/features/issues/filter_issues_spec.rb
spec/features/issues/filter_issues_spec.rb
+0
-6
spec/features/issues_spec.rb
spec/features/issues_spec.rb
+0
-4
spec/features/projects/commit/builds_spec.rb
spec/features/projects/commit/builds_spec.rb
+0
-1
spec/features/projects/commits/cherry_pick_spec.rb
spec/features/projects/commits/cherry_pick_spec.rb
+0
-1
spec/features/projects/labels/issues_sorted_by_priority_spec.rb
...eatures/projects/labels/issues_sorted_by_priority_spec.rb
+0
-3
spec/features/search_spec.rb
spec/features/search_spec.rb
+0
-5
spec/features/security/group/internal_access_spec.rb
spec/features/security/group/internal_access_spec.rb
+0
-1
spec/features/security/group/private_access_spec.rb
spec/features/security/group/private_access_spec.rb
+0
-1
spec/features/security/group/public_access_spec.rb
spec/features/security/group/public_access_spec.rb
+0
-1
spec/features/signup_spec.rb
spec/features/signup_spec.rb
+0
-2
spec/features/tags/master_deletes_tag_spec.rb
spec/features/tags/master_deletes_tag_spec.rb
+0
-1
spec/features/users_spec.rb
spec/features/users_spec.rb
+0
-1
spec/finders/group_projects_finder_spec.rb
spec/finders/group_projects_finder_spec.rb
+0
-2
spec/finders/snippets_finder_spec.rb
spec/finders/snippets_finder_spec.rb
+0
-1
spec/helpers/visibility_level_helper_spec.rb
spec/helpers/visibility_level_helper_spec.rb
+0
-2
spec/initializers/settings_spec.rb
spec/initializers/settings_spec.rb
+0
-2
spec/lib/banzai/pipeline/wiki_pipeline_spec.rb
spec/lib/banzai/pipeline/wiki_pipeline_spec.rb
+0
-1
spec/lib/ci/charts_spec.rb
spec/lib/ci/charts_spec.rb
+0
-1
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+0
-1
spec/lib/gitlab/asciidoc_spec.rb
spec/lib/gitlab/asciidoc_spec.rb
+0
-3
spec/lib/gitlab/ci/build/artifacts/metadata/entry_spec.rb
spec/lib/gitlab/ci/build/artifacts/metadata/entry_spec.rb
+0
-1
spec/lib/gitlab/diff/inline_diff_marker_spec.rb
spec/lib/gitlab/diff/inline_diff_marker_spec.rb
+0
-1
spec/lib/gitlab/fogbugz_import/client_spec.rb
spec/lib/gitlab/fogbugz_import/client_spec.rb
+0
-1
spec/lib/gitlab/git_access_spec.rb
spec/lib/gitlab/git_access_spec.rb
+0
-1
spec/lib/gitlab/github_import/label_formatter_spec.rb
spec/lib/gitlab/github_import/label_formatter_spec.rb
+0
-1
spec/lib/gitlab/google_code_import/importer_spec.rb
spec/lib/gitlab/google_code_import/importer_spec.rb
+0
-1
spec/lib/gitlab/import_export/members_mapper_spec.rb
spec/lib/gitlab/import_export/members_mapper_spec.rb
+0
-1
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
+0
-1
spec/lib/gitlab/import_export/project_tree_saver_spec.rb
spec/lib/gitlab/import_export/project_tree_saver_spec.rb
+0
-2
spec/lib/gitlab/import_export/reader_spec.rb
spec/lib/gitlab/import_export/reader_spec.rb
+0
-1
spec/lib/gitlab/import_export/repo_bundler_spec.rb
spec/lib/gitlab/import_export/repo_bundler_spec.rb
+0
-1
spec/lib/gitlab/import_export/wiki_repo_bundler_spec.rb
spec/lib/gitlab/import_export/wiki_repo_bundler_spec.rb
+0
-1
spec/lib/gitlab/ldap/auth_hash_spec.rb
spec/lib/gitlab/ldap/auth_hash_spec.rb
+0
-1
spec/lib/gitlab/o_auth/user_spec.rb
spec/lib/gitlab/o_auth/user_spec.rb
+0
-3
spec/lib/gitlab/push_data_builder_spec.rb
spec/lib/gitlab/push_data_builder_spec.rb
+0
-1
spec/lib/gitlab/saml/user_spec.rb
spec/lib/gitlab/saml/user_spec.rb
+0
-1
spec/lib/gitlab/url_sanitizer_spec.rb
spec/lib/gitlab/url_sanitizer_spec.rb
+0
-1
spec/mailers/notify_spec.rb
spec/mailers/notify_spec.rb
+0
-5
spec/models/build_spec.rb
spec/models/build_spec.rb
+0
-1
spec/models/concerns/issuable_spec.rb
spec/models/concerns/issuable_spec.rb
+0
-1
spec/models/concerns/strip_attribute_spec.rb
spec/models/concerns/strip_attribute_spec.rb
+0
-1
spec/models/email_spec.rb
spec/models/email_spec.rb
+0
-2
spec/models/forked_project_link_spec.rb
spec/models/forked_project_link_spec.rb
+0
-3
spec/models/identity_spec.rb
spec/models/identity_spec.rb
+0
-1
spec/models/members/project_member_spec.rb
spec/models/members/project_member_spec.rb
+0
-1
spec/models/namespace_spec.rb
spec/models/namespace_spec.rb
+0
-1
spec/models/project_services/jira_service_spec.rb
spec/models/project_services/jira_service_spec.rb
+0
-2
spec/models/project_services/slack_service/wiki_page_message_spec.rb
.../project_services/slack_service/wiki_page_message_spec.rb
+0
-1
spec/models/repository_spec.rb
spec/models/repository_spec.rb
+0
-1
spec/models/service_spec.rb
spec/models/service_spec.rb
+0
-2
spec/requests/api/api_helpers_spec.rb
spec/requests/api/api_helpers_spec.rb
+0
-1
spec/requests/api/award_emoji_spec.rb
spec/requests/api/award_emoji_spec.rb
+0
-1
spec/requests/api/commit_statuses_spec.rb
spec/requests/api/commit_statuses_spec.rb
+0
-1
spec/requests/api/doorkeeper_access_spec.rb
spec/requests/api/doorkeeper_access_spec.rb
+0
-1
spec/requests/api/labels_spec.rb
spec/requests/api/labels_spec.rb
+0
-1
spec/requests/api/notes_spec.rb
spec/requests/api/notes_spec.rb
+0
-3
spec/requests/api/projects_spec.rb
spec/requests/api/projects_spec.rb
+0
-1
spec/requests/api/services_spec.rb
spec/requests/api/services_spec.rb
+0
-1
spec/requests/api/settings_spec.rb
spec/requests/api/settings_spec.rb
+0
-1
spec/requests/api/users_spec.rb
spec/requests/api/users_spec.rb
+0
-1
spec/routing/admin_routing_spec.rb
spec/routing/admin_routing_spec.rb
+0
-1
spec/routing/project_routing_spec.rb
spec/routing/project_routing_spec.rb
+0
-1
spec/routing/routing_spec.rb
spec/routing/routing_spec.rb
+0
-1
spec/services/git_hooks_service_spec.rb
spec/services/git_hooks_service_spec.rb
+0
-2
spec/services/git_push_service_spec.rb
spec/services/git_push_service_spec.rb
+0
-6
spec/services/merge_requests/refresh_service_spec.rb
spec/services/merge_requests/refresh_service_spec.rb
+0
-1
spec/services/notification_service_spec.rb
spec/services/notification_service_spec.rb
+0
-5
spec/services/projects/transfer_service_spec.rb
spec/services/projects/transfer_service_spec.rb
+0
-1
spec/support/jira_service_helper.rb
spec/support/jira_service_helper.rb
+0
-1
spec/tasks/gitlab/backup_rake_spec.rb
spec/tasks/gitlab/backup_rake_spec.rb
+0
-1
spec/workers/project_cache_worker_spec.rb
spec/workers/project_cache_worker_spec.rb
+0
-1
No files found.
.rubocop.yml
View file @
9e211091
...
...
@@ -193,7 +193,7 @@ Style/EmptyLineBetweenDefs:
# Don't use several empty lines in a row.
Style/EmptyLines
:
Enabled
:
fals
e
Enabled
:
tru
e
# Keep blank lines around access modifiers.
Style/EmptyLinesAroundAccessModifier
:
...
...
app/controllers/admin/hooks_controller.rb
View file @
9e211091
...
...
@@ -22,7 +22,6 @@ def destroy
redirect_to
admin_hooks_path
end
def
test
@hook
=
SystemHook
.
find
(
params
[
:hook_id
])
data
=
{
...
...
app/controllers/confirmations_controller.rb
View file @
9e211091
class
ConfirmationsController
<
Devise
::
ConfirmationsController
def
almost_there
flash
[
:notice
]
=
nil
render
layout:
"devise_empty"
...
...
app/controllers/import/base_controller.rb
View file @
9e211091
class
Import::BaseController
<
ApplicationController
private
def
get_or_create_namespace
...
...
app/controllers/import/fogbugz_controller.rb
View file @
9e211091
...
...
@@ -5,7 +5,6 @@ class Import::FogbugzController < Import::BaseController
rescue_from
Fogbugz
::
AuthenticationException
,
with: :fogbugz_unauthorized
def
new
end
def
callback
...
...
@@ -22,7 +21,6 @@ def callback
end
def
new_user_map
end
def
create_user_map
...
...
app/controllers/import/gitorious_controller.rb
View file @
9e211091
...
...
@@ -44,5 +44,4 @@ def client
def
verify_gitorious_import_enabled
render_404
unless
gitorious_import_enabled?
end
end
app/controllers/import/google_code_controller.rb
View file @
9e211091
...
...
@@ -3,7 +3,6 @@ class Import::GoogleCodeController < Import::BaseController
before_action
:user_map
,
only:
[
:new_user_map
,
:create_user_map
]
def
new
end
def
callback
...
...
@@ -34,7 +33,6 @@ def callback
end
def
new_user_map
end
def
create_user_map
...
...
app/controllers/invites_controller.rb
View file @
9e211091
...
...
@@ -5,7 +5,6 @@ class InvitesController < ApplicationController
respond_to
:html
def
show
end
def
accept
...
...
app/controllers/projects/issues_controller.rb
View file @
9e211091
...
...
@@ -76,7 +76,6 @@ def show
render
json:
@issue
.
to_json
(
include:
[
:milestone
,
:labels
])
end
end
end
def
create
...
...
app/controllers/projects/network_controller.rb
View file @
9e211091
...
...
@@ -7,7 +7,6 @@ class Projects::NetworkController < Projects::ApplicationController
before_action
:authorize_download_code!
def
show
@url
=
namespace_project_network_path
(
@project
.
namespace
,
@project
,
@ref
,
@options
.
merge
(
format: :json
))
@commit_url
=
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
'ae45ca32'
).
gsub
(
"ae45ca32"
,
"%s"
)
...
...
app/controllers/projects/wikis_controller.rb
View file @
9e211091
...
...
@@ -124,5 +124,4 @@ def load_project_wiki
def
wiki_params
params
[
:wiki
].
slice
(
:title
,
:content
,
:format
,
:message
)
end
end
app/helpers/emails_helper.rb
View file @
9e211091
module
EmailsHelper
# Google Actions
# https://developers.google.com/gmail/markup/reference/go-to-action
def
email_action
(
url
)
...
...
app/helpers/issuables_helper.rb
View file @
9e211091
module
IssuablesHelper
def
sidebar_gutter_toggle_icon
sidebar_gutter_collapsed?
?
icon
(
'angle-double-left'
)
:
icon
(
'angle-double-right'
)
end
...
...
app/helpers/search_helper.rb
View file @
9e211091
module
SearchHelper
def
search_autocomplete_opts
(
term
)
return
unless
current_user
...
...
app/models/concerns/issuable.rb
View file @
9e211091
...
...
@@ -58,7 +58,6 @@ def award_emojis_loaded?
scope
:references_project
,
->
{
references
(
:project
)
}
scope
:non_archived
,
->
{
join_project
.
where
(
projects:
{
archived:
false
})
}
delegate
:name
,
:email
,
to: :author
,
...
...
app/models/members/project_member.rb
View file @
9e211091
...
...
@@ -15,7 +15,6 @@ class ProjectMember < Member
before_destroy
:delete_member_todos
class
<<
self
# Add users to project teams with passed access option
#
# access can be an integer representing a access code
...
...
app/models/project_services/bugzilla_service.rb
View file @
9e211091
class
BugzillaService
<
IssueTrackerService
prop_accessor
:title
,
:description
,
:project_url
,
:issues_url
,
:new_issue_url
def
title
...
...
@@ -21,5 +20,4 @@ def description
def
to_param
'bugzilla'
end
end
app/models/project_services/custom_issue_tracker_service.rb
View file @
9e211091
class
CustomIssueTrackerService
<
IssueTrackerService
prop_accessor
:title
,
:description
,
:project_url
,
:issues_url
,
:new_issue_url
def
title
...
...
@@ -31,5 +30,4 @@ def fields
{
type:
'text'
,
name:
'new_issue_url'
,
placeholder:
'New Issue url'
}
]
end
end
app/models/project_services/drone_ci_service.rb
View file @
9e211091
class
DroneCiService
<
CiService
prop_accessor
:drone_url
,
:token
,
:enable_ssl_verification
validates
:drone_url
,
presence:
true
,
url:
true
,
if: :activated?
...
...
app/models/project_services/issue_tracker_service.rb
View file @
9e211091
class
IssueTrackerService
<
Service
validates
:project_url
,
:issues_url
,
:new_issue_url
,
presence:
true
,
url:
true
,
if: :activated?
default_value_for
:category
,
'issue_tracker'
...
...
app/models/project_services/jira_service.rb
View file @
9e211091
...
...
@@ -190,7 +190,6 @@ def add_comment(data, issue_name)
end
end
def
auth
require
'base64'
Base64
.
urlsafe_encode64
(
"
#{
self
.
username
}
:
#{
self
.
password
}
"
)
...
...
app/models/project_services/redmine_service.rb
View file @
9e211091
class
RedmineService
<
IssueTrackerService
prop_accessor
:title
,
:description
,
:project_url
,
:issues_url
,
:new_issue_url
def
title
...
...
app/models/repository.rb
View file @
9e211091
...
...
@@ -875,7 +875,6 @@ def is_ancestor?(ancestor_id, descendant_id)
merge_base
(
ancestor_id
,
descendant_id
)
==
ancestor_id
end
def
search_files
(
query
,
ref
)
offset
=
2
args
=
%W(
#{
Gitlab
.
config
.
git
.
bin_path
}
grep -i -I -n --before-context
#{
offset
}
--after-context
#{
offset
}
-E -e
#{
Regexp
.
escape
(
query
)
}
#{
ref
||
root_ref
}
)
...
...
app/models/user.rb
View file @
9e211091
...
...
@@ -852,7 +852,6 @@ def projects_union(min_access_level = nil)
projects
.
select
(
:id
),
groups
.
joins
(
:shared_projects
).
select
(
:project_id
)]
if
min_access_level
scope
=
{
access_level:
Gitlab
::
Access
.
values
.
select
{
|
access
|
access
>=
min_access_level
}
}
relations
=
[
relations
.
shift
]
+
relations
.
map
{
|
relation
|
relation
.
where
(
members:
scope
)
}
...
...
app/services/create_release_service.rb
View file @
9e211091
...
...
@@ -2,7 +2,6 @@
class
CreateReleaseService
<
BaseService
def
execute
(
tag_name
,
release_description
)
repository
=
project
.
repository
existing_tag
=
repository
.
find_tag
(
tag_name
)
...
...
app/services/issues/base_service.rb
View file @
9e211091
module
Issues
class
BaseService
<
::
IssuableBaseService
def
hook_data
(
issue
,
action
)
issue_data
=
issue
.
to_hook_data
(
current_user
)
issue_url
=
Gitlab
::
UrlBuilder
.
build
(
issue
)
...
...
app/services/merge_requests/base_service.rb
View file @
9e211091
module
MergeRequests
class
BaseService
<
::
IssuableBaseService
def
create_note
(
merge_request
)
SystemNoteService
.
change_status
(
merge_request
,
merge_request
.
target_project
,
current_user
,
merge_request
.
state
,
nil
)
end
...
...
app/services/merge_requests/merge_when_build_succeeds_service.rb
View file @
9e211091
...
...
@@ -40,6 +40,5 @@ def cancel(merge_request)
error
(
"Can't cancel the automatic merge"
,
406
)
end
end
end
end
app/services/milestones/destroy_service.rb
View file @
9e211091
module
Milestones
class
DestroyService
<
Milestones
::
BaseService
def
execute
(
milestone
)
Milestone
.
transaction
do
update_params
=
{
milestone:
nil
}
...
...
app/services/projects/download_service.rb
View file @
9e211091
module
Projects
class
DownloadService
<
BaseService
WHITELIST
=
[
/^[^.]+\.fogbugz.com$/
]
...
...
app/services/projects/import_export/export_service.rb
View file @
9e211091
module
Projects
module
ImportExport
class
ExportService
<
BaseService
def
execute
(
_options
=
{})
@shared
=
Gitlab
::
ImportExport
::
Shared
.
new
(
relative_path:
File
.
join
(
project
.
path_with_namespace
,
'work'
))
save_all
...
...
app/services/system_note_service.rb
View file @
9e211091
...
...
@@ -293,7 +293,6 @@ def self.cross_reference(noteable, mentioner, author)
end
end
def
self
.
cross_reference?
(
note_text
)
note_text
.
start_with?
(
cross_reference_note_prefix
)
end
...
...
app/services/update_release_service.rb
View file @
9e211091
...
...
@@ -2,7 +2,6 @@
class
UpdateReleaseService
<
BaseService
def
execute
(
tag_name
,
release_description
)
repository
=
project
.
repository
existing_tag
=
repository
.
find_tag
(
tag_name
)
...
...
app/services/wiki_pages/base_service.rb
View file @
9e211091
module
WikiPages
class
BaseService
<
::
BaseService
def
hook_data
(
page
,
action
)
hook_data
=
{
object_kind:
page
.
class
.
name
.
underscore
,
...
...
config/initializers/1_settings.rb
View file @
9e211091
...
...
@@ -96,7 +96,6 @@ def host(url)
end
end
# Default settings
Settings
[
'ldap'
]
||=
Settingslogic
.
new
({})
Settings
.
ldap
[
'enabled'
]
=
false
if
Settings
.
ldap
[
'enabled'
].
nil?
...
...
@@ -124,7 +123,6 @@ def host(url)
end
end
Settings
[
'omniauth'
]
||=
Settingslogic
.
new
({})
Settings
.
omniauth
[
'enabled'
]
=
false
if
Settings
.
omniauth
[
'enabled'
].
nil?
Settings
.
omniauth
[
'auto_sign_in_with_provider'
]
=
false
if
Settings
.
omniauth
[
'auto_sign_in_with_provider'
].
nil?
...
...
@@ -218,7 +216,6 @@ def host(url)
Settings
.
gitlab
[
'import_sources'
]
||=
%w[github bitbucket gitlab gitorious google_code fogbugz git gitlab_project]
Settings
.
gitlab
[
'trusted_proxies'
]
||=
[]
#
# CI
#
...
...
@@ -348,7 +345,6 @@ def host(url)
Settings
[
'satellites'
]
||=
Settingslogic
.
new
({})
Settings
.
satellites
[
'path'
]
=
File
.
expand_path
(
Settings
.
satellites
[
'path'
]
||
"tmp/repo_satellites/"
,
Rails
.
root
)
#
# Extra customization
#
...
...
config/routes.rb
View file @
9e211091
...
...
@@ -133,7 +133,6 @@
#
resources
:notification_settings
,
only:
[
:create
,
:update
]
#
# Import
#
...
...
@@ -466,7 +465,6 @@
resources
:namespaces
,
path:
'/'
,
constraints:
{
id:
/[a-zA-Z.0-9_\-]+/
},
only:
[]
do
resources
(
:projects
,
constraints:
{
id:
/[a-zA-Z.0-9_\-]+(?<!\.atom)/
},
except:
[
:new
,
:create
,
:index
],
path:
"/"
)
do
member
do
put
:transfer
delete
:remove_fork
...
...
features/steps/dashboard/new_project.rb
View file @
9e211091
...
...
@@ -49,5 +49,4 @@ class Spinach::Features::NewProject < Spinach::FeatureSteps
step
'I redirected to Google Code import page'
do
expect
(
current_path
).
to
eq
new_import_google_code_path
end
end
features/steps/explore/projects.rb
View file @
9e211091
...
...
@@ -69,7 +69,6 @@ class Spinach::Features::ExploreProjects < Spinach::FeatureSteps
visit
namespace_project_issues_path
(
public_project
.
namespace
,
public_project
)
end
step
'I should see list of issues for "Community" project'
do
expect
(
page
).
to
have_content
"Bug"
expect
(
page
).
to
have_content
public_project
.
name
...
...
@@ -88,7 +87,6 @@ class Spinach::Features::ExploreProjects < Spinach::FeatureSteps
visit
namespace_project_issues_path
(
internal_project
.
namespace
,
internal_project
)
end
step
'I should see list of issues for "Internal" project'
do
expect
(
page
).
to
have_content
"Internal Bug"
expect
(
page
).
to
have_content
internal_project
.
name
...
...
@@ -137,7 +135,6 @@ def public_project
@public_project
||=
Project
.
find_by!
(
name:
'Community'
)
end
def
internal_merge_request
@internal_merge_request
||=
MergeRequest
.
find_by!
(
title:
'Feature implemented'
)
end
...
...
features/steps/project/archived.rb
View file @
9e211091
...
...
@@ -33,5 +33,4 @@ class Spinach::Features::ProjectArchived < Spinach::FeatureSteps
When
'I set project unarchived'
do
click_link
"Unarchive"
end
end
features/steps/project/issues/issues.rb
View file @
9e211091
...
...
@@ -124,14 +124,12 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
end
step
'project "Shop" has milestone "v2.2"'
do
milestone
=
create
(
:milestone
,
title:
"v2.2"
,
project:
project
)
3
.
times
{
create
(
:issue
,
project:
project
,
milestone:
milestone
)
}
end
step
'project "Shop" has milestone "v3.0"'
do
milestone
=
create
(
:milestone
,
title:
"v3.0"
,
project:
project
)
3
.
times
{
create
(
:issue
,
project:
project
,
milestone:
milestone
)
}
...
...
@@ -147,7 +145,6 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
end
When
'I select first assignee from "Shop" project'
do
first_assignee
=
project
.
users
.
first
select
first_assignee
.
name
,
from:
"assignee_id"
end
...
...
@@ -160,7 +157,6 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
end
step
'project "Shop" have "Release 0.4" open issue'
do
create
(
:issue
,
title:
"Release 0.4"
,
project:
project
,
...
...
@@ -360,5 +356,4 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
def
filter_issue
(
text
)
fill_in
'issue_search'
,
with:
text
end
end
features/steps/project/project_find_file.rb
View file @
9e211091
...
...
@@ -66,7 +66,6 @@ class Spinach::Features::ProjectFindFile < Spinach::FeatureSteps
expect
(
page
).
not_to
have_content
(
".gitignore"
)
end
def
find_file
(
text
)
fill_in
'file_find'
,
with:
text
end
...
...
features/steps/shared/issuable.rb
View file @
9e211091
...
...
@@ -189,5 +189,4 @@ def expect_sidebar_content(content)
expect
(
page
).
to
have_content
content
end
end
end
features/steps/snippet_search.rb
View file @
9e211091
...
...
@@ -52,5 +52,4 @@ class Spinach::Features::SnippetSearch < Spinach::FeatureSteps
step
'I should not see "Personal snippet private" in results'
do
expect
(
page
).
not_to
have_content
'Personal snippet private'
end
end
lib/api/award_emoji.rb
View file @
9e211091
...
...
@@ -11,7 +11,6 @@ class AwardEmoji < Grape::API
[
":id/
#{
awardable_string
}
/:
#{
awardable_id_string
}
/award_emoji"
,
":id/
#{
awardable_string
}
/:
#{
awardable_id_string
}
/notes/:note_id/award_emoji"
].
each
do
|
endpoint
|
# Get a list of project +awardable+ award emoji
#
# Parameters:
...
...
lib/api/branches.rb
View file @
9e211091
...
...
@@ -40,7 +40,6 @@ class Branches < Grape::API
# PUT /projects/:id/repository/branches/:branch/protect
put
':id/repository/branches/:branch/protect'
,
requirements:
{
branch:
/.+/
}
do
authorize_admin_project
@branch
=
user_project
.
repository
.
find_branch
(
params
[
:branch
])
...
...
@@ -60,7 +59,6 @@ class Branches < Grape::API
# PUT /projects/:id/repository/branches/:branch/unprotect
put
':id/repository/branches/:branch/unprotect'
,
requirements:
{
branch:
/.+/
}
do
authorize_admin_project
@branch
=
user_project
.
repository
.
find_branch
(
params
[
:branch
])
...
...
lib/api/builds.rb
View file @
9e211091
...
...
@@ -13,7 +13,6 @@ class Builds < Grape::API
# Example Request:
# GET /projects/:id/builds
get
':id/builds'
do
builds
=
user_project
.
builds
.
order
(
'id DESC'
)
builds
=
filter_builds
(
builds
,
params
[
:scope
])
...
...
lib/api/milestones.rb
View file @
9e211091
...
...
@@ -115,7 +115,6 @@ def filter_milestones_state(milestones, state)
issues
=
IssuesFinder
.
new
(
current_user
,
finder_params
).
execute
present
paginate
(
issues
),
with:
Entities
::
Issue
,
current_user:
current_user
end
end
end
end
lib/api/project_hooks.rb
View file @
9e211091
...
...
@@ -28,7 +28,6 @@ class ProjectHooks < Grape::API
present
@hook
,
with:
Entities
::
ProjectHook
end
# Add hook to project
#
# Parameters:
...
...
lib/api/project_members.rb
View file @
9e211091
...
...
@@ -4,7 +4,6 @@ class ProjectMembers < Grape::API
before
{
authenticate!
}
resource
:projects
do
# Get a project team members
#
# Parameters:
...
...
lib/api/projects.rb
View file @
9e211091
...
...
@@ -341,7 +341,6 @@ def map_public_to_visibility_level(attrs)
else
not_found!
(
"Source Project"
)
end
end
# Remove a forked_from relationship
...
...
@@ -418,7 +417,6 @@ def map_public_to_visibility_level(attrs)
present
paginate
(
projects
),
with:
Entities
::
Project
end
# Get a users list
#
# Example Request:
...
...
lib/api/services.rb
View file @
9e211091
...
...
@@ -4,7 +4,6 @@ class Services < Grape::API
before
{
authenticate!
}
before
{
authorize_admin_project
}
resource
:projects
do
# Set <service_slug> service for project
#
...
...
lib/banzai/filter/image_link_filter.rb
View file @
9e211091
...
...
@@ -8,7 +8,6 @@ class ImageLinkFilter < HTML::Pipeline::Filter
# of the anchor, and then replace the img with the link-wrapped version.
def
call
doc
.
xpath
(
'descendant-or-self::img[not(ancestor::a)]'
).
each
do
|
img
|
div
=
doc
.
document
.
create_element
(
'div'
,
class:
'image-container'
...
...
lib/banzai/filter/wiki_link_filter.rb
View file @
9e211091
...
...
@@ -8,7 +8,6 @@ module Filter
# Context options:
# :project_wiki
class
WikiLinkFilter
<
HTML
::
Pipeline
::
Filter
def
call
return
doc
unless
project_wiki?
...
...
lib/banzai/pipeline/full_pipeline.rb
View file @
9e211091
module
Banzai
module
Pipeline
class
FullPipeline
<
CombinedPipeline
.
new
(
PlainMarkdownPipeline
,
GfmPipeline
)
end
end
end
lib/ci/charts.rb
View file @
9e211091
...
...
@@ -13,7 +13,6 @@ def initialize(project)
collect
end
def
push
(
from
,
to
,
format
)
@labels
<<
from
.
strftime
(
format
)
@total
<<
project
.
builds
.
...
...
lib/disable_email_interceptor.rb
View file @
9e211091
# Read about interceptors in http://guides.rubyonrails.org/action_mailer_basics.html#intercepting-emails
class
DisableEmailInterceptor
def
self
.
delivering_email
(
message
)
message
.
perform_deliveries
=
false
Rails
.
logger
.
info
"Emails disabled! Interceptor prevented sending mail
#{
message
.
subject
}
"
...
...
lib/gitlab/asciidoc.rb
View file @
9e211091
...
...
@@ -4,7 +4,6 @@ module Gitlab
# Parser/renderer for the AsciiDoc format that uses Asciidoctor and filters
# the resulting HTML through HTML pipeline filters.
module
Asciidoc
DEFAULT_ADOC_ATTRS
=
[
'showtitle'
,
'idprefix=user-content-'
,
'idseparator=-'
,
'env=gitlab'
,
'env-gitlab'
,
'source-highlighter=html-pipeline'
...
...
lib/gitlab/backend/grack_auth.rb
View file @
9e211091
...
...
@@ -8,7 +8,6 @@ def self.call(env)
end
class
Auth
<
Rack
::
Auth
::
Basic
attr_accessor
:user
,
:project
,
:env