summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Move to project dropdown with infinite scroll for better performance17932-move-to-project-dropdown-improvePaco Guzman2016-08-171-8/+6
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into pipeline-hooks-...Kamil Trzcinski2016-08-168-17/+102
|\
| * Merge branch 'issue_18656' into 'master' Douwe Maan2016-08-161-0/+19
| |\
| | * Load issues and merge requests templates from repositoryFelipe Artur2016-08-161-0/+19
| * | Merge remote-tracking branch 'origin/master' into ee-581-backport-changesee-581-backport-changesTimothy Andrew2016-08-161-0/+5
| |\ \ | | |/
| | * 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
| * | | | 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
| * | | | Backport changes from gitlab-org/gitlab-ee!581 to CE.Timothy Andrew2016-08-161-10/+16
| |/ / /
| * | | 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
* | | | | Merge branch 'fix-failing-tests' into pipeline-hooks-without-slackKamil Trzcinski2016-08-152-3/+22
|\ \ \ \ \ | |/ / / /
| * | | | 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 remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-151-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
* | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-132-4/+4
|\ \ \ \ | |/ / /
| * | | Fix bug where destroying a namespace would not always destroy projectsStan Hu2016-08-112-4/+4
| |/ /
* | | Merge branch 'improve-pipeline-processing' into pipeline-hooks-without-slackKamil Trzcinski2016-08-122-2/+2
|\ \ \ | |/ /
| * | 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 remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-119-111/+307
|\ \ \ \ | |/ / /
| * | | 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
| | | |/ | | |/|
* | | | Merge remote-tracking branch 'upstream/master' into pipeline-hooks-without-slackLin Jen-Shin2016-08-1115-58/+72
|\ \ \ \ | |/ / /
| * | | Merge branch 'clean-up-project-destroy' into 'master' Robert Speicher2016-08-101-1/+1
| |\ \ \
| | * | | Clean up project destructionclean-up-project-destroyStan Hu2016-08-101-1/+1
| | |/ /
| * | | Merge branch 'master' into feature/svg-badge-templateGrzegorz Bizon2016-08-094-32/+30
| |\ \ \ | | |/ /
| | * | Merge branch 'duduribeiro/gitlab-ce-current_password_when_auto_set'Rémy Coutable2016-08-091-0/+1
| | |\ \
| | | * | Avoid to show the original password field when password is automatically setedCarlos Ribeiro2016-08-081-0/+1