summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Reduce UPDATEs for background column type changesbackground-migration-fixYorick Peterse2018-01-183-3/+6
| | | | | | | | | | | | | | | Prior to this commit we would essentially update all rows in a table, even those where the source column (e.g. `issues.closed_at`) was NULL. This in turn could lead to statement timeouts when using the default batch size of 10 000 rows per job. To work around this we don't schedule jobs for rows where the source value is NULL. We also don't update rows where the source column is NULL (as an extra precaution) or the target column already has a non-NULL value. Using this approach it should be possible to update 10 000 rows in the "issues" table in about 7.5 - 8 seconds. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/42158
* Merge branch 'sh-fix-mermaid-start-on-load-typo' into 'master'Jacob Schatz2018-01-182-1/+10
|\ | | | | | | | | | | | | Fix Mermaid drawings not loading on some browsers Closes #42052 See merge request gitlab-org/gitlab-ce!16537
| * Fix Mermaid drawings not loading on some browserssh-fix-mermaid-start-on-load-typoStan Hu2018-01-172-1/+10
| | | | | | | | | | | | | | | | | | | | As mentioned in https://github.com/knsv/mermaid/issues/291#issuecomment-287673609, the parameter should be `startOnLoad` instead of `loadOnStart`. In addition, `mermaid.initialize()` expects to see `startOnLoad` in the `mermaid` hash: https://github.com/knsv/mermaid/blob/6cd5ffe637d88525b93417bf3954e9c0e5a4deb8/src/mermaid.js#L118 Closes #42052
* | Merge branch 'feature/merge-request-system-hook' into 'master'Douwe Maan2018-01-1829-61/+419
|\ \ | | | | | | | | | | | | System hooks for Merge Requests See merge request gitlab-org/gitlab-ce!14387
| * | accept_confirm requires js driverAlexis Reigel2018-01-171-1/+1
| | |
| * | reference triggers.values for permitted parametersAlexis Reigel2018-01-174-17/+33
| | |
| * | add missing permitted paramAlexis Reigel2018-01-172-0/+2
| | |
| * | use class reader instead of dynamic constantAlexis Reigel2018-01-176-10/+12
| | |
| * | no need for a named parameterAlexis Reigel2018-01-173-3/+3
| | |
| * | accepts `.all` as a hook scope as wellAlexis Reigel2018-01-172-2/+11
| | |
| * | use safer .hooks_for instead of .public_sendAlexis Reigel2018-01-174-2/+26
| | | | | | | | | | | | | | | with .public_send we can't make sure that the scope on the model actually exists.
| * | extract concern for hook triggersAlexis Reigel2018-01-174-23/+67
| | |
| * | doc for system hook merge_requests_eventsAlexis Reigel2018-01-171-0/+129
| | |
| * | doc for system hook merge_requests_events apiAlexis Reigel2018-01-041-0/+2
| | |
| * | api support for merge_requests_events system hookAlexis Reigel2018-01-044-3/+23
| | |
| * | add changelogAlexis Reigel2018-01-041-0/+5
| | |
| * | we only need a test for the happy pathAlexis Reigel2018-01-041-8/+0
| | | | | | | | | | | | | | | the failure case is already covered by the test in spec/services/test_hooks/system_service_spec.rb
| * | use sentence case for "Merge request events"Alexis Reigel2018-01-044-4/+4
| | |
| * | merge requests on system hook admin pageAlexis Reigel2018-01-042-8/+70
| | |
| * | test hook for system merge request hookAlexis Reigel2018-01-042-0/+27
| | |
| * | invoke SystemHooksService instead of direct modelAlexis Reigel2018-01-042-10/+4
| | |
| * | execute system hooks from projectAlexis Reigel2018-01-044-2/+32
| | |
* | | Merge branch '42129-fix-project-snippet-user-agent-detail' into 'master'Sean McGivern2018-01-183-8/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix the user-agent detail API endpoint for project snippets Closes #42129 See merge request gitlab-org/gitlab-ce!16521
| * | | Fix the user-agent detail API endpoint for project snippetsNick Thomas2018-01-173-8/+16
| | | |
* | | | Merge branch 'winh-stop-jobs-modal' into 'master'Phil Hughes2018-01-188-10/+160
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add modal for stopping jobs in admin area Closes #41305 See merge request gitlab-org/gitlab-ce!16283
| * | | | Add modal for stopping jobs in admin areaWinnie Hellmann2018-01-188-10/+160
| | | | |
* | | | | Merge branch 'jramsay-improved-convdev-image-docs' into 'master'Sean McGivern2018-01-181-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update ConvDev Index docs w better screenshot See merge request gitlab-org/gitlab-ce!16533
| * | | | | Update ConvDev Index docs w better screenshotjramsay-improved-convdev-image-docsJames Ramsay2018-01-171-0/+0
| | | | | |
* | | | | | Merge branch 'add-opensuse-to-supported-list' into 'master'Marin Jankovski2018-01-181-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add openSUSE to the supported Unix OS list See merge request gitlab-org/gitlab-ce!16544
| * | | | | | Add openSUSE to the supported Unix OS listBalasankar C2018-01-181-0/+1
|/ / / / / /
* | | | | | Merge branch 'patch-28' into 'master'Achilleas Pipinellis2018-01-181-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove a broken link in the docs See merge request gitlab-org/gitlab-ce!16532
| * | | | | | Remove the second link, blog URL has changed hands and I can't find any new ↵Connor Shea2018-01-171-1/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | blog by this guy.
* | | | | | Merge branch 'rc/port-from-ee-4119' into 'master'Sean McGivern2018-01-181-26/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the :migration metadata, and don't use factories in FixWronglyRenamedRoutes spec See merge request gitlab-org/gitlab-ce!16535
| * | | | | | Add the :migration metadata, and don't use factories in ↵rc/port-from-ee-4119Rémy Coutable2018-01-171-26/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FixWronglyRenamedRoutes spec Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch '34252-trailing-plus' into 'master'Phil Hughes2018-01-184-1/+44
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Cannot filter issues by labels ending with a plus char in board view" Closes #41715 and #34252 See merge request gitlab-org/gitlab-ce!16490
| * | | | | | | sentence-case changelog entry34252-trailing-plusSimon Knox2018-01-181-2/+2
| | | | | | | |
| * | | | | | | feature spec for #34252Simon Knox2018-01-181-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/34252
| * | | | | | | consistent code styleSimon Knox2018-01-181-2/+1
| | | | | | | |
| * | | | | | | add test for search terms with +Simon Knox2018-01-181-2/+9
| | | | | | | |
| * | | | | | | fix board filter parsing - don't replace encoded + symbols with spacesSimon Knox2018-01-163-1/+27
| | | | | | | |
* | | | | | | | Merge branch '41743-unused-selectors-for-cycle-analytics' into 'master'Annabel Dunstone Gray2018-01-182-41/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused CSS selectors for Cycle Analytics (between 1st iteration and 2nd iteration) Closes #41743 See merge request gitlab-org/gitlab-ce!16270
| * | | | | | | | Remove unused CSS selectors for Cycle AnalyticsTakuya Noguchi2018-01-072-41/+5
| | | | | | | | |
* | | | | | | | | Merge branch 'file-content-large-screen-padding' into 'master'Annabel Dunstone Gray2018-01-172-0/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Double padding for file-content wiki class on larger screens See merge request gitlab-org/gitlab-ce!16534
| * | | | | | | | | Double padding for file-content wiki class on larger screensfile-content-large-screen-paddingtauriedavis2018-01-172-0/+9
| | | | | | | | | |
* | | | | | | | | | Merge branch 'winh-search-page-filters' into 'master'Clement Ho2018-01-174-0/+65
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter groups and projects dropdowns of search page on backend Closes #38739 See merge request gitlab-org/gitlab-ce!16336
| * | | | | | | | | Filter groups and projects dropdowns of search page on backendWinnie Hellmann2018-01-174-0/+65
|/ / / / / / / / /
* | | | | | | | | Merge branch 'fj-42112-fix-deploy-keys-migration-mysql' into 'master'Stan Hu2018-01-173-28/+111
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug in security release with deploy keys migration See merge request gitlab-org/gitlab-ce!16531
| * | | | | | | | Applied fixFrancisco Javier López2018-01-173-28/+111
| |/ / / / / / /
* | | | | | | | Merge branch 'rs-buttons-partial' into 'master'Rémy Coutable2018-01-171-21/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Further simplify app/views/projects/buttons/_dropdown.html.haml See merge request gitlab-org/gitlab-ce!16503
| * | | | | | | Further simplify app/views/projects/buttons/_dropdown.html.hamlrs-buttons-partialRobert Speicher2018-01-161-21/+14
| | |_|_|/ / / | |/| | | | |
View Lorry Controller Status