summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Use synchronous pipeline processinguse-pipeline-sync-processingKamil Trzcinski2016-10-201-2/+2
* Merge branch '22191-delete-dynamic-envs-mr' into 'master' Rémy Coutable2016-10-193-2/+41
|\
| * Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-182-3/+18
| |\
| * | Add `stop!` to `environment`Kamil Trzcinski2016-10-181-0/+6
| * | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-181-1/+1
| |\ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 22191-delete-dy...Kamil Trzcinski2016-10-171-4/+6
| |\ \ \
| * | | | Fix environments specsKamil Trzcinski2016-10-171-0/+3
| * | | | Improve after code reviewKamil Trzcinski2016-10-172-5/+7
| * | | | Add on_stop column [ci skip]Kamil Trzcinski2016-10-171-2/+0
| * | | | Refactor code to use available and stopped statuses and refactor views to use...Kamil Trzcinski2016-10-174-27/+18
| * | | | Add environment stop action [ci skip]Kamil Trzcinski2016-10-171-10/+0
| * | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-1730-92/+450
| |\ \ \ \
| * | | | | Make environments to be close ableKamil Trzcinski2016-10-061-1/+1
| * | | | | Add play typeKamil Trzcinski2016-10-061-1/+15
| * | | | | Initial support for closing environmentsKamil Trzcinski2016-10-063-0/+35
* | | | | | Merge branch 'pipeline-emails' into 'master' Kamil Trzciński2016-10-185-13/+116
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailspipeline-emailsLin Jen-Shin2016-10-182-5/+7
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-173-15/+15
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Just show the first merge request we found, feedback:Lin Jen-Shin2016-10-142-10/+0
| * | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-1415-70/+184
| |\ \ \ \ \ \
| * | | | | | | Introduce Pipeline#merge_requests_with_active_first,Lin Jen-Shin2016-10-142-4/+12
| * | | | | | | Use any? instead of count > 0, feedback:Lin Jen-Shin2016-10-132-2/+2
| * | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-0829-62/+363
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-0426-167/+303
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Sorry, was confused.Lin Jen-Shin2016-09-211-1/+1
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-2116-97/+386
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make various trace methods take last_lines argument:Lin Jen-Shin2016-09-211-9/+11
| * | | | | | | | | | Avoid using the same name with methodLin Jen-Shin2016-09-211-4/+4
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-1910-57/+75
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Omit else, feedback:Lin Jen-Shin2016-09-151-2/+2
| * | | | | | | | | | | Use keyword arg, feedback:Lin Jen-Shin2016-09-151-2/+2
| * | | | | | | | | | | Prefer public_send, feedback:Lin Jen-Shin2016-09-141-1/+1
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-144-2/+39
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Split notification integration into another branchLin Jen-Shin2016-09-142-12/+1
| * | | | | | | | | | | | Fixed the names and add missing checkLin Jen-Shin2016-09-131-3/+5
| * | | | | | | | | | | | Try to integrate the email into notification systemLin Jen-Shin2016-09-133-2/+14
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-1231-822/+622
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | send works on stringsLin Jen-Shin2016-09-011-1/+1
| * | | | | | | | | | | | | So that it could create the service without having a templateLin Jen-Shin2016-09-011-0/+1
| * | | | | | | | | | | | | Fix array literal styleLin Jen-Shin2016-09-011-2/+2
| * | | | | | | | | | | | | Add mock email templatesLin Jen-Shin2016-09-012-2/+6
| * | | | | | | | | | | | | Add a new pipeline email service. TODO: email templates and testsLin Jen-Shin2016-08-261-0/+93
* | | | | | | | | | | | | | Merge branch '21192-retried-builds' into 'master' Jacob Schatz2016-10-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Move build order array to HasStatus module21192-retried-buildsAnnabel Dunstone Gray2016-10-181-0/+1
* | | | | | | | | | | | | | Merge branch 'retry-cancelled-pipelines' into 'master' Kamil Trzciński2016-10-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into retry-cancelled-pipelinesretry-cancelled-pipelinesLin Jen-Shin2016-10-182-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Make cancelled pipelines being able to retryLin Jen-Shin2016-10-171-1/+1
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'master' into issue_19734_2Phil Hughes2016-10-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into merge-conflicts-editor-2Alfredo Sumaran2016-10-171-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-177-26/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |