summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into ↵Grzegorz Bizon2018-06-055-18/+91
|\ | | | | | | | | | | 'backstage/gb/use-persisted-stages-to-improve-pipelines-table' # Conflicts: # db/schema.rb
| * Prevent Gitaly WriteConfig log noiseJacob Vosmaer (GitLab)2018-06-051-0/+5
| |
| * Merge branch 'add-background-migrations-for-not-archived-traces' into 'master'Kamil Trzciński2018-06-051-0/+24
| |\ | | | | | | | | | | | | | | | | | | Add background migrations to archive legacy job traces Closes #46642 See merge request gitlab-org/gitlab-ce!19194
| | * Revise comments in ArchiveLegacyTracesShinya Maeda2018-06-041-3/+3
| | |
| | * Directly refer application code from migration codeShinya Maeda2018-06-041-66/+11
| | |
| | * Add background migrations to arhive legacy tracesShinya Maeda2018-06-041-0/+79
| | |
| * | Merge branch 'override-consider-extend' into 'master'Nick Thomas2018-06-051-3/+13
| |\ \ | | | | | | | | | | | | | | | | Also verify if extending would override a class method See merge request gitlab-org/gitlab-ce!19377
| | * | Also verify if extending would override a class methodoverride-consider-extendLin Jen-Shin2018-06-051-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since extending a class means including on the singleton class of the class, this should now complain this: ``` ruby module M extend Gitlab::Utils::Override override :f def f super.succ end end class C extend M def self.f 0 end end ``` It should complain because `C.f` wasn't calling `M#f`. This should pass verification: ``` ruby module M extend Gitlab::Utils::Override override :f def f super.succ end end class B def self.f 0 end end class C < B extend M end ``` Because `C.f` would now call `M#f`, and `M#f` does override something.
| * | | Merge branch 'gh-importer-transactions' into 'master'Nick Thomas2018-06-051-14/+42
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Perform pull request IO work outside a transaction See merge request gitlab-org/gitlab-ce!19372
| | * | | Perform pull request IO work outside a transactiongh-importer-transactionsYorick Peterse2018-06-041-14/+42
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When importing a GitHub pull request we would perform all work in a single database transaction. This is less than ideal, because we perform various slow Git operations when creating a merge request. This in turn can lead to many DB connections being used, while just waiting for an IO operation to complete. To work around this, we now move most of the heavy lifting out of the database transaction. Some extra error handling is added to ensure we can resume importing a partially imported pull request, instead of just throwing an error. This commit also changes the specs for IssueImporter so they don't rely on deprecated RSpec methods.
| * | | Merge branch 'perform-ci-build-auth-always-on-primary-ce' into 'master'Grzegorz Bizon2018-06-051-1/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Bring back the EE changes to CE to authentication of builds See merge request gitlab-org/gitlab-ce!19391
| | * | | Bring back the EE changes to CE to authentication of buildsperform-ci-build-auth-always-on-primary-ceKamil Trzciński2018-06-041-1/+7
| | |/ /
* | | | Merge branch 'master' into ↵backstage/gb/use-persisted-stages-to-improve-pipelines-tableGrzegorz Bizon2018-06-0538-83/+362
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | 'backstage/gb/use-persisted-stages-to-improve-pipelines-table' Conflicts: app/models/ci/pipeline.rb
| * | | Adjust insufficient diff hunks being persisted on NoteDiffFileosw-ignore-diff-header-when-persisting-diff-hunkOswaldo Ferreira2018-06-052-3/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This currently causes 500's errors when loading the MR page (Discussion) in a few scenarios. We were not considering detailed diff headers such as "--- a/doc/update/mysql_to_postgresql.md\n+++ b/doc/update/mysql_to_postgresql.md" to crop the diff. In order to address it, we're now using Gitlab::Diff::Parser, clean the diffs and builds Gitlab::Diff::Line objects we can iterate and filter on.
| * | Backport EE SlashCommand RefactorMark Chao2018-06-041-8/+10
| | |
| * | Merge branch 'rails5-fix-46281' into 'master'Yorick Peterse2018-06-041-2/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Rails5 fix arel from Closes #46281 See merge request gitlab-org/gitlab-ce!19340
| | * | Rails5 Fix arel fromJasper Maes2018-06-021-2/+7
| | |/
| * | Add ability to search wiki titlesFrancisco Javier López2018-06-043-8/+44
| | |
| * | Reveert build_relations and simply add a line for creating iidShinya Maeda2018-06-021-13/+7
| | |
| * | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-06-0211-28/+132
| |\ \ | | |/
| | * Make http_io honor HTTP(S)_PROXY environment.NLR2018-06-011-1/+1
| | |
| | * Add "deny disk access" Gitaly feature (tripswitch)Jacob Vosmaer (GitLab)2018-06-018-22/+100
| | |
| | * Merge branch '46481-preserve-warnings-even-if-passed' into 'master'Douwe Maan2018-06-011-0/+19
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "A lot of constants redefinition warnings" Closes #46481 See merge request gitlab-org/gitlab-ce!19286
| | | * Introduce Gitlab::Auth.omniauth_setup_providersLin Jen-Shin2018-06-011-2/+17
| | | | | | | | | | | | | | | | Which could extend from EE
| | | * Eliminate constants warnings by:Lin Jen-Shin2018-06-011-0/+4
| | | | | | | | | | | | | | | | | | | | * Replace `require` or `require_relative` with `require_dependency` * Remove unneeded `autoload`
| | * | Add validation to webhook and service URLs to ensure they are not blocked ↵Francisco Javier López2018-06-011-5/+12
| | |/ | | | | | | | | | because of SSRF
| * | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-06-0114-18/+116
| |\ \ | | |/
| | * Merge branch 'rails5-active-sup-subscriber' into 'master'Rémy Coutable2018-05-311-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Make ActiveRecordSubscriber rails 5 compatible Closes #44702 See merge request gitlab-org/gitlab-ce!19276
| | | * Make ActiveRecordSubscriber rails 5 compatibleJarka Kadlecová2018-05-311-1/+1
| | | |
| | * | Merge branch '41587-osw-mr-metrics-migration-take-two' into 'master'Grzegorz Bizon2018-05-312-2/+13
| | |\ \ | | | | | | | | | | | | | | | | | | | | Take two for MR metrics population background migration See merge request gitlab-org/gitlab-ce!19097
| | | * | Take two for MR metrics population background migrationOswaldo Ferreira2018-05-302-2/+13
| | | | |
| | * | | Export assigned issues in iCalendar feedImre Farkas2018-05-312-5/+15
| | | | |
| | * | | Merge branch 'rails5-calendar' into 'master'Yorick Peterse2018-05-311-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace .having with .where in calendar query Closes #46964 See merge request gitlab-org/gitlab-ce!19230
| | | * | | Replace .having with .where in calendar queryJan Provaznik2018-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the current syntax doesn't work properly in Rails 5, the resulting query looks like: HAVING "events"."project_id" IN (0) instead of: HAVING "events"."project_id" IN (SELECT "projects"."id" FROM... Also we should not use ActiveRecord internal methods. In this case we can filter projects in WHERE clause instead of doing this in HAVING clause. Usage of WHERE should be also more efficient because grouping is then done on much smaller subset of records.
| | * | | | Merge branch '46445-fix-gitaly-tree-entry-encoding' into 'master'Douwe Maan2018-05-311-1/+1
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix encoding bug in Gitaly::Commit::TreeEntry Closes #46445 and gitaly#1208 See merge request gitlab-org/gitlab-ce!19243
| | | * | | Fix encoding error in Gitaly::Commit::TreeEntryKim "BKC" Carlbäcker2018-05-301-1/+1
| | | | |/ | | | |/|
| | * | | Merge branch 'fj-36819-remove-v3-api' into 'master'Douwe Maan2018-05-313-7/+7
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removal of API v3 from the codebase Closes #36819 See merge request gitlab-org/gitlab-ce!18970
| | | * | | Removed API endpoint and specsfj-36819-remove-v3-apiFrancisco Javier López2018-05-303-7/+7
| | | |/ /
| | * | | Merge branch 'dm-relative-url-root-in-development' into 'master'Rémy Coutable2018-05-312-1/+6
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | Fix various bugs related to relative_url_root in development See merge request gitlab-org/gitlab-ce!19213
| | | * | Fix various bugs related to relative_url_root in developmentDouwe Maan2018-05-292-1/+6
| | | | |
| | * | | Merge branch 'brodock-refactor-hashed-storage-task' into 'master'Douwe Maan2018-05-301-0/+71
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Extracted auxiliary methods from storage.rake into specific RakeHelper See merge request gitlab-org/gitlab-ce!18962
| | | * | | refactor to remove duplicationGabriel Mazetto2018-05-281-14/+12
| | | | | |
| | | * | | Refactor RakeHelper to reduce complexityGabriel Mazetto2018-05-281-26/+18
| | | | | |
| | | * | | Extracted auxiliary methods from storage.rake into specific RakeHelperGabriel Mazetto2018-05-281-0/+81
| | | | | |
| | * | | | Merge branch 'fix/bitbucket_import_anonymous' into 'master'Douwe Maan2018-05-301-0/+1
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Import bitbucket issues that are reported by an anonymous user Closes #44381 See merge request gitlab-org/gitlab-ce!18199
| | | * | | Import bitbucket issues that are reported by an anonymous userBart Libert2018-05-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For these kind of issues, the "reporter" field is present but zero. In such a case, "fetch" will not return the default value, but it will return nil. Hence, importing fails, because the "username" field of nil is referenced Fixes issue #44381
| * | | | | Add build_relations method in Chain::PopulateShinya Maeda2018-05-302-7/+13
| | | | | |
| * | | | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-3015-37/+208
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '6045-extract-ee-specific-specs-lines' into 'master'Robert Speicher2018-05-291-2/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Resolve "Extract EE specific files/lines for some controller specs" Closes #6045 See merge request gitlab-org/gitlab-ce!19089
| | | * | | | Try to fetch the CE branch in EE because sometimes it has the same name6045-extract-ee-specific-specs-linesRémy Coutable2018-05-241-2/+2
| | | |/ / / | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>