summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Refactor `find_for_git_client` method to not use assignment in conditionals a...Patricio Cano2016-08-172-4/+4
* Moved 2FA check to `auth.rb` and cleaned up the flow `authenticate_user`Patricio Cano2016-08-161-8/+8
* Added better information about the personal tokensPatricio Cano2016-08-162-2/+5
* 2FA check is now done in the main GitHTTPClientControllerPatricio Cano2016-08-161-0/+7
* Deny Git over HTTP access to users that have 2FA enabled, unless they use a P...Patricio Cano2016-08-161-0/+4
* 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
| * | | Use cache for todos counter calling TodoServicePaco Guzman2016-08-121-2/+2
* | | | Pass project IDs relation to ProjectsFinder instead of using a blockAhmad Sherif2016-08-152-5/+3
* | | | Speed up todos queries by limiting the projects set we join withAhmad Sherif2016-08-152-11/+12
* | | | Ability to specify branches for pivotal tracker integrationEgor Lynko2016-08-151-4/+27
| |/ / |/| |
* | | Merge branch 'push-mr-url-guards' into 'master' Douwe Maan2016-08-121-1/+12
|\ \ \
| * | | Don't show new MR URL after push when it doesn't make senseDouwe Maan2016-08-121-1/+12
* | | | Add archived badge to project listingDrew Blessing2016-08-121-0/+2
|/ / /
* | | Merge branch 'fix-namespace-deletion' into 'master' Robert Speicher2016-08-126-8/+42
|\ \ \
| * | | Fix bug where destroying a namespace would not always destroy projectsStan Hu2016-08-116-8/+42
* | | | Merge branch '20059-environment-list' into 'master' Jacob Schatz2016-08-128-14/+52
|\ \ \ \ | |_|/ / |/| | |
| * | | Add gravatars to build history20059-environment-listAnnabel Dunstone2016-08-083-3/+4
| * | | Add deployment ID and gravatar to environments pageAnnabel Dunstone2016-08-083-4/+8
| * | | Format environment history pageAnnabel Dunstone2016-08-081-2/+2
| * | | Add avatar to commit message; environment style updates to match pipelines pageAnnabel Dunstone2016-08-085-9/+25
View Lorry Controller Status