summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Migrate Gitlab::Git::Wiki#page to Gitalyfeature/migrate-find-wiki-page-to-gitalyAhmad Sherif2017-10-313-7/+82
| | | | Closes gitaly#677
* Merge branch 'feature/migrate-wiki-delete-page-to-gitaly' into 'master'Sean McGivern2017-10-312-9/+40
|\ | | | | | | | | | | | | Migrate Gitlab::Git::Wiki#delete_page to Gitaly Closes gitaly#673 See merge request gitlab-org/gitlab-ce!14910
| * Migrate Gitlab::Git::Wiki#delete_page to GitalyAhmad Sherif2017-10-312-9/+40
| | | | | | | | Closes gitaly#673
* | Handle large values on `MergeRequestDiffCommit` dates39561-seed_fu-fails-to-load-gitlab-testAlejandro Rodríguez2017-10-301-0/+8
|/
* Fix 500 error for old (somewhat) MRsAlexWayfer2017-10-301-3/+5
|
* Fetch the merged branches at onceLin Jen-Shin (godfat)2017-10-272-0/+19
|
* Merge branch 'zj-commit-cache' into 'master'Sean McGivern2017-10-271-1/+2
|\ | | | | | | | | Cache commits on the repository model See merge request gitlab-org/gitlab-ce!14863
| * Cache commits on the repository modelZeger-Jan van de Weg2017-10-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | Now, when requesting a commit from the Repository model, the results are not cached. This means we're fetching the same commit by oid multiple times during the same request. To prevent us from doing this, we now cache results. Caching is done only based on object id (aka SHA). Given we cache on the Repository model, results are scoped to the associated project, eventhough the change of two repositories having the same oids for different commits is small.
* | Avoid using Rugged in Gitlab::Git::Wiki#preview_slugAhmad Sherif2017-10-271-1/+10
| |
* | Merge branch 'an/local_branches_opt_out' into 'master'Douwe Maan2017-10-261-1/+1
|\ \ | | | | | | | | | | | | Make local_branches OPT_OUT See merge request gitlab-org/gitlab-ce!15045
| * | Make local_branches OPT_OUTan/local_branches_opt_outAndrew Newdigate2017-10-261-1/+1
| | |
* | | Merge branch 'fix/add-path-attr-to-wiki-file' into 'master'Sean McGivern2017-10-261-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+2
| |/ / | | | | | | | | | Fixes #39420
* | | Fix the incorrect value being used to set GL_USERNAME on hooksgl-username-hook-fixAlejandro Rodríguez2017-10-251-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
| | | | | | |
View Lorry Controller Status