summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'bvl-fix-count-with-selects' into 'master'Douwe Maan2017-11-171-1/+3
|\ | | | | | | | | | | | | Remove the selects when counting the last page Closes #40266 See merge request gitlab-org/gitlab-ce!15456
| * Remove the selects when counting the last pageBob Van Landuyt2017-11-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | The last page of the first collection is only loaded into memory when it is being viewed. If it isn't loaded into memory, the `#size` call triggers a count query. This `#count` would generate an invalid query if our custom preloaded counts are included by adding a separate `as count_column` alias on top of the count aliases. Removing the selects in this case will make sure a valid `COUNT(*)` is generated.
* | Merge branch 'mk-add-user-rate-limits' into 'master'Douwe Maan2017-11-174-97/+146
|\ \ | | | | | | | | | | | | | | | | | | Add request rate limits Closes #30053 See merge request gitlab-org/gitlab-ce!14708
| * | 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 ↵Douwe Maan2017-11-171-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '40230-groups-gitlab-org-labels-json-redirects-to-groups-gitlab-org-labels-json' into 'master' Resolve "/groups/gitlab-org/labels.json redirects to /groups/gitlab-org/-/labels/.json" Closes #40230 See merge request gitlab-org/gitlab-ce!15427
| * | 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
| |/ | | | | | | | | | | | | | | Because we ignored the format, a request to `/groups/foo/labels.json` would redirect to `/groups/foo/-/labels/.json`. But really, it's worse than that, because unless the request contained a trailing slash, we shouldn't add one. Now, we only _keep_ a trailing slash, but don't _add_ one.
* | 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 string Closes #40256 See merge request gitlab-org/gitlab-ce!15448
| * | 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 ↵Stan Hu2017-11-171-0/+30
|/ | | | | | | migration This is to smear updates over a few hours to avoid causing excessive replication lag as seen in https://gitlab.com/gitlab-com/infrastructure/issues/3235.
* 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 Env See merge request gitlab-org/gitlab-ce!15376
| * 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 helper See merge request gitlab-org/gitlab-ce!15346
| * | 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
| | | | | | | | | | | | | | | | | | | | | We should allow to use double underscore in the path, and it seems that our container repository path regexp was outdated. See https://github.com/docker/distribution/blob/master/reference/regexp.go
* | | Merge branch 'update-emoji-digests-with-latest-from-gemojione' into 'master'Filipa Lacerda2017-11-151-2/+29
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update Emoji digests and assets with latest from Gemojione v3.3.0 Closes #32634 See merge request gitlab-org/gitlab-ce!15390
| * | | 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 ↵Douwe Maan2017-11-152-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40122-only-one-note-webhook-is-triggered-when-a-comment-with-time-spent-is-added' into 'master' Resolve "Only one note webhook is triggered when a comment with time spent is added" Closes #40122 See merge request gitlab-org/gitlab-ce!15381
| * | | 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
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '39573-hashed-storage-backup' into 'master'Stan Hu2017-11-151-8/+16
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Fix gitlab:backup rake for hashed storage based repositories Closes #39573 See merge request gitlab-org/gitlab-ce!15400
| * | | Fix dumping hashed storage based repositoryGabriel Mazetto2017-11-151-8/+16
| |/ /
* | | Always fetch master from the canonical remoteRémy Coutable2017-11-151-3/+3
|/ / | | | | | | | | | | | | | | This way, if a fork's master branch is far behind the canonical's master, it won't use the tip of the fork's master branch as merge base and thus won't create a huge and wrong patch file. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | 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 service See merge request gitlab-org/gitlab-ce!15397
| * Prefer polymorphism over specific type checks in Import servicedm-import-service-polymorphismDouwe Maan2017-11-152-0/+8
| |
* | Merge branch 'bvl-fork-network-memberships-for-deleted-source' into 'master'Yorick Peterse2017-11-141-1/+11
|\ \ | | | | | | | | | | | | | | | | | | Don't try to create fork network memberships for forks of forks Closes #40072 See merge request gitlab-org/gitlab-ce!15366
| * | Don't try to create fork network memberships for forks of forksbvl-fork-network-memberships-for-deleted-sourceBob Van Landuyt2017-11-141-1/+11
| |/ | | | | | | | | | | | | | | | | In case the root project of a Fork-of-fork is deleted, the ForkNetwork and the membership for that fork network is never created. In this case we shouldn't try to create the membership, since the parent membership will never be created. This means that these fork networks will be lost.
* | Merge branch 'fix/sm/31771-do-not-allow-jobs-to-be-erased-new' into 'master'Kamil Trzciński2017-11-142-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Do not allow jobs to be erased Closes #31771 See merge request gitlab-org/gitlab-ce!15216
| * \ Merge branch 'master' into fix/sm/31771-do-not-allow-jobs-to-be-erased-newShinya Maeda2017-11-0755-478/+888
| |\ \
| * | | Add doc. Fix spec. Add erase_build in protected_ref ruleShinya Maeda2017-11-072-2/+0
| | | |
| * | | Fix spec. Revert update check.Shinya Maeda2017-11-062-0/+2
| | | |
| * | | Do not allow jobs to be erasedShinya Maeda2017-11-062-2/+2
| | | |
View Lorry Controller Status