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
6c31b607
Commit
6c31b607
authored
Sep 20, 2018
by
Semyon Pupkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix SpaceBeforeFirstArg cop
parent
7d6c6638
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
24 deletions
+10
-24
.rubocop_todo.yml
.rubocop_todo.yml
+0
-14
config/routes/project.rb
config/routes/project.rb
+1
-1
db/migrate/20170506185517_add_foreign_key_pipeline_schedules_and_pipelines.rb
...85517_add_foreign_key_pipeline_schedules_and_pipelines.rb
+1
-1
lib/api/runners.rb
lib/api/runners.rb
+1
-1
spec/features/search/user_uses_search_filters_spec.rb
spec/features/search/user_uses_search_filters_spec.rb
+2
-2
spec/routing/project_routing_spec.rb
spec/routing/project_routing_spec.rb
+4
-4
spec/services/system_note_service_spec.rb
spec/services/system_note_service_spec.rb
+1
-1
No files found.
.rubocop_todo.yml
View file @
6c31b607
...
...
@@ -53,20 +53,6 @@ Layout/IndentArray:
Layout/IndentHash
:
Enabled
:
false
# Offense count: 11
# Cop supports --auto-correct.
# Configuration parameters: AllowForAlignment.
Layout/SpaceBeforeFirstArg
:
Exclude
:
-
'
config/routes/project.rb'
-
'
db/migrate/20170506185517_add_foreign_key_pipeline_schedules_and_pipelines.rb'
-
'
features/steps/project/source/browse_files.rb'
-
'
features/steps/project/source/markdown_render.rb'
-
'
lib/api/runners.rb'
-
'
spec/features/search/user_uses_search_filters_spec.rb'
-
'
spec/routing/project_routing_spec.rb'
-
'
spec/services/system_note_service_spec.rb'
# Offense count: 93
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle.
...
...
config/routes/project.rb
View file @
6c31b607
...
...
@@ -365,7 +365,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
get
:discussions
,
format: :json
end
collection
do
post
:bulk_update
post
:bulk_update
end
end
...
...
db/migrate/20170506185517_add_foreign_key_pipeline_schedules_and_pipelines.rb
View file @
6c31b607
...
...
@@ -13,7 +13,7 @@ class AddForeignKeyPipelineSchedulesAndPipelines < ActiveRecord::Migration
'SET NULL'
end
add_concurrent_foreign_key
:ci_pipelines
,
:ci_pipeline_schedules
,
add_concurrent_foreign_key
:ci_pipelines
,
:ci_pipeline_schedules
,
column: :pipeline_schedule_id
,
on_delete:
on_delete
end
...
...
lib/api/runners.rb
View file @
6c31b607
...
...
@@ -94,7 +94,7 @@ module API
optional
:status
,
type:
String
,
desc:
'Status of the job'
,
values:
Ci
::
Build
::
AVAILABLE_STATUSES
use
:pagination
end
get
':id/jobs'
do
get
':id/jobs'
do
runner
=
get_runner
(
params
[
:id
])
authenticate_list_runners_jobs!
(
runner
)
...
...
spec/features/search/user_uses_search_filters_spec.rb
View file @
6c31b607
...
...
@@ -14,7 +14,7 @@ describe 'User uses search filters', :js do
visit
(
search_path
)
end
context
'
when filtering by group'
do
context
'
when filtering by group'
do
it
'shows group projects'
do
find
(
'.js-search-group-dropdown'
).
click
...
...
@@ -36,7 +36,7 @@ describe 'User uses search filters', :js do
end
end
context
'
when filtering by project'
do
context
'
when filtering by project'
do
it
'shows a project'
do
page
.
within
(
'.project-filter'
)
do
find
(
'.js-search-project-dropdown'
).
click
...
...
spec/routing/project_routing_spec.rb
View file @
6c31b607
...
...
@@ -258,10 +258,10 @@ describe 'project routing' do
end
it
'to #logs_tree'
do
expect
(
get
(
'/gitlab/gitlabhq/refs/stable/logs_tree'
)).
to
route_to
(
'projects/refs#logs_tree'
,
namespace_id:
'gitlab'
,
project_id:
'gitlabhq'
,
id:
'stable'
)
expect
(
get
(
'/gitlab/gitlabhq/refs/feature%2345/logs_tree'
)).
to
route_to
(
'projects/refs#logs_tree'
,
namespace_id:
'gitlab'
,
project_id:
'gitlabhq'
,
id:
'feature#45'
)
expect
(
get
(
'/gitlab/gitlabhq/refs/feature%2B45/logs_tree'
)).
to
route_to
(
'projects/refs#logs_tree'
,
namespace_id:
'gitlab'
,
project_id:
'gitlabhq'
,
id:
'feature+45'
)
expect
(
get
(
'/gitlab/gitlabhq/refs/feature@45/logs_tree'
)).
to
route_to
(
'projects/refs#logs_tree'
,
namespace_id:
'gitlab'
,
project_id:
'gitlabhq'
,
id:
'feature@45'
)
expect
(
get
(
'/gitlab/gitlabhq/refs/stable/logs_tree'
)).
to
route_to
(
'projects/refs#logs_tree'
,
namespace_id:
'gitlab'
,
project_id:
'gitlabhq'
,
id:
'stable'
)
expect
(
get
(
'/gitlab/gitlabhq/refs/feature%2345/logs_tree'
)).
to
route_to
(
'projects/refs#logs_tree'
,
namespace_id:
'gitlab'
,
project_id:
'gitlabhq'
,
id:
'feature#45'
)
expect
(
get
(
'/gitlab/gitlabhq/refs/feature%2B45/logs_tree'
)).
to
route_to
(
'projects/refs#logs_tree'
,
namespace_id:
'gitlab'
,
project_id:
'gitlabhq'
,
id:
'feature+45'
)
expect
(
get
(
'/gitlab/gitlabhq/refs/feature@45/logs_tree'
)).
to
route_to
(
'projects/refs#logs_tree'
,
namespace_id:
'gitlab'
,
project_id:
'gitlabhq'
,
id:
'feature@45'
)
expect
(
get
(
'/gitlab/gitlabhq/refs/stable/logs_tree/foo/bar/baz'
)).
to
route_to
(
'projects/refs#logs_tree'
,
namespace_id:
'gitlab'
,
project_id:
'gitlabhq'
,
id:
'stable'
,
path:
'foo/bar/baz'
)
expect
(
get
(
'/gitlab/gitlabhq/refs/feature%2345/logs_tree/foo/bar/baz'
)).
to
route_to
(
'projects/refs#logs_tree'
,
namespace_id:
'gitlab'
,
project_id:
'gitlabhq'
,
id:
'feature#45'
,
path:
'foo/bar/baz'
)
expect
(
get
(
'/gitlab/gitlabhq/refs/feature%2B45/logs_tree/foo/bar/baz'
)).
to
route_to
(
'projects/refs#logs_tree'
,
namespace_id:
'gitlab'
,
project_id:
'gitlabhq'
,
id:
'feature+45'
,
path:
'foo/bar/baz'
)
...
...
spec/services/system_note_service_spec.rb
View file @
6c31b607
...
...
@@ -324,7 +324,7 @@ describe SystemNoteService do
end
it
"posts the 'merge when pipeline succeeds' system note"
do
expect
(
subject
.
note
).
to
eq
"canceled the automatic merge"
expect
(
subject
.
note
).
to
eq
"canceled the automatic merge"
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