summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use a UNION ALL for getting merge request notesmerge-request-notes-performanceYorick Peterse2017-10-024-10/+33
| | | | | | | | | In this particular case the use of UNION ALL leads to a better query plan compared to using 1 big query that uses an OR statement to combine different data sources. See https://gitlab.com/gitlab-org/gitlab-ce/issues/38508 for more information.
* Merge branch '38052-use-simple-api-for-projects' into 'master'Tim Zallmann2017-10-023-2/+7
|\ | | | | | | | | | | | | Use `simple=true` for projects API in Projects dropdown for better search performance Closes #38052 See merge request gitlab-org/gitlab-ce!14585
| * Add changelog entry38052-use-simple-api-for-projectskushalpandya2017-09-291-0/+5
| |
| * Use `simple=true` for projects API for better performancekushalpandya2017-09-292-2/+2
| |
* | Merge branch 'bvl-port-of-ee-translations' into 'master'Douwe Maan2017-10-0215-778/+4918
|\ \ | | | | | | | | | | | | Merge branch 'master-i18n' into 'master' See merge request gitlab-org/gitlab-ce!14608
| * | Merge branch 'master-i18n' into 'master'Douwe Maan2017-10-0115-778/+4918
| | | | | | | | | | | | | | | New Crowdin translations See merge request gitlab-org/gitlab-ee!2947
* | | Merge branch 'remote_user' into 'master'Douwe Maan2017-10-0212-40/+69
|\ \ \ | | | | | | | | | | | | | | | | Add GL_USERNAME environment variable for hooks See merge request gitlab-org/gitlab-ce!13264
| * | | add username to authorized result, so that gitlab-shell can pass it to hooksDavid Turner2017-09-294-8/+15
| | | |
| * | | Add username as GL_USERNAME in hooks (http)David Turner2017-09-299-34/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling pre-receive, post-receive, and update hooks, add the GitLab username as the GL_USERNAME environment variable. This patch only handles cases where pushes are over http, or via the web interface. Later, we will address the ssh case.
| * | | remove unused from_gitaly methodDavid Turner2017-09-291-4/+0
| | | |
* | | | Merge branch 'sh-fix-issue-38646' into 'master'Grzegorz Bizon2017-10-023-4/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pushes to an empty repository not invalidating has_visible_content? cache Closes #38646 See merge request gitlab-org/gitlab-ce!14613
| * | | | Fix pushes to an empty repository not invalidating has_visible_content? cacheStan Hu2017-10-013-4/+23
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | `Repository#has_visible_content?` used to rely on the cached count of local branches, but since it is now an independently cached value it needs to be invalidated on its own. Closes #38646
* | | | Merge branch '38616-take-down-references-to-gitlab-chart-docs' into 'master'Achilleas Pipinellis2017-10-022-11/+16
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Updates to Helm chart docs Closes #38616 See merge request gitlab-org/gitlab-ce!14589
| * | | minor cleanup38616-take-down-references-to-gitlab-chart-docsJoshua Lambert2017-10-011-2/+2
| | | |
| * | | minor cleanupJoshua Lambert2017-09-301-1/+1
| | | |
| * | | updatesJoshua Lambert2017-09-301-3/+3
| | | |
| * | | Fix dead linkJoshua Lambert2017-09-301-1/+1
| | | |
| * | | updatesJoshua Lambert2017-09-302-8/+13
| | | |
* | | | Merge branch 'allow_n_plus_1_detection_bypass' into 'master'Robert Speicher2017-09-302-2/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add environment variable to bypass n+1 See merge request gitlab-org/gitlab-ce!14451
| * | | | Add environment variable to bypass n+1Andrew Newdigate2017-09-302-2/+32
|/ / / /
* | | | Merge branch 'sh-fix-gitlab-qa-admin' into 'master'Grzegorz Bizon2017-09-301-9/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Admin -> License selector for GitLab QA specs Closes gitlab-qa#68 See merge request gitlab-org/gitlab-ce!14599
| * | | | Fix Admin -> License selector for GitLab QA specsStan Hu2017-09-291-9/+4
| | |/ / | |/| | | | | | | | | | Closes gitlab-qa#68
* | | | Merge branch 'sh-add-qa-docs' into 'master'Grzegorz Bizon2017-09-301-0/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add GitLab QA documentation See merge request gitlab-org/gitlab-ce!14600
| * | | | Add GitLab QA documentationStan Hu2017-09-291-0/+19
| |/ / / | | | | | | | | | | | | [ci skip]
* | | | Merge branch 'patch-19' into 'master'Stan Hu2017-09-301-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | remove period See merge request gitlab-org/gitlab-ce!14598
| * | | remove periodBen Bodenmiller2017-09-301-1/+1
|/ / / | | | | | | [skip ci]
* | | Merge branch 'jramsay-38624-right-align' into 'master'Jacob Schatz2017-09-292-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrectly aligned last updated time Closes #38624 See merge request gitlab-org/gitlab-ce!14592
| * | | Fix incorrectly aligned last updated timeJames Ramsay2017-09-292-2/+2
|/ / /
* | | Merge branch 'gitaly-create-repository' into 'master'Douwe Maan2017-09-2915-48/+77
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Create repositories via Gitaly Closes gitaly#595 See merge request gitlab-org/gitlab-ce!14566
| * | | Create repositories via GitalyJacob Vosmaer2017-09-2915-48/+77
| |/ /
* | | Merge branch 'lint-changelog-yaml' into 'master'Robert Speicher2017-09-2914-34/+33
|\ \ \ | |/ / |/| | | | | | | | Add static analysis job to find invalid YAML in changelogs See merge request gitlab-org/gitlab-ce!14518
| * | Remove changelogs with invalid extensionsSean McGivern2017-09-298-31/+0
| | | | | | | | | | | | | | | All of these were in past releases, so missed their chance to be included in the main changelog :-(
| * | Extend changelog checker to test file extensionsSean McGivern2017-09-291-2/+5
| | | | | | | | | | | | | | | Changelogs without a .yml extension won't be picked up, and will be ignored completely, so fail the pipeline when one of those is found.
| * | Fix invalid changelog entrieslint-changelog-yamlSean McGivern2017-09-272-2/+2
| | |
| * | Manually add CHANGELOG entry for !13325Sean McGivern2017-09-271-0/+2
| | | | | | | | | | | | This was discarded from the initial compilation because it had invalid YAML.
| * | Add static analysis job to find invalid YAML in changelogsSean McGivern2017-09-273-1/+26
| | | | | | | | | | | | | | | | | | | | | When a changelog has invalid YAML (typically, there is an unquoted @ at the start of the author field), then the entry will be discarded. This script checks all unreleased changelogs for validity, and runs as part of the static-analysis step, so the pipeline will fail if this happens in future.
* | | Merge branch 'fork-btn-enabled-user-groups' into 'master'Filipa Lacerda2017-09-2912-24/+146
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix fork button being disabled for users who can fork to group Closes #38462 See merge request gitlab-org/gitlab-ce!14551
| * | | moved fork checks into policiesfork-btn-enabled-user-groupsPhil Hughes2017-09-296-9/+61
| | | |
| * | | Fix fork button being disabled for users who can fork to groupPhil Hughes2017-09-298-24/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the fork button was disabled for all users if they have exceeded their project limit. This fixes that by changing the check to see if the user can fork to a group instead of their own namespace. This behaviour is already possible by visiting the new fork page directly, so this just fixes the button being disabled. Closes #38462
* | | | Merge branch '38582-popover-badge' into 'master'Phil Hughes2017-09-292-2/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves UX of autodevops popover to match gpg one Closes #38582 See merge request gitlab-org/gitlab-ce!14582
| * | | | Improves UX of autodevops popover to match gpg oneFilipa Lacerda2017-09-292-2/+7
| |/ / /
* | | | Merge branch 'hash-mr-scroll-load' into 'master'Filipa Lacerda2017-09-293-16/+72
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Fixed anchored content not being scrolled into view Closes #38326 See merge request gitlab-org/gitlab-ce!14562
| * | | spec fixhash-mr-scroll-loadPhil Hughes2017-09-291-7/+3
| | | |
| * | | CHANGELOG itemPhil Hughes2017-09-291-0/+5
| | | |
| * | | Fixed anchored content not being scrolled into viewPhil Hughes2017-09-292-16/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly scrolls anchored content into view when the user loads the page. This is most obvious when the user loads a link note in a merge request & the page does not scroll down to the note. Closes #38326
* | | | Merge branch 'jramsay-4012-externalize-wiki-strings' into 'master'38609-generalise-pop-overs-to-work-on-hover-and-implement-in-existing-placesDouwe Maan2017-09-2912-64/+186
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add translatable strings to wiki pages See merge request gitlab-org/gitlab-ce!14534
| * | | | Add translatable strings to wiki pagesjramsay-4012-externalize-wiki-stringsJames Ramsay2017-09-2812-64/+186
| | | | |
* | | | | Merge branch ↵Rémy Coutable2017-09-295-25/+226
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '36631-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout' into 'master' Insert at most 1,000 rows at once in MR diff background migration Closes #36631 et #37505 See merge request gitlab-org/gitlab-ce!13661
| * | | | | Reschedule merge request diff background migration36631-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeoutSean McGivern2017-09-293-0/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first attempt didn't migrate all rows on GitLab.com, due to a couple of issues: 1. Some rows in merge_request_diffs had truly huge numbers of commits and diffs serialised - one in particular had 26,000 commits! 2. The jobs were sometimes on Sidekiq hosts with frequent OOM errors, leading to the job being lost. The previous commit adds more logging, and a more robust insertion method. This commit reschedules the jobs, with a generous pause between each.
| * | | | | Make MR diff background migration less likely to time outSean McGivern2017-09-292-31/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This version does not use transactions, but individual statements. As we have unique constraints on the target tables for the inserts, we can just ignore uniqueness violations there (as long as we always insert the same batch size, in the same order). This means the spec now must use truncation, not a transaction, as the uniqueness violation means that the whole transaction for that spec would be invalid, which isn't what we'd want. In real-world use, this isn't run in a transaction anyway. This commit also wraps unhandled exceptions, for easier finding in Sentry, and logs with a consistent format, for easier searching.
View Lorry Controller Status