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
64dc0fcc
Commit
64dc0fcc
authored
Sep 12, 2018
by
Marcel Amirault
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix setup to set-up in EE-only code
parent
bc13cb81
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
14 additions
and
14 deletions
+14
-14
ee/app/models/project_services/github_service.rb
ee/app/models/project_services/github_service.rb
+1
-1
ee/spec/controllers/projects/mirrors_controller_spec.rb
ee/spec/controllers/projects/mirrors_controller_spec.rb
+2
-2
ee/spec/javascripts/sidebar/sidebar_weight_spec.js
ee/spec/javascripts/sidebar/sidebar_weight_spec.js
+1
-1
ee/spec/lib/gitlab/geo/fdw_spec.rb
ee/spec/lib/gitlab/geo/fdw_spec.rb
+2
-2
ee/spec/lib/gitlab/legacy_github_import/project_creator_spec.rb
...c/lib/gitlab/legacy_github_import/project_creator_spec.rb
+1
-1
ee/spec/models/project_services/github_service_spec.rb
ee/spec/models/project_services/github_service_spec.rb
+1
-1
ee/spec/requests/api/projects_spec.rb
ee/spec/requests/api/projects_spec.rb
+2
-2
ee/spec/services/projects/create_service_spec.rb
ee/spec/services/projects/create_service_spec.rb
+2
-2
ee/spec/support/shared_examples/git_access_shared_examples.rb
...pec/support/shared_examples/git_access_shared_examples.rb
+2
-2
No files found.
ee/app/models/project_services/github_service.rb
View file @
64dc0fcc
...
...
@@ -45,7 +45,7 @@ class GithubService < Service
end
def
disabled_title
'Please setup a pipeline on your repository.'
'Please set
up a pipeline on your repository.'
end
def
execute
(
data
)
...
...
ee/spec/controllers/projects/mirrors_controller_spec.rb
View file @
64dc0fcc
...
...
@@ -29,7 +29,7 @@ describe Projects::MirrorsController do
end
context
'when trying to create a mirror with the same URL'
do
it
'does not setup the mirror'
do
it
'does not set
up the mirror'
do
do_put
(
project
,
mirror:
true
,
import_url:
remote_mirror
.
url
)
expect
(
project
.
reload
.
mirror
).
to
be_falsey
...
...
@@ -46,7 +46,7 @@ describe Projects::MirrorsController do
end
context
'mirror user is not the current user'
do
it
'does not setup the mirror'
do
it
'does not set
up the mirror'
do
new_user
=
create
(
:user
)
project
.
add_maintainer
(
new_user
)
...
...
ee/spec/javascripts/sidebar/sidebar_weight_spec.js
View file @
64dc0fcc
...
...
@@ -14,7 +14,7 @@ describe('Sidebar Weight', function () {
beforeEach
(()
=>
{
SidebarWeight
=
Vue
.
extend
(
sidebarWeight
);
// Setup the stores, services, etc
// Set
up the stores, services, etc
sidebarMediator
=
new
SidebarMediator
(
Mock
.
mediator
);
});
...
...
ee/spec/lib/gitlab/geo/fdw_spec.rb
View file @
64dc0fcc
...
...
@@ -132,7 +132,7 @@ describe Gitlab::Geo::Fdw, :geo do
describe
'has_foreign_schema?'
do
context
'with functional FDW environment'
do
it
'returns true'
do
# When testing it locally, make sure you have FDW setup correctly.
# When testing it locally, make sure you have FDW set
up correctly.
# If you are using GDK, you can run, from GDK root folder:
#
# make postgresql/geo-fdw/test
...
...
@@ -155,7 +155,7 @@ describe Gitlab::Geo::Fdw, :geo do
describe
'connection_exist?'
do
context
'with functional FDW environment'
do
it
'returns true'
do
# When testing it locally, make sure you have FDW setup correctly.
# When testing it locally, make sure you have FDW set
up correctly.
# If you are using GDK, you can run, from GDK root folder:
#
# make postgresql/geo-fdw/test
...
...
ee/spec/lib/gitlab/legacy_github_import/project_creator_spec.rb
View file @
64dc0fcc
...
...
@@ -33,7 +33,7 @@ describe Gitlab::LegacyGithubImport::ProjectCreator do
expect
{
service
.
execute
(
params
)
}.
to
change
(
Project
,
:count
).
by
(
1
)
end
it
'calls the service to setup the project'
do
it
'calls the service to set
up the project'
do
expect
(
CiCd
::
SetupProject
).
to
receive_message_chain
(
:new
,
:execute
)
service
.
execute
(
params
)
...
...
ee/spec/models/project_services/github_service_spec.rb
View file @
64dc0fcc
...
...
@@ -183,7 +183,7 @@ describe GithubService do
it
'raises error if no pipeline found'
do
project
.
pipelines
.
delete_all
expect
{
test_data
}.
to
raise_error
'Please setup a pipeline on your repository.'
expect
{
test_data
}.
to
raise_error
'Please set
up a pipeline on your repository.'
end
it
'generates data for latest pipeline'
do
...
...
ee/spec/requests/api/projects_spec.rb
View file @
64dc0fcc
...
...
@@ -18,7 +18,7 @@ describe API::Projects do
}
end
it
'creates new project with pull mirroring setup'
do
it
'creates new project with pull mirroring set
up'
do
post
api
(
'/projects'
,
user
),
mirror_params
expect
(
response
).
to
have_gitlab_http_status
(
201
)
...
...
@@ -195,7 +195,7 @@ describe API::Projects do
)
end
it
'updates project without mirror attributes when the project is unable to setup repository mirroring'
do
it
'updates project without mirror attributes when the project is unable to set
up repository mirroring'
do
stub_licensed_features
(
repository_mirrors:
false
)
put
(
api
(
"/projects/
#{
project
.
id
}
"
,
user
),
mirror_params
)
...
...
ee/spec/services/projects/create_service_spec.rb
View file @
64dc0fcc
...
...
@@ -24,7 +24,7 @@ describe Projects::CreateService, '#execute' do
stub_licensed_features
(
ci_cd_projects:
true
)
end
it
'calls the service to setup CI/CD on the project'
do
it
'calls the service to set
up CI/CD on the project'
do
expect
(
CiCd
::
SetupProject
).
to
receive_message_chain
(
:new
,
:execute
)
create_project
(
user
,
opts
)
...
...
@@ -36,7 +36,7 @@ describe Projects::CreateService, '#execute' do
stub_licensed_features
(
ci_cd_projects:
false
)
end
it
"doesn't call the service to setup CI/CD on the project"
do
it
"doesn't call the service to set
up CI/CD on the project"
do
expect
(
CiCd
::
SetupProject
).
not_to
receive
(
:new
)
create_project
(
user
,
opts
)
...
...
ee/spec/support/shared_examples/git_access_shared_examples.rb
View file @
64dc0fcc
...
...
@@ -14,7 +14,7 @@ shared_examples 'a read-only GitLab instance' do
allow
(
Gitlab
::
Geo
).
to
receive
(
:secondary_with_primary?
).
and_return
(
secondary_with_primary
)
end
context
'that is incorrectly setup'
do
context
'that is incorrectly set
up'
do
let
(
:secondary_with_primary
)
{
false
}
let
(
:error_message
)
{
"You can't push code to a read-only GitLab instance."
}
...
...
@@ -25,7 +25,7 @@ shared_examples 'a read-only GitLab instance' do
end
end
context
'that is correctly setup'
do
context
'that is correctly set
up'
do
let
(
:secondary_with_primary
)
{
true
}
let
(
:payload
)
do
{
...
...
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