summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | remove monacoLoader and import monaco directly within Editor classMike Greiling2018-06-0711-106/+42
| | | | | | | | | | | |
| * | | | | | | | | | | remove copy-webpack-pluginMike Greiling2018-06-072-40/+2
| | | | | | | | | | | |
| * | | | | | | | | | | fix bug in call to monaco.Uri. first param is checked with `typeof param ↵Mike Greiling2018-06-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | === 'object'` which is true for `null` due to a JS quirk
| * | | | | | | | | | | add monaco-editor-webpack-plugin and update webpack configMike Greiling2018-06-074-39/+12
| | | | | | | | | | | |
| * | | | | | | | | | | update webpack and webpack-cli to latestMike Greiling2018-06-072-853/+217
| | | | | | | | | | | |
| * | | | | | | | | | | update monaco-editor dependencyMike Greiling2018-06-072-4/+4
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'set-tooltip-default-boundary' into 'master'Mike Greiling2018-06-083-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set tooltips to have default boundary viewport Closes #47518 See merge request gitlab-org/gitlab-ce!19561
| * | | | | | | | | | | | Set tooltips to have default boundary viewportClement Ho2018-06-083-2/+8
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'fix-ci-runner-token-hidden' into 'master'Annabel Gray2018-06-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix revealing a CI runner token doesn't actually reveal it Closes #47552 See merge request gitlab-org/gitlab-ce!19567
| * | | | | | | | | | | | Fix revealing a CI runner token doesn't actually reveal itClement Ho2018-06-071-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'fix-loading-icon' into 'master'Annabel Gray2018-06-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix loading icon in activity view Closes #47508 See merge request gitlab-org/gitlab-ce!19566
| * | | | | | | | | | | | | Fix loading icon in activity viewfix-loading-iconClement Ho2018-06-071-1/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'fix-markdown-code-mr-discussion' into 'master'Annabel Gray2018-06-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown code highlighting in mr discussion Closes #47521 See merge request gitlab-org/gitlab-ce!19564
| * | | | | | | | | | | | | Fix markdown code highlighting in mr discussionClement Ho2018-06-071-1/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'fix-tasks-completed' into 'master'Annabel Gray2018-06-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix tasks completed header Closes #47506 See merge request gitlab-org/gitlab-ce!19562
| * | | | | | | | | | | | | Fix tasks completed headerClement Ho2018-06-071-1/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'workhorse-4-3-1' into 'master'Stan Hu2018-06-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update to GitLab Workhorse v4.3.1 See merge request gitlab-org/gitlab-ce!19525
| * | | | | | | | | | | | | Update to GitLab Workhorse v4.3.1Nick Thomas2018-06-071-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'fix-card-header-titles' into 'master'Annabel Gray2018-06-082-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix card title h3 headers See merge request gitlab-org/gitlab-ce!19510
| * | | | | | | | | | | | | | Fix card title h3 headersClement Ho2018-06-082-2/+9
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'jl-update-error-rate-to-percent' into 'master'Mike Greiling2018-06-072-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update NGINX error rate to a percentage See merge request gitlab-org/gitlab-ce!19471
| * | | | | | | | | | | | | Update docsJoshua Lambert2018-06-071-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Update NGINX error rate to a percentageJoshua Lambert2018-06-061-4/+4
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ce-5784-user-board-lists' into 'master'Sean McGivern2018-06-0733-118/+273
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of "Add assignee lists to boards" See merge request gitlab-org/gitlab-ce!19464
| * | | | | | | | | | | | | | Backport of "Add assignee lists to boards"Mario de la Ossa2018-06-0733-118/+273
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'mk/avoid-credential-leak-qa' into 'master'Robert Speicher2018-06-073-12/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QA: Redact credentials from URI in git output Closes gitlab-qa#258 See merge request gitlab-org/gitlab-ce!19492
| * | | | | | | | | | | | | QA: Redact credentials from URI in git outputMichael Kozono2018-06-073-12/+49
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch '47182-use-the-default-strings-of-timeago-js' into 'master'Clement Ho2018-06-074-20/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the default strings of timeago.js for timeago Closes #47182 See merge request gitlab-org/gitlab-ce!19350
| * | | | | | | | | | | | | Use the default strings of timeago.js for timeagoTakuya Noguchi2018-06-044-20/+25
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jivl-ce-backport-card-class-integration-forms' into 'master'Clement Ho2018-06-073-5/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport for the card class changes See merge request gitlab-org/gitlab-ce!19453
| * | | | | | | | | | | | | | CE backport for the card class changesJose Ivan Vargas2018-06-073-5/+9
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch '47358-labels' into 'master'Clement Ho2018-06-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Labels were bold in 10.8 but not with bootstrap4" Closes #47358 See merge request gitlab-org/gitlab-ce!19504
| * | | | | | | | | | | | | Resolve "Labels were bold in 10.8 but not with bootstrap4"Annabel Gray2018-06-071-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'override-bootstrap4-font-hierarchy' into 'master'Annabel Gray2018-06-071-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Override default font family hierarchy of bootstrap 4 Closes #47493 See merge request gitlab-org/gitlab-ce!19542
| * | | | | | | | | | | | | Override default font family hierarchy of bootstrap 4Clement Ho2018-06-071-0/+2
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch '46648-timeout-searching-group-issues' into 'master'Grzegorz Bizon2018-06-075-23/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Timeout searching group issues" Closes #46648 See merge request gitlab-org/gitlab-ce!19429
| * | | | | | | | | | | | | Force Postgres to avoid trigram indexes when in a groupSean McGivern2018-06-073-5/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When filtering issues with a search string in a group, we observed on GitLab.com that Postgres was using an inefficient query plan, preferring the (global) trigram indexes on description and title, rather than using a filter on the restricted set of issues within the group. Change the callers of the IssuableFinder to use a CTE in this case to fence the rest of the query from the LIKE filters, so that the optimiser is forced to perform the filter in the order we prefer. This will only force the use of a CTE when: 1. The use_cte_for_search params is truthy. 2. We are using Postgres. 3. We have passed the `search` param. The third item is important - searching issues using the search box does not use the finder in this way, but contructs a query and appends `full_search` to that. For some reason, this query does not suffer from the same issue. Currenly, we only pass this param when filtering issuables (issues or MRs) in a group context.
| * | | | | | | | | | | | | Simplify issuable finder queriesSean McGivern2018-06-064-18/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had `item_project_ids` to help make slow queries on the dashboard faster, but this isn't necessary any more - the queries are plenty fast, and we forbid searching the dashboard without filters.
* | | | | | | | | | | | | | Merge branch 'issue_44230' into 'master'Sean McGivern2018-06-077-33/+286
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply notification settings level of groups to all child objects Closes #44230 See merge request gitlab-org/gitlab-ce!19191
| * | | | | | | | | | | | | | Apply notification settings level of groups to all child objectsFelipe Artur2018-06-077-33/+286
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ce-6213-fix-appearance-forms' into 'master'Clement Ho2018-06-071-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Port of EE Resolve "Admin area > Appearance forms" See merge request gitlab-org/gitlab-ce!19551
| * | | | | | | | | | | | | | Fix height of color inputsPaul Slaughter2018-06-071-0/+4
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jivl-fix-group-members-information' into 'master'Annabel Gray2018-06-072-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix group member information not collapsing in a single line Closes #47448 See merge request gitlab-org/gitlab-ce!19508
| * | | | | | | | | | | | | | Fix group member information not collapsing in a single lineJose2018-06-062-10/+10
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '38542-application-control-panel-in-settings-page' into 'master'Kamil Trzciński2018-06-0712-34/+149
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add deploy strategies to Auto DevOps settings" Closes #38542 See merge request gitlab-org/gitlab-ce!19172
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into ↵Kamil Trzciński2018-06-07220-872/+2596
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38542-application-control-panel-in-settings-page
| * | | | | | | | | | | | | | | Use 0 continuous default for deploy strategyMatija Čupić2018-06-072-3/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add spec for continuous deploy strategyMatija Čupić2018-06-071-0/+13
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add trait for manual deploy strategyMatija Čupić2018-06-071-0/+4
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Change database deploy strategy default to continuousMatija Čupić2018-06-071-1/+1
| | | | | | | | | | | | | | | |
View Lorry Controller Status