summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix conflict highlightingfix-conflict-highlightingSean McGivern2017-11-173-4/+11
* Merge branch 'mk-add-user-rate-limits' into 'master'Douwe Maan2017-11-1717-140/+984
|\
| * Renaming AuthenticationException to AuthenticationErrormk-add-user-rate-limitsFrancisco Lopez2017-11-173-10/+10
| * Changes after rebaseFrancisco Lopez2017-11-172-23/+6
| * Removing OffenderFrancisco Lopez2017-11-171-1/+0
| * Moved Exceptions to Gitlab::AuthFrancisco Lopez2017-11-178-48/+51
| * Moving exceptions to UserAuthFindersFrancisco Lopez2017-11-176-49/+52
| * Leaving atom? query to fix testsFrancisco Lopez2017-11-171-1/+1
| * Change the rss url guard clauseFrancisco Lopez2017-11-172-6/+4
| * Added some more commentsFrancisco Lopez2017-11-174-15/+14
| * Removed method handle_return_valueFrancisco Lopez2017-11-171-13/+8
| * Added UserAuthFinders specFrancisco Lopez2017-11-172-2/+196
| * Added RequestAuthenticator specFrancisco Lopez2017-11-171-0/+67
| * Homogenising the type of the request handled by UserAuthFinder. Also tests fixedFrancisco Lopez2017-11-174-29/+32
| * Applied some code review commentsFrancisco Lopez2017-11-174-32/+29
| * Removing private tokenFrancisco Lopez2017-11-173-34/+16
| * Some fixes after rebaseFrancisco Lopez2017-11-174-96/+41
| * Updated refactor and pushing to see if test failsFrancisco Lopez2017-11-173-44/+19
| * Pushing to see how this tests behavesFrancisco Lopez2017-11-171-7/+7
| * First refactorFrancisco Lopez2017-11-174-82/+116
| * Add link to discussionMichael Kozono2017-11-171-0/+4
| * Remove extra attemptsMichael Kozono2017-11-171-7/+22
| * Dry up URLs and get args constructionMichael Kozono2017-11-171-36/+48
| * Prevent affecting other testsMichael Kozono2017-11-171-4/+4
| * Refactor application setting managementMichael Kozono2017-11-171-41/+35
| * Refactor with ActionDispatch::RequestMichael Kozono2017-11-171-13/+11
| * Don't add methods to Rack::AttackMichael Kozono2017-11-171-10/+12
| * Fix Rubocop offensesMichael Kozono2017-11-171-13/+13
| * Fix OAuth API and RSS rate limitingMichael Kozono2017-11-175-112/+244
| * Allow throttling code in test environmentMichael Kozono2017-11-172-21/+14
| * Add Rack::Attack throttle specsMichael Kozono2017-11-171-0/+286
| * Add request throttlesMichael Kozono2017-11-177-3/+180
| * Add throttle application settingsMichael Kozono2017-11-173-0/+56
* | Merge branch '40230-groups-gitlab-org-labels-json-redirects-to-groups-gitlab-...Douwe Maan2017-11-172-14/+20
|\ \
| * | Don't add a trailing slash in group redirects40230-groups-gitlab-org-labels-json-redirects-to-groups-gitlab-org-labels-jsonSean McGivern2017-11-162-14/+20
* | | Merge branch '38822-oauth-search-case-insensitive' into 'master'Douwe Maan2017-11-178-12/+43
|\ \ \
| * | | Changing OAuth lookup to be case insensitiveFrancisco Javier López2017-11-178-12/+43
|/ / /
* | | Merge branch 'sh-port-hashed-storage-transfer-fix' into 'master'Nick Thomas2017-11-173-9/+54
|\ \ \
| * | | Fix hashed storage with project transfers to another namespacesh-port-hashed-storage-transfer-fixStan Hu2017-11-163-9/+54
* | | | Merge branch 'bvl-delete-empty-fork-networks' into 'master'Douwe Maan2017-11-177-1/+102
|\ \ \ \
| * | | | Delete orphaned fork networks in a migrationbvl-delete-empty-fork-networksBob Van Landuyt2017-11-174-1/+66
| * | | | Delete the fork network when removing the last membershipBob Van Landuyt2017-11-173-0/+36
* | | | | Merge branch 'ci-pipeline-status-query' into 'master'Kamil Trzciński2017-11-1711-66/+274
|\ \ \ \ \
| * | | | | Optimise getting the pipeline status of commitsci-pipeline-status-queryYorick Peterse2017-11-1611-66/+274
* | | | | | Merge branch 'dm-go-get-blank-enabled-protocol' into 'master'Sean McGivern2017-11-172-3/+10
|\ \ \ \ \ \
| * | | | | | Fix go-import meta data when enabled_git_access_protocol is a blank stringDouwe Maan2017-11-172-3/+10
* | | | | | | Merge branch '34600-performance-wiki-pages' into 'master'Douwe Maan2017-11-1710-27/+102
|\ \ \ \ \ \ \
| * | | | | | | Resolve "Performance issues when loading large number of wiki pages"Francisco Javier López2017-11-1710-27/+102
|/ / / / / / /
* | | | | | | Merge branch '38869-project-1' into 'master'Phil Hughes2017-11-178-311/+272
|\ \ \ \ \ \ \
| * | | | | | | Exports a couple of project related code as es6 modulesFilipa Lacerda2017-11-178-311/+272
|/ / / / / / /
View Lorry Controller Status