summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-2027-1096/+340
* Merge branch 'faster-builds-ci' into 'master' Douwe Maan2016-07-201-7/+28
|\
| * Use YAML inheritance to DRY the .gitlab-ci.ymlfaster-builds-ciZ.J. van de Weg2016-07-201-19/+14
| * Speed improvement for builds without DBZ.J. van de Weg2016-06-291-8/+34
* | Merge branch 'cs-warn-on-failure' into 'master' Fatih Acet2016-07-209-10/+73
|\ \
| * \ Merge remote-tracking branch 'origin/master' into cs-warn-on-failurecs-warn-on-failureKamil Trzcinski2016-07-2033-105/+283
| |\ \
| * | | Use switch statements instead of if/else chains.Connor Shea2016-07-192-8/+10
| * | | Address feedback.Connor Shea2016-07-193-11/+21
| * | | Add with_warnings? method to Pipelines and add tests.Connor Shea2016-07-194-0/+35
| * | | Starting work on the warn_on_failure feature for the MR build status.Connor Shea2016-07-195-5/+23
* | | | Merge branch '14284-allow-all-deploy-keys-to-be-retrieved-via-api-regardless-...Gabriel Mazetto2016-07-206-75/+159
|\ \ \ \
| * | | | Change `return`s for `next`s to please rubocop (behaviour is the same)Alejandro Rodríguez2016-07-201-2/+2
| * | | | Add /deploy_keys API to retrieve all deploy keys regardless of project affili...Alejandro Rodríguez2016-07-206-75/+159
* | | | | Merge branch 'fix-side-by-side-comment-widget' into 'master' Jacob Schatz2016-07-203-7/+103
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added diff comments feature testfix-side-by-side-comment-widgetLuke "Jared" Bennett2016-07-191-0/+94
| * | | | Updated CHANGELOG.Fatih Acet2016-07-191-0/+1
| * | | | Off mouse listener from document for diff comment button.Fatih Acet2016-07-191-1/+3
| * | | | Fix inline view for comment button selector.Fatih Acet2016-07-191-1/+4
| * | | | Revert "Refactored .prev and .next methods"Fatih Acet2016-07-191-7/+3
* | | | | Merge branch 'add-link-to-commit-avatar' into 'master' Rémy Coutable2016-07-206-17/+35
|\ \ \ \ \
| * | | | | Add link to user profile to commit avatar (!5163)winniehell2016-07-206-17/+35
* | | | | | Merge branch 'migration-downtime-tags' into 'master' Robert Speicher2016-07-2010-24/+311
|\ \ \ \ \ \
| * | | | | | Added checks for migration downtimemigration-downtime-tagsYorick Peterse2016-07-2010-24/+311
* | | | | | | Merge branch 'rubocop/enable-multiline-ternary-operator-cop' into 'master' Robert Speicher2016-07-204-10/+15
|\ \ \ \ \ \ \
| * | | | | | | Enable Style/MultilineTernaryOperator rubocop coprubocop/enable-multiline-ternary-operator-copGrzegorz Bizon2016-07-204-10/+15
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'issue_8110' into 'master' Rémy Coutable2016-07-2016-118/+276
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Refactor service settings viewissue_8110Felipe Artur2016-07-2015-138/+86
| * | | | | | Add project service documentation and update integration documentationFelipe Artur2016-07-1910-46/+78
| * | | | | | Allow slack service to send messages on different channelsFelipe Artur2016-07-1910-21/+199
* | | | | | | Merge branch 'fix-retries-on-manual-actions' into 'master' Rémy Coutable2016-07-204-14/+33
|\ \ \ \ \ \ \
| * | | | | | | Fix a problem with processing a pipeline where stage only has manual actionsfix-retries-on-manual-actionsKamil Trzcinski2016-07-202-13/+16
| * | | | | | | Don't show other actions of the same nameKamil Trzcinski2016-07-202-1/+17
* | | | | | | | Merge branch '17862-honour-limit-in-ldap-check' into 'master' Rémy Coutable2016-07-202-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | A CHANGELOG entryRémy Coutable2016-07-201-0/+1
| * | | | | | | | Use limit parameter rather than hardcoded valueM. Ricketts2016-07-201-1/+1
* | | | | | | | | Merge branch 'explore-nav' into 'master' Jacob Schatz2016-07-201-4/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Remove icons from explore navAnnabel Dunstone2016-07-201-4/+0
* | | | | | | | | Merge branch 'compare-code-view' into 'master' Jacob Schatz2016-07-202-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Apply diff view cookie on comparecompare-code-viewPhil Hughes2016-07-152-0/+2
* | | | | | | | | | Merge branch '15343-build-settiings' into 'master' Rémy Coutable2016-07-2012-100/+179
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Change how we style redirect_toKamil Trzcinski2016-07-201-3/+1
| * | | | | | | | | Use flash[:notice] onlyKamil Trzcinski2016-07-201-2/+1
| * | | | | | | | | Create PipelinesSettingsController for showing settings pageKamil Trzcinski2016-07-209-61/+79
| * | | | | | | | | Update routesKamil Trzcinski2016-07-201-4/+1
| * | | | | | | | | Fix updating settings for pipelines15343-build-settiingsKamil Trzcinski2016-07-202-15/+8
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into 15343-build-settiingsKamil Trzcinski2016-07-2083-283/+1242
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Move Pipelines settings under `gitlab.com/gitlab-org/gitlab-ce/pipelines/sett...Kamil Trzcinski2016-07-199-15/+73
| * | | | | | | | | Change title to CI/CD PipelinesAnnabel Dunstone2016-07-192-3/+3
| * | | | | | | | | Capitalize CI PipelinesAnnabel Dunstone2016-07-191-1/+1
| * | | | | | | | | Fix badge testAnnabel Dunstone2016-07-191-1/+1