summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'hashed-storage-attachments-migration-path' into 'master'Nick Thomas2017-11-281-15/+70
|\ | | | | | | | | Hashed storage attachments migration path See merge request gitlab-org/gitlab-ce!15352
| * Improve storage migration rake taskGabriel Mazetto2017-11-231-15/+70
| |
* | Merge branch 'tm/feature/list-runners-jobs-api' into 'master'Kamil Trzciński2017-11-282-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 logicTomasz Maczukin2017-11-281-6/+2
| | |
| * | Modify outputTomasz Maczukin2017-11-282-6/+9
| | |
| * | Allow filtering by 'status'Tomasz Maczukin2017-11-281-1/+8
| | |
| * | Add information about projectTomasz Maczukin2017-11-282-6/+17
| | |
| * | Add new API endpoint - list jobs of a specified runnerTomasz Maczukin2017-11-281-0/+18
| | |
* | | Merge branch 'tm/feature/namespace-by-id-api' into 'master'Kamil Trzciński2017-11-282-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 groupTomasz Maczukin2017-11-231-1/+1
| | |
| * | Allow request namespace by ID or pathTomasz Maczukin2017-11-232-16/+24
| | |
| * | Add new API endpoint - get a namespace by IDTomasz Maczukin2017-11-231-0/+24
| | |
* | | Merge branch '39601-create-issuable-destroy-service' into 'master'Rémy Coutable2017-11-272-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Create issue and merge request destroy services Closes #39601 See merge request gitlab-org/gitlab-ce!15604
| * | | Create issue and merge request destroy servicesGeorge Andrinopoulos2017-11-252-2/+6
| | | |
* | | | static-analysis fix40352-ignore-hashed-repos-cleanup-dirsdigitalMoksha2017-11-251-2/+1
| | | |
* | | | refactored the hashed repository namedigitalMoksha2017-11-251-2/+5
| | | |
* | | | ignore hashed repositories when doing rake gitlab:cleanup:dirsdigitalMoksha2017-11-241-1/+2
|/ / /
* | | Merge branch 'jej/fix-protected-branch-validations-ce' into 'master'Rémy Coutable2017-11-241-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Fix ProtectedBranch access level validations See merge request gitlab-org/gitlab-ce!15586
| * | | Fix ProtectedBranch access level validationsJames Edwards-Jones2017-11-241-2/+2
| | | | | | | | | | | | | | | | | | | | Before an access_level was required in EE even when an it had been set for a user/group.
* | | | Drastically improve project search performance by no longer searching ↵dm-project-search-performanceDouwe Maan2017-11-241-1/+1
| | | | | | | | | | | | | | | | namespace name
* | | | Merge branch 'dm-fix-registry-with-sudo-token' into 'master'Sean McGivern2017-11-241-15/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pulling and pushing using a personal access token with the sudo scope Closes #40466 See merge request gitlab-org/gitlab-ce!15571
| * | | | Fix pulling and pushing using a personal access token with the sudo scopedm-fix-registry-with-sudo-tokenDouwe Maan2017-11-231-15/+10
| | | | |
* | | | | Merge branch 'pawel/update_prometheus_gem_to_well_tested_version' into 'master'Douwe Maan2017-11-242-24/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Prometheus Gem version and disable Prometheus method call instrumentation by default. Closes gitlab-ee#4139 and #40457 See merge request gitlab-org/gitlab-ce!15558
| * | | | | Use feature flag instead of application settigns to control if method calls ↵pawel/update_prometheus_gem_to_well_tested_versionPawel Chojnacki2017-11-232-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | should be instrumented
| * | | | | Use only real duration to measure method call performance via PrometheusPawel Chojnacki2017-11-231-21/+6
| | | | | |
| * | | | | check method timing threshold when observing method performancePawel Chojnacki2017-11-231-2/+2
| | | | | |
| * | | | | Reenable prometheus metricsPawel Chojnacki2017-11-231-3/+3
| | | | | |
| * | | | | Move prometheus middle ware to prometheus initialized.Pawel Chojnacki2017-11-232-2/+11
| | | | | |
* | | | | | Fix hashed storage for attachments bugsJames Lopez2017-11-231-2/+1
| | | | | |
* | | | | | Merge branch 'dm-cleanup-fetch-and-mirror-methods' into 'master'Sean McGivern2017-11-235-41/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up repository fetch and mirror methods See merge request gitlab-org/gitlab-ce!15424
| * | | | | | Rename fetch_refs to refmapDouwe Maan2017-11-234-22/+23
| | | | | | |
| * | | | | | Clean up repository fetch and mirror methodsDouwe Maan2017-11-235-38/+43
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jej-rename-legacy-protected-branches-api-service' into 'master'Rémy Coutable2017-11-231-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-serviceJames Edwards-Jones2017-11-231-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '39887-move-identical-check-to-merged-branches' into 'master'Douwe Maan2017-11-232-4/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_namesLin Jen-Shin2017-11-232-4/+18
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'reviewing-db-changes' into 'master'Rémy Coutable2017-11-2313-0/+104
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Rubocop config for background migrations See merge request gitlab-org/gitlab-ce!15576
| * | | | | | Added Rubocop config for background migrationsreviewing-db-changesYorick Peterse2017-11-2313-0/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a Rubocop configuration file specific to lib/gitlab/background_migrations. This configuration will be used to (hopefully) make reviewing background migrations easier by enforcing stricter rules compared to the rest of GitLab. Because this configuration is directory specific it will only affect background migrations.
* | | | | | | Merge branch 'use-merge-requests-diff-id-column' into 'master'Douwe Maan2017-11-232-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use foreign key to get latest MR diff Closes #37631 See merge request gitlab-org/gitlab-ce!15126
| * | | | | | | Use latest_merge_request_diff associationSean McGivern2017-11-232-1/+3
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge branch 'jk-group-mentions-fix' into 'master'Sean McGivern2017-11-231-1/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link text from group context Closes gitlab-ee#4100 See merge request gitlab-org/gitlab-ce!15565
| * | | | | | Fix link text from group contextJarka Kadlecova2017-11-231-1/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Allow password authentication to be disabled entirelyMarkus Koller2017-11-236-15/+31
| |_|/ / / |/| | | |
* | | | | Merge branch '40463-ee-compatibility-check-job-fails-unexpectedly' into 'master'Sean McGivern2017-11-231-6/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Resolve "EE Compatibility Check Job Fails Unexpectedly" Closes #40463 See merge request gitlab-org/gitlab-ce!15555
| * | | | In EeCompatCheck, always reset to canonical-ee/master when applying a patch40463-ee-compatibility-check-job-fails-unexpectedlyRémy Coutable2017-11-231-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Generate the patch against `origin/#{branch}` instead of just `#{branch}`Rémy Coutable2017-11-221-1/+1
| | | | |
| * | | | Try to always find the merge base using `origin/#{branch}` instead of just ↵Rémy Coutable2017-11-221-1/+1
| | |_|/ | |/| | | | | | | | | | `#{branch}`
* | | | Fix encoding bugs in Gitlab::Git::UserJacob Vosmaer (GitLab)2017-11-232-2/+11
|/ / /
* | | Merge branch '32620-speed-up-unicorn-specs' into 'master'Rémy Coutable2017-11-222-2/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Speed up Unicorn specs by using a dummy Rack application instead of GitLab Closes #32620 See merge request gitlab-org/gitlab-ce!15548
| * | | Speed up Unicorn specs by using a dummy Rack application instead of GitLabNick Thomas2017-11-222-2/+1
| | | |