diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-11-17 15:40:54 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-11-17 15:40:54 +0100 |
| commit | e849b51cae8956c9d4eebe9c42804443a55edb83 (patch) | |
| tree | 69d96404ed3d9fb6f10d59334cffce4c4cf62725 /app/models/ci/commit.rb | |
| parent | 56ea71a3b19396b01b3b8495337fbf22c534524f (diff) | |
| parent | 1c040b3f0a3ecb18fc8fdea3cf99b70edad8d873 (diff) | |
| download | gitlab-ce-e849b51cae8956c9d4eebe9c42804443a55edb83.tar.gz | |
Merge branch 'master' into james11/gitlab-ce-removable-group-owner
Diffstat (limited to 'app/models/ci/commit.rb')
| -rw-r--r-- | app/models/ci/commit.rb | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/app/models/ci/commit.rb b/app/models/ci/commit.rb index 13437b2483f..33b57173928 100644 --- a/app/models/ci/commit.rb +++ b/app/models/ci/commit.rb @@ -1,18 +1,19 @@ # == Schema Information # -# Table name: commits +# Table name: ci_commits # -# id :integer not null, primary key -# project_id :integer -# ref :string(255) -# sha :string(255) -# before_sha :string(255) -# push_data :text -# created_at :datetime -# updated_at :datetime -# tag :boolean default(FALSE) -# yaml_errors :text -# committed_at :datetime +# id :integer not null, primary key +# project_id :integer +# ref :string(255) +# sha :string(255) +# before_sha :string(255) +# push_data :text +# created_at :datetime +# updated_at :datetime +# tag :boolean default(FALSE) +# yaml_errors :text +# committed_at :datetime +# gl_project_id :integer # module Ci @@ -187,7 +188,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 |