diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2016-12-19 14:40:24 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2016-12-19 14:40:24 +0000 |
commit | 54ab4adc335a46eb38f43c93e3216c9029068fbf (patch) | |
tree | 9eb94d60fcf4172a35985af40d9fe7e45f081435 /lib/gitlab/ci/status/build/play.rb | |
parent | 083e185cdaee03e66dec0ab267a2f3b5d3dab9a7 (diff) | |
parent | 16f950b4c321708c8701e031316b5ed91c50f2eb (diff) | |
download | gitlab-ce-54ab4adc335a46eb38f43c93e3216c9029068fbf.tar.gz |
Merge branch 'master' into 19703-direct-link-pipelines
* master: (175 commits)
Fix typo
Always use `fixture_file_upload` helper to upload files in tests.
Add CHANGELOG
Fix extra spacing in all rgba methods in status file
Improve spacing and fixes manual status color
Add `ci-manual` status CSS with darkest gray color
Move admin application spinach test to rspec
Move admin deploy keys spinach test to rspec
Fix CI/CD statuses actions' CSS on pipeline graphs
Fix rubocop failures
Store mattermost_url in settings
Improve Mattermost Session specs
Ensure the session is destroyed
Improve session tests
Setup mattermost session
Fix link from doc/development/performance.md to 'Performance Monitoring'
Fix query in Projects::ProjectMembersController to fetch members
Improve test for sort dropdown on members page
Fix sort dropdown alignment
Undo changes on members search button stylesheet
...
Diffstat (limited to 'lib/gitlab/ci/status/build/play.rb')
-rw-r--r-- | lib/gitlab/ci/status/build/play.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/ci/status/build/play.rb b/lib/gitlab/ci/status/build/play.rb index 5c506e6d59f..1bf949c96dd 100644 --- a/lib/gitlab/ci/status/build/play.rb +++ b/lib/gitlab/ci/status/build/play.rb @@ -17,6 +17,10 @@ module Gitlab 'icon_status_manual' end + def group + 'manual' + end + def has_action? can?(user, :update_build, subject) end |