summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix stage index migration failing in PostgreSQL 10sh-fix-issue-59985Stan Hu2019-04-032-3/+3
| | | | | | | | | | | | | | | | | | | | | As discussed in https://www.postgresql.org/message-id/9922.1353433645%40sss.pgh.pa.us, the PostgreSQL window function last_value may not consider the right rows: Note that first_value, last_value, and nth_value consider only the rows within the "window frame", which by default contains the rows from the start of the partition through the last peer of the current row. This is likely to give unhelpful results for last_value and sometimes also nth_value. You can redefine the frame by adding a suitable frame specification (RANGE or ROWS) to the OVER clause. See Section 4.2.8 for more information about frame specifications. This query could be fixed by adding `RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING`, but that's quite verbose. It's simpler just to use the first_value function. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59985
* Merge branch 'da-fix-broken-master' into 'master'Stan Hu2019-04-041-2/+4
|\ | | | | | | | | Fix broken spec for Merge request > Revert modal See merge request gitlab-org/gitlab-ce!26961
| * Fix broken spec for Merge request > Revert modalDouglas Barbosa Alexandre2019-04-031-2/+4
| |
* | Merge branch 'docs-google_secure_ldap' into 'master'Evan Read2019-04-045-0/+215
|\ \ | | | | | | | | | | | | Add documentation for Google Secure LDAP See merge request gitlab-org/gitlab-ce!26064
| * | Add documentation for Google Secure LDAPdocs-google_secure_ldapDrew Blessing2019-04-035-0/+215
| | | | | | | | | | | | | | | | | | | | | | | | As of 11.9 GitLab supports Google Secure LDAP for authentication and group sync. This documentation outlines how to configure the service. Rename file
* | | Merge branch 'docs/refactor-pgloader' into 'master'Evan Read2019-04-041-147/+139
|\ \ \ | |_|/ |/| | | | | | | | Clean up the mysql to postgres guide See merge request gitlab-org/gitlab-ce!24061
| * | Clean up the mysql to postgres guidedocs/refactor-pgloaderAchilleas Pipinellis2019-04-031-147/+139
| |/ | | | | | | | | This change refactors the pgloader instructions to have less headings and be more straightforward.
* | Merge branch '10879/fix-security-template-inclusion' into 'master'Douglas Barbosa Alexandre2019-04-041-1/+3
|\ \ | | | | | | | | | | | | Include DAST as dependent CI template See merge request gitlab-org/gitlab-ce!26956
| * | Include DAST as dependent CI templateLucas Charles2019-04-041-1/+3
|/ /
* | Merge branch 'mk/add-mkozono-to-backend-codeowners' into 'master'Douglas Barbosa Alexandre2019-04-041-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Add @mkozono to backend CODEOWNERS Closes gitlab-com/www-gitlab-com#3355 See merge request gitlab-org/gitlab-ce!26947
| * | Add @mkozono to backend CODEOWNERSmk/add-mkozono-to-backend-codeownersMichael Kozono2019-04-031-2/+2
| | |
* | | Merge branch 'xanf/gitlab-ce-move-project-tags' into 'master'Clement Ho2019-04-033-4/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project overview UI: Line break when there are multiple project tags" Closes #55650 See merge request gitlab-org/gitlab-ce!26797
| * | | Move topics to separate line in project overviewxanf/gitlab-ce-move-project-tagsIllya Klymov2019-04-033-4/+8
| | | |
* | | | Merge branch 'ee-feature-doc-fixes' into 'master'Evan Read2019-04-031-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Minor EE feature doc fixes See merge request gitlab-org/gitlab-ce!26900
| * | | | Use correct `ifEE` variable nameMark Florian2019-04-031-3/+3
|/ / / / | | | | | | | | | | | | Presumably the `renderIfEE` is from an older edit.
* | | | Merge branch '29249-show-download-diff-even-when-merge-request-is-closed' ↵59323-legend-showing-nan-for-avg-max-when-they-are-fractional-quantitiesMike Greiling2019-04-033-42/+43
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Show download diff even when merge request is closed" Closes #29249 See merge request gitlab-org/gitlab-ce!26772
| * | | Show Download diff links in closed MRs29249-show-download-diff-even-when-merge-request-is-closedFatih Acet2019-04-033-42/+43
| | | | | | | | | | | | | | | | | | | | Download MR diffs links were only available for open MRs, however it may still be useful for closed MRs.
* | | | Merge branch 'fix-issues-time-counter' into 'master'Annabel Dunstone Gray2019-04-033-6/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace 'x seconds ago' with 'just now' Closes #58425 See merge request gitlab-org/gitlab-ce!25992
| * | | | Replace 'x seconds ago' with 'just now'Sergiu Marton2019-04-033-6/+12
|/ / / /
* | | | Merge branch '13784-validate-variables-for-masking' into 'master'Clement Ho2019-04-0317-50/+193
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Simple masking frontend - CE See merge request gitlab-org/gitlab-ce!26751
| * | | Remove duplicate environment selector dropdown13784-validate-variables-for-maskingmfluharty2019-03-291-2/+0
| | | |
| * | | Add control for variable value maskingmfluharty2019-03-2917-50/+195
| | | | | | | | | | | | | | | | | | | | | | | | Show masked switch for each variable When toggled on, the variable value will be masked in runner logs Show warning message if the switch is on but the value is not maskable
* | | | Merge branch 'localize-notification-dropdown' into 'master'Clement Ho2019-04-033-1/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Localize notifications dropdown Closes gitlab-ee#10686 See merge request gitlab-org/gitlab-ce!26844
| * | | | Localize the notifications dropdown stringJacques Erasmus2019-04-033-1/+10
|/ / / / | | | | | | | | | | | | Localized the notifications dropdown string
* | | | Merge branch 'eric_theitguy-master-patch-89133' into 'master'Achilleas Pipinellis2019-04-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Removing redundant "predefined" See merge request gitlab-org/gitlab-ce!26516
| * | | | Removing redundant "predefined"Eric Hendricks2019-04-031-1/+1
|/ / / /
* | | | Merge branch 'docs/fix-syntax-highlighting' into 'master'Achilleas Pipinellis2019-04-031-7/+6
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Fix code block and other minor fixes See merge request gitlab-org/gitlab-ce!26894
| * | | Fix code block and other minor fixesEvan Read2019-04-031-7/+6
|/ / /
* | | Merge branch '58644-remove-reply_to_individual_notes-feature-flag' into 'master'Nick Thomas2019-04-037-146/+36
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove reply_to_individual_notes feature flag Closes #58644 See merge request gitlab-org/gitlab-ce!26889
| * | | Remove reply_to_individual_notes feature flag58644-remove-reply_to_individual_notes-feature-flagHeinrich Lee Yu2019-04-037-146/+36
| | |/ | |/| | | | | | | Also removes specs related to the flag
* | | Update CHANGELOG.md for 11.9.5GitLab Release Tools Bot2019-04-035-20/+13
| | | | | | | | | [ci skip]
* | | Merge branch '10864-fix-undefined-with-fallback' into 'master'Lin Jen-Shin2019-04-031-0/+13
|\ \ \ | | | | | | | | | | | | | | | | Backport: Bring back Gitlab::UntrustedRegexp.with_fallback See merge request gitlab-org/gitlab-ce!26901
| * | | Bring back Gitlab::UntrustedRegexp.with_fallback10864-fix-undefined-with-fallbackPatrick Bajao2019-04-031-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | It's still being called in PushRule model. Also still present in 11-9-stable-ee branch.
* | | | Merge branch 'docs-jest-debug' into 'master'Fatih Acet2019-04-032-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add docs for debugging Jest tests See merge request gitlab-org/gitlab-ce!26810
| * | | | Add docs for debugging Jest testsSimon Knox2019-04-032-0/+5
|/ / / /
* | | | Merge branch '59942-fix-mr-swipe-diff-user-select' into 'master'Phil Hughes2019-04-032-4/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MR image diff swipe view: Disable user-select on drag Closes #59942 See merge request gitlab-org/gitlab-ce!26884
| * | | | MR image diff swipe view: Disable user-select on dragftab2019-04-032-4/+8
|/ / / / | | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/59942
* | | | Merge branch 'remaining-lib-differences' into 'master'Robert Speicher2019-04-031-0/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Resolve remaining CE to EE differences in lib/ See merge request gitlab-org/gitlab-ce!26608
| * | | | Backport EE changes to gitlab:env:inforemaining-lib-differencesYorick Peterse2019-04-021-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports EE specific changes for the Rake task `gitlab:env:info`, wrapping them in a conditional. There is no way to inject code in the middle of a Rake task in EE, so unfortunately this is the best we can do.
* | | | | Merge branch 'feature/webide_escaping' into 'master'Nick Thomas2019-04-035-11/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve file handling of special characters in WebIDE Closes #54376 See merge request gitlab-org/gitlab-ce!25727
| * | | | | Merge branch 'feature/webide_escaping' of gitlab.com:hiddentiger/gitlab-ce ↵Kieran Andrews2019-04-035-11/+36
|/ / / / / | | | | | | | | | | | | | | | into feature/webide_escaping
* | | | | Merge branch '52560-fix-duplicate-tag-system-hooks' into 'master'Rémy Coutable2019-04-033-12/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only execute system hooks once when pushing tags Closes #52560 See merge request gitlab-org/gitlab-ce!26888
| * | | | | Only execute system hooks once when pushing tagsNick Thomas2019-04-033-12/+19
| | |_|/ / | |/| | |
* | | | | Merge branch '59756-shared-example-already-defined' into 'master'Sean McGivern2019-04-031-85/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove already defined shared example Closes #59756 See merge request gitlab-org/gitlab-ce!26867
| * | | | | Remove already defined shared example59756-shared-example-already-definedAlexandru Croitor2019-04-021-85/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing the time traking shared example as it was actually moved under time_tracking_quick_action_shared_examples.rb filename to a different path as part of spec refactorign for quick action https://gitlab.com/gitlab-org/gitlab-ce/issues/50199 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26095
* | | | | Merge branch 'ce-fj-10179-add-ports-to-web-ide-config' into 'master'Kamil Trzciński2019-04-0326-27/+997
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Backport: Update Web IDE config to accept ports Closes gitlab-ee#10179 See merge request gitlab-org/gitlab-ce!26679
| * | | | | Add port section to CI Image objectFrancisco Javier López2019-04-0326-27/+997
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to implement https://gitlab.com/gitlab-org/gitlab-ee/issues/10179 we need several modifications on the CI config file. We are adding a new ports section in the default Image object. Each of these ports will accept: number, protocol and name. By default this new configuration will be only enabled in the Web IDE config file.
* | | | | Merge branch 'patch-50' into 'master'Kamil Trzciński2019-04-031-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | docs: add gitlab version for list jobs of a runner See merge request gitlab-org/gitlab-ce!26815
| * | | | | docs: add gitlab version for list jobs of a runnerjk2K2019-04-011-0/+2
| | | | | |
* | | | | | Merge branch '55268-exclude-system-notes-from-commits-in-mr' into 'master'Rémy Coutable2019-04-033-9/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not show system notes on commits in the MR page Closes #55268 See merge request gitlab-org/gitlab-ce!26396