summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Make local_branches OPT_OUTan/local_branches_opt_outAndrew Newdigate2017-10-261-1/+1
|
* Merge branch 'gitaly-ff-merge-preparation' into 'master'Rémy Coutable2017-10-252-4/+10
|\ | | | | | | | | | | | | 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-242-4/+10
| | | | | | | | We also delete some unused code related to the aforementioned feature.
* | Merge branch 'gitaly-gl-username' into 'master'Douwe Maan2017-10-243-17/+10
|\ \ | | | | | | | | | | | | 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/+10
| | | | | | | | | | | | | | | 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-2/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'bvl-circuitbreaker-backoff' into 'master'Sean McGivern2017-10-245-13/+54
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Circuitbreaker backoff and retries Closes #37383 and #38231 See merge request gitlab-org/gitlab-ce!14933
| * | | Allow enabling the circuitbreaker using an env variablebvl-circuitbreaker-backoffBob Van Landuyt2017-10-231-1/+10
| | | | | | | | | | | | | | | | 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-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-234-9/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'performance-bar-sql' into 'master'Rémy Coutable2017-10-241-2/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Remove Sherlock usage from the performance bar Closes #39351 See merge request gitlab-org/gitlab-ce!15000
| * | | Remove Sherlock usage from the performance barperformance-bar-sqlYorick Peterse2017-10-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sherlock::Query generates a backtrace on every call to "new", which is very slow. Formatter queries are also not displayed properly due to the lack of "white-space: pre" in the CSS. We took a look at fixing this, but the produced output is not really better than just displaying queries on one line. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/39351
* | | | Merge branch 'zj-peek-gitaly' into 'master'Rémy Coutable2017-10-231-0/+9
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Show Gitaly data in the peek performance bar Closes #39231 See merge request gitlab-org/gitlab-ce!14949
| * | | Add Gitaly data to the Peek performance barZeger-Jan van de Weg2017-10-231-0/+9
| | | |
* | | | 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
| | |/ | |/|
* | | Avoind unnecesary `force_encoding` operationsAlejandro Rodríguez2017-10-181-2/+5
|/ / | | | | | | | | | | 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 'feature/migrate-wiki-write-page-to-gitaly' into 'master'Sean McGivern2017-10-182-8/+72
|\ \ | |/ |/| | | | | | | | | Migrate Gitlab::Git::Wiki#write_page to Gitaly Closes gitaly#638 See merge request gitlab-org/gitlab-ce!14870
| * Migrate Gitlab::Git::Wiki#write_page to Gitalyfeature/migrate-wiki-write-page-to-gitalyAhmad Sherif2017-10-162-8/+72
| | | | | | | | Closes gitaly#638
* | Merge branch 'tc-saml-fix-false-empty' into 'master'Douwe Maan2017-10-181-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 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-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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-6/+16
|\ \ \ | | | | | | | | | | | | | | | | 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-6/+16
| | | |
* | | | Handle null serialised commits in background migration39181-gitlab-backgroundmigration-deserializemergerequestdiffsandcommits-error-nomethoderror-undefined-method-map-for-nil-nilclassSean McGivern2017-10-171-0/+1
| |/ / |/| | | | | | | | This is already handled for diffs, but not commits.
* | | Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-173-18/+36
|\ \ \ | | | | | | | | | | | | | | | | Make the circuitbreaker configurable at runtime See merge request gitlab-org/gitlab-ce!14842
| * | | Read circuitbreaker settings from `Gitlab::CurrentSettings`Bob Van Landuyt2017-10-173-18/+36
| | | | | | | | | | | | | | | | Instead of from the configuration file
* | | | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-175-6/+209
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show collapsible tree on the project show page Closes #30343 See merge request gitlab-org/gitlab-ce!14055
| * \ \ \ Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-1045-93/+1657
| |\ \ \ \
| * | | | | Reuse `base_and_ancestors` for `ancestors` in `GroupHierarchy`Bob Van Landuyt2017-10-101-2/+1
| | | | | |
| * | | | | Optimize queries and pagination in `GroupDescendantsFinder`Bob Van Landuyt2017-10-051-0/+61
| | | | | |
| * | | | | Move merging of Hashes out of the `GroupDescendant` concernBob Van Landuyt2017-10-041-0/+117
| | | | | | | | | | | | | | | | | | | | | | | | 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-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+5
| | | | | |
| * | | | | Update `children` route to handle projects and groupsBob Van Landuyt2017-10-041-1/+0
| | | | | |
* | | | | | Merge branch 'fix_global_board_routes_39073' into 'master'Douwe Maan2017-10-161-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove "boards" from TOP_LEVEL_ROUTES Closes #39073 See merge request gitlab-org/gitlab-ce!14861
| * | | | | | Remove boards from the list of reserved top pathsValery Sizov2017-10-131-1/+0
| | | | | | |
* | | | | | | Merge branch 'git-env-handle-arrays' into 'master'Sean McGivern2017-10-162-1/+12
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Add Gitlab::Git::Env.to_env_hash See merge request gitlab-org/gitlab-ce!14841
| * | | | | | Add Gitlab::Git::Env.to_env_hashJacob Vosmaer2017-10-162-1/+12
| | | | | | |
* | | | | | | Merge branch 'conflict-resolution-refactor' into 'master'Sean McGivern2017-10-1613-210/+330
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflict resolution refactor See merge request gitlab-org/gitlab-ce!14747
| * | | | | | | Move line code generation into Gitlab::Gitconflict-resolution-refactorAlejandro Rodríguez2017-10-127-29/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having a distinct class just for that was a bit overkill
| * | | | | | | Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-1213-280/+291
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename classes to (hopefully) clearer names while we're doing that.
| * | | | | | | Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-128-227/+314
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prepares the codebase for a Gitaly migration. See https://gitlab.com/gitlab-org/gitaly/issues/553
| * | | | | | | Clean hierarchy of calls between models and Gitalb::Git for blob searchAlejandro Rodríguez2017-10-121-0/+4
| | | | | | | |
| * | | | | | | Move Gitlab::Diff::LineCode to module Gitlab::GitAlejandro Rodríguez2017-10-125-6/+6
| | | | | | | |
| * | | | | | | Encapsulate git operations for conflict resolution into libAlejandro Rodríguez2017-10-121-13/+49
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'fix_diff_parsing' into 'master'Sean McGivern2017-10-161-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Fix confusing double usage of 'metadata'Jacob Vosmaer (GitLab)2017-10-161-4/+16
| | | | | | |
* | | | | | | Popen with a timeoutAndrew Newdigate2017-10-162-0/+70
| | | | | | |
View Lorry Controller Status