summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issue_18135' into 'master' Douwe Maan2016-08-191-0/+1
* Merge branch 'gokmengoksel/gitlab-ce-koding' into 'master' Stan Hu2016-08-192-0/+17
* Merge branch 'pipeline-hooks-without-slack' into 'master' Robert Speicher2016-08-192-8/+12
* Merge branch 'expiration-date-on-memberships' into 'master' Douwe Maan2016-08-194-6/+18
* Merge branch 'issue-boards-label-text-color' into 'master' Robert Speicher2016-08-191-1/+1
* Merge branch 'issue_18656' into 'master' Douwe Maan2016-08-191-0/+19
* Merge branch 'diff-line-comment-vuejs' into 'master' Douwe Maan2016-08-193-7/+79
* Merge branch '4273-slash-commands' into 'master'test-8-11-stable-2Robert Speicher2016-08-185-13/+21
* Merge branch '2fa-check-git-http' into 'master' Robert Speicher2016-08-181-0/+10
* Merge branch '21028-missing-default-sort-for-users-with-an-existing-cookie' i...Robert Speicher2016-08-181-0/+5
* Merge branch '17334-u2f-device-identifiers' into 'master' Robert Speicher2016-08-182-4/+15
* Merge branch 'fix/simplify-todo-destroy-queries' into 'master' Yorick Peterse2016-08-181-5/+1
* Merge branch 'tab-persistance' into 'master' Rubén Dávila Santos2016-08-182-1/+1
* Merge branch '17932-move-to-project-dropdown-improve' into 'master' Yorick Peterse2016-08-171-8/+6
* Merge branch 'ee-581-backport-changes' into 'master' Douwe Maan2016-08-172-15/+29
* Merge branch 'mc-ui'Douwe Maan2016-08-171-5/+52
* Merge branch '18681-pipelines-merge-request' into 'master' Jacob Schatz2016-08-171-4/+17
* Merge branch '20808-merge-request-new-diff-view' into 'master' Robert Speicher2016-08-171-0/+2
* Merge branch 'issue-boards' into 'master'Douwe Maan2016-08-175-0/+232
* Merge remote-tracking branch 'dev/master'Ruben Davila2016-08-161-0/+5
|\
| * Merge branch 'fix/import-permissions' into 'master' Douwe Maan2016-08-151-0/+5
| |\
| | * Fix permissions check in controller, added relevant spec and updated docsJames Lopez2016-08-111-0/+5
* | | Merge branch 'akismet-submittable' into 'master' Robert Speicher2016-08-153-0/+37
|\ \ \
| * | | Further refactor and syntax fixes.Patricio Cano2016-08-152-8/+6
| * | | Refactored AkismetHelper into AkismetService and cleaned up `Spammable`Patricio Cano2016-08-152-10/+2
| * | | Allow `Issue` to be submitted as spamPatricio Cano2016-08-152-0/+34
| * | | Allow `SpamLog` to be submitted as hamPatricio Cano2016-08-151-2/+9
| * | | Refactored spam related code even furtherPatricio Cano2016-08-151-0/+6
| |/ /
* | | Merge branch 'frank-west-iii/gitlab-ce-fwiii-5857-web-editor-overwrites-commits'Douwe Maan2016-08-151-2/+12
|\ \ \
| * | | Prevents accidental overwrites of commits from UIFrank West2016-08-151-2/+12
* | | | Expose coverage report badge in pipeline settingsGrzegorz Bizon2016-08-151-1/+7
* | | | 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 '20842-todos-queries-cache' into 'master' Yorick Peterse2016-08-151-2/+2
|\ \ \ | |/ / |/| |
| * | Recover usage of Todos counter cache20842-todos-queries-cachePaco Guzman2016-08-121-2/+2
* | | Fix bug where destroying a namespace would not always destroy projectsStan Hu2016-08-112-4/+4
|/ /
* | Merge branch '15000-rename-markdown-preview' into 'master' Robert Speicher2016-08-112-2/+2
|\ \
| * | Rename `markdown_preview` routes to `preview_markdown`Christopher Bartz2016-08-112-2/+2
* | | Merge branch 'remove-grack-lfs' into 'master' Rémy Coutable2016-08-114-104/+299
|\ \ \
| * | | Improve validation of X-Gitlab-Lfs-Tmp headerJacob Vosmaer2016-08-101-7/+3
| * | | Use && and || instead of ifJacob Vosmaer2016-08-101-12/+3
| * | | Rename lfs_enabled helper methodJacob Vosmaer2016-08-102-2/+2
| * | | Remove duplicate method reintroduced by mergeJacob Vosmaer2016-08-091-4/+0
| * | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into remove-...Jacob Vosmaer2016-08-0928-148/+245
| |\ \ \ | | | |/ | | |/|
| * | | RubocopJacob Vosmaer2016-07-221-7/+6
| * | | Better cache when modifying in-placeJacob Vosmaer2016-07-221-1/+1
| * | | Add LFS controllersJacob Vosmaer2016-07-224-104/+313
* | | | Pre-create all builds for Pipeline when a trigger is receivedKamil Trzcinski2016-08-114-6/+6
| |_|/ |/| |
* | | Merge branch 'fix-branches-dropdown-initial-state' into 'master' Rémy Coutable2016-08-111-1/+2
|\ \ \
| * | | Fix branches page dropdown sort initial stateClement Ho2016-08-101-1/+2
| | |/ | |/|
View Lorry Controller Status