| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'issue_30663' into 'security-10-2' | Sean McGivern | 2017-12-08 | 1 | -0/+2 |
| | | | | | | | | | | Prevent creating issues through API without having permissions See merge request gitlab/gitlabhq!2225 (cherry picked from commit c298bbaa88883343dc9cbbb6abec0808fb3b546c) 915b97c5 Prevent creating issues through API without having permissions | ||||
| * | Merge branch 'rs-security-group-api' into 'security-10-2' | Douwe Maan | 2017-12-08 | 1 | -2/+15 |
| | | | | | | | | | | [10.2] Ensure we expose group projects using GroupProjectsFinder See merge request gitlab/gitlabhq!2234 (cherry picked from commit 072f8f2fd6ec794645375a16ca4ddc1cbeb76d7a) a2240338 Ensure we expose group projects using GroupProjectsFinder | ||||
| * | Allow git pull/push on project redirects | Mayra Cabrera | 2017-12-08 | 1 | -2/+11 |
| | | |||||
| * | Move the circuitbreaker check out in a separate processbvl-circuitbreaker-process | Bob Van Landuyt | 2017-12-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving the check out of the general requests, makes sure we don't have any slowdown in the regular requests. To keep the process performing this checks small, the check is still performed inside a unicorn. But that is called from a process running on the same server. Because the checks are now done outside normal request, we can have a simpler failure strategy: The check is now performed in the background every `circuitbreaker_check_interval`. Failures are logged in redis. The failures are reset when the check succeeds. Per check we will try `circuitbreaker_access_retries` times within `circuitbreaker_storage_timeout` seconds. When the number of failures exceeds `circuitbreaker_failure_count_threshold`, we will block access to the storage. After `failure_reset_time` of no checks, we will clear the stored failures. This could happen when the process that performs the checks is not running. | ||||
| * | Use relative _path helper URLs in the GitLab UI40825-use-relative-path-urls | Eric Eastwood | 2017-12-07 | 1 | -0/+3 |
| | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40825 | ||||
| * | Merge branch 'jej/per-user-protected-branches-api-ce' into 'master' | Sean McGivern | 2017-12-07 | 1 | -10/+8 |
| |\ | | | | | | | | | CE backport of "ProtectedBranches API handles per user/group granularity" See merge request gitlab-org/gitlab-ce!15747 | ||||
| | * | CE backport of ProtectedBranches API changes | James Edwards-Jones | 2017-12-07 | 1 | -10/+8 |
| | | | | | | | | | | | In EE we now allow individual users/groups to be set on POST, which required some refactoring. See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3516 | ||||
| * | | The API isn't using the appropriate services for managing forks | Francisco Javier López | 2017-12-07 | 1 | -10/+11 |
| | | | |||||
| * | | Merge branch 'zj-multiple-artifacts' into 'master' | Grzegorz Bizon | 2017-12-05 | 2 | -9/+7 |
| |\ \ | |/ |/| | | | | | Multiple artifacts See merge request gitlab-org/gitlab-ce!14367 | ||||
| | * | Store expire_at in ci_job_artifacts | Kamil Trzcinski | 2017-12-03 | 1 | -4/+5 |
| | | | |||||
| | * | Rename Artifact to JobArtifact, split metadata out | Zeger-Jan van de Weg | 2017-12-03 | 2 | -9/+6 |
| | | | | | | | | | | | | | | | | | | | Two things at ones, as there was no clean way to seperate the commit and give me feedback from the tests. But the model Artifact is now JobArtifact, and the table does not have a type anymore, but the metadata is now its own model: Ci::JobArtifactMetadata. | ||||
| | * | Create Ci::Artifacts | Zeger-Jan van de Weg | 2017-12-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow jobs/builds to have multiple artifacts, and to start seperating concerns from Ci::Build a new model is created: Ci::Artifact. Changes include the updating of the ArtifactUploader to adapt to a slightly different interface. The uploader expects to be initialized with a `Ci::Build`. Futher a migration with the minimal fields, the needed foreign keys and an index. Last, the way this works is by prepending a module to Ci::Build so we can basically override behaviour but if needed use `super` to get the original behaviour. | ||||
| * | | Merge branch 'sh-optimize-groups-api' into 'master' | Douwe Maan | 2017-12-04 | 4 | -14/+98 |
| |\ \ | | | | | | | | | | | | | | | | | | | Optimize API /groups/:id/projects by preloading assocations Closes #40308 See merge request gitlab-org/gitlab-ce!15475 | ||||
| | * | | Not forcing to redefine preload_relation | Francisco Lopez | 2017-12-01 | 1 | -1/+1 |
| | | | | |||||
| | * | | Undoing the change to ForkNetworkMember | Francisco Lopez | 2017-12-01 | 1 | -11/+7 |
| | | | | |||||
| | * | | Fixed BasicProjectDetail parent | Francisco Lopez | 2017-12-01 | 1 | -1/+1 |
| | | | | |||||
| | * | | Removed binding.pry | Francisco Lopez | 2017-12-01 | 1 | -1/+0 |
| | | | | |||||
| | * | | Removing blank line | Francisco Lopez | 2017-12-01 | 1 | -1/+0 |
| | | | | |||||
| | * | | Changes after rebase | Francisco Lopez | 2017-12-01 | 1 | -3/+14 |
| | | | | |||||
| | * | | Undoing debugging change | Francisco Lopez | 2017-12-01 | 1 | -2/+2 |
| | | | | |||||
| | * | | Comments from code review applied. Also switched forked_from_project and ↵ | Francisco Lopez | 2017-12-01 | 3 | -43/+52 |
| | | | | | | | | | | | | | ForkedProjectLinks to ForkNetworkMember | ||||
| | * | | Refactored /projects and /user/:user_id/projects endpoints | Francisco Lopez | 2017-12-01 | 4 | -25/+77 |
| | | | | |||||
| | * | | Code review comments applied | Francisco Lopez | 2017-12-01 | 1 | -2/+2 |
| | | | | |||||
| | * | | Small renaming | Francisco Lopez | 2017-12-01 | 1 | -4/+4 |
| | | | | |||||
| | * | | More preloading improvement and added batch count services | Francisco Lopez | 2017-12-01 | 1 | -5/+20 |
| | | | | |||||
| | * | | Preload project route to avoid N+1 query | Stan Hu | 2017-12-01 | 1 | -1/+1 |
| | | | | |||||
| | * | | Only serialize namespace essentials in group's projects API response | Stan Hu | 2017-12-01 | 1 | -2/+4 |
| | | | | |||||
| | * | | Omit the `all` call after Project#project_group_links to avoid unnecessary loads | Stan Hu | 2017-12-01 | 1 | -1/+1 |
| | | | | |||||
| | * | | Optimize API /groups/:id/projects by preloading associations | Stan Hu | 2017-12-01 | 1 | -0/+1 |
| | |/ | | | | | | | Closes #40308 | ||||
| * | | Added default order to UserFinder | Francisco Javier López | 2017-12-04 | 2 | -0/+12 |
| |/ | |||||
| * | 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 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |