summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Move forking to Gitalyzj-fork-mandatoryZeger-Jan van de Weg2018-06-191-15/+2
| | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/817 Closes https://gitlab.com/gitlab-org/gitaly/issues/1236
* Merge branch 'bvl-i18n-validation' into 'master'Rémy Coutable2018-06-184-53/+131
|\ | | | | | | | | | | | | Updates to `.po` & `.pot` linting Closes #46096 et #39292 See merge request gitlab-org/gitlab-ce!18779
| * Correctly translate all forms in testsbvl-i18n-validationBob Van Landuyt2018-06-153-20/+56
| |
| * Add Polish as a supported languageBob Van Landuyt2018-06-151-1/+2
| | | | | | | | | | | | We already had some Polish translations, that were currently not available to users. Adding it here because it helps me debug some issues regarding language with more than one form.
| * Validate PO-variable usage in message idsBob Van Landuyt2018-06-151-0/+4
| | | | | | | | | | That way we can detect incorrect usage before the strings are added to Crowdin for translation
| * Forbids combining named and unnamed variables in `gitlab.pot`Bob Van Landuyt2018-06-152-41/+78
| | | | | | | | | | This would break with an argument error when interpolating using `sprintf` in ruby.
* | Merge branch 'dm-favicon-redirect' into 'master'Sean McGivern2018-06-181-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Redirect favicon.(png|ico) to actual favicon asset or upload Closes #47840 See merge request gitlab-org/gitlab-ce!19956
| * | Redirect favicon.(png|ico) to actual favicon asset or uploaddm-favicon-redirectDouwe Maan2018-06-181-0/+1
| | |
* | | Merge branch 'rails5-fix-db-check' into 'master'Yorick Peterse2018-06-181-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Rails5 fix db check: connection execute returns integer instead of string See merge request gitlab-org/gitlab-ce!19901
| * | | Rails5 fix connection execute return integer instead of stringJasper Maes2018-06-151-1/+1
| | | |
* | | | Merge branch ↵Yorick Peterse2018-06-181-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'blackst0ne-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-namespace' into 'master' Resolve "[Rails5] Invalid single-table inheritance type: Group is not a subclass of Namespace" Closes #48014 See merge request gitlab-org/gitlab-ce!19918
| * | | | [Rails5] Disable inheritance_column for ↵blackst0ne-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-namespaceblackst0ne2018-06-161-0/+1
| |/ / / | | | | | | | | | | | | Gitlab::Database::RenameReservedPathsMigration::V1::MigrationClasses::Namespace
* | | | Merge branch 'expose-clean-backtrace-method-from-profiler' into 'master'Rémy Coutable2018-06-181-5/+8
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Expose a clean_backtrace method from Gitlab::Profiler See merge request gitlab-org/gitlab-ce!19894
| * | | Expose a clean_backtrace method from Gitlab::Profilerexpose-clean-backtrace-method-from-profilerSean McGivern2018-06-151-5/+8
| | |/ | |/| | | | | | | | | | This method makes it easier for other parts of the app to get clean backtraces, as well as console users.
* | | Make Gitaly wiki RPC's mandatoryJacob Vosmaer (GitLab)2018-06-181-148/+22
| |/ |/|
* | Remove FaviconUploader favicon_main versiondm-remove-favicon-main-versionDouwe Maan2018-06-151-1/+1
|/ | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/47677 for more information
* Merge branch 'rails5-database' into 'master'Sean McGivern2018-06-142-3/+7
|\ | | | | | | | | | | | | Fix table_exists? to be Rails5 compatible Closes #45107 See merge request gitlab-org/gitlab-ce!19418
| * Use data_source_exists? instead of table_exists?rails5-databaseJarka Kadlecová2018-06-142-3/+7
| | | | | | | | Use data_source_exists? where possible instead of table_exists? in order to be Rails5 compatible
* | Merge branch 'zj-mandatory-batch' into 'master'Sean McGivern2018-06-142-137/+29
|\ \ | | | | | | | | | | | | | | | | | | Move Gitaly RPCs to mandatory Closes gitaly#217, gitaly#389, gitaly#390, gitaly#220, gitaly#376, and gitaly#354 See merge request gitlab-org/gitlab-ce!19759
| * | Local branches go through GitalyZeger-Jan van de Weg2018-06-141-20/+2
| | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/217
| * | HasLocalBranches check is done by Gitaly onlyZeger-Jan van de Weg2018-06-141-18/+2
| | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/217
| * | Branches are fully migrated to GitalyZeger-Jan van de Weg2018-06-141-6/+2
| | | | | | | | | | | | Closes: https://gitlab.com/gitlab-org/gitaly/issues/389
| * | Tags are migrated to GitalyZeger-Jan van de Weg2018-06-141-32/+2
| | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/390
| * | Move TagNames to mandatory through GitalyZeger-Jan van de Weg2018-06-141-7/+15
| | | | | | | | | | | | Closes: https://gitlab.com/gitlab-org/gitaly/issues/220
| * | Tag names returned through GitalyZeger-Jan van de Weg2018-06-141-7/+1
| | | | | | | | | | | | Migration: https://gitlab.com/gitlab-org/gitaly/issues/220
| * | Default branch detection happens through GitalyZeger-Jan van de Weg2018-06-141-32/+5
| | | | | | | | | | | | Migration: https://gitlab.com/gitlab-org/gitaly/issues/220
| * | RawBlame only called through GitalyZeger-Jan van de Weg2018-06-131-17/+2
| | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/376
* | | Deny repository disk access in development and testJacob Vosmaer (GitLab)2018-06-141-6/+8
| | |
* | | Merge branch 'unify-parallel_importer' into 'master'Stan Hu2018-06-131-0/+9
|\ \ \ | | | | | | | | | | | | | | | | Bring changes from EE for parallel_importer.rb See merge request gitlab-org/gitlab-ce!19779
| * | | Bring changes from EE for parallel_importer.rbLin Jen-Shin2018-06-141-0/+9
| | | |
* | | | Add support for verifying remote uploads, artifacts, and LFS objects in ↵Michael Kozono2018-06-135-16/+79
|/ / / | | | | | | | | | check rake tasks
* | | Merge branch 'zj-empty-batch-no-rpc' into 'master'Rémy Coutable2018-06-131-0/+2
|\ \ \ | |/ / |/| | | | | | | | ListCommitByOid isn't called with an empty batch See merge request gitlab-org/gitlab-ce!19753
| * | ListCommitByOid isn't called with an empty batchZeger-Jan van de Weg2018-06-131-0/+2
| | | | | | | | | | | | | | | | | | Batching commits for performance improvements, might lead to empty batches being used. This isn't the case yet, but to guard against this in future cases, a guard clause is added.
* | | Merge branch 'sql-buckets' into 'master'Stan Hu2018-06-132-2/+2
|\ \ \ | |/ / |/| | | | | | | | Adjust SQL and transaction Prometheus buckets See merge request gitlab-org/gitlab-ce!19650
| * | Adjust SQL and transaction Prometheus bucketssql-bucketsYorick Peterse2018-06-112-2/+2
| | | | | | | | | | | | | | | This allows us to better calculate Apdex scores, instead of having to use the 0.1 and 1.0 buckets.
* | | Resolve "Quick actions are case sensitive"Jan2018-06-132-5/+5
| | |
* | | Merge branch '47735-milestone-regression' into 'master'Phil Hughes2018-06-131-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Regressions for assigning group milestone from ancestor" Closes #47735 See merge request gitlab-org/gitlab-ce!19721
| * | | Sidebar Milestone - Fix wrong URL when selecting a parent group milestone47735-milestone-regressionMario de la Ossa2018-06-121-0/+2
| | | |
* | | | Merge branch 'zj-compare-source-branch' into 'master'Sean McGivern2018-06-131-11/+11
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Migrate compare_source_branch to use only Gitaly Closes gitaly#771 See merge request gitlab-org/gitlab-ce!19700
| * | | Migrate compare_source_branch to use only GitalyZeger-Jan van de Weg2018-06-121-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initially expected this to be a full blown migration, but that wasn't the case as we could fetch to a reference that would be deleted after the instanciation of the Diff object. This is a racy RPC, as #delete_refs is called and garbage collections runs right than, the commit can't be found later. Closes https://gitlab.com/gitlab-org/gitaly/issues/771
* | | | Merge branch 'pr-importer-io-extra-error-handling' into 'master'Nick Thomas2018-06-121-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure MR diffs always exist in the PR importer Closes #47312 See merge request gitlab-org/gitlab-ce!19704
| * | | | Ensure MR diffs always exist in the PR importerpr-importer-io-extra-error-handlingYorick Peterse2018-06-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In rare cases it could happen that an MR was created, but creating the MR diffs somehow failed (e.g. due to an error). This commit adds an additional check to make sure MR diffs are always present when importing GitHub pull requests.
* | | | | Merge branch 'gitaly-disk-access-3' into 'master'Douwe Maan2018-06-124-42/+62
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Find and mark more Git disk access locations, part 2 See merge request gitlab-org/gitlab-ce!19437
| * | | | Find and mark more Git disk access locations, part 2Jacob Vosmaer2018-06-124-42/+62
| | | | |
* | | | | Merge branch 'da-port-cte-to-ce' into 'master'Yorick Peterse2018-06-121-0/+50
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add Gitlab::SQL:CTE for easily building CTE statements See merge request gitlab-org/gitlab-ce!19652
| * | | | | Add Gitlab::SQL:CTE for easily building CTE statementsDouglas Barbosa Alexandre2018-06-111-0/+50
| | |_|/ / | |/| | |
* | | | | Move Gitaly branch/tag/ref RPC's to opt-outJacob Vosmaer (GitLab)2018-06-121-8/+8
| |_|/ / |/| | |
* | | | Merge branch 'sh-expire-content-cache-after-import' into 'master'Mayra Cabrera2018-06-111-2/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Expire Wiki content cache after importing a repository Closes #47546 See merge request gitlab-org/gitlab-ce!19617
| * | | Expire Wiki content cache after importing a repositoryStan Hu2018-06-111-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The cache state for Wikis that were imported via GitHub or Bitbucket does not appear to have been flushed after a successful import. Closes #47546
* | | | Avoid checking the user format in every url validationFrancisco Javier López2018-06-111-2/+2
| | | |
View Lorry Controller Status