summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix rubocop offense in pipeline modelmark-as-processableGrzegorz Bizon2016-08-191-1/+1
* Make all future skipped builds as processable when retrying a buildKamil Trzcinski2016-08-183-0/+9
* Refactor merge_request-tabsAnnabel Dunstone2016-08-161-8/+6
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18681-pipelines...Annabel Dunstone2016-08-1625-103/+301
|\
| * Merge branch 'issue_18656' into 'master' Douwe Maan2016-08-1612-35/+223
| |\
| | * Load issues and merge requests templates from repositoryFelipe Artur2016-08-1612-35/+223
| * | Merge remote-tracking branch 'origin/master' into ee-581-backport-changesee-581-backport-changesTimothy Andrew2016-08-162-1/+6
| |\ \ | | |/
| * | Fix a missed `before_action` for `AutocompleteController`.Timothy Andrew2016-08-161-0/+1
| * | Backport `AutocompleteController#load_project` from EE!581.Timothy Andrew2016-08-161-5/+12
| * | Fix failing tests relating to backporting ee!581.Timothy Andrew2016-08-161-4/+4
| * | Move the "update" portion of the protected branch view into a partial.Timothy Andrew2016-08-162-10/+13
| * | Backport changes from gitlab-org/gitlab-ee!581 to CE.Timothy Andrew2016-08-1610-55/+54
* | | Add pipelines badge to MR tabAnnabel Dunstone2016-08-162-6/+2
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18681-pipelines...Annabel Dunstone2016-08-162-1/+6
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'dev/master'Ruben Davila2016-08-162-1/+6
| |\ \ | | |/ | |/|
| | * Merge branch 'fix/import-permissions' into 'master' Douwe Maan2016-08-152-1/+6
| | |\
| | | * Fix permissions check in controller, added relevant spec and updated docsJames Lopez2016-08-112-1/+6
* | | | Hide branch name and status text on mr pipelines; don't use shorter timeagoAnnabel Dunstone2016-08-163-10/+28
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18681-pipelines...Kamil Trzcinski2016-08-16297-1875/+3494
|\ \ \ \ | |/ / /
| * | | Merge branch 'akismet-submittable' into 'master' Robert Speicher2016-08-1517-68/+342
| |\ \ \
| | * | | Further refactor and syntax fixes.Patricio Cano2016-08-1512-133/+132
| | * | | Refactored AkismetHelper into AkismetService and cleaned up `Spammable`Patricio Cano2016-08-159-98/+180
| | * | | Allow `Issue` to be submitted as spamPatricio Cano2016-08-157-6/+80
| | * | | Allow `SpamLog` to be submitted as hamPatricio Cano2016-08-153-2/+18
| | * | | Refactored spam related code even furtherPatricio Cano2016-08-157-67/+86
| | * | | Complete refactor of the `Spammable` concern and tests:Patricio Cano2016-08-155-32/+67
| | * | | Lay the ground works to submit information to AkismetPatricio Cano2016-08-155-0/+49
| * | | | Merge branch 'frank-west-iii/gitlab-ce-fwiii-5857-web-editor-overwrites-commits'Douwe Maan2016-08-154-4/+43
| |\ \ \ \
| | * | | | Prevents accidental overwrites of commits from UIFrank West2016-08-154-4/+43
| * | | | | Restore `Largest repository` sort option on admin projects page20317-admin-cant-order-by-sizeAlfredo Sumaran2016-08-151-1/+7
| * | | | | Merge branch 'feature/test-coverage-badge' into 'master' Douwe Maan2016-08-154-27/+50
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Render collection of badges instead of using iteratorGrzegorz Bizon2016-08-153-29/+28
| | * | | | Extract pipeline badges to the separate view partialGrzegorz Bizon2016-08-152-28/+29
| | * | | | Expose coverage report badge in pipeline settingsGrzegorz Bizon2016-08-152-25/+35
| | * | | | Add method for coverage badge in badges controllerGrzegorz Bizon2016-08-151-2/+15
| | * | | | Move badges to separate modules and add base classGrzegorz Bizon2016-08-152-2/+2
| * | | | | Merge branch 'ee-parity' into 'master' Robert Speicher2016-08-151-0/+4
| |\ \ \ \ \
| | * | | | | Add method missing from EEee-parityAlejandro Rodríguez2016-08-121-0/+4
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'zj-deployment-status-on-mr' into 'master' Douwe Maan2016-08-155-1/+37
| |\ \ \ \ \
| | * | | | | Method names changed to #includes_commit?zj-deployment-status-on-mrZ.J. van de Weg2016-08-125-9/+16
| | * | | | | CI build status not per environmentZ.J. van de Weg2016-08-111-19/+17
| | * | | | | Incorporate feedbackZ.J. van de Weg2016-08-113-6/+6
| | * | | | | Tests for release status heading on MR#showZ.J. van de Weg2016-08-111-2/+2
| | * | | | | Show deployment status on a MR viewZ.J. van de Weg2016-08-114-14/+45
| * | | | | | Merge branch 'svg-render-size-limit' into 'master' Douwe Maan2016-08-152-5/+18
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Limit the size of SVGs when viewing them as blobssvg-render-size-limitYorick Peterse2016-08-152-5/+18
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'new-phantomjs-version' into 'master' Jacob Schatz2016-08-151-7/+4
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Updated failing testsPhil Hughes2016-08-131-7/+4
| | |/ / /
| * | | | Merge branch '20842-todos-queries-cache' into 'master' Yorick Peterse2016-08-154-7/+8
| |\ \ \ \
| | * | | | Recover usage of Todos counter cache20842-todos-queries-cachePaco Guzman2016-08-123-5/+6
View Lorry Controller Status