summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-3113-28/+185
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (84 commits) Migrate Gitlab::Git::Wiki#page to Gitaly Load participants async Normalize LDAP DN when looking up identity Improve the maintenance policy page add changelog fix spec failure Allow promoting project milestones to group milestones fix specs Be able to bundle gems with newer rubies Upgrade Ruby to 2.3.5 fixed up upload feature after master merge fix missing issue assignees Migrate Gitlab::Git::Wiki#delete_page to Gitaly Enable eslint Make `#hashed_storage?` require feature argument Adds callback function to inital cluster request Fix example typo. Upload files through the multi-file editor get branch name from the DOM Resolve "Convert autosize.js library to be a Yarn managed library" ...
| * Merge branch 'feature/migrate-find-wiki-page-to-gitaly' into 'master'Sean McGivern2017-10-313-7/+82
| |\ | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Wiki#page to Gitaly Closes gitaly#677 See merge request gitlab-org/gitlab-ce!14955
| | * Migrate Gitlab::Git::Wiki#page to Gitalyfeature/migrate-find-wiki-page-to-gitalyAhmad Sherif2017-10-313-7/+82
| | | | | | | | | | | | Closes gitaly#677
| * | Merge branch 'dm-ldap-identity-normalize-dn' into 'master'Sean McGivern2017-10-312-3/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Normalize LDAP DN when looking up identity Closes #39559 See merge request gitlab-org/gitlab-ce!15103
| | * | Normalize LDAP DN when looking up identityDouwe Maan2017-10-312-3/+4
| | | |
| * | | Merge branch 'zj/gitlab-ce-zj-ruby-2.3.5' into 'master'Sean McGivern2017-10-311-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Upgrade Ruby to 2.3.5 See merge request gitlab-org/gitlab-ce!15099
| | * | | Upgrade Ruby to 2.3.5Zeger-Jan van de Weg2017-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | Part of gitlab-org/gitlab-ce#38040
| * | | | Merge branch 'fix/import-issue-assignees' into 'master'Sean McGivern2017-10-311-0/+1
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Fix missing issue assignees Closes #39170 See merge request gitlab-org/gitlab-ce!15109
| | * | | fix missing issue assigneesJames Lopez2017-10-311-0/+1
| | | | |
| * | | | 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
| * | | | Merge branch '39561-seed_fu-fails-to-load-gitlab-test' into 'master'Sean McGivern2017-10-311-0/+8
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Handle large values on `MergeRequestDiffCommit` dates Closes #39561 See merge request gitlab-org/gitlab-ce!15093
| | * | | Handle large values on `MergeRequestDiffCommit` dates39561-seed_fu-fails-to-load-gitlab-testAlejandro Rodríguez2017-10-301-0/+8
| | | |/ | | |/|
| * | | Merge branch '39619-cancel-merge-when-pipeline-succeeds-from-the-api-fails' ↵Rémy Coutable2017-10-311-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix namespacing for MergeWhenPipelineSucceedsService in MR API Closes #39619 See merge request gitlab-org/gitlab-ce!15088
| | * | | Fix namespacing for MergeWhenPipelineSucceedsService in MR APIMark Fletcher2017-10-301-1/+1
| | |/ /
| * | | Merge branch 'add-packagist-project-service' into 'master'Kamil Trzciński2017-10-312-0/+41
| |\ \ \ | | |_|/ | |/| | | | | | | | | | Add Packagist project service See merge request gitlab-org/gitlab-ce!14493
| | * | Add Packagist project serviceMatt Coleman2017-10-132-0/+41
| | | |
| * | | Only set Auto-Submitted header once39593-emails-on-push-are-sent-to-only-the-first-recipient-when-using-aws-sesSean McGivern2017-10-301-4/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The emails on push feature reuses the same email object, to avoid the expensive work of generating the email body. This interceptor would previously set multiple values for the same header, as that's the mail gem's default behaviour when called with the same header more than once. We don't want to change the emails on push service (although it's the only place where this happens), but fixing the interceptor is just as sensible anyway.
| * | Fix 500 error for old (somewhat) MRsAlexWayfer2017-10-301-3/+5
| | |
* | | allow inspect_request to inject request headers in order to test Sendfile ↵Mike Greiling2017-10-301-1/+11
| | | | | | | | | | | | requests in jobs_spec.rb
* | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-2925-45/+309
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (96 commits) Fetch the merged branches at once Merging EE doc into CE Avoid using Rugged in Gitlab::Git::Wiki#preview_slug Cache commits on the repository model Remove groups_select from global namespace & simplifies the code Change default disabled merge request widget message to "Merge is not allowed yet" Semi-linear history merge is now available in CE. Remove repetitive karma spec Improve spec to check hidden component Rename to shouldShowUsername Add KubernetesService#default_namespace tests Revert "Merge branch '36670-remove-edit-form' into 'master'" Fix bitbucket login Remove duped tests Add path attribute to WikiFile class Make local_branches OPT_OUT Clarify the language around External Group membership with SAML SSO to clarify that this will NOT add users to GitLab Groups. Added ssh fingerprint, gitlab ci and pages information in an instance configuration page Fix the incorrect value being used to set GL_USERNAME on hooks Resolve "Remove overzealous tooltips in projects page tabs" ...
| * | 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.
| * | | Merge branch 'fix/avoid-using-rugged-in-wiki-preview-slug' into 'master'Sean McGivern2017-10-271-1/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Avoid using Rugged in Gitlab::Git::Wiki#preview_slug See merge request gitlab-org/gitlab-ce!15054
| | * | | Avoid using Rugged in Gitlab::Git::Wiki#preview_slugAhmad Sherif2017-10-271-1/+10
| | | | |
| * | | | Merge branch '39495-fix-bitbucket-login' into 'master'Rémy Coutable2017-10-271-0/+4
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Fix bitbucket login Closes #39495 See merge request gitlab-org/gitlab-ce!15051
| | * | | Fix bitbucket login39495-fix-bitbucket-loginJarka Kadlecova2017-10-261-0/+4
| | | | |
| * | | | 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
| * | | | Merge branch 'gl-username-hook-fix' into 'master'Douwe Maan2017-10-261-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix the incorrect value being used to set GL_USERNAME on hooks See merge request gitlab-org/gitlab-ce!15038
| | * | | | Fix the incorrect value being used to set GL_USERNAME on hooksgl-username-hook-fixAlejandro Rodríguez2017-10-251-1/+1
| | |/ / /
| * | | | Merge branch 'api-configure-jira' into 'master'Douwe Maan2017-10-261-2/+2
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Validate username/pw for Jiraservice, require them in the API Closes #36621 See merge request gitlab-org/gitlab-ce!15025
| | * | | Validate username/pw for Jiraservice, require them in the APIRobert Schilling2017-10-241-2/+2
| | |/ /
| * | | 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 '23000-pages-api' into 'master'Grzegorz Bizon2017-10-244-0/+139
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Pages API" Closes #23000 See merge request gitlab-org/gitlab-ce!13917
| | * | | | Add pages domains API implementationTravis Miller2017-10-223-0/+122
| | | | | |
| | * | | | Add pages domains API entitiesTravis Miller2017-10-221-0/+17
| | | | | |
| * | | | | 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
View Lorry Controller Status