summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issue_9013' into 'master' Douwe Maan2016-05-201-7/+1
|\
| * Use the right default notification settings for non membersissue_9013Felipe Artur2016-05-191-7/+1
| * Update documentationFelipe Artur2016-05-171-1/+1
| * Improve documentation and add changelogFelipe Artur2016-05-172-9/+4
| * Let users set notification levels in projects which they are not membersFelipe Artur2016-05-172-4/+9
* | Merge branch 'issue-17537-fix' into 'master' Douwe Maan2016-05-201-4/+8
|\ \
| * | Fix Error 500 when attempting to retrieve project license when HEAD points to...Stan Hu2016-05-141-4/+8
* | | Merge branch 'rs-issue-3055' into 'master' Douwe Maan2016-05-201-1/+1
|\ \ \
| * | | Use extended regexp flag for `git grep`-ing filesrs-issue-3055Robert Speicher2016-05-181-1/+1
* | | | refactor project to include some nicer EE stufffix/url-refactor-from-eeJames Lopez2016-05-201-8/+3
* | | | Merge branch 'feature/runner-config-untagged-jobs' into 'master' Robert Speicher2016-05-199-50/+73
|\ \ \ \
| * | | | Minor runner-related code refactoringsGrzegorz Bizon2016-05-192-10/+11
| * | | | Rename method that validates runner tag constrainsGrzegorz Bizon2016-05-191-2/+2
| * | | | Display validation errors when admin edits a runnerGrzegorz Bizon2016-05-192-11/+17
| * | | | Add minor corrections related to config of runnerGrzegorz Bizon2016-05-192-3/+2
| * | | | Move runner validator to separate private methodGrzegorz Bizon2016-05-191-6/+10
| * | | | Use form errors helper in CI runner edit formGrzegorz Bizon2016-05-191-4/+1
| * | | | Add method that check if build has tagsGrzegorz Bizon2016-05-191-3/+5
| * | | | Improve displaying validation messages for runnerGrzegorz Bizon2016-05-193-4/+13
| * | | | Add custom validator to runner modelGrzegorz Bizon2016-05-192-1/+9
| * | | | Disallow runner to pick untagged build if configuredGrzegorz Bizon2016-05-191-0/+4
| * | | | Extend runner config options for untagged jobsGrzegorz Bizon2016-05-194-35/+22
| * | | | Add form for runner config to run untagged jobsGrzegorz Bizon2016-05-191-0/+6
* | | | | Merge branch 'fix-ci-commit-creation' into 'master' Rémy Coutable2016-05-191-10/+7
|\ \ \ \ \
| * | | | | Fix creation of Ci::Commit object which can lead to pending, failed in some s...Kamil Trzcinski2016-05-191-10/+7
* | | | | | Merge branch 'create-todo-on-failing-build' into 'master' Douwe Maan2016-05-1911-33/+105
|\ \ \ \ \ \
| * | | | | | Create a todo on failing MR buildSean McGivern2016-05-1711-33/+105
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '17464-backport-email-syntax-highlighting' into 'master' Douwe Maan2016-05-199-54/+118
|\ \ \ \ \ \
| * | | | | | Syntax-highlight diffs in push emails17464-backport-email-syntax-highlightingSean McGivern2016-05-179-54/+118
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'with-pipeline-view' into 'master' Douwe Maan2016-05-1926-95/+507
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Create pipeline objects with parameterswith-pipeline-viewKamil Trzcinski2016-05-184-11/+9
| * | | | | Use pipelines.errors when communicating the errorKamil Trzcinski2016-05-183-27/+30
| * | | | | Wrap textKamil Trzcinski2016-05-161-1/+0
| * | | | | Improve the pipeline boxKamil Trzcinski2016-05-163-12/+39
| * | | | | Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-05-1650-446/+641
| |\ \ \ \ \ | | |/ / / /
| * | | | | Improve design of commit_box with status of builds and pipelinesKamil Trzcinski2016-05-163-29/+37
| * | | | | Improve the pipelines designKamil Trzcinski2016-05-168-17/+21
| * | | | | Add method new_pipelineKamil Trzcinski2016-05-141-4/+6
| * | | | | Remove testing delegateKamil Trzcinski2016-05-141-2/+2
| * | | | | Fix specs for MySQLKamil Trzcinski2016-05-142-4/+3
| * | | | | Revert `stages` changeKamil Trzcinski2016-05-142-4/+10
| * | | | | Fix specsKamil Trzcinski2016-05-142-4/+1
| * | | | | Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-05-13150-1868/+514
| |\ \ \ \ \
| * | | | | | Fix specsKamil Trzcinski2016-05-133-11/+5
| * | | | | | Added pipelines specKamil Trzcinski2016-05-131-1/+1
| * | | | | | Fix CI testsKamil Trzcinski2016-05-125-9/+12
| * | | | | | Use pipeline permissions instead of buildKamil Trzcinski2016-05-102-3/+2
| * | | | | | Update generic commit status to make it look like a buildKamil Trzcinski2016-05-103-25/+21
| * | | | | | Improve pipelines designKamil Trzcinski2016-05-108-69/+128
| * | | | | | Fix SQL queries for calculating stages statusKamil Trzcinski2016-05-103-13/+14