Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-06-05Merge branch 'master' into 'rd-44364-deprecate-support-for-dsa-keys'Douwe Maan
# Conflicts: # db/schema.rb
2018-06-05Merge branch '42751-rename-mr-maintainer-push' into 'master'Robert Speicher
Rephrase Merge Request Maintainer Edit See merge request gitlab-org/gitlab-ce!19061
2018-06-05Merge branch 'optimise-runner-update-cached-info' into 'master'Grzegorz Bizon
Optimise runner update cached info See merge request gitlab-org/gitlab-ce!19187
2018-06-05Merge branch 'fix-avatars-n-plus-one' into 'master'Robert Speicher
Fix an N+1 in avatar URLs Closes #43114 See merge request gitlab-org/gitlab-ce!18488
2018-06-05Merge remote-tracking branch 'origin/master' into ↵Luke Bennett
39549-label-list-page-redesign-with-draggable-labels
2018-06-05Eliminate N+1 queries with authors and push_data_payload in Events APIStan Hu
2018-06-05Fix an N+1 in avatar URLsSean McGivern
This is tricky: the query was being run in `ObjectStorage::Extension::RecordsUploads#retrieve_from_store!`, but we can't just add batch loading there, because the `#upload=` method there would use the result immediately, making the batch only have one item. Instead, we can pre-emptively add an item to the batch whenever an avatarable object is initialized, and then reuse that batch item in `#retrieve_from_store!`. However, this also has problems: 1. There is a lot of logic in `Avatarable#retrieve_upload_from_batch`. 2. Some of that logic constructs a 'fake' model for the batch key. This should be fine, because of ActiveRecord's override of `#==`, but it relies on that staying the same.
2018-06-05Merge branch 'add-background-migrations-for-not-archived-traces' into 'master'Kamil Trzciński
Add background migrations to archive legacy job traces Closes #46642 See merge request gitlab-org/gitlab-ce!19194
2018-06-05Merge branch ↵Kamil Trzciński
'46452-nomethoderror-undefined-method-previous_changes-for-nil-nilclass' into 'master' Resolve "NoMethodError: undefined method `previous_changes' for nil:NilClass" Closes #46452 See merge request gitlab-org/gitlab-ce!19190
2018-06-05Merge branch 'gh-importer-transactions' into 'master'Nick Thomas
Perform pull request IO work outside a transaction See merge request gitlab-org/gitlab-ce!19372
2018-06-05Merge branch 'rails5-fix-46236' into 'master'Yorick Peterse
Support rails5 in postgres indexes function and fix some migrations Closes #46236 See merge request gitlab-org/gitlab-ce!19400
2018-06-05Merge remote-tracking branch 'origin/master' into ↵Luke Bennett
39549-label-list-page-redesign-with-draggable-labels
2018-06-05Merge branch 'optimise-pages-service-calling' into 'master'Grzegorz Bizon
Optimise pages service calling See merge request gitlab-org/gitlab-ce!19388
2018-06-05Merge branch 'sh-fix-pipeline-jobs-nplus-one' into 'master'Rémy Coutable
Eliminate N+1 queries for CI job artifacts in /api/projects/:id/pipelines/:pipeline_id/jobs See merge request gitlab-org/gitlab-ce!19353
2018-06-05Resolve "Add Xcode Button in UI"André Luís
2018-06-05Merge branch 'presigned-multipart-uploads' into 'master'Grzegorz Bizon
Support presigned multipart uploads See merge request gitlab-org/gitlab-ce!18855
2018-06-05Remove PagesService and instead make it explicit that we call PagesWorkerKamil Trzciński
2018-06-05Do not validate cached dataKamil Trzciński
2018-06-05Merge branch 'sh-add-uncached-query-limiter' into 'master'Rémy Coutable
Remove N+1 query for author in issues API See merge request gitlab-org/gitlab-ce!19345
2018-06-05Support smarter system notesJose Ivan Vargas
2018-06-05Merge branch 'osw-ignore-diff-header-when-persisting-diff-hunk' into 'master'Sean McGivern
Adjust insufficient diff hunks being persisted on NoteDiffFile See merge request gitlab-org/gitlab-ce!19399
2018-06-05Merge branch '36862-subgroup-milestones' into 'master'Sean McGivern
Include all ancestors milestones in json list & autocomplete Closes #36862 See merge request gitlab-org/gitlab-ce!19317
2018-06-05Support rails5 in postgres indexes function and fix some migrationsJasper Maes
2018-06-05Adjust insufficient diff hunks being persisted on NoteDiffFileOswaldo Ferreira
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.
2018-06-05Add migration to disable the usage of DSA keysRubén Dávila
Additionally the current application setting is also updated to disable the usage of DSA keys.
2018-06-05Eliminate N+1 queries for CI job artifacts in ↵Stan Hu
/api/projects/:id/pipelines/:pipeline_id/jobs
2018-06-05Remove N+1 query for author in issues APIStan Hu
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`.
2018-06-05Remove N+1 query for author in issues APIStan Hu
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`.
2018-06-04Messaging on terms page when user already acceptedtauriedavis
We show a blue flash banner if the user already accepted, and show a button allowing them to continue to the application.
2018-06-04Remove unused running_or_pending_build_countKamil Trzciński
2018-06-04Perform pull request IO work outside a transactionYorick Peterse
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.
2018-06-04Include all ancestors milestones in json list & autocompleteJarka Kadlecová
2018-06-04Merge branch '46845-update-email_spec-to-2-2-0' into 'master'Robert Speicher
Update email_spec to 2.2.0 Closes #46845 See merge request gitlab-org/gitlab-ce!19164
2018-06-04Merge branch 'rails5-fix-46281' into 'master'Yorick Peterse
Rails5 fix arel from Closes #46281 See merge request gitlab-org/gitlab-ce!19340
2018-06-04Add ability to search wiki titlesFrancisco Javier López
2018-06-04Support presigned multipart uploadsKamil Trzciński
2018-06-04Merge branch 'sh-fix-source-project-nplus-one' into 'master'Sean McGivern
Fix N+1 with source_projects in merge requests API See merge request gitlab-org/gitlab-ce!19346
2018-06-04Merge branch 'bvl-bump-gitlab-shell-7-1-3' into 'master'Douwe Maan
Bump gitlab-shell to 7.1.3 See merge request gitlab-org/gitlab-ce!19358
2018-06-04Merge branch 'sh-fix-secrets-not-working' into 'master'Douwe Maan
Fix attr_encryption key settings Closes #47166 See merge request gitlab-org/gitlab-ce!19341
2018-06-04Bump gitlab-shell to 7.1.3Bob Van Landuyt
This includes the change that prints the @username of a user instead of the full name. https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/204
2018-06-04Add changelogShinya Maeda
2018-06-04Merge branch 'master' into per-project-pipeline-iidShinya Maeda
2018-06-03Use the default strings of timeago.js for timeagoTakuya Noguchi
2018-06-03Update selenium-webdriver to 3.12.0Takuya Noguchi
2018-06-03Update email_spec to 2.2.0Takuya Noguchi
2018-06-03Fix N+1 with source projects in merge requests APIStan Hu
Now that we are checking `MergeRequest#for_fork?`, we also need the source project preloaded for a merge request.
2018-06-0344790: Add change logMarc Shaw
2018-06-02Rails5 Fix arel fromJasper Maes
2018-06-02Fix attr_encryption key settingsStan Hu
attr_encrypted does different things with `key` depending on what mode you are using: 1. In `:per_attribute_iv_and_salt` mode, it generates a hash with the salt: https://github.com/attr-encrypted/encryptor/blob/c3a62c4a9e74686dd95e0548f9dc2a361fdc95d1/lib/encryptor.rb#L77. There is no need to truncate the key to 32 bytes here. 2. In `:per_attribute_iv` mode, it sets the key directly to the password, so truncation to 32 bytes is necessary. Closes #47166
2018-06-02Merge branch 'master' into per-project-pipeline-iidShinya Maeda