summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Fix 500 error for old (somewhat) MRsAlexWayfer2017-10-301-0/+37
|
* Fetch the merged branches at onceLin Jen-Shin (godfat)2017-10-272-0/+58
|
* Merge branch 'fix/add-path-attr-to-wiki-file' into 'master'Sean McGivern2017-10-261-3/+7
|\ | | | | | | | | | | | | Add path attribute to WikiFile class Closes #39420 See merge request gitlab-org/gitlab-ce!15019
| * Add path attribute to WikiFile classAhmad Sherif2017-10-261-3/+7
| | | | | | | | Fixes #39420
* | Fix the incorrect value being used to set GL_USERNAME on hooksgl-username-hook-fixAlejandro Rodríguez2017-10-251-13/+15
|/
* Merge branch 'gitaly-ff-merge-preparation' into 'master'Rémy Coutable2017-10-251-0/+54
|\ | | | | | | | | | | | | Move all rugged operation for ff_merge inside Gitlab::Git Closes gitaly#683 See merge request gitlab-org/gitlab-ce!15011
| * Move all rugged operation for ff_merge inside Gitlab::Gitgitaly-ff-merge-preparationAlejandro Rodríguez2017-10-241-0/+54
| | | | | | | | We also delete some unused code related to the aforementioned feature.
* | Merge branch 'gitaly-gl-username' into 'master'Douwe Maan2017-10-243-17/+21
|\ \ | | | | | | | | | | | | Support `Gitaly::User`'s gl_username field See merge request gitlab-org/gitlab-ce!15016
| * | Support `Gitaly::User`'s gl_username fieldgitaly-gl-usernameAlejandro Rodríguez2017-10-233-17/+21
| | | | | | | | | | | | | | | We also unify conversions from and to `Gitaly::User`s in the `Gitlab::Git::User` class.
* | | Merge branch 'sh-memoize-logger' into 'master'Nick Thomas2017-10-241-0/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Memoize GitLab logger to reduce open file descriptors Closes gitlab-ee#3664 See merge request gitlab-org/gitlab-ce!15007
| * | | Memoize GitLab logger to reduce open file descriptorsStan Hu2017-10-241-0/+12
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | We see that in gitlab-org/gitlab-ee#3664 that if we log a lot of data in Sidekiq workers, the number of open file descriptors reaches over 1000. To avoid this, we can memoize the logger per thread via RequestStore. Closes gitlab-org/gitlab-ee#3664
* | | Allow enabling the circuitbreaker using an env variablebvl-circuitbreaker-backoffBob Van Landuyt2017-10-231-2/+13
| | | | | | | | | | | | That way we can enable the circuitbreaker for just one host at a time.
* | | Perform the stat check multiple times when checking a storageBob Van Landuyt2017-10-232-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | Instead of only checking once within a timeout, check multiple times within a timeout. That means with a timeout of 30 seconds and 3 retries. Each try would be allowed 20 seconds.
* | | Implement backoff for the circuitbreakerBob Van Landuyt2017-10-232-178/+94
|/ / | | | | | | | | | | | | | | | | | | The circuitbreaker now has 2 failure modes: - Backing off: This will raise the `Gitlab::Git::Storage::Failing` exception. Access to the shard is blocked temporarily. - Circuit broken: This will raise the `Gitlab::Git::Storage::CircuitBroken` exception. Access to the shard will be blocked until the failures are reset.
* | Merge branch 'fix-application-setting-nil-cache' into 'master'Winnie Hellmann2017-10-201-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Prevent ApplicationSetting to cache nil value Closes #39275 See merge request gitlab-org/gitlab-ce!14952
| * | Fix failure in current_settings_spec.rbfix-application-setting-nil-cacheWinnie Hellmann2017-10-201-1/+1
| | |
* | | Merge branch '37391-wiki-disk-path-helper' into 'master'Nick Thomas2017-10-201-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Use wiki.disk_path See merge request gitlab-org/gitlab-ce!14930
| * | | Use wiki.disk_pathNick Thomas2017-10-181-1/+1
| | |/ | |/|
* | | Merge branch '18765-stub_env_in_specs' into 'master'Robert Speicher2017-10-191-4/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add a 'custom cop' to RuboCop that bans ENV assignment" Closes #18765 See merge request gitlab-org/gitlab-ce!14810
| * | | Stub ENV in the backup task spec fileRémy Coutable2017-10-181-4/+0
| |/ / | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Avoind unnecesary `force_encoding` operationsAlejandro Rodríguez2017-10-181-2/+14
|/ / | | | | | | | | | | They're costly. This will also avoid some edge cases where charlock_holmes assigns a weird encoding to a perfectly valid UTF-8 string.
* | Merge branch 'sh-security-fix-backports-master' into 'master'Robert Speicher2017-10-181-0/+5
|\ \ | | | | | | | | | | | | Backport all fixes from GitLab 10.1 into master See merge request gitlab-org/gitlab-ce!14922
| * \ Merge branch 'master' into sh-security-fix-backports-masterStan Hu2017-10-179-57/+184
| |\ \ | | |/
| * | Merge branch 'security-10-1' into '10-1-stable'Jen-Shin Lin2017-10-171-0/+5
| | | | | | | | | | | | | | | Security fixes for 10.1 RC See merge request gitlab/gitlabhq!2209
* | | Merge branch 'tc-saml-fix-false-empty' into 'master'Douwe Maan2017-10-182-17/+55
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | SAML fix when auth hash attributes do not define groups Closes #38923 See merge request gitlab-org/gitlab-ce!14913
| * | Fix SAML error 500 when no groups are defined for usertc-saml-fix-false-emptyToon Claes2017-10-182-17/+55
| | | | | | | | | | | | | | | | | | | | | | | | When there are no groups defined in the auth hash attributes, `Gitlab::Saml::AuthHash#groups` should return an empty array, and `Gitlab::Saml::User#find_user` should not mark the user as external. Closes gitlab-org/gitlab-ce#38923.
* | | Merge branch 'bvl-do-not-use-redis-keys' into 'master'Rémy Coutable2017-10-172-30/+4
|\ \ \ | | | | | | | | | | | | | | | | Avoid using `Redis#keys` See merge request gitlab-org/gitlab-ce!14889
| * | | Don't use `Redis#keys` in the circuitbreakerbvl-do-not-use-redis-keysBob Van Landuyt2017-10-172-30/+4
| | | |
* | | | Handle null serialised commits in background migration39181-gitlab-backgroundmigration-deserializemergerequestdiffsandcommits-error-nomethoderror-undefined-method-map-for-nil-nilclassSean McGivern2017-10-171-2/+19
| |/ / |/| | | | | | | | This is already handled for diffs, but not commits.
* | | Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-172-18/+40
|\ \ \ | | | | | | | | | | | | | | | | Make the circuitbreaker configurable at runtime See merge request gitlab-org/gitlab-ce!14842
| * | | Read circuitbreaker settings from `Gitlab::CurrentSettings`Bob Van Landuyt2017-10-172-18/+40
| | | | | | | | | | | | | | | | Instead of from the configuration file
* | | | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-175-7/+121
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Show collapsible tree on the project show page Closes #30343 See merge request gitlab-org/gitlab-ce!14055
| * | | Always use the same order specs for `MultiCollectionPaginator`Bob Van Landuyt2017-10-111-1/+1
| | | |
| * | | Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-1054-188/+2162
| |\ \ \
| * | | | Optimize queries and pagination in `GroupDescendantsFinder`Bob Van Landuyt2017-10-051-0/+46
| | | | |
| * | | | Move merging of Hashes out of the `GroupDescendant` concernBob Van Landuyt2017-10-041-0/+33
| | | | | | | | | | | | | | | | | | | | Since it can technically merge any hash with objects that respond to `==`
| * | | | Make it possible to limit ancestors in a `GroupHierarchy`Bob Van Landuyt2017-10-041-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing a parent_id will limit ancestors upto the specified parent if it is found. Using `ancestors` and `descendants` the `base` relation will not be included
| * | | | Don't break when building unions on empty collectionsBob Van Landuyt2017-10-041-0/+7
| | | | |
| * | | | Update `children` route to handle projects and groupsBob Van Landuyt2017-10-041-7/+7
| | | | |
* | | | | Merge branch 'git-env-handle-arrays' into 'master'Sean McGivern2017-10-161-5/+37
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Add Gitlab::Git::Env.to_env_hash See merge request gitlab-org/gitlab-ce!14841
| * | | | Add Gitlab::Git::Env.to_env_hashJacob Vosmaer2017-10-161-5/+37
| | | | |
* | | | | Merge branch 'conflict-resolution-refactor' into 'master'Sean McGivern2017-10-164-53/+55
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflict resolution refactor See merge request gitlab-org/gitlab-ce!14747
| * | | | | Move line code generation into Gitlab::Gitconflict-resolution-refactorAlejandro Rodríguez2017-10-121-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Having a distinct class just for that was a bit overkill
| * | | | | Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-123-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | Rename classes to (hopefully) clearer names while we're doing that.
| * | | | | Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-123-43/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prepares the codebase for a Gitaly migration. See https://gitlab.com/gitlab-org/gitaly/issues/553
| * | | | | Move Gitlab::Diff::LineCode to module Gitlab::GitAlejandro Rodríguez2017-10-121-10/+10
| | | | | |
* | | | | | Merge branch 'fix_diff_parsing' into 'master'Sean McGivern2017-10-161-0/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix diff parser so it tolerates to diff special markers in the content Closes #34431 See merge request gitlab-org/gitlab-ce!14848
| * | | | | | Fix diff parser so it tolerates to diff special markers in the contentValery Sizov2017-10-151-0/+17
| | |/ / / / | |/| | | |
* | | | | | Popen with a timeoutAndrew Newdigate2017-10-161-0/+132
| | | | | |
* | | | | | Merge branch ↵Kamil Trzciński2017-10-161-0/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cluster-disabled-instead-of-gcp-cluster-count' into 'master' Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, instead of `Gcp::Cluster.count` Closes #38960 See merge request gitlab-org/gitlab-ce!14807
View Lorry Controller Status