Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Renaming AuthenticationException to AuthenticationErrormk-add-user-rate-limits | Francisco Lopez | 2017-11-17 | 2 | -9/+9 |
| | |||||
* | Changes after rebase | Francisco Lopez | 2017-11-17 | 2 | -23/+6 |
| | |||||
* | Removing Offender | Francisco Lopez | 2017-11-17 | 1 | -1/+0 |
| | |||||
* | Moved Exceptions to Gitlab::Auth | Francisco Lopez | 2017-11-17 | 4 | -30/+31 |
| | |||||
* | Moving exceptions to UserAuthFinders | Francisco Lopez | 2017-11-17 | 3 | -33/+36 |
| | |||||
* | Leaving atom? query to fix tests | Francisco Lopez | 2017-11-17 | 1 | -1/+1 |
| | |||||
* | Change the rss url guard clause | Francisco Lopez | 2017-11-17 | 1 | -1/+1 |
| | |||||
* | Added some more comments | Francisco Lopez | 2017-11-17 | 3 | -14/+13 |
| | |||||
* | Removed method handle_return_value | Francisco Lopez | 2017-11-17 | 1 | -13/+8 |
| | |||||
* | Homogenising the type of the request handled by UserAuthFinder. Also tests fixed | Francisco Lopez | 2017-11-17 | 3 | -13/+11 |
| | |||||
* | Applied some code review comments | Francisco Lopez | 2017-11-17 | 3 | -30/+28 |
| | |||||
* | Removing private token | Francisco Lopez | 2017-11-17 | 2 | -7/+16 |
| | |||||
* | Some fixes after rebase | Francisco Lopez | 2017-11-17 | 3 | -72/+41 |
| | |||||
* | Updated refactor and pushing to see if test fails | Francisco Lopez | 2017-11-17 | 2 | -18/+18 |
| | |||||
* | First refactor | Francisco Lopez | 2017-11-17 | 3 | -82/+115 |
| | |||||
* | Refactor with ActionDispatch::Request | Michael Kozono | 2017-11-17 | 1 | -13/+11 |
| | |||||
* | Fix OAuth API and RSS rate limiting | Michael Kozono | 2017-11-17 | 2 | -30/+64 |
| | |||||
* | Add request throttles | Michael Kozono | 2017-11-17 | 1 | -0/+30 |
| | |||||
* | Merge branch 'fix/git-env-repo-paths' into 'master' | Douwe Maan | 2017-11-16 | 2 | -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-paths | Ahmad Sherif | 2017-11-14 | 2 | -1/+15 |
| | | |||||
* | | Merge branch 'fix/add-attributes-bag-class-to-gitaly-client' into 'master' | Sean McGivern | 2017-11-16 | 5 | -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-client | Ahmad Sherif | 2017-11-15 | 5 | -32/+39 |
| | | | |||||
* | | | Update container repository path reference | Grzegorz Bizon | 2017-11-16 | 1 | -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 Lacerda | 2017-11-15 | 1 | -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-gemojione | Eric Eastwood | 2017-11-15 | 1 | -1/+6 |
| | | | | |||||
| * | | | Regenerate emoji digests with latest gemojione | Eric Eastwood | 2017-11-14 | 1 | -1/+23 |
| | |/ | |/| | |||||
* | | | Merge branch ↵ | Douwe Maan | 2017-11-15 | 2 | -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-added | Rémy Coutable | 2017-11-15 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | Merge branch '39573-hashed-storage-backup' into 'master' | Stan Hu | 2017-11-15 | 1 | -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 repository | Gabriel Mazetto | 2017-11-15 | 1 | -8/+16 |
| |/ / | |||||
* | | | Always fetch master from the canonical remote | Rémy Coutable | 2017-11-15 | 1 | -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-forks | Yorick Peterse | 2017-11-15 | 2 | -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-polymorphism | Douwe Maan | 2017-11-15 | 2 | -0/+8 |
| | | |||||
* | | Merge branch 'bvl-fork-network-memberships-for-deleted-source' into 'master' | Yorick Peterse | 2017-11-14 | 1 | -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-source | Bob Van Landuyt | 2017-11-14 | 1 | -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ński | 2017-11-14 | 2 | -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-new | Shinya Maeda | 2017-11-07 | 55 | -478/+888 |
| |\ \ | |||||
| * | | | Add doc. Fix spec. Add erase_build in protected_ref rule | Shinya Maeda | 2017-11-07 | 2 | -2/+0 |
| | | | | |||||
| * | | | Fix spec. Revert update check. | Shinya Maeda | 2017-11-06 | 2 | -0/+2 |
| | | | | |||||
| * | | | Do not allow jobs to be erased | Shinya Maeda | 2017-11-06 | 2 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'jej/fix-lfs-integrity-with-forks' into 'master' | Douwe Maan | 2017-11-14 | 1 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle forks in Gitlab::Checks::LfsIntegrity Closes #39902 See merge request gitlab-org/gitlab-ce!15279 | ||||
| * | | | | Handle forks in Gitlab::Checks::LfsIntegrityjej/fix-lfs-integrity-with-forks | James Edwards-Jones | 2017-11-09 | 1 | -1/+4 |
| | | | | | |||||
* | | | | | Merge branch 'gitaly-wiki-get-all-pages' into 'master' | Rémy Coutable | 2017-11-14 | 3 | -18/+62 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporate Gitaly's WikiService.WikiGetAllPages RPC Closes gitaly#722 See merge request gitlab-org/gitlab-ce!15307 | ||||
| * | | | | | Incorporate Gitaly's WikiService.WikiGetAllPages RPCgitaly-wiki-get-all-pages | Alejandro Rodríguez | 2017-11-13 | 3 | -18/+62 |
| | | | | | | |||||
* | | | | | | Add administrative endpoint to list all pages domains | Travis Miller | 2017-11-13 | 3 | -3/+48 |
| | | | | | | |||||
* | | | | | | Add Gitlab::Utils::StrongMemoize | Lin Jen-Shin (godfat) | 2017-11-13 | 2 | -3/+36 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge branch 'zj-move-repo-exists-opt-out' into 'master' | Sean McGivern | 2017-11-13 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Repository Exists check is OPT_OUT for Gitaly See merge request gitlab-org/gitlab-ce!15287 | ||||
| * | | | | | Repository Exists check is OPT_OUT for Gitaly | Zeger-Jan van de Weg | 2017-11-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving more git operations to be executed by Gitaly, now the check if a repository exists is an opt out endpoint. Can be disabled, for the time being, by performing in the rails console: > Feature.get('gitaly_repository_exists').disable => true Part of gitlab-org/gitaly#314 | ||||
* | | | | | | Prepare Repository#fetch_source_branch for migration | Jacob Vosmaer (GitLab) | 2017-11-10 | 3 | -29/+97 |
| | | | | | | |||||
* | | | | | | Merge branch 'cleanup-issues-schema' into 'master' | Sean McGivern | 2017-11-10 | 1 | -1/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up the schema of the table "issues" Closes #31811 See merge request gitlab-org/gitlab-ce!15225 |