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
e41a29b0
Commit
e41a29b0
authored
Sep 18, 2015
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow to disable GitLab CI
parent
1eb3dde4
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
47 additions
and
7 deletions
+47
-7
app/controllers/admin/application_settings_controller.rb
app/controllers/admin/application_settings_controller.rb
+1
-0
app/controllers/ci/application_controller.rb
app/controllers/ci/application_controller.rb
+9
-0
app/controllers/ci/projects_controller.rb
app/controllers/ci/projects_controller.rb
+6
-2
app/models/application_setting.rb
app/models/application_setting.rb
+2
-1
app/views/admin/application_settings/_form.html.haml
app/views/admin/application_settings/_form.html.haml
+9
-0
app/views/ci/projects/disabled.html.haml
app/views/ci/projects/disabled.html.haml
+1
-0
app/views/layouts/ci/application.html.haml
app/views/layouts/ci/application.html.haml
+1
-1
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/nav/_dashboard.html.haml
+1
-1
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+1
-0
config/routes.rb
config/routes.rb
+1
-1
db/migrate/20150918084513_add_ci_enabled_to_application_settings.rb
.../20150918084513_add_ci_enabled_to_application_settings.rb
+5
-0
db/schema.rb
db/schema.rb
+2
-1
lib/ci/api/api.rb
lib/ci/api/api.rb
+4
-0
lib/ci/api/helpers.rb
lib/ci/api/helpers.rb
+4
-0
No files found.
app/controllers/admin/application_settings_controller.rb
View file @
e41a29b0
...
...
@@ -56,6 +56,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:restricted_signup_domains_raw
,
:version_check_enabled
,
:user_oauth_applications
,
:ci_enabled
,
restricted_visibility_levels:
[],
import_sources:
[]
)
...
...
app/controllers/ci/application_controller.rb
View file @
e41a29b0
module
Ci
class
ApplicationController
<
::
ApplicationController
before_action
:check_enable_flag!
def
self
.
railtie_helpers_paths
"app/helpers/ci"
end
...
...
@@ -8,6 +10,13 @@ module Ci
private
def
check_enable_flag!
unless
current_application_settings
.
ci_enabled
redirect_to
(
disabled_ci_projects_path
)
return
end
end
def
authenticate_public_page!
unless
project
.
public
authenticate_user!
...
...
app/controllers/ci/projects_controller.rb
View file @
e41a29b0
...
...
@@ -5,13 +5,17 @@ module Ci
before_action
:authenticate_user!
,
except:
[
:build
,
:badge
,
:index
,
:show
]
before_action
:authenticate_public_page!
,
only: :show
before_action
:project
,
only:
[
:build
,
:integration
,
:show
,
:badge
,
:edit
,
:update
,
:destroy
,
:toggle_shared_runners
,
:dumped_yaml
]
before_action
:authorize_access_project!
,
except:
[
:build
,
:badge
,
:index
,
:show
,
:new
,
:create
]
before_action
:authorize_access_project!
,
except:
[
:build
,
:badge
,
:index
,
:show
,
:new
,
:create
,
:disabled
]
before_action
:authorize_manage_project!
,
only:
[
:edit
,
:integration
,
:update
,
:destroy
,
:toggle_shared_runners
,
:dumped_yaml
]
before_action
:authenticate_token!
,
only:
[
:build
]
before_action
:no_cache
,
only:
[
:badge
]
skip_before_action
:check_enable_flag!
,
only:
[
:disabled
]
protect_from_forgery
except: :build
layout
'ci/project'
,
except: :index
layout
'ci/project'
,
except:
[
:index
,
:disabled
]
def
disabled
end
def
index
@limit
,
@offset
=
(
params
[
:limit
]
||
PROJECTS_BATCH
).
to_i
,
(
params
[
:offset
]
||
0
).
to_i
...
...
app/models/application_setting.rb
View file @
e41a29b0
...
...
@@ -83,7 +83,8 @@ class ApplicationSetting < ActiveRecord::Base
default_project_visibility:
Settings
.
gitlab
.
default_projects_features
[
'visibility_level'
],
default_snippet_visibility:
Settings
.
gitlab
.
default_projects_features
[
'visibility_level'
],
restricted_signup_domains:
Settings
.
gitlab
[
'restricted_signup_domains'
],
import_sources:
[
'github'
,
'bitbucket'
,
'gitlab'
,
'gitorious'
,
'google_code'
,
'fogbugz'
,
'git'
]
import_sources:
[
'github'
,
'bitbucket'
,
'gitlab'
,
'gitorious'
,
'google_code'
,
'fogbugz'
,
'git'
],
ci_enabled:
Settings
.
gitlab_ci
[
'enabled'
]
)
end
...
...
app/views/admin/application_settings/_form.html.haml
View file @
e41a29b0
...
...
@@ -124,5 +124,14 @@
=
f
.
text_area
:help_page_text
,
class:
'form-control'
,
rows:
4
.help-block
Markdown enabled
%fieldset
%legend
Continuous Integration
.form-group
.col-sm-offset-2.col-sm-10
.checkbox
=
f
.
label
:ci_enabled
do
=
f
.
check_box
:ci_enabled
Enable Continuous Integration
.form-actions
=
f
.
submit
'Save'
,
class:
'btn btn-primary'
app/views/ci/projects/disabled.html.haml
0 → 100644
View file @
e41a29b0
Continuous Integration has been disabled. Please ask your administrator to enable it.
app/views/layouts/ci/application.html.haml
View file @
e41a29b0
...
...
@@ -2,7 +2,7 @@
%html
{
lang:
"en"
}
=
render
'layouts/head'
%body
{
class:
"ci-body #{user_application_theme}"
,
'data-page'
=>
body_data_page
}
-
header_title
=
"C
I Projects
"
-
header_title
=
"C
ontinuous Integration
"
-
if
current_user
=
render
"layouts/header/default"
,
title:
header_title
-
else
...
...
app/views/layouts/nav/_dashboard.html.haml
View file @
e41a29b0
...
...
@@ -31,7 +31,7 @@
%span
Merge Requests
%span
.count
=
current_user
.
assigned_merge_requests
.
opened
.
count
=
nav_link
(
path:
'ci/projects#index'
)
do
=
nav_link
(
path:
[
'ci/projects#index'
,
'ci/projects#disabled'
]
)
do
=
link_to
ci_projects_path
,
title:
'Continuous Integration'
,
data:
{
placement:
'right'
}
do
=
icon
(
'building fw'
)
%span
...
...
config/initializers/1_settings.rb
View file @
e41a29b0
...
...
@@ -178,6 +178,7 @@ Settings.gitlab['import_sources'] ||= ['github','bitbucket','gitlab','gitorious'
# CI
#
Settings
[
'gitlab_ci'
]
||=
Settingslogic
.
new
({})
Settings
.
gitlab_ci
[
'enabled'
]
=
true
if
Settings
.
gitlab_ci
[
'enabled'
].
nil?
Settings
.
gitlab_ci
[
'all_broken_builds'
]
=
true
if
Settings
.
gitlab_ci
[
'all_broken_builds'
].
nil?
Settings
.
gitlab_ci
[
'add_pusher'
]
=
false
if
Settings
.
gitlab_ci
[
'add_pusher'
].
nil?
Settings
.
gitlab_ci
[
'url'
]
||=
Settings
.
send
(
:build_gitlab_ci_url
)
...
...
config/routes.rb
View file @
e41a29b0
...
...
@@ -12,7 +12,7 @@ Gitlab::Application.routes.draw do
resources
:projects
do
collection
do
post
:add
get
:
gitlab
get
:
disabled
end
member
do
...
...
db/migrate/20150918084513_add_ci_enabled_to_application_settings.rb
0 → 100644
View file @
e41a29b0
class
AddCiEnabledToApplicationSettings
<
ActiveRecord
::
Migration
def
change
add_column
:application_settings
,
:ci_enabled
,
:boolean
,
null:
false
,
default:
true
end
end
db/schema.rb
View file @
e41a29b0
...
...
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
version:
2015091
6145038
)
do
ActiveRecord
::
Schema
.
define
(
version:
2015091
8084513
)
do
# These are extensions that must be enabled in order to support this database
enable_extension
"plpgsql"
...
...
@@ -46,6 +46,7 @@ ActiveRecord::Schema.define(version: 20150916145038) do
t
.
integer
"session_expire_delay"
,
default:
10080
,
null:
false
t
.
text
"import_sources"
t
.
text
"help_page_text"
t
.
boolean
"ci_enabled"
,
default:
true
,
null:
false
end
create_table
"audit_events"
,
force:
true
do
|
t
|
...
...
lib/ci/api/api.rb
View file @
e41a29b0
...
...
@@ -23,6 +23,10 @@ module Ci
rack_response
({
'message'
=>
'500 Internal Server Error'
},
500
)
end
before
do
check_enable_flag!
end
format
:json
helpers
Helpers
...
...
lib/ci/api/helpers.rb
View file @
e41a29b0
...
...
@@ -3,6 +3,10 @@ module Ci
module
Helpers
UPDATE_RUNNER_EVERY
=
60
def
check_enable_flag!
not_found!
unless
current_application_settings
.
ci_enabled
end
def
authenticate_runners!
forbidden!
unless
params
[
:token
]
==
GitlabCi
::
REGISTRATION_TOKEN
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