diff options
| -rw-r--r-- | .gitlab-ci.yml | 11 | ||||
| -rw-r--r-- | app/models/project.rb | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 290fa120812..1c817ce359a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -185,9 +185,8 @@ notify:slack: script: - source ./scripts/notify_slack.sh "#ci-test" "Build failed for master/tags!" when: on_failure - # TODO: uncomment these lines. - #only: - # - master@gitlab-org/gitlab-ce - # - tags@gitlab-org/gitlab-ce - # - master@gitlab-org/gitlab-ee - # - tags@gitlab-org/gitlab-ee
\ No newline at end of file + only: + - master@gitlab-org/gitlab-ce + - tags@gitlab-org/gitlab-ce + - master@gitlab-org/gitlab-ee + - tags@gitlab-org/gitlab-ee
\ No newline at end of file diff --git a/app/models/project.rb b/app/models/project.rb index 165c21288ca..043f08b9a13 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -42,7 +42,7 @@ require 'carrierwave/orm/activerecord' require 'file_size_validator' -glass Project < ActiveRecord::Base +class Project < ActiveRecord::Base include Gitlab::ConfigHelper include Gitlab::ShellAdapter include Gitlab::VisibilityLevel |