summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add support for creating random passwords in user creation APIsh-add-force-random-password-user-apiStan Hu2019-06-274-30/+51
| | | | | | | | To avoid having to specify an actual password to create users, admins can now use the `force_random_password` parameter to let Devise generate a password. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63826
* Merge branch 'dohtaset' into 'master'Mike Greiling2019-06-272-4/+11
|\ | | | | | | | | Fix charts on Cluster page See merge request gitlab-org/gitlab-ce!30073
| * Fix charts on Cluster pagedohtasetSimon Knox2019-06-272-4/+11
| |
* | Merge branch ↵Clement Ho2019-06-274-6/+29
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '11888-regression-deploy-correlation-markers-on-monitoring-graphs-not-clickable' into 'master' Turn commit sha in monitor charts popover to link Closes gitlab-ee#11888 See merge request gitlab-org/gitlab-ce!29914
| * | Turn commit sha in monitor charts popover to link11888-regression-deploy-correlation-markers-on-monitoring-graphs-not-clickableDhiraj Bodicherla2019-06-264-6/+29
| | | | | | | | | | | | | | | | | | Commit sha in deployment popovers within monitoring dashboard are not clickable or selectable. This commit makes those commit sha links selectable and point to projects commit page
* | | Merge branch 'docs/gitlab-basics-community-contribution' into 'master'Marcia Ramos2019-06-271-2/+14
|\ \ \ | | | | | | | | | | | | | | | | Add alerts to GitLab basics See merge request gitlab-org/gitlab-ce!30071
| * | | Add alerts to GitLab basicsAchilleas Pipinellis2019-06-271-2/+14
|/ / /
* | | Merge branch 'mj/feature-flags-doc' into 'master'Marcia Ramos2019-06-279-390/+422
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refresh feature flags documentation Closes #62751 See merge request gitlab-org/gitlab-ce!29759
| * | | Reorganize feature flag documentationMarin Jankovski2019-06-279-390/+422
|/ / / | | | | | | | | | Split the FF docs in 3 separate docs to cover 3 different use-cases.
* | | Merge branch '63825-increase-rspec-parallelism' into 'master'Robert Speicher2019-06-271-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Attempt to work around migration spec failures by increasing parallelism See merge request gitlab-org/gitlab-ce!30130
| * | | Attempt to fix migration spec failures by increasing parallelism63825-increase-rspec-parallelismNick Thomas2019-06-271-2/+2
| | | |
* | | | Merge branch 'docs-video-style' into 'master'Mike Lewis2019-06-271-2/+90
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Docs: Update style guide for videos See merge request gitlab-org/gitlab-ce!29683
| * | | | Address Mike's reviewMarcia Ramos2019-06-271-2/+90
|/ / / / | | | | | | | | | | | | | | | | | | | | - explictly say not to upload videos - link videos from any YT account - embed videos from GL's YT account only
* | | | Merge branch 'remove-database-reviewer-template' into 'master'Andreas Brandl2019-06-271-34/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Removes Database Reviewer template See merge request gitlab-org/gitlab-ce!30128
| * | | | Removes Database Reviewer templateMayra Cabrera2019-06-271-34/+0
|/ / / / | | | | | | | | | | | | It was moved to wwww-gitlab-com
* | | | Merge branch 'docs/fix-typo-on-e2e-quick-start-guide' into 'master'Rémy Coutable2019-06-271-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix typo on end-to-end testing quick start guide Closes gitlab-ee#12466 See merge request gitlab-org/gitlab-ce!30129
| * | | Fix typo on end-to-end quick start guideWalmyr Lima2019-06-271-1/+1
|/ / /
* | | Merge branch '12429-report' into 'master'Phil Hughes2019-06-271-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for app/assets/javascripts/reports/components/report_item.vue Closes gitlab-ee#12429 See merge request gitlab-org/gitlab-ce!30092
| * | | Removes EE differences12429-reportFilipa Lacerda2019-06-261-1/+1
| | | |
* | | | Merge branch 'sh-avoid-loading-pipeline-status' into 'master'Nick Thomas2019-06-273-1/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Avoid loading pipeline status in search results See merge request gitlab-org/gitlab-ce!30111
| * | | | Avoid loading pipeline status in search resultsStan Hu2019-06-273-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the performance of search, since the pipeline status is not displayed. Identified in https://gitlab.com/gitlab-org/gitlab-ce/issues/56627
* | | | | Merge branch 'qa/updates-on-epics-management-e2e-tests' into 'master'Rémy Coutable2019-06-271-2/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport of EE MR See merge request gitlab-org/gitlab-ce!30051
| * | | | | Backport of EE MRqa/updates-on-epics-management-e2e-testsWalmyr Lima2019-06-271-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14320
* | | | | | Merge branch '63200-reply-button-broken' into 'master'Filipa Lacerda2019-06-273-4/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix unresponsive reply button in discussions Closes #63200 See merge request gitlab-org/gitlab-ce!29936
| * | | | | | Fix unresponsive reply button in discussionsPaul Gascou-Vaillancourt2019-06-273-4/+47
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Events listeners have been fixed to ensure UI interactions are properly handled in discussion notes
* | | | | | Merge branch 'leipert-danger-dogs' into 'master'Nick Thomas2019-06-272-0/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a danger rule to suggest `docs-` prefixes Closes #54490 See merge request gitlab-org/gitlab-ce!30115
| * | | | | | Add a danger rule to suggest `docs-` prefixesleipert-danger-dogsLukas Eipert2019-06-272-0/+25
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an MR only changes files within `doc/` we can save valueable CI time by prepending a branch name with `docs-`. This danger rule helps educate people about that fact. On the other hand, if someone has a branch with a `docs` prefix or suffix, the branch shouldn't contain any changes outside of the `docs` directory
* | | | | | Merge branch 'po-raw-changes-encoding' into 'master'Douglas Barbosa Alexandre2019-06-274-3/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change GetRawChanges RPC to use bytes Closes gitaly#1470 See merge request gitlab-org/gitlab-ce!28164
| * | | | | | Change GetRawChanges RPC to use bytesPaul Okstad2019-06-274-3/+22
|/ / / / / /
* | | | | | Merge branch 'improve-accessibility-frontend-docs' into 'master'Achilleas Pipinellis2019-06-271-2/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve accessibility tooling documentation See merge request gitlab-org/gitlab-ce!30114
| * | | | | | Improve accessibility tooling documentationimprove-accessibility-frontend-docsDavid Pisek2019-06-271-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add links to useful browser extensions and learning resources to the FE-accessibility documentation.
* | | | | | | Merge branch 'sh-handle-nil-replication-lag' into 'master'Andreas Brandl2019-06-273-1/+14
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix background migrations failing with unused replication slot Closes #63666 See merge request gitlab-org/gitlab-ce!30042
| * | | | | | Fix background migrations failing with unused replication slotsh-handle-nil-replication-lagStan Hu2019-06-253-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there is an unused replication slot, the replication lag function will return a nil value, resulting in "NoMethodError: undefined method `>=' for nil:NilClass" error. We now just ignore these nil values. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63666
* | | | | | | Merge branch 'add-metrics-dashboard-permission-check' into 'master'Rémy Coutable2019-06-277-8/+48
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Add permission check to metrics dashboards See merge request gitlab-org/gitlab-ce!30017
| * | | | | | Add permission check to dashboardsSarah Yasonik2019-06-277-8/+48
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds permission checks to the metrics_dashboard endpoint. Users with role of Reporter or above should have access to view the metrics for a given project.
* | | | | | Merge branch '12436-mr-widget' into 'master'Phil Hughes2019-06-271-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for spec/javascripts/vue_mr_widget/mr_widget_options_spec.js Closes gitlab-ee#12436 See merge request gitlab-org/gitlab-ce!30091
| * | | | | | Removes EE differences12436-mr-widgetFilipa Lacerda2019-06-261-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'sh-add-gitaly-ref-caching-search-controller' into 'master'Kamil Trzciński2019-06-275-6/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Gitaly ref caching for SearchController See merge request gitlab-org/gitlab-ce!30105
| * | | | | | Enable Gitaly ref caching for SearchControllersh-add-gitaly-ref-caching-search-controllerStan Hu2019-06-265-6/+17
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we noticed in https://gitlab.com/gitlab-org/gitlab-ce/issues/56627#note_185828742, clicking on the "Issues" tab often requests the same reference in rendering Markdown.
* | | | | | Merge branch 'gt-fix-styling-for-framework-system-messages' into 'master'Phil Hughes2019-06-272-11/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix styling for `app/assets/stylesheets/framework/notes.scss` Closes #59884 See merge request gitlab-org/gitlab-ce!26879
| * | | | | Fix styling for `app/assets/stylesheets/framework/notes.scss`George Tsiolis2019-06-272-11/+1
|/ / / / /
* | | | | Merge branch '54595-incorrect-reaction-emoji-placement-in-discussion' into ↵Phil Hughes2019-06-273-1/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix incorrect reaction placement in commit diff discussion Closes #54595 See merge request gitlab-org/gitlab-ce!29445
| * | | | | Fix incorrect reaction placement in commit diff discussionSamantha Ming2019-06-273-1/+22
|/ / / / /
* | | | | Merge branch 'update-toast-styling' into 'master'Kushal Pandya2019-06-271-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Update toast action selector See merge request gitlab-org/gitlab-ce!30024
| * | | | Update action selectorJacques Erasmus2019-06-271-2/+2
|/ / / / | | | | | | | | | | | | Updated the toast action selector to `first-of-type` instead
* | | | Merge branch 'qa-ml-unquarantine-add-file-template-tests' into 'master'Ramya Authappan2019-06-272-4/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Unquarantine fixed tests See merge request gitlab-org/gitlab-ce!30109
| * | | | Unquarantine fixed testsqa-ml-unquarantine-add-file-template-testsMark Lapierre2019-06-272-4/+2
| | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28915
* | | | | Merge branch 'mh/related-issues-design-ce' into 'master'Kushal Pandya2019-06-274-93/+148
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conform related issues/MRs card to design docs Closes #59594 and #61357 See merge request gitlab-org/gitlab-ce!29626
| * | | | | Conform related issues/MRs card to design docsMartin Hanzel2019-06-274-93/+148
|/ / / / /
* | | | | Merge branch 'rs-ee-only-routes-2' into 'master'Lin Jen-Shin2019-06-277-7/+171
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE-EE parity for routes See merge request gitlab-org/gitlab-ce!29994