diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2015-11-03 12:13:21 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2015-11-03 12:13:21 +0000 |
| commit | 86c0d8d28983c4f6abbcbf461e422b2fe5962847 (patch) | |
| tree | 54dbd46b12b64bc655ba329e2698e7ca90bf5b4d /app | |
| parent | 819cfcef59f127a9ad92dc969570b479088a6974 (diff) | |
| parent | fe34b745e71a3e4ebb18d77a186d24de23b50863 (diff) | |
| download | gitlab-ce-86c0d8d28983c4f6abbcbf461e422b2fe5962847.tar.gz | |
Merge branch 'only-syntax' into 'master'
Extend yml syntax for only and except to support specifying repository path
This allows to limit execution of jobs to specific repository.
For example:
```yaml
job:
only:
- branches@gitlab-org/gitlab-ce
except:
- master@gitlab-org/gitlab-ce
```
The above will run `job` for all branches on `gitlab-org/gitlab-ce`, except master.
@dzaporozhets @JobV @vsizov Please review.
See merge request !1720
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/ci/commit.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/commit.rb b/app/models/ci/commit.rb index 13437b2483f..e58420d82d4 100644 --- a/app/models/ci/commit.rb +++ b/app/models/ci/commit.rb @@ -187,7 +187,7 @@ module Ci end def config_processor - @config_processor ||= Ci::GitlabCiYamlProcessor.new(ci_yaml_file) + @config_processor ||= Ci::GitlabCiYamlProcessor.new(ci_yaml_file, gl_project.path_with_namespace) rescue Ci::GitlabCiYamlProcessor::ValidationError => e save_yaml_error(e.message) nil |