summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Simplify system hook testing and guarantee test will firesh-simplify-system-hook-testingStan Hu2017-08-272-0/+54
| | | | | | | | | | | The change in !11728 would cause an arbitrary project to be chosen to test system hooks, and it's likely that the project would not have any commits or relevant commits to test the hook. This would prevent admins from verifying that the hook fired. Instead of trying to create a representative hook dynamically, just send static data to guarantee the hook will actually be tested. Closes #37067
* Merge branch '31409-fix-group-and-project-search-for-anonymous-users' into ↵Kamil Trzciński2017-08-251-11/+3
|\ | | | | | | | | | | | | | | | | 'master' Fix group and project search for anonymous users Closes #31409 See merge request !13745
| * Refactor complicated API group finding rules into GroupsFinderNick Thomas2017-08-241-10/+2
| |
| * Allow v4 API GET requests for groups to be unauthenticatedNick Thomas2017-08-231-4/+4
| |
* | Merge branch '36939-fix-find-blobs-by-path' into 'master'Sean McGivern2017-08-251-11/+32
|\ \ | | | | | | | | | | | | | | | | | | Fix searching for files by path Closes #36939 See merge request !13798
| * | Fix searching for files by pathNick Thomas2017-08-251-11/+32
| | |
* | | Merge branch 'git-operation-user' into 'master'Sean McGivern2017-08-244-9/+70
|\ \ \ | |/ / |/| | | | | | | | Move GitHooksService into Gitlab::Git See merge request !13739
| * | Rubocop whitespaceJacob Vosmaer2017-08-232-9/+8
| | |
| * | Move GitHooksService to Gitlab::GitJacob Vosmaer2017-08-232-2/+39
| | |
| * | Make gl_repository a G::G::Repository attributeJacob Vosmaer2017-08-232-7/+11
| | |
| * | Decouple GitOperationService from UserJacob Vosmaer2017-08-231-0/+21
| | |
* | | Merge branch 'fix-old-mr-diffs' into 'master'Douwe Maan2017-08-241-1/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix old MR diffs Closes #36516 See merge request !13744
| * | | Show un-highlighted diffs when blobs are the sameSean McGivern2017-08-241-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | For some old merge requests, we don't have enough information to figure out the old blob and the new blob for the file. This means that we can't highlight the diff correctly, but we can still display it without highlighting.
| * | | Always return a simple diff viewerSean McGivern2017-08-221-0/+2
| | | | | | | | | | | | | | | | | | | | We didn't have a fallback case before, because we believed the conditions were exhaustive. They weren't, so we can always fallback to not previewing.
* | | | Delegate Repository::branch_exists? and ref_exists? to Gitlab::GitAndrew Newdigate2017-08-242-1/+24
| | | |
* | | | Merge branch 'sh-fix-branch-count' into 'master'Douwe Maan2017-08-241-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inconsistent number of branches when remote branches are present Closes #36934 See merge request !13784
| * | | | Fix inconsistent number of branches when remote branches are presentsh-fix-branch-countStan Hu2017-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users of project mirrors would see that the number of branches did not match the number in the branch dropdown because remote branches were counted when Rugged was in use. With Gitaly, only local branches are counted. Closes #36934
* | | | | Merge branch 'dm-ldap-adapter-attributes' into 'master'Robert Speicher2017-08-232-5/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Support simple string LDAP attribute specifications, and search for name rather… Closes #36841 See merge request !13776
| * | | | Support simple string LDAP attribute specifications, and search for name ↵dm-ldap-adapter-attributesDouwe Maan2017-08-232-5/+10
| | | | | | | | | | | | | | | | | | | | rather than username attributes
* | | | | Merge branch 'fix/gitlay-raw-blame-request-encoding' into 'master'Robert Speicher2017-08-231-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Properly encode Gitaly RawBlame request params See merge request !13764
| * | | | Properly encode Gitaly RawBlame request paramsfix/gitlay-raw-blame-request-encodingAhmad Sherif2017-08-231-2/+2
| | | | |
* | | | | Merge branch 'bvl-improve-bare-project-import' into 'master'Sean McGivern2017-08-234-81/+100
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Make the import take subgroups into account Closes #36664 and #30546 See merge request !13670
| * | | | Fix error when importing a GitHub-wiki repositorybvl-improve-bare-project-importBob Van Landuyt2017-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This would occur when Wiki's are enabled on GitHub, but there is no wiki repository
| * | | | Migrate creation of nested groups into a serviceBob Van Landuyt2017-08-232-50/+3
| | | | |
| * | | | Improve bare repository importBob Van Landuyt2017-08-232-63/+129
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Allow imports into nested groups - Make sure it sets the correct visibility level when creating new groups While doing this, I moved the import into a testable class, that made it easier to improve.
* | | | Merge branch 'gitaly-commit-patch' into 'master'Sean McGivern2017-08-232-1/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporate DiffService.CommitPatch Gitaly RPC Closes gitaly#463 See merge request !13441
| * | | | Incorporate DiffService.CommitPatch Gitaly RPCgitaly-commit-patchAlejandro Rodríguez2017-08-222-1/+17
| | | | |
* | | | | Fix a potential timeout in `Gitlab::Logger.read_latest`Robert Speicher2017-08-221-6/+2
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If this method was called for a file that didn't exist, we attempted to first `build` it. But if the file wasn't writeable, such as a symlink pointing to an unmounted filesystem, the method would just hang and eventually timeout. Further, this was entirely pointless since we were creating a file and then shelling out to `tail`, eventually returning an empty Array. Now we just skip building it and return the empty Array straight away.
* | | | Merge branch 'fix/sm/34762-bad-validation-message' into 'master'Kamil Trzciński2017-08-221-1/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Enforce namespace of Kubernetes to lowercase Closes #34762 See merge request !13732
| * | | Enfouce namespace for Kubernetes to lowercaseShinya Maeda2017-08-221-1/+2
| | |/ | |/|
* | | Merge branch 'fix/import-fork-mr' into 'master'Sean McGivern2017-08-222-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix Import/Export issue to do with fork merge requests Closes #36666 See merge request !13717
| * | | Fix fork MRs importing issueJames Lopez2017-08-212-1/+3
| | | |
* | | | Merge branch '34533-inline-single-authorized-projects' into 'master'Douwe Maan2017-08-221-9/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use an event-based system when waiting for AuthorizedProjectsWorker to complete See merge request !13564
| * | | | Use event-based waiting in Gitlab::JobWaiterNick Thomas2017-08-221-9/+48
| | | | |
* | | | | Refactor project and storage typesGabriel Mazetto2017-08-221-1/+1
| | | | |
* | | | | Prevent using gitlab import task when hashed storage is enabledGabriel Mazetto2017-08-221-0/+6
| | | | |
* | | | | New storage is now "Hashed" instead of "UUID"Gabriel Mazetto2017-08-221-0/+1
| |_|/ / |/| | |
* | | | Merge branch 'gitaly-tree-entries-encoding' into 'master'36778-url-redirection-from-old-note-attachments-path-to-new-uploads-path-not-working36775-move-helm-chart-data-to-gitlab-ce-repo-instead-of-omnibus-docsRobert Speicher2017-08-211-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly encode string params for Gitaly's TreeEntries RPC Closes #36720 See merge request !13724
| * | | | Correctly encode string params for Gitaly's TreeEntries RPCgitaly-tree-entries-encodingAlejandro Rodríguez2017-08-211-2/+2
| | |/ / | |/| |
* | | | Merge branch 'only-limit-fetch-when-requested' into 'master'Robert Speicher2017-08-211-0/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Only require sidekiq-limit_fetch when enabled in settings Closes #36253 See merge request !13715
| * | | Only require sidekiq-limit_fetch when enabled in settingsonly-limit-fetch-when-requestedSean McGivern2017-08-211-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | This gem allows Sidekiq jobs to be throttled. Unfortunately, it has a side-effect: when we haven't enabled job throttling, it will still hit Redis a lot (and miss, because nothing is configured). As this setting already required a restart, ensure that the library is only required when it's enabled.
* | | Merge branch 'backstage/gb/migrate-stages-statuses' into 'master'Kamil Trzciński2017-08-211-0/+77
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Migrate CI/CD stages statuses Closes #33453 See merge request !12584
| * \ \ Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-08-16127-744/+2532
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (1000 commits) Fix username autocomplete group name with no avatar alignment Fix 'Projected tags' typo in protected_tags_spec.rb Many Repo Fixes Repo Editor Fixes Docs: New index for permissions link article from CI index link tech articles from the landing page new articles come first fix relative link fix date format Fixed changed files dropdown not being shown Update publication date Remove deprecated field from workhorse API responses Fix API responses when dealing with txt files Make sure MySQL would not use CURRENT_TIMESTAMP Add two more project templates Allow usage of any_projects? with an Array Copyedit Artifactory and GitLab article Rename Artifactory and GitLab article file Display GPG status loading spinner only when Ajax request is made ...
| * \ \ \ Merge commit '9a3b283402b8cc1c86802c526f19a459ce09c2e3' into ↵Grzegorz Bizon2017-07-3131-444/+576
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backstage/gb/migrate-stages-statuses * commit '9a3b283402b8cc1c86802c526f19a459ce09c2e3': (270 commits) Add a note about EFS and GitLab log files Projects logo are not centered vertically on projects page Fix spec/features/projects/branches_spec Fixup POST /v3/:id/hooks and PUT /v3/:id/hooks/:hook_id Fix a spec that was assuming to be on the wrong page Add copy about search terms to ux guide Update documentation of user creation by replacing the 'confirm' param with 'skip_confirmation' Fix replying to commit comments on MRs from forks Fix 500 error when rendering avatar for deleted project creator Load and process at most 100 commits when pushing into default branch Ensure Gitlab::Application.routes.default_url_options are set correctly in Capybara + :js specs Add log messages to clarify log messages about API CSRF token verification failure Update gitlab_flow.md, Teatro seems to be completely dead, see also https://forum.gitlab.com/t/gitlab-flow-documentation-teatro/7774 Fix diff commenting results just after changing view Update CHANGELOG.md for 9.4.2 none is not a CSS Value for sizes ;-) Merge issuable "reopened" state into "opened" Make access level more compatible with EE Add link to JIRA article in docs Expand pipeline_trigger_service_spec by godfat request ...
| * \ \ \ \ Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-07-2633-251/+541
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (110 commits) Add missing colon Fix project wiki web_url spec Resolve "Memory usage notice doesn't link anywhere" Docs new topic "user/index" Implement GRPC call to RepositoryService Pending delete projects should not show in deploy keys Remove outdated ~Frontend label in CONTRIBUTING.md Fixes 500 error caused by pending delete projects in admin dashboard Add lower path index to redirect_routes Remove project_key from the Jira configuration Update CHANGELOG.md for 9.4.1 Enable gitaly_post_upload_pack by default Add `api` prefix as a top level route in the spec. Move relative_path to the element that is being clicked Bumps Gitlab Omniauth LDAP version Add directives to Vue component ordering synchronize ukrainian translation in zanata again v3 API is unsupported after 9.5, but may not be removed Fix vertical alignment in firefox and safari for pipeline mini graph Adds link_to_gfm method instrumentation ... Conflicts: db/schema.rb
| * \ \ \ \ \ Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-07-2443-108/+311
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (97 commits) Bulk update sidebar UI polish Fix margin in mini graph for commits box Add space between words in language dropdown Fix support for old CI API when image or services are not specified Short-circuit build coverage extraction for empty regexes Update VERSION to 9.5.0-pre Update CHANGELOG.md for 9.4.0 Compress gitlab svg logo Fix the gcovr coverage regex by removing line separators before scanning Capitalize Sidekiq word in dev doc Add 1px to breadcrumbs min height Update nginx docs Use custom font SVG for logo Port spinach tests to rspec feature specs Merge branch 'fix-re2-infinite-loop-nick' into 'security-9-3' Copy-edit background migrations guidelines Add Traditional Chinese in Taiwan translations of Pipeline Schedules Fix new project selectors in GitLab QA Reword success to passing for pipeline badges Rename build to pipeline for status badges ...
| * \ \ \ \ \ \ Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-07-201-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fix background migration cleanup specs Fix JS; make buttons sr accessibile; fix overlay Isolate stage_id reference clean up migration Fix eslint Make sidebar accessible on mobile Add mobile navigation on project page Fix database schema version number Fix background migrations module specs Remove migration dependency from stage_id migration Remove obsolete argument from bg migrations code Add specs for stage_id reference cleanup migration Add pending set of specs for stage_id cleanup migration Rename stage_id reference clean up migration Implement build stage_id reference migration clean up
| * \ \ \ \ \ \ \ Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-07-2088-679/+1219
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (319 commits) remove redundant changelog entries Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3' Merge branch '33303-404-for-unauthorized-project' into 'security-9-3' Merge branch '33359-pers-snippet-files-location' into 'security-9-3' Merge branch 'bvl-remove-appearance-symlink' into 'security-9-3' Hide description about protected branches to non-member Update CHANGELOG.md for 9.0.11 Update CHANGELOG.md for 9.1.8 Update CHANGELOG.md for 8.17.7 Update CHANGELOG.md for 9.2.8 Update CHANGELOG.md for 9.3.8 Respect blockquote line breaks in markdown 35209 Add wip message to new navigation preference section Add github imported projects count to usage data Add versions to Prometheus metrics doc Add Bulgarian translations of Pipeline Schedules Add Esperanto translations of Pipeline Schedules Add Traditional Chinese in HongKong translations of Pipeline Schedules Add Simplified Chinese translations of Pipeline Schedules Resolve "Clarify k8s service keys" ... Conflicts: db/schema.rb
| * | | | | | | | | Freeze mutable constants in stages migration codeGrzegorz Bizon2017-07-111-1/+1
| | | | | | | | | |
| * | | | | | | | | Schedule stages statuses bg migrations in batchesGrzegorz Bizon2017-07-101-2/+3
| | | | | | | | | |
View Lorry Controller Status