summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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-2053-0/+74
|\ \
| * | Adds Rubocop rule for line break after guard clauseJacopo2017-11-1653-0/+74
* | | 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-174-97/+146
|\ \ \ \
| * | | | Renaming AuthenticationException to AuthenticationErrormk-add-user-rate-limitsFrancisco Lopez2017-11-172-9/+9
| * | | | Changes after rebaseFrancisco Lopez2017-11-172-23/+6
| * | | | Removing OffenderFrancisco Lopez2017-11-171-1/+0
| * | | | Moved Exceptions to Gitlab::AuthFrancisco Lopez2017-11-174-30/+31
| * | | | Moving exceptions to UserAuthFindersFrancisco Lopez2017-11-173-33/+36
| * | | | 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-173-14/+13
| * | | | Removed method handle_return_valueFrancisco Lopez2017-11-171-13/+8
| * | | | Homogenising the type of the request handled by UserAuthFinder. Also tests fixedFrancisco Lopez2017-11-173-13/+11
| * | | | Applied some code review commentsFrancisco Lopez2017-11-173-30/+28
| * | | | Removing private tokenFrancisco Lopez2017-11-172-7/+16
| * | | | Some fixes after rebaseFrancisco Lopez2017-11-173-72/+41
| * | | | Updated refactor and pushing to see if test failsFrancisco Lopez2017-11-172-18/+18
| * | | | First refactorFrancisco Lopez2017-11-173-82/+115
| * | | | 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
| |/ /
* | | Resolve "Performance issues when loading large number of wiki pages"Francisco Javier López2017-11-171-11/+45
* | | Convert migration to populate latest merge request ID into a background migra...Stan Hu2017-11-171-0/+30
|/ /
* | Merge branch 'fix/git-env-repo-paths' into 'master'Douwe Maan2017-11-162-1/+15
|\ \
| * | Use relative git object paths to construct absolute ones before setting Envfix/git-env-repo-pathsAhmad Sherif2017-11-142-1/+15
| |/
* | Merge branch 'fix/add-attributes-bag-class-to-gitaly-client' into 'master'Sean McGivern2017-11-165-32/+39
|\ \
| * | Add an attributes bag class as a GitalyClient helperfix/add-attributes-bag-class-to-gitaly-clientAhmad Sherif2017-11-155-32/+39
* | | Update container repository path referenceGrzegorz Bizon2017-11-161-1/+1
* | | Merge branch 'update-emoji-digests-with-latest-from-gemojione' into 'master'Filipa Lacerda2017-11-151-2/+29
|\ \ \
| * | | Move :gay_pride_flag: to flags categoryupdate-emoji-digests-with-latest-from-gemojioneEric Eastwood2017-11-151-1/+6
| * | | Regenerate emoji digests with latest gemojioneEric Eastwood2017-11-141-1/+23
| | |/ | |/|
* | | Merge branch '40122-only-one-note-webhook-is-triggered-when-a-comment-with-ti...Douwe Maan2017-11-152-0/+2
|\ \ \
| * | | Add total_time_spent to the `changes` hash in issuable Webhook payloads40122-only-one-note-webhook-is-triggered-when-a-comment-with-time-spent-is-addedRémy Coutable2017-11-152-0/+2
* | | | Merge branch '39573-hashed-storage-backup' into 'master'Stan Hu2017-11-151-8/+16
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix dumping hashed storage based repositoryGabriel Mazetto2017-11-151-8/+16
| |/ /
* | | Always fetch master from the canonical remoteRémy Coutable2017-11-151-3/+3
|/ /
* | Merge branch 'dm-import-service-polymorphism' into 'master'40186-the-ee_compat_check-job-sometimes-fail-on-the-git-apply-3way-step-for-forksYorick Peterse2017-11-152-0/+8
|\ \ | |/ |/|
| * Prefer polymorphism over specific type checks in Import servicedm-import-service-polymorphismDouwe Maan2017-11-152-0/+8
View Lorry Controller Status