Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | support ordering of project notes in notes api | haseeb | 2017-11-29 | 1 | -1/+6 |
| | |||||
* | Merge branch 'gitaly-ssh-upload-pack-opt-out' into 'master' | Sean McGivern | 2017-11-29 | 1 | -4/+4 |
|\ | | | | | | | | | | | | | SSHUploadPack over Gitaly is now OptOut Closes gitaly#730 See merge request gitlab-org/gitlab-ce!15623 | ||||
| * | SSHUploadPack over Gitaly is now OptOutgitaly-ssh-upload-pack-opt-out | Kim "BKC" Carlbäcker | 2017-11-29 | 1 | -4/+4 |
| | | | | | | | | - Better gitaly-handling in /api/internal/allowed specs | ||||
* | | Add timeouts for Gitaly calls | Andrew Newdigate | 2017-11-29 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'tm/feature/list-runners-jobs-api' into 'master' | Kamil Trzciński | 2017-11-28 | 2 | -7/+42 |
|\ \ | | | | | | | | | | | | | | | | | | | Add new API endpoint - list jobs of a specified runner Closes #39699 See merge request gitlab-org/gitlab-ce!15432 | ||||
| * | | Refactorize jobs finding logic | Tomasz Maczukin | 2017-11-28 | 1 | -6/+2 |
| | | | |||||
| * | | Modify output | Tomasz Maczukin | 2017-11-28 | 2 | -6/+9 |
| | | | |||||
| * | | Allow filtering by 'status' | Tomasz Maczukin | 2017-11-28 | 1 | -1/+8 |
| | | | |||||
| * | | Add information about project | Tomasz Maczukin | 2017-11-28 | 2 | -6/+17 |
| | | | |||||
| * | | Add new API endpoint - list jobs of a specified runner | Tomasz Maczukin | 2017-11-28 | 1 | -0/+18 |
| | | | |||||
* | | | Merge branch 'tm/feature/namespace-by-id-api' into 'master' | Kamil Trzciński | 2017-11-28 | 2 | -0/+32 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | Add new API endpoint - get a namespace by ID Closes #40254 See merge request gitlab-org/gitlab-ce!15442 | ||||
| * | | Introduce :read_namespace access policy for namespace and group | Tomasz Maczukin | 2017-11-23 | 1 | -1/+1 |
| | | | |||||
| * | | Allow request namespace by ID or path | Tomasz Maczukin | 2017-11-23 | 2 | -16/+24 |
| | | | |||||
| * | | Add new API endpoint - get a namespace by ID | Tomasz Maczukin | 2017-11-23 | 1 | -0/+24 |
| | | | |||||
* | | | Create issue and merge request destroy services | George Andrinopoulos | 2017-11-25 | 2 | -2/+6 |
| |/ |/| | |||||
* | | Merge branch 'jej/fix-protected-branch-validations-ce' into 'master' | Rémy Coutable | 2017-11-24 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | Fix ProtectedBranch access level validations See merge request gitlab-org/gitlab-ce!15586 | ||||
| * | | Fix ProtectedBranch access level validations | James Edwards-Jones | 2017-11-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | Before an access_level was required in EE even when an it had been set for a user/group. | ||||
* | | | Merge branch 'jej-rename-legacy-protected-branches-api-service' into 'master' | Rémy Coutable | 2017-11-23 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | Renamed ProtectedBranches::ApiUpdateService to LegacyApiUpdateService See merge request gitlab-org/gitlab-ce!15575 | ||||
| * | | | Renamed ProtectedBranches::ApiUpdateService to LegacyApiUpdateServicejej-rename-legacy-protected-branches-api-service | James Edwards-Jones | 2017-11-23 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge branch '39887-move-identical-check-to-merged-branches' into 'master' | Douwe Maan | 2017-11-23 | 1 | -1/+5 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Move identical merged branch check to merged_branch_names Closes #39887 See merge request gitlab-org/gitlab-ce!15464 | ||||
| * | | | Move identical merged branch check to merged_branch_names | Lin Jen-Shin | 2017-11-23 | 1 | -1/+5 |
| |/ / | |||||
* | | | Merge branch 'use-merge-requests-diff-id-column' into 'master' | Douwe Maan | 2017-11-23 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Use foreign key to get latest MR diff Closes #37631 See merge request gitlab-org/gitlab-ce!15126 | ||||
| * | | Use latest_merge_request_diff association | Sean McGivern | 2017-11-23 | 1 | -1/+1 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compared to the merge_request_diff association: 1. It's simpler to query. The query uses a foreign key to the merge_request_diffs table, so no ordering is necessary. 2. It's faster for preloading. The merge_request_diff association has to load every diff for the MRs in the set, then discard all but the most recent for each. This association means that Rails can just query for N diffs from N MRs. 3. It's more complicated to update. This is a bidirectional foreign key, so we need to update two tables when adding a diff record. This also means we need to handle this as a special case when importing a GitLab project. There is some juggling with this association in the merge request model: * `MergeRequest#latest_merge_request_diff` is _always_ the latest diff. * `MergeRequest#merge_request_diff` reuses `MergeRequest#latest_merge_request_diff` unless: * Arguments are passed. These are typically to force-reload the association. * It doesn't exist. That means we might be trying to implicitly create a diff. This only seems to happen in specs. * The association is already loaded. This is important for the reasons explained in the comment, which I'll reiterate here: if we a) load a non-latest diff, then b) get its `merge_request`, then c) get that MR's `merge_request_diff`, we should get the diff we loaded in c), even though that's not the latest diff. Basically, `MergeRequest#merge_request_diff` is the latest diff in most cases, but not quite all. | ||||
* | | Allow password authentication to be disabled entirely | Markus Koller | 2017-11-23 | 4 | -10/+20 |
|/ | |||||
* | Skip confirmation user api | Daniel Juarez | 2017-11-21 | 1 | -1/+2 |
| | |||||
* | Merge branch ↵ | Sean McGivern | 2017-11-21 | 1 | -2/+2 |
|\ | | | | | | | | | | | | | | | | | '39461-notes-api-for-issues-no-longer-returns-label-additions-removals' into 'master' Resolve "Notes API for issues no longer returns label additions/removals" Closes #39461 See merge request gitlab-org/gitlab-ce!15080 | ||||
| * | add `#with_metadata` scope to remove a N+1 from the notes' API | micael.bergeron | 2017-11-21 | 1 | -2/+2 |
| | | |||||
* | | Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master' | Rémy Coutable | 2017-11-20 | 8 | -0/+14 |
|\ \ | | | | | | | | | | | | | | | | | | | Adds Rubocop rule for line break after guard clause Closes #18040 See merge request gitlab-org/gitlab-ce!15188 | ||||
| * | | Adds Rubocop rule for line break after guard clause | Jacopo | 2017-11-16 | 8 | -0/+14 |
| |/ | | | | | | | Adds a rubocop rule (with autocorrect) to ensure line break after guard clauses. | ||||
* | | Changes after rebase | Francisco Lopez | 2017-11-17 | 1 | -20/+1 |
| | | |||||
* | | Moved Exceptions to Gitlab::Auth | Francisco Lopez | 2017-11-17 | 2 | -11/+11 |
| | | |||||
* | | Moving exceptions to UserAuthFinders | Francisco Lopez | 2017-11-17 | 2 | -26/+11 |
| | | |||||
* | | Added some more comments | Francisco Lopez | 2017-11-17 | 1 | -7/+8 |
| | | |||||
* | | Homogenising the type of the request handled by UserAuthFinder. Also tests fixed | Francisco Lopez | 2017-11-17 | 1 | -3/+0 |
| | | |||||
* | | Applied some code review comments | Francisco Lopez | 2017-11-17 | 1 | -5/+0 |
| | | |||||
* | | Removing private token | Francisco Lopez | 2017-11-17 | 1 | -6/+1 |
| | | |||||
* | | Some fixes after rebase | Francisco Lopez | 2017-11-17 | 1 | -24/+7 |
| | | |||||
* | | Updated refactor and pushing to see if test fails | Francisco Lopez | 2017-11-17 | 1 | -2/+0 |
| | | |||||
* | | First refactor | Francisco Lopez | 2017-11-17 | 1 | -39/+19 |
| | | |||||
* | | 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/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 | 6 | -12/+25 |
| |\ | |||||
| * | | 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 |
| | | | |||||
* | | | 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 | 1 | -3/+5 |
| | | | |||||
* | | | Add /groups/:id/subgroups endpoint to API | Winnie Hellmann | 2017-11-09 | 1 | -22/+44 |
| | | | |||||
* | | | Merge branch '39895-cant-set-mattermost-username-channel-from-api' into 'master' | Rémy Coutable | 2017-11-09 | 1 | -0/+6 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix acceptance of username for Mattermost service update Closes #39895 See merge request gitlab-org/gitlab-ce!15275 | ||||
| * | | | Fix acceptance of username for Mattermost service update via API | Mark Fletcher | 2017-11-08 | 1 | -0/+6 |
| | | | |