summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improve indexes on merge_request_diffsremove-mr-diff-serialised-columnsSean McGivern2017-11-283-1/+35
| | | | | | | For getting the SHAs from an MR to find pipelines, we get the last 100 MR diffs for the MR, and find commits from those. This was un-indexed before, because the index was not a composite index on merge_request_diff_id, id. Changing that means that this scope can exclusively use indexes.
* Remove serialised diff and commit columnsSean McGivern2017-11-2823-566/+488
| | | | | | | | | | | | | | | | The st_commits and st_diffs columns on merge_request_diffs historically held the YAML-serialised data for a merge request diff, in a variety of formats. Since 9.5, these have been migrated in the background to two new tables: merge_request_diff_commits and merge_request_diff_files. That has the advantage that we can actually query the data (for instance, to find out how many commits we've stored), and that it can't be in a variety of formats, but must match the new schema. This is the final step of that journey, where we drop those columns and remove all references to them. This is a breaking change to the importer, because we can no longer import diffs created in the old format, and we cannot guarantee the export will be in the new format unless it was generated after this commit.
* Fix instructions for creating project templatesSean McGivern2017-11-281-1/+1
| | | | Sidekiq has to be running too.
* Merge branch 'zj-controller-action-gitaly-metrics' into 'master'Rémy Coutable2017-11-281-7/+42
|\ | | | | | | | | Add controller#action metrics on Gitaly See merge request gitlab-org/gitlab-ce!15244
| * Add controller#action metrics on GitalyZeger-Jan van de Weg2017-11-281-7/+42
| | | | | | | | | | | | | | At this time we had good metrics on what number or requests each GRPC received, but were in the dark what controller#action combination was responsable. Or if Sidekiq was responsable. Now added are call counts per service and rpc matched with controller#action combinations.
* | Merge branch 'default-values-for-mr-states' into 'master'Sean McGivern2017-11-285-3/+91
|\ \ | | | | | | | | | | | | | | | | | | Fix defaults for MR states and merge statuses Closes #40534 See merge request gitlab-org/gitlab-ce!15594
| * | Fix defaults for MR states and merge statusesdefault-values-for-mr-statesYorick Peterse2017-11-245-3/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that merge_requests.state and merge_requests.merge_status both have a proper default value and NOT NULL constraint on database level. We also make sure to update any bogus rows first, without blowing up the database. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/40534
* | | Merge branch 'hashed-storage-attachments-migration-path' into 'master'Nick Thomas2017-11-2814-150/+523
|\ \ \ | | | | | | | | | | | | | | | | Hashed storage attachments migration path See merge request gitlab-org/gitlab-ce!15352
| * | | Changes to Attachments Migration for EE and Geo compatibilityGabriel Mazetto2017-11-283-8/+22
| | | |
| * | | Backport EE changes to make test possible when prepending modulesGabriel Mazetto2017-11-243-6/+18
| | | |
| * | | fix exclusive lease specs fro hashed storage migrationGabriel Mazetto2017-11-232-9/+15
| | | |
| * | | Changelog and Documentation for storage migration of project attachmentsGabriel Mazetto2017-11-232-13/+89
| | | |
| * | | Codestyle changes and Added Exclusive Lease to hashed storage migrationGabriel Mazetto2017-11-233-15/+57
| | | |
| * | | when rollingback repository migration, toggle readonly mode backGabriel Mazetto2017-11-233-6/+8
| | | |
| * | | Raises error when migration cannot happen so job is cancelledGabriel Mazetto2017-11-232-6/+5
| | | |
| * | | attachments migration should move only the base folderGabriel Mazetto2017-11-232-49/+30
| | | |
| * | | Improve storage migration rake taskGabriel Mazetto2017-11-232-17/+73
| | | |
| * | | WIP Attachments migrationGabriel Mazetto2017-11-234-1/+172
| | | |
| * | | Refactor Hashed Storage migration to add additional migration stepsGabriel Mazetto2017-11-234-59/+73
| | | |
* | | | Merge branch '40561-environment-scope-value-is-not-trimmed' into 'master'Kamil Trzciński2017-11-283-0/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Strip leading & trailing whitespaces in CI/CD secret variable keys See merge request gitlab-org/gitlab-ce!15615
| * | | | Strip leading & trailing whitespaces in CI/CD secret variable keys40561-environment-scope-value-is-not-trimmedRémy Coutable2017-11-273-0/+27
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'winh-upgrade-codeclimate' into 'master'Rémy Coutable2017-11-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade codeclimate image to latest Closes #40255 See merge request gitlab-org/gitlab-ce!15461
| * | | | | Upgrade codeclimate image to latestWinnie Hellmann2017-11-281-1/+1
|/ / / / /
* | | | | Merge branch 'tm/feature/list-runners-jobs-api' into 'master'Kamil Trzciński2017-11-287-7/+327
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new API endpoint - list jobs of a specified runner Closes #39699 See merge request gitlab-org/gitlab-ce!15432
| * | | | | Refactorize jobs finding logicTomasz Maczukin2017-11-284-10/+67
| | | | | |
| * | | | | Update documentationTomasz Maczukin2017-11-281-11/+36
| | | | | |
| * | | | | Use 'set' instead of 'let!' when it's possibleTomasz Maczukin2017-11-281-1/+1
| | | | | |
| * | | | | Modify outputTomasz Maczukin2017-11-282-6/+9
| | | | | |
| * | | | | Allow filtering by 'status'Tomasz Maczukin2017-11-282-5/+54
| | | | | |
| * | | | | Add information about projectTomasz Maczukin2017-11-284-10/+30
| | | | | |
| * | | | | Add CHANGELOG entryTomasz Maczukin2017-11-281-0/+5
| | | | | |
| * | | | | Add new API endpoint - list jobs of a specified runnerTomasz Maczukin2017-11-283-0/+161
| | | | | |
* | | | | | Merge branch 'icon-sizes' into 'master'Tim Zallmann2017-11-282-5/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | limit icon component size to valid values See merge request gitlab-org/gitlab-ce!15618
| * | | | | | limit icon component size to valid valuesicon-sizesSimon Knox2017-11-282-5/+18
| | | | | | |
* | | | | | | Merge branch '40568-bump-seed-fu-to-2-3-7' into 'master'Rémy Coutable2017-11-283-2/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade seed-fu to 2.3.7 Closes #40568 See merge request gitlab-org/gitlab-ce!15607
| * | | | | | | Upgrade seed-fu to 2.3.7Takuya Noguchi2017-11-263-2/+7
| | | | | | | |
* | | | | | | | Merge branch 'tm/feature/namespace-by-id-api' into 'master'Kamil Trzciński2017-11-2810-14/+361
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new API endpoint - get a namespace by ID Closes #40254 See merge request gitlab-org/gitlab-ce!15442
| * | | | | | | Update policies unit testsTomasz Maczukin2017-11-272-14/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit also makes spec/policies/namespace_policy_spec.rb file to be compatible with the same file in GitLab EE.
| * | | | | | | Add some unit tests for lib/api/helpers.rbTomasz Maczukin2017-11-271-0/+109
| | | | | | | |
| * | | | | | | Introduce :read_namespace access policy for namespace and groupTomasz Maczukin2017-11-234-11/+52
| | | | | | | |
| * | | | | | | Allow request namespace by ID or pathTomasz Maczukin2017-11-234-28/+72
| | | | | | | |
| * | | | | | | Add CHANGELOG entryTomasz Maczukin2017-11-231-0/+5
| | | | | | | |
| * | | | | | | Add new API endpoint - get a namespace by IDTomasz Maczukin2017-11-233-0/+125
| | | | | | | |
* | | | | | | | Merge branch '40226-refactor-the-issuable-s-webhooks-data-architecture' into ↵Douwe Maan2017-11-288-39/+58
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Refactor the way we pass `old associations` to issuable's update services Closes #40226 See merge request gitlab-org/gitlab-ce!15542
| * | | | | | | | Refactor the way we pass `old associations` to issuable's update services40226-refactor-the-issuable-s-webhooks-data-architectureRémy Coutable2017-11-248-39/+58
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'backport-disable-autocomplete' into 'master'Fatih Acet2017-11-274-3/+28
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Backport disable autocomplete See merge request gitlab-org/gitlab-ce!15557
| * | | | | | | backport disable autocompletebackport-disable-autocompleteClement Ho2017-11-224-3/+28
| | | | | | | |
* | | | | | | | Merge branch 'pawel/update_prometheus_gem_to_fix_build_on_Rpi' into 'master'Robert Speicher2017-11-272-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update prometheus gem to fix build on RPi Closes omnibus-gitlab#2988 See merge request gitlab-org/gitlab-ce!15616
| * | | | | | | | Update prometheus gem to fix build on RPiPawel Chojnacki2017-11-272-3/+3
| | | | | | | | |
* | | | | | | | | Merge branch 'backport-epic-fullscreen' into 'master'Fatih Acet2017-11-273-68/+91
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport epic fullscreen See merge request gitlab-org/gitlab-ce!15437
View Lorry Controller Status