summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Refactor the 2FA docsdocs/refactor-2faAchilleas Pipinellis2019-06-285-68/+82
| | | | | | - Remove outdated images - Add info on browser support - Mention that U2F works with SoloKeys
* Merge branch 'support-jsonb-default-value' into 'master'Thong Kuah2019-06-283-1/+25
|\ | | | | | | | | Support jsonb Default Value in add_column_with_default Migration Helper See merge request gitlab-org/gitlab-ce!29871
| * Support jsonb Default Value in add_column_with_default Migration HelperJason Goodman2019-06-283-1/+25
|/
* Merge branch 'fix-style-guide-links-docs' into 'master'Evan Read2019-06-281-2/+2
|\ | | | | | | | | Fix broken style guide links See merge request gitlab-org/gitlab-ce!30149
| * Fix broken style guide linkscharlie ablett2019-06-281-2/+2
| |
* | Merge branch 'docs/admin_area_monitoring' into 'master'Evan Read2019-06-281-1/+64
|\ \ | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57874 Closes #57874 See merge request gitlab-org/gitlab-ce!30013
| * | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57874Russell Dickenson2019-06-281-1/+64
|/ /
* | Merge branch 'docs-appdev-platform-udpates' into 'master'Evan Read2019-06-281-4/+13
|\ \ | | | | | | | | | | | | Application Development Platform docs updates See merge request gitlab-org/gitlab-ce!30058
| * | Application Development Platform docs updatesDaniel Gruesso2019-06-281-4/+13
|/ /
* | Merge branch 'ek-js-example-spltting-strings-with-links' into 'master'Evan Read2019-06-281-12/+33
|\ \ | |/ |/| | | | | Update documentation examples of string splitting See merge request gitlab-org/gitlab-ce!30009
| * Update info on externalizing linksEzekiel Kigbo2019-06-281-12/+33
|/ | | | | Added example for splitting strings with links in javascript and sentence to interpolation.
* Merge branch 'docs-serverless-ssl' into 'master'Evan Read2019-06-282-0/+272
|\ | | | | | | | | Docs serverless ssl See merge request gitlab-org/gitlab-ce!29946
| * Docs serverless sslDaniel Gruesso2019-06-282-0/+272
|/
* Merge branch 'remove_group_and_instance_clusters_feature_flag' into 'master'Stan Hu2019-06-2715-196/+72
|\ | | | | | | | | | | | | Remove group and instance clusters feature flag Closes #63383 See merge request gitlab-org/gitlab-ce!30124
| * Remove instance_clusters feature_flagremove_group_and_instance_clusters_feature_flagThong Kuah2019-06-287-85/+39
| | | | | | | | | | | | Now we have terminals for instance and group clusters we can remove the FF now. Deploying to instance clusters has been working without complaints too.
| * Remove group_clusters feature flagThong Kuah2019-06-289-111/+33
| | | | | | | | | | | | Now we have terminals for instance and group clusters we can remove the FF now. Deploying to group clusters has been working without complaints too.
* | Merge branch 'cgomes-add-memory-team-label' into 'master'Mek Stittri2019-06-271-0/+2
|\ \ | | | | | | | | | | | | Added Memory and Ecosystem team labels See merge request gitlab-org/gitlab-ce!30142
| * | Added Memory and Ecosystem team labelsCraig Gomes2019-06-271-0/+2
| | |
* | | Merge branch 'sh-add-force-random-password-user-api' into 'master'Mayra Cabrera2019-06-274-30/+51
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Add support for creating random passwords in user creation API Closes #63826 See merge request gitlab-org/gitlab-ce!30138
| * | 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.