summaryrefslogtreecommitdiff
path: root/changelogs
Commit message (Collapse)AuthorAgeFilesLines
* Update/help integration screenshotTuğçe Nur Taş2018-06-061-0/+5
|
* Support LFS objects when creating a project by importFrancisco Javier López2018-06-061-0/+5
|
* Merge branch '42751-rename-master-to-maintainer' into 'master'Sean McGivern2018-06-061-0/+5
|\ | | | | | | | | | | | | Resolve "Rename the `Master` role to `Maintainer`" Closes #42751 See merge request gitlab-org/gitlab-ce!19080
| * add changelogMark Chao2018-06-061-0/+5
| |
* | Merge branch 'live-trace-v2-persist-data' into 'master'Kamil Trzciński2018-06-061-0/+5
|\ \ | |/ |/| | | | | Live trace: Rescue stale live trace See merge request gitlab-org/gitlab-ce!18680
| * Add change logShinya Maeda2018-06-061-0/+5
| |
* | Merge branch 'sh-improve-import-status-error' into 'master'Fatih Acet2018-06-061-0/+5
|\ \ | | | | | | | | | | | | | | | | | | Show a more helpful error for import status Closes #47365 See merge request gitlab-org/gitlab-ce!19467
| * | Show a more helpful error for import statusStan Hu2018-06-061-0/+5
| |/ | | | | | | | | | | | | | | Importing a project from GitHub for a project namespace that already exists would show an unhelpful error, "An error occurred while importing project." We now add the base message from Projects::CreateService when this fails. Closes #47365
* | Merge branch 'rails5-fix-47376' into 'master'Yorick Peterse2018-06-061-0/+5
|\ \ | | | | | | | | | | | | | | | | | | Rails 5 fix glob spec Closes #47376 See merge request gitlab-org/gitlab-ce!19469
| * | Rails 5 fix glob specJasper Maes2018-06-061-0/+5
| |/
* | Merge branch '47189-github_import_visibility' into 'master'Douwe Maan2018-06-061-0/+6
|\ \ | | | | | | | | | | | | | | | | | | Use Github repo visibility during import while respecting restricted visibility levels Closes #47189 See merge request gitlab-org/gitlab-ce!19450
| * | Use Github repo visibility during import while respecting restricted ↵Imre Farkas2018-06-061-0/+6
| | | | | | | | | | | | visibility levels
* | | Merge branch '45821-avatar_api' into 'master'Rémy Coutable2018-06-061-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add Avatar API Closes #45821 See merge request gitlab-org/gitlab-ce!19121
| * | | Add Avatar APIImre2018-06-061-0/+5
| | | |
* | | | Merge branch 'bvl-graphql-start-34754' into 'master'Douwe Maan2018-06-061-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GraphQL setup: Basic Project and Merge request endpoint Closes #34754 See merge request gitlab-org/gitlab-ce!19008
| * | | | Add `present_using` to typesBob Van Landuyt2018-06-051-0/+5
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | By specifying a presenter for the object type, we can keep the logic out of `GitlabSchema`. The presenter gets initialized using the object being presented, and the context (including the `current_user`).
* | | | Merge branch 'jprovazn-uploader-migration' into 'master'Sean McGivern2018-06-061-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate jobs in object_storage_upload queue Closes gitlab-ee#4811 See merge request gitlab-org/gitlab-ce!19180
| * | | | Migrate jobs in object_storage_upload queueJan Provaznik2018-06-051-0/+5
| |/ / /
* | | | Merge branch '25045-add-variables-to-post-pipeline-api' into 'master'Grzegorz Bizon2018-06-061-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "POST api/v4/projects/:id/pipeline should accept variables" Closes #25045 See merge request gitlab-org/gitlab-ce!19124
| * | | | Adds variables to POST api/v4/projects/:id/pipelineJacopo2018-06-011-0/+5
| | | | |
* | | | | Rails 5 fix unknown keywords: changes, key_id, project, gl_repository, ↵Jasper Maes2018-06-061-0/+6
| |_|_|/ |/| | | | | | | | | | | action, secret_token, protocol
* | | | Fix repository archive generation when hashed storage is enabledNick Thomas2018-06-051-0/+5
| |/ / |/| |
* | | Merge branch 'rd-44364-deprecate-support-for-dsa-keys' into 'master'Douwe Maan2018-06-051-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add migration to disable the usage of DSA keys Closes #44364 See merge request gitlab-org/gitlab-ce!19299
| * \ \ Merge branch 'master' into 'rd-44364-deprecate-support-for-dsa-keys'Douwe Maan2018-06-0524-0/+120
| |\ \ \ | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | Add migration to disable the usage of DSA keysrd-44364-deprecate-support-for-dsa-keysRubén Dávila2018-06-041-0/+5
| | |_|/ | |/| | | | | | | | | | | | | | Additionally the current application setting is also updated to disable the usage of DSA keys.
* | | | Merge branch '46585-gdpr-terms-acceptance' into 'master'Robert Speicher2018-06-051-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Missing Accept button for terms of service" Closes #46585 See merge request gitlab-org/gitlab-ce!19156
| * | | | Messaging on terms page when user already accepted46585-gdpr-terms-acceptancetauriedavis2018-06-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | We show a blue flash banner if the user already accepted, and show a button allowing them to continue to the application.
* | | | | Merge branch 'sh-fix-events-nplus-one' into 'master'Rémy Coutable2018-06-051-0/+5
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | 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/+5
| | | | |
* | | | | Merge branch '42751-rename-mr-maintainer-push' into 'master'Robert Speicher2018-06-051-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | branch" "Maintainer" will be freed to be used for #42751
* | | | | | Merge branch 'optimise-runner-update-cached-info' into 'master'Grzegorz Bizon2018-06-051-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimise runner update cached info See merge request gitlab-org/gitlab-ce!19187
| * | | | | | Do not validate cached dataoptimise-runner-update-cached-infoKamil Trzciński2018-06-051-0/+5
| | | | | | |
* | | | | | | Merge branch 'fix-avatars-n-plus-one' into 'master'Robert Speicher2018-06-051-0/+5
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an N+1 in avatar URLs Closes #43114 See merge request gitlab-org/gitlab-ce!18488
| * | | | | | Fix an N+1 in avatar URLsSean McGivern2018-06-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge branch 'add-background-migrations-for-not-archived-traces' into 'master'Kamil Trzciński2018-06-051-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add background migrations to archive legacy job traces Closes #46642 See merge request gitlab-org/gitlab-ce!19194
| * | | | | | | Add changelogShinya Maeda2018-06-041-0/+5
| | | | | | | |
* | | | | | | | Merge branch ↵Kamil Trzciński2018-06-051-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | | | | | | Add CHANGELOG entry46452-nomethoderror-undefined-method-previous_changes-for-nil-nilclassMatija Čupić2018-05-281-0/+5
| | | | | | | | |
* | | | | | | | | Merge branch 'gh-importer-transactions' into 'master'Nick Thomas2018-06-051-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+5
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'rails5-fix-46236' into 'master'Yorick Peterse2018-06-051-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support rails5 in postgres indexes function and fix some migrations Closes #46236 See merge request gitlab-org/gitlab-ce!19400
| * | | | | | | | | Support rails5 in postgres indexes function and fix some migrationsJasper Maes2018-06-051-0/+5
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'optimise-pages-service-calling' into 'master'Grzegorz Bizon2018-06-052-0/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimise pages service calling See merge request gitlab-org/gitlab-ce!19388
| * | | | | | | | | Remove PagesService and instead make it explicit that we call PagesWorkeroptimise-pages-service-callingKamil Trzciński2018-06-051-0/+5
| | | | | | | | | |
| * | | | | | | | | Remove unused running_or_pending_build_countremove-unused-query-in-hooksKamil Trzciński2018-06-041-0/+5
| |/ / / / / / / /
* | | | | | | | | Merge branch 'sh-fix-pipeline-jobs-nplus-one' into 'master'Rémy Coutable2018-06-051-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /api/projects/:id/pipelines/:pipeline_id/jobs
| * | | | | | | | | Remove N+1 query for author in issues APIStan Hu2018-06-041-0/+5
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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`.
* | | | | | | | | Resolve "Add Xcode Button in UI"André Luís2018-06-051-0/+5
| |_|_|_|/ / / / |/| | | | | | |