diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-06-13 14:36:40 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-13 14:36:40 +0100 |
| commit | 3e11cbebb7bd45678dc8f9a2c5e8c4b9018e8bcb (patch) | |
| tree | cabfdabca18169433d11c127ee82f12e6f918a46 /doc/gitlab-basics/add-merge-request.md | |
| parent | 75f692748d853d38494ba93ff15f98475b6c2da7 (diff) | |
| parent | 69228d796c26e71da894c18f157c7f95022f0b6b (diff) | |
| download | gitlab-ce-3e11cbebb7bd45678dc8f9a2c5e8c4b9018e8bcb.tar.gz | |
Merge branch 'master' into gl-remove-window-scope
* master:
Add documentation: Overview of Frontend Testing
Resolve "Add `/confidential` quick action for issues"
i18n: externalize strings from 'app/views/award_emoji'
Fix broken tests due to bad conflict resolution
Updates eslint rules
Documentation does not need an exception to be picked
Fix conflicts caused by vue_shared/components/user_avatar/user_avatar_image.vue
[Rails5] Fix `storage_counter` helper
Adjust SQL and transaction Prometheus buckets
Updates eslint vue plugin version
Diffstat (limited to 'doc/gitlab-basics/add-merge-request.md')
0 files changed, 0 insertions, 0 deletions