summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Ensure that Blob.raw returns always returns a valid blob objectsh-blob-raw-checkStan Hu2017-09-211-0/+2
| | | | | | | In gitlab-org/gitlab-ee!2976, we saw that a given OID could point to a commit, which would cause the delta size check to fail. Gitaly already returns nil if the OID isn't a blob, so this change makes the Rugged implementation consistent.
* Merge branch 'gitlab-git-popen' into 'master'Douwe Maan2017-09-204-8/+14
|\ | | | | | | | | | | | | Use Gitlab::Git's Popen on that module's code Closes gitaly#597 See merge request gitlab-org/gitlab-ce!14237
| * Use Gitlab::Git's Popen on that module's codegitlab-git-popenAlejandro Rodríguez2017-09-204-8/+14
| | | | | | | | | | This allows the current Gitaly migration to depend on less code outside of the Gitlab::Git module
* | Merge branch '37713-enable-ee_compat_check-for-forks' into 'master'Rémy Coutable2017-09-201-1/+6
|\ \ | | | | | | | | | | | | | | | | | | Enable ee_compat_check for forks, but not EE Closes #37713 See merge request gitlab-org/gitlab-ce!14189
| * | Update ee_compat_check for community contributors37713-enable-ee_compat_check-for-forksLin Jen-Shin2017-09-151-1/+6
| | |
* | | Fix rewriting issue references with group milestonesGrzegorz Bizon2017-09-201-0/+6
| |/ |/|
* | Merge branch 'fix/gitaly-commit-diff-rpc-encoding-error' into 'master'Robert Speicher2017-09-201-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Encode paths properly for Gitaly Commit{Diff,Delta} Closes gitaly#589 See merge request gitlab-org/gitlab-ce!14361
| * | Encode paths properly for Gitaly Commit{Diff,Delta}fix/gitaly-commit-diff-rpc-encoding-errorAhmad Sherif2017-09-191-1/+1
| | | | | | | | | | | | Fixes gitaly#589
* | | Prepare cherry-pick and revert for migration to GitalyJacob Vosmaer (GitLab)2017-09-194-4/+98
| | |
* | | Merge branch 'backstage/gb/jobs-triggering-policy-specifications' into 'master'Kamil Trzciński2017-09-195-92/+130
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Implement job policy specifications Closes #37280 See merge request gitlab-org/gitlab-ce!14265
| * | | Raise exception when initializing unknown policyGrzegorz Bizon2017-09-181-5/+1
| | | |
| * | | Do not initialize YAML processor with project full pathGrzegorz Bizon2017-09-181-3/+2
| | | |
| * | | Do not pass project path from YAML processorGrzegorz Bizon2017-09-184-11/+11
| | | | | | | | | | | | | | | | Use project full path that can be received from a pipeline object
| * | | Simplify pipeline source policy pattern matchingGrzegorz Bizon2017-09-181-9/+2
| | | |
| * | | Add specs for CI/CD job policy refs specificationGrzegorz Bizon2017-09-181-1/+1
| | | |
| * | | Fix Rubocop offenses in YAML processor classesGrzegorz Bizon2017-09-181-1/+0
| | | |
| * | | Remove YAML processor refactoring stubs and fix specsGrzegorz Bizon2017-09-182-32/+26
| | | |
| * | | Extract job refs policy specs into separate classGrzegorz Bizon2017-09-182-66/+59
| | | |
| * | | Use CI/CD job policy specification in YAML processorGrzegorz Bizon2017-09-183-9/+26
| | | |
| * | | Implement CI/CD kubernetes policy specificationGrzegorz Bizon2017-09-182-0/+47
| | | |
* | | | Merge branch '37999-fix-circuit-breaker' into 'master'Douwe Maan2017-09-191-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Fix the filesystem shard health check to check all configured shards Closes #37999 See merge request gitlab-org/gitlab-ce!14341
| * | | Fix the filesystem shard health check to check all configured shardsNick Thomas2017-09-191-1/+1
| | | |
* | | | Detect n+1 issues involving GitalyAndrew Newdigate2017-09-193-12/+163
| | | |
* | | | Merge branch 'bvl-port-of-ee-translations' into 'master'Douwe Maan2017-09-191-1/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Port of EE translations Closes #37914 See merge request gitlab-org/gitlab-ce!14340
| * | | Add Dutch as an available language.Bob Van Landuyt2017-09-181-1/+2
| |/ /
* | | Merge branch '37789-followup-for-read-registry-change' into 'master'Rémy Coutable2017-09-181-7/+17
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Clean up read_registry scope changes Closes #37789 See merge request gitlab-org/gitlab-ce!14307
| * | Clean up read_registry scope changesRobin Bobbitt2017-09-181-7/+17
| |/ | | | | | | Closes #37789
* | Merge branch 'operation-service-merge' into 'master'Rémy Coutable2017-09-182-1/+43
|\ \ | | | | | | | | | | | | | | | | | | Prepare Repository#merge for migration to Gitaly Closes gitaly#559 See merge request gitlab-org/gitlab-ce!14154
| * | Prepare Repository#merge for migration to Gitalyoperation-service-mergeJacob Vosmaer2017-09-152-1/+43
| |/
* | Merge branch 'mk-delete-conflicting-redirects-mysql' into 'master'Douwe Maan2017-09-182-0/+129
|\ \ | | | | | | | | | | | | | | | | | | Clean up redirect routes that conflict with regular routes Closes #36229 See merge request gitlab-org/gitlab-ce!13783
| * | Spread out the work a littleMichael Kozono2017-09-141-3/+43
| | |
| * | Extract helper for queuing background jobsMichael Kozono2017-09-141-0/+48
| | |
| * | Simplify queryMichael Kozono2017-09-141-15/+4
| | | | | | | | | | | | Performance does not need to be optimized in this case because this will be run in batches at a controlled rate.
| * | Add specs for deleting conflicting redirectsMichael Kozono2017-09-141-2/+2
| | |
| * | Delete conflicting redirects in backgroundMichael Kozono2017-09-141-0/+52
| |/
* | Fix setting share_with_group_lockfix-share-with-group-lock-updateYorick Peterse2017-09-152-3/+28
|/ | | | | | | | | | | | | | | | | | | Prior to this commit running Namespace#force_share_with_group_lock_on_descendants would result in updating _all_ namespaces in the namespaces table, not just the descendants. This is the result of ActiveRecord::Relation#update_all not taking into account the CTE. To work around this we use the CTE query as a sub-query instead of directly calling #update_all. To prevent this from happening the relations returned by Gitlab::GroupHierarchy are now marked as read-only, resulting in an error being raised when methods such as #update_all are used. Fortunately on GitLab.com our statement timeouts appear to have prevented this query from actually doing any damage other than causing a very large amount of dead tuples. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37916
* Merge branch 'gitlab-git-user' into 'master'Rémy Coutable2017-09-143-18/+24
|\ | | | | | | | | Rename Gitlab::Git::Committer to User See merge request gitlab-org/gitlab-ce!14254
| * Rename Gitlab::Git::Committer to UserJacob Vosmaer2017-09-143-18/+24
| |
* | Merge branch '37845-fix-oauth-provider-forced-encoding' into 'master'Grzegorz Bizon2017-09-141-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Don't force the encoding of the OAuth provider in Gitlab::OAuth::AuthHash#provider Closes #37845 See merge request gitlab-org/gitlab-ce!14263
| * | Don't force the encoding of the OAuth provider in ↵37845-fix-oauth-provider-forced-encodingRémy Coutable2017-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::OAuth::AuthHash#provider Some providers freeze their name (e.g. https://github.com/zquestz/omniauth-google-oauth2/blob/414c43ef3ffec37d473321f262e80f1e46dda89f/lib/omniauth/strategies/google_oauth2.rb#L1), so trying to modify the string would fail with a `can't modify frozen String` exception (see https://gitlab.com/gitlab-org/gitlab-ce/issues/37845#note_40308148). In this case, we can just stop trying to force the encoding of the provider name as they should always be in utf8 by default. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch ↵Douwe Maan2017-09-141-1/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | '37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-header' into 'master' Resolve "Renamed files have escaped HTML for the inline diff in the header" Closes #37576 See merge request gitlab-org/gitlab-ce!14121
| * | changed InlineDiffMarker to make it html_safe its output37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-headermicael.bergeron2017-09-121-1/+2
| | | | | | | | | | | | updated the spec
* | | Merge branch 'backport-ee-changes-to-url-sanitizer' into 'master'Rémy Coutable2017-09-131-4/+21
|\ \ \ | |_|/ |/| | | | | | | | Backport more EE changes to Gitlab::UrlSanitizer See merge request !14150
| * | Backport more EE changes to Gitlab::UrlSanitizerNick Thomas2017-09-111-4/+21
| | |
* | | Fix: GPG tmp dir removal race conditionAlexis Reigel2017-09-131-4/+10
| | |
* | | Merge branch 'zj-usage-data-auto-devops' into 'master'Kamil Trzciński2017-09-131-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add usage ping for Auto DevOps Closes #37648 See merge request !14162
| * | | Add auto devops enabled/disabled to usage pingZeger-Jan van de Weg2017-09-121-0/+2
| | | |
| * | | Add usage ping for Auto DevOpsZeger-Jan van de Weg2017-09-081-0/+2
| | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#37648
* | | | Merge branch '5836-move-lib-ci-into-gitlab-namespace' into 'master'Grzegorz Bizon2017-09-136-2/+731
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Move `lib/ci` to `lib/gitlab/ci`" Closes #5836 See merge request !14078
| * | | | adds changelogMaxim Rydkin2017-09-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix CI fix CI
View Lorry Controller Status