summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge branch 'sh-fix-events-nplus-one' into 'master'Rémy Coutable2018-06-051-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Eliminate N+1 queries with authors and push_data_payload in Events API See merge request gitlab-org/gitlab-ce!19347
| | * | | | Eliminate N+1 queries with authors and push_data_payload in Events APIStan Hu2018-06-051-0/+1
| | | |_|/ | | |/| |
| * | | | Merge branch '42751-rename-mr-maintainer-push' into 'master'Robert Speicher2018-06-053-3/+6
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Rephrase Merge Request Maintainer Edit See merge request gitlab-org/gitlab-ce!19061
| | * | | Rephrase "maintainer" to more precise "members who can merge to the target ↵42751-rename-mr-maintainer-pushMark Chao2018-06-013-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | branch" "Maintainer" will be freed to be used for #42751
* | | | | Merge branch 'master' into ↵Grzegorz Bizon2018-06-0510-23/+261
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | '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-052-3/+25
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-042-69/+12
| | | | | |
| | * | | | 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 'sh-fix-pipeline-jobs-nplus-one' into 'master'Rémy Coutable2018-06-051-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminate N+1 queries for CI job artifacts in /api/projects/:id/pipelines/:pipeline_id/jobs See merge request gitlab-org/gitlab-ce!19353
| | * | | | | Eliminate N+1 queries for CI job artifacts in ↵sh-fix-pipeline-jobs-nplus-oneStan Hu2018-06-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | /api/projects/:id/pipelines/:pipeline_id/jobs
| | * | | | | Remove N+1 query for author in issues APIStan Hu2018-06-041-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was being masked by the statement cache because only one author was used per issue in the test.. Also adds support for an Rspec matcher `exceed_all_query_limit`.
| * | | | | Merge branch 'presigned-multipart-uploads' into 'master'Grzegorz Bizon2018-06-052-1/+167
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support presigned multipart uploads See merge request gitlab-org/gitlab-ce!18855
| | * | | | | Update validatorpresigned-multipart-uploadsKamil Trzciński2018-06-041-1/+1
| | | | | | |
| | * | | | | Support presigned multipart uploadsKamil Trzciński2018-06-042-1/+167
| | | | | | |
| * | | | | | Merge branch 'sh-add-uncached-query-limiter' into 'master'Rémy Coutable2018-06-051-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove N+1 query for author in issues API See merge request gitlab-org/gitlab-ce!19345
| | * | | | | | Remove N+1 query for author in issues APIsh-add-uncached-query-limiterStan Hu2018-06-041-1/+1
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was being masked by the statement cache because only one author was used per issue in the test.. Also adds support for an Rspec matcher `exceed_all_query_limit`.
| * | | | | | 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-05101-5643/+548
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-044-11/+45
| | |/ / / | |/| | |
| * | | | Merge branch 'sh-fix-source-project-nplus-one' into 'master'47213-epics-page-styling-is-brokenSean McGivern2018-06-041-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix N+1 with source_projects in merge requests API See merge request gitlab-org/gitlab-ce!19346
| | * | | | Fix N+1 with source projects in merge requests APIsh-fix-source-project-nplus-oneStan Hu2018-06-031-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | Now that we are checking `MergeRequest#for_fork?`, we also need the source project preloaded for a merge request.
| * | | | 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-0218-61/+170
| |\ \ \ \ | | |/ / /
| | * | | Use RequestStore to memoize Flipper features so that memoized values are ↵Rémy Coutable2018-06-011-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleared between requests Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | Make http_io honor HTTP(S)_PROXY environment.NLR2018-06-011-1/+1
| | | | |
| | * | | Merge branch '46010-add-more-validations-for-runners-and-runner-type' into ↵Kamil Trzciński2018-06-012-11/+11
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | 'master' Improve validations for Ci::Runner#runner_type See merge request gitlab-org/gitlab-ce!18901
| | | * | Improve Runners API validationsKamil Trzciński2018-05-311-1/+1
| | | | |
| | | * | Improve runner registration APIKamil Trzciński2018-05-311-7/+9
| | | | |
| | | * | Improve `Ci::Runner#assign_to` to return a flag whether it succeeded or notKamil Trzciński2018-05-311-3/+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-015-20/+37
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-014-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Replace `require` or `require_relative` with `require_dependency` * Remove unneeded `autoload`
| | | * | | Preserve warnings even if it passedLin Jen-Shin2018-06-011-10/+10
| | | | |/ | | | |/|
| | * | | 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-0168-5534/+231
| |\ \ \ | | |/ /
| | * | 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
| | | |/
| | * | Add merge requests list endpoint for groupsFelipe Artur2018-05-311-17/+32
| | | |
View Lorry Controller Status