diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2015-11-13 20:55:16 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2015-11-13 20:55:16 +0300 |
| commit | eaf27c6295394562eb734d8a10918f9cac301dbd (patch) | |
| tree | 53a8104c9adceec0713c0ca53b18762b8f85c481 /app/services | |
| parent | f197b528ff8556d480914c7b5234addbb86b82d3 (diff) | |
| parent | fea2f214370420cdb86336881bfbcb24a994f6c6 (diff) | |
Merge branch 'builds_feature' into 'master'
Expose builds feature
Expose builds feature in project settings (as feature).
Enable it by default for a new projects.
I deliberately named it builds instead of CI, because we actualy allow to run tests using infrastructure built-in GitLab. I'm free to change it.
If we are ok, I'll add feature tests for it.
/cc @sytses @dzaporozhets
See merge request !1767
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/git_push_service.rb | 2 | ||||
| -rw-r--r-- | app/services/projects/fork_service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb index 3de7bb9dcaa..ccb6b97858c 100644 --- a/app/services/git_push_service.rb +++ b/app/services/git_push_service.rb @@ -60,7 +60,7 @@ class GitPushService # If CI was disabled but .gitlab-ci.yml file was pushed # we enable CI automatically - if !project.gitlab_ci? && gitlab_ci_yaml?(newrev) + if !project.builds_enabled? && gitlab_ci_yaml?(newrev) project.enable_ci end diff --git a/app/services/projects/fork_service.rb b/app/services/projects/fork_service.rb index 46374a3909a..5da1c7afd92 100644 --- a/app/services/projects/fork_service.rb +++ b/app/services/projects/fork_service.rb @@ -17,7 +17,7 @@ module Projects new_project = CreateService.new(current_user, new_params).execute if new_project.persisted? - if @project.gitlab_ci? + if @project.builds_enabled? new_project.enable_ci settings = @project.gitlab_ci_project.attributes.select do |attr_name, value| |