diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-20 15:33:45 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-20 15:33:45 +0000 |
| commit | dc761e3a0a7bf9ff4feddc4785113df33a585cd2 (patch) | |
| tree | 2cf4fb69f3ba8a76ebdd4709bb35436973b77325 /app/helpers/avatars_helper.rb | |
| parent | 529c9f9e2c5779590d880aafd65724e24baf49d6 (diff) | |
| parent | 6c339026a39eabb8593d2851d21f8eef7b595378 (diff) | |
| download | gitlab-ce-dc761e3a0a7bf9ff4feddc4785113df33a585cd2.tar.gz | |
Merge branch 'fix-retries-on-manual-actions' into 'master'
Fix two small problems on how we handle manual actions
## What does this MR do?
Fixes two small problems in how we handle manual actions:
- On environments page we show a `Play` for the same action that is lately deployed, we should show other actions only
- When we process a pipeline that have only a manual action in a stage, the pipeline will stop being processed.
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5366
Diffstat (limited to 'app/helpers/avatars_helper.rb')
0 files changed, 0 insertions, 0 deletions