summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Handle missing keys in sentry api responseReuben Pereira2019-03-291-11/+21
| | | | | | - Do not raise error when there are missing non-essential keys in sentry api response. - Add specs for to check for missing keys behavior.
* Merge branch '50199-quick-actions-refactor' into 'master'Sean McGivern2019-03-298-3/+717
|\ | | | | | | | | | | | | Extend quick actions dsl Closes #50199 See merge request gitlab-org/gitlab-ce!26095
| * Extend quick actions dsl50199-quick-actions-refactorAlexandru Croitor2019-03-298-3/+717
| | | | | | | | | | | | | | | | | | | | | | * 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-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Use a Gitlab::FakeApplicationSettings when migrations are pending Closes #59462 See merge request gitlab-org/gitlab-ce!26601
| * | Use a Gitlab::FakeApplicationSettings when migrations are pendingRémy Coutable2019-03-261-1/+1
| | | | | | | | | | | | 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/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using `refs/merge-requests/:iid/head` ok ok Improve naming nicely Add nice tests add nice tests fix some more revert
* | | | Merge branch 'sh-fix-gitaly-find-commit-caching' into 'master'Kamil Trzciński2019-03-292-1/+21
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Allow ref name caching CommitService#find_commit Closes #57083 See merge request gitlab-org/gitlab-ce!26248
| * | | Guard against nested allows with ref name cachingsh-fix-gitaly-find-commit-cachingStan Hu2019-03-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids the case: ``` allow_ref_name_caching do allow_ref_name_caching do # using-feature end end ```
| * | | Allow ref name caching CommitService#find_commitStan Hu2019-03-272-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '10735-geo-gitlab-revision-can-return-not-consistent-results' ↵Sean McGivern2019-03-291-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | into 'master' Use a fixed git abbrev parameter when we fetch a git revision See merge request gitlab-org/gitlab-ce!26707
| * | | Use a fixed git abbrev parameter when we fetch a git revision10735-geo-gitlab-revision-can-return-not-consistent-resultsValery Sizov2019-03-281-1/+1
| | | |
* | | | Memoize old_blob and new_blob to improve performanceIgor2019-03-281-2/+6
|/ / /
* | | Fix Auto DevOps missing domain error handlingDylan Griffith2019-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | For some reason this value can be an empty string and we want to ensure that we correctly fail the job before a deploy. This is particularly problematic at the moment when coupled with https://gitlab.com/gitlab-org/gitlab-ce/issues/54760 as the user has no easy way to recover without destroying the cluster and starting over.
* | | Merge branch 'sh-add-gitaly-duration-logs' into 'master'Douglas Barbosa Alexandre2019-03-272-7/+16
|\ \ \ | |/ / |/| | | | | | | | Log Gitaly RPC duration to api_json.log and production_json.log See merge request gitlab-org/gitlab-ce!26652
| * | Log Gitaly RPC duration to api_json.log and production_json.logStan Hu2019-03-272-7/+16
| | | | | | | | | | | | | | | | | | | | | This makes it easier to debug Gitaly performance issues in the field. This commit also makes the tracking of query time thread-safe via RequestStore.
* | | Merge branch 'osw-multi-line-suggestions-creation-strategy' into 'master'Andreas Brandl2019-03-275-2/+96
|\ \ \ | |/ / |/| | | | | | | | Prepares suggestion implementation for multi-line support See merge request gitlab-org/gitlab-ce!26057
| * | Prepare suggestion implementation for multi-lineOswaldo Ferreira2019-03-275-2/+96
| |/ | | | | | | | | | | 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.
* | Resolve "Get milestone by title via API"Fabio Busatto2019-03-272-0/+8
| |
* | Merge branch 'bvl-allow-more-repos-per-resource-ce' into 'master'James Lopez2019-03-276-29/+95
|\ \ | | | | | | | | | | | | Allow multiple repositories per project See merge request gitlab-org/gitlab-ce!26539
| * | Allow multiple repositories per projectBob Van Landuyt2019-03-266-29/+95
| | | | | | | | | | | | | | | | | | | | | | | | 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-261-6/+25
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 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-261-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-261-0/+36
|\ \ \ | | | | | | | | | | | | | | | | 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-251-0/+36
| | | | | | | | | | | | | | | | This will be further required for supporting multi-assignees MRs
* | | | Merge branch 'backport-api-parameters' into 'master'Robert Speicher2019-03-269-48/+183
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Backport EE API parameters in lib/api See merge request gitlab-org/gitlab-ce!26369
| * | | | Backport parameters for API::ParametersYorick Peterse2019-03-261-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | This backports the EE specific parameters for API::Parameters, wrapping them in a conditional.
| * | | | Backport parameters for API::UsersYorick Peterse2019-03-261-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | This backports the EE specific parameters for API::Users, and wraps them in a conditional.
| * | | | Backport API parameters for API::SettingsYorick Peterse2019-03-261-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | This backports the API parameters from API::Settings that were added in EE, wrapping them in a conditional.
| * | | | Backport changes to API::ProtectedBranchesYorick Peterse2019-03-261-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | This backports EE specific parameters EE adds to API::ProtectedBranches, and wraps them in a conditional.
| * | | | Backport parameters from API::ProjectsYorick Peterse2019-03-262-35/+44
| | | | | | | | | | | | | | | | | | | | | | | | | This backports various parameter changes EE makes to API::Projects, along with moving some code around to make it easier to extend in EE.
| * | | | Backport API::Issues parameters from EEYorick Peterse2019-03-262-13/+37
| | | | | | | | | | | | | | | | | | | | | | | | | This backports the parameters that EE adds to API::Issues, and wraps them in conditionals so they are only used in EE.
| * | | | Backport API::Helpers::ProjectsHelpers from EEYorick Peterse2019-03-261-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | This backports all changes made to this module in EE to CE, and wraps EE specific code in a conditional.
| * | | | Backport EE API parameters for API::GroupsYorick Peterse2019-03-261-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports the API parameters for API::Groups from EE to CE, ensuring both implementations use the same code. EE specific parameters are wrapped in an `if` statement for two reasons: 1. It allows us to completely disable the parameters in CE. 2. It removes the need for adding a source comment to signal that the parameters are EE only.
* | | | | Merge branch 'fix-hidden-statistics' into 'master'Nick Thomas2019-03-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show statistics also when repository is disabled Closes #59390 See merge request gitlab-org/gitlab-ce!26509
| * | | | | Show statistics also when repository is disabledPeter Marko2019-03-231-1/+1
| | |/ / / | |/| | |
* | | | | Force to recreate all diffs on importrecreate-all-diffs-on-importKamil Trzciński2019-03-261-10/+6
| |/ / / |/| | | | | | | | | | | | | | | | | | | 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-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '54916-extended-tooltip-for-merge-request-links' into 'master'Phil Hughes2019-03-262-6/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Extended tooltip for merge request links" Closes #54916 See merge request gitlab-org/gitlab-ce!25221
| * | | | | Add merge request popover with detailsSam Bigelow2019-03-212-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Show pipeline status, title, MR Status and project path - Popover attached to gitlab flavored markdown everywhere, including: + MR/Issue Title + MR/Issue description + MR/Issue comments + Rendered markdown files
* | | | | | Apply suggestion to lib/gitlab/danger/helper.rbMike Greiling2019-03-251-1/+1
| | | | | |
* | | | | | Update frontend-specific files in reviewer rouletteMike Greiling2019-03-251-1/+17
| | | | | |
* | | | | | Merge branch 'ce-1974-update-user-name-upon-ldap-sync' into 'master'Douwe Maan2019-03-251-10/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-10/+7
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'winh-eslint-config-danger' into 'master'Mike Greiling2019-03-251-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark .eslintrc.yml as frontend change for Danger See merge request gitlab-org/gitlab-ce!26549
| * | | | | | Mark .eslintrc.yml as frontend change for DangerWinnie Hellmann2019-03-251-1/+1
| |/ / / / /
* | | | | | Merge branch 'sh-fix-github-import-creator' into 'master'Douglas Barbosa Alexandre2019-03-251-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Add error tracking usage countsLogan King2019-03-251-0/+1
|/ / / /