Robert Speicher 2d77a21d59 Merge branch 'ci-fix-500' into 'master' ...

Fix 500 when using CI

- Fix for Ci::Build state machine, allowing to process builds without the project
- Forcefully update builds that didn't want to update with state machine
- Fix saving GitLabCiService as Admin Template

Fixes #3556 

See merge request !1873

2015-11-23 21:51:51 +00:00

..

assets

Merge branch 'fix-clipboard-styling-in-create-mr' into 'master'

2015-11-23 21:18:09 +00:00

controllers

Emoji bug: Invalid url to image

2015-11-22 01:51:00 +02:00

finders

Port GitLab EE ProjectsFinder changes

2015-11-20 15:53:04 +01:00

helpers

Fix for Emoji

2015-11-20 11:13:43 +02:00

mailers

Remove duplication in mailers/emails/notes.rb

2015-11-17 11:55:43 +01:00

models

Merge branch 'ci-fix-500' into 'master'

2015-11-23 21:51:51 +00:00

services

Merge branch 'issue_2296' into 'master'

2015-11-23 13:09:34 +00:00

uploaders

Merge branch 'refactor-duplication' into 'master'

2015-11-16 13:05:49 +00:00

views

Merge branch 'issue_2993' into 'master'

2015-11-23 10:56:02 +00:00

workers

Fix 500 when using CI

2015-11-23 13:51:41 +01:00