summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-2250-53/+305
|\
| * Set the default gitlab-shell timeout to 3 hoursNick Thomas2017-11-211-2/+1
| * Merge branch 'sh-optimize-read-only-check' into 'master'Douwe Maan2017-11-211-1/+7
| |\
| | * Revert "check for `read_only?` first before seeing if request is disallowed"digitalMoksha2017-11-211-1/+1
| | * check for `read_only?` first before seeing if request is disallowedsh-optimize-read-only-checkdigitalMoksha2017-11-211-1/+1
| | * use `Gitlab::Routing.url_helpers` instead of `Rails.application.routes.url_he...digitalMoksha2017-11-211-1/+1
| | * Optimize read-only middleware so that it does not consume as much CPUStan Hu2017-11-201-0/+6
| * | Batchload blobs for diff generationZeger-Jan van de Weg2017-11-214-14/+16
| * | Memoize GitlabShellAdapter for performance and ease of testingStan Hu2017-11-201-1/+1
| |/
| * Merge branch '40292-bitbucket-import-hashed-storage' into 'master'Douwe Maan2017-11-201-2/+2
| |\
| | * Fix bitbucket wiki import with hashed storage enabledNick Thomas2017-11-201-2/+2
| * | Clarify wording of protected branch settings for the default branchSean McGivern2017-11-201-3/+3
| * | Merge branch 'gitaly-delete-refs' into 'master'Douwe Maan2017-11-202-1/+16
| |\ \ | | |/ | |/|
| | * Incorporate Gitaly's RefService.DeleteRefs RPCgitaly-delete-refsAlejandro Rodríguez2017-11-172-1/+16
| * | Merge branch 'bvl-dont-move-projects-using-hashed-storage' into 'master'Douwe Maan2017-11-202-3/+17
| |\ \
| | * | Don't move project repository/attachments when using hashed storageBob Van Landuyt2017-11-202-3/+17
| * | | Clean up schema of the "merge_requests" tableYorick Peterse2017-11-201-1/+1
| * | | Merge branch 'fix-conflict-highlighting' into 'master'Douwe Maan2017-11-201-0/+4
| |\ \ \
| | * | | Fix conflict highlightingfix-conflict-highlightingSean McGivern2017-11-171-0/+4
| * | | | Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'Rémy Coutable2017-11-2032-0/+37
| |\ \ \ \
| | * | | | Adds Rubocop rule for line break after guard clauseJacopo2017-11-1632-0/+37
| * | | | | Fix Gitlab::Git::Repository#remote_tags using unexisting variableAlejandro Rodríguez2017-11-201-2/+2
| | |_|/ / | |/| | |
| * | | | Merge branch 'restrict-update-column-in-batches-for-large-tables' into 'master'Robert Speicher2017-11-171-0/+9
| |\ \ \ \
| | * | | | Add computed update docs for update_column_in_batchesSean McGivern2017-11-171-0/+9
| * | | | | Merge branch 'bvl-fix-count-with-selects' into 'master'Douwe Maan2017-11-171-1/+3
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Remove the selects when counting the last pageBob Van Landuyt2017-11-171-1/+3
| * | | | | Merge branch 'mk-add-user-rate-limits' into 'master'Douwe Maan2017-11-172-0/+134
| |\ \ \ \ \
| | * | | | | Renaming AuthenticationException to AuthenticationErrormk-add-user-rate-limitsFrancisco Lopez2017-11-172-9/+9
| | * | | | | Changes after rebaseFrancisco Lopez2017-11-171-3/+5
| | * | | | | Removing OffenderFrancisco Lopez2017-11-171-1/+0
| | * | | | | Moved Exceptions to Gitlab::AuthFrancisco Lopez2017-11-172-19/+20
| | * | | | | Moving exceptions to UserAuthFindersFrancisco Lopez2017-11-171-7/+25
| | * | | | | Leaving atom? query to fix testsFrancisco Lopez2017-11-171-1/+1
| | * | | | | Change the rss url guard clauseFrancisco Lopez2017-11-171-1/+1
| | * | | | | Added some more commentsFrancisco Lopez2017-11-172-7/+5
| | * | | | | Removed method handle_return_valueFrancisco Lopez2017-11-171-13/+8
| | * | | | | Homogenising the type of the request handled by UserAuthFinder. Also tests fixedFrancisco Lopez2017-11-172-10/+11
| | * | | | | Applied some code review commentsFrancisco Lopez2017-11-172-25/+28
| | * | | | | Removing private tokenFrancisco Lopez2017-11-171-1/+15
| | * | | | | Some fixes after rebaseFrancisco Lopez2017-11-172-48/+34
| | * | | | | Updated refactor and pushing to see if test failsFrancisco Lopez2017-11-171-16/+18
| | * | | | | First refactorFrancisco Lopez2017-11-172-43/+96
| | * | | | | Refactor with ActionDispatch::RequestMichael Kozono2017-11-171-13/+11
| | * | | | | Fix OAuth API and RSS rate limitingMichael Kozono2017-11-172-30/+64
| | * | | | | Add request throttlesMichael Kozono2017-11-171-0/+30
| | |/ / / /
| * | | | | Merge branch '40230-groups-gitlab-org-labels-json-redirects-to-groups-gitlab-...Douwe Maan2017-11-171-3/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Don't add a trailing slash in group redirects40230-groups-gitlab-org-labels-json-redirects-to-groups-gitlab-org-labels-jsonSean McGivern2017-11-161-3/+3
| | |/ / /
| * | | | Changing OAuth lookup to be case insensitiveFrancisco Javier López2017-11-172-5/+2
| * | | | Merge branch 'dm-go-get-blank-enabled-protocol' into 'master'Sean McGivern2017-11-171-3/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix go-import meta data when enabled_git_access_protocol is a blank stringDouwe Maan2017-11-171-3/+2
| | |/ /