summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge branch 'jprovazn-graphql-prometheus' into 'master'"Jan Provaznik2019-04-021-35/+0
| | | | This reverts merge request !26569
* Merge branch 'jarv/dev-to-gitlab-2019-04-02' into 'master'Robert Speicher2019-04-027-46/+239
|\ | | | | | | | | | | | | Jarv/dev to gitlab 2019 04 02 Closes #2810 See merge request gitlab-org/gitlab-ce!26846
| * Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵jarv/dev-to-gitlab-2019-04-02John Jarvis2019-04-027-46/+239
| |\ | | | | | | | | | jarv/dev-to-gitlab-2019-04-02
| | * Rake task for removing exif from uploadsJan Provaznik2019-04-021-0/+120
| | | | | | | | | | | | | | | Adds a rake task which can be used for removing EXIF data from existing uploads.
| | * Merge branch 'security-use-untrusted-regexp' into 'master'GitLab Release Tools Bot2019-04-026-46/+119
| | |\ | | | | | | | | | | | | | | | | Use UntrustedRegexp for CI refs matching See merge request gitlab/gitlabhq!3005
| | | * Make CI refs matching to to use UntrustedRegexpKamil Trzciński2019-03-156-46/+119
| | | | | | | | | | | | | | | | | | | | | | | | This makes ref validation to use always `UntrustedRegexp`. This also splits the existing RubySyntax into separate class.
* | | | Monitor GraphQL with PrometheusJan Provaznik2019-04-021-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extends graphql's platform tracing class to observe duration of graphql methods. In graphql 1.8.11 is added prometheus class but it's not very useful for us because it uses prometheus_exporter to export results.
* | | | Merge branch 'sh-fix-rugged-tree-entries' into 'master'Sean McGivern2019-04-021-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid excessive recursive calls with Rugged TreeEntries Closes #59759 See merge request gitlab-org/gitlab-ce!26813
| * | | | Avoid excessive recursive calls with Rugged TreeEntriessh-fix-rugged-tree-entriesStan Hu2019-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Rugged implementation was recursively scanning the repository to create `flat_path` because the post-process step was being called from with a loop. For large repositories, this was significantly slowing things down. Break the call to `rugged_populate_flat_path` out of this loop to make this work efficiently. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59759
* | | | | Merge branch 'issue_51789_part_1' into 'master'Sean McGivern2019-04-021-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Migrate issuable states to integer patch 1 of 2 Closes #51789 See merge request gitlab-org/gitlab-ce!25107
| * | | | Merge masterFelipe Artur2019-03-27111-579/+4011
| |\ \ \ \
| * | | | | Address review commentsFelipe Artur2019-02-191-5/+5
| | | | | |
| * | | | | Merge branch 'master' into issue_51789_part_1Felipe Artur2019-02-1912-46/+591
| |\ \ \ \ \
| * | | | | | Add Reschedulable moduleFelipe Artur2019-02-151-5/+5
| | | | | | |
| * | | | | | Fix specsFelipe Artur2019-02-151-0/+2
| | | | | | |
* | | | | | | Allow streaming io objects into GitalyBob Van Landuyt2019-04-011-2/+11
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to set the encoding of an IO passed without reading it into memory. This is useful if we want to stream files into Gitaly. Like we do when uploading a new file to the repository.
* | | | | | Merge branch '50199-quick-actions-refactor' into 'master'Sean McGivern2019-03-292-1/+55
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend quick actions dsl Closes #50199 See merge request gitlab-org/gitlab-ce!26095
| * | | | | | Extend quick actions dsl50199-quick-actions-refactorAlexandru Croitor2019-03-292-1/+55
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Extend quick actions dsl to allow specifying model types to which given quick action applies * Rename issuable attribute to noteable in interpret_service.rb * Refactor and reorder quick action specs * Create a shared example spec for each quick action to be used for issue, merge request and commit specs. https://gitlab.com/gitlab-org/gitlab-ce/issues/50199
* | | | | | Merge branch '59462-applicatonsettings-not-tolerant-of-missing-db-columns' ↵Stan Hu2019-03-291-3/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Use a Gitlab::FakeApplicationSettings when migrations are pending Closes #59462 See merge request gitlab-org/gitlab-ce!26601
| * | | | | | Apply suggestion to spec/lib/gitlab/current_settings_spec.rb59462-applicatonsettings-not-tolerant-of-missing-db-columnsLin Jen-Shin2019-03-281-1/+1
| | | | | | |
| * | | | | | Use a Gitlab::FakeApplicationSettings when migrations are pendingRémy Coutable2019-03-261-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'persist-fulll-ref-path-for-mr-pipelines' into 'master'Kamil Trzciński2019-03-293-1/+83
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use merge request HEAD ref for detached merge request pipelines Closes #58454 See merge request gitlab-org/gitlab-ce!25504
| * | | | | | | Create detached merge request pipelinespersist-fulll-ref-path-for-mr-pipelinesShinya Maeda2019-03-293-1/+83
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using `refs/merge-requests/:iid/head` ok ok Improve naming nicely Add nice tests add nice tests fix some more revert
* | | | | | | Allow ref name caching CommitService#find_commitStan Hu2019-03-271-0/+15
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For a given merge request, it's quite common to see duplicate FindCommit Gitaly requests because the Gitaly CommitService caches the request by the commit SHA, not by the ref name. However, most of the duplicate requests use the ref name, so the cache is never actually used in practice. This leads to unnecessary requests that slow performance. This commit allows certain callers to bypass the ref name to OID conversion in the cache. We don't do this by default because it's possible the tip of the branch changes during the commit, which would cause the caller to get stale data. This commit also forces the Ci::Pipeline to use the full ref name so that caching can work for merge requests. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57083
* | | | | | Merge branch 'osw-multi-line-suggestions-creation-strategy' into 'master'Andreas Brandl2019-03-274-0/+175
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepares suggestion implementation for multi-line support See merge request gitlab-org/gitlab-ce!26057
| * | | | | | Prepare suggestion implementation for multi-lineOswaldo Ferreira2019-03-274-0/+175
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the groundwork needed in order to persist multi-line suggestions, while providing the parsing strategy which will be reused for the **Preview** as well.
* | | | | | Merge branch 'bvl-allow-more-repos-per-resource-ce' into 'master'James Lopez2019-03-274-15/+83
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow multiple repositories per project See merge request gitlab-org/gitlab-ce!26539
| * | | | | | Allow multiple repositories per projectBob Van Landuyt2019-03-264-15/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the repository type from a binary `wiki?` to a type. So we can have more than 2 repository types. Now everywhere we called `.wiki?` and expected a boolean, we check that type.
* | | | | | | Merge branch '48132-display-output-from-pre-receive-scripts' into 'master'Dmitriy Zaporozhets2019-03-262-8/+18
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow custom hooks errors to appear in GitLab UI Closes #48132 See merge request gitlab-org/gitlab-ce!25625
| * | | | | | Allow custom hooks errors to appear in GitLab UILuke Duncalfe2019-03-262-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error messages from custom pre-receive hooks now appear in the GitLab UI. This is re-enabling a feature that had been disabled in merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18646 The feature had been disabled due to security concerns that information which was not intended to be public (like stack traces) would leak into public view. PreReceiveErrors (from pre-receive, post-receive and update custom hooks) are now filtered for messages that have been prefixed in a particular way. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48132
* | | | | | | Merge branch 'osw-multi-assignees-merge-requests-migration' into 'master'Douglas Barbosa Alexandre2019-03-262-0/+57
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add multiple MR assignees migration and background table population See merge request gitlab-org/gitlab-ce!26496
| * | | | | | | Add multiple assignees migration and table populationOswaldo Ferreira2019-03-252-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be further required for supporting multi-assignees MRs
* | | | | | | | GitalyClient spec: Remove the diff between CE/EEZeger-Jan van de Weg2019-03-261-0/+10
| | | | | | | |
* | | | | | | | Force to recreate all diffs on importrecreate-all-diffs-on-importKamil Trzciński2019-03-261-33/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If for whatever reason we fail to import MR data, subsequent run will fail as we try to insert duplicate data. Instead of trying to recover, lets delete all and retry again.
* | | | | | | | Merge branch ↵Sean McGivern2019-03-261-0/+12
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '58805-allow-incomplete-commit-data-to-be-fetched-from-collection' into 'master' Enrich commits with full data in CommitCollection Closes #58805 See merge request gitlab-org/gitlab-ce!26445
| * | | | | | | Enrich commits with full data in CommitCollectionLuke Duncalfe2019-03-221-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow incomplete commit records to load their full data from gitaly. Commits can be based on a Hash of data retrieved from PostgreSQL, and this data can be intentionally incomplete in order to save space. A new method #gitaly? has been added to Gitlab::Git::Commit, which returns true if the underlying data source of the Commit is a Gitaly::GitCommit. CommitCollection now has a method #enrich which replaces non-gitaly commits in place with commits from gitaly. CommitCollection#without_merge_commits has been updated to call this method, as in order to determine a merge commit we need to have parent data. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/58805
* | | | | | | | Merge branch 'ce-1974-update-user-name-upon-ldap-sync' into 'master'Douwe Maan2019-03-251-3/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport 'Update user name upon LDAP sync' from EE See merge request gitlab-org/gitlab-ce!26432
| * | | | | | | | Backport 'Update user name upon LDAP sync' from EERémy Coutable2019-03-251-3/+8
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'sh-fix-github-import-creator' into 'master'Douglas Barbosa Alexandre2019-03-251-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitHub importer: Use the project creator to create branches from forks Closes #59396 See merge request gitlab-org/gitlab-ce!26510
| * | | | | | | GitHub importer: Use the project creator to create branches from forksStan Hu2019-03-231-3/+3
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The project owner may actually be a group, in which case the branch creation would fail due to a lack of username. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59396
* | | | | | | Merge branch ↵Rémy Coutable2019-03-251-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ce-10136-extract-ee-specific-files-lines-for-plan-spec-lib-gitlab' into 'master' Freeze strings in ReferenceExtractor spec See merge request gitlab-org/gitlab-ce!26466
| * | | | | | | Freeze strings in ReferenceExtractor specSean McGivern2019-03-221-0/+2
| | | | | | | |
* | | | | | | | Add error tracking usage countsLogan King2019-03-251-0/+4
| |/ / / / / / |/| | | | | |
* | | | | | | Set proper default-branch on GitHub ImportKamil Trzciński2019-03-221-0/+11
|/ / / / / /
* | | | | | Merge branch 'da-capitalize-db-apapter-name-on-rails-console' into 'master'Stan Hu2019-03-221-0/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display the database adapter name in a human-friendly way See merge request gitlab-org/gitlab-ce!26437
| * | | | | | Add helper method to return a human-friendly name for database adapterDouglas Barbosa Alexandre2019-03-211-0/+14
| | | | | | |
* | | | | | | Merge branch '59147-duplicate-match-line' into 'master'Douwe Maan2019-03-211-0/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix duplicated bottom match line Closes #59147 See merge request gitlab-org/gitlab-ce!26402
| * | | | | | | Fix diff bottom expand button appears twiceMark Chao2019-03-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a quick fix by only append match line once when calling diff_lines_for_serializer multiple time. Also enable feature by default
* | | | | | | | Merge branch '10514-fix-non-existing-authorized-keys-file' into 'master'Nick Thomas2019-03-211-45/+141
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle cases when authorized_keys doesn't exist See merge request gitlab-org/gitlab-ce!26347
| * | | | | | | | Update Gitlab::AuthorizedKeys specs to be clearerPatrick Bajao2019-03-211-4/+40
| | | | | | | | |