diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-05-31 22:58:34 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-05-31 22:58:34 +0800 |
| commit | afb1bf0baf23a6e7b111fb5b305c16c38cf3a99e (patch) | |
| tree | 6f7981f1d809e205df6bbe13638c28d91f3caeed /spec/controllers/projects/jobs_controller_spec.rb | |
| parent | 258cdd14b557b96c5340ea91c6915b8787ce1b1e (diff) | |
| parent | 4ad85b22e25ab9b2d089fce7138f07c72c5fd5d6 (diff) | |
| download | gitlab-ce-afb1bf0baf23a6e7b111fb5b305c16c38cf3a99e.tar.gz | |
Merge remote-tracking branch 'upstream/master' into rename-builds-controller
* upstream/master: (63 commits)
Update docs related to protected actions
Add changelog for protected branches abilities fix
Ask for an example project for bug reports
Center loading spinner in issuable filters
Fix chat commands specs related to protected actions
Fix builds controller specs related to protected actions
Fix pipeline retry specs related to protected actions
Fix environment model specs related to protected actions
Fix build factory specs related to protected actions
Fix job play service specs related to protected actions
Fix play status specs related to protected actions
Fix deploy chat command specs for protected actions
Fix environment specs related to protected actions
Fix pipeline processing specs related to protected actions
Fix build entity specs related to protected actions
Check only a merge ability for protected actions
Add tag_list param to project api
Allow PostReceivePack to be enabled with Gitaly
Remove some deprecated methods
Add :owned param to ProjectFinder
...
Diffstat (limited to 'spec/controllers/projects/jobs_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/jobs_controller_spec.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/controllers/projects/jobs_controller_spec.rb b/spec/controllers/projects/jobs_controller_spec.rb index d011ce70244..838bdae1445 100644 --- a/spec/controllers/projects/jobs_controller_spec.rb +++ b/spec/controllers/projects/jobs_controller_spec.rb @@ -234,7 +234,11 @@ describe Projects::JobsController do describe 'POST play' do before do - project.add_master(user) + project.add_developer(user) + + create(:protected_branch, :developers_can_merge, + name: 'master', project: project) + sign_in(user) post_play |