summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Unify app/views/shared/issuable/form/_metadata.html.hamlce-6145-extract-app-views-shared-issuable-3Lin Jen-Shin2018-06-141-1/+4
* Unify app/views/shared/issuable/_sidebar_assignees.html.hamlLin Jen-Shin2018-06-141-1/+1
* Merge branch 'qa-clear-session-only-if-block-given-and-no-errors' into 'master'Rémy Coutable2018-06-131-13/+1
|\
| * Only clear the sessions if block_given? and no errorLin Jen-Shin2018-06-131-13/+1
* | Merge branch 'ab-document-migration-needs-changelog' into 'master'Yorick Peterse2018-06-131-0/+2
|\ \
| * | Database migrations should have a changelog entry.Andreas Brandl2018-06-131-0/+2
|/ /
* | Merge branch 'gl-remove-window-scope' into 'master'Phil Hughes2018-06-136-56/+41
|\ \
| * \ Merge branch 'master' into gl-remove-window-scopeFilipa Lacerda2018-06-13261-1105/+1399
| |\ \
| * | | Removes merge conflicts vue code from globalnamespaceFilipa Lacerda2018-06-136-57/+42
* | | | Merge branch 'fix-ux-handbook-link' into 'master'Stan Hu2018-06-131-1/+1
|\ \ \ \
| * | | | Fix UX handbook link in contribution guideAndreas Kämmerle2018-06-131-1/+1
* | | | | Merge branch 'zj-empty-batch-no-rpc' into 'master'Rémy Coutable2018-06-132-0/+12
|\ \ \ \ \
| * | | | | ListCommitByOid isn't called with an empty batchZeger-Jan van de Weg2018-06-132-0/+12
| | |/ / / | |/| | |
* | | | | Merge branch 'fj-use-gitaly-0-105-1' into 'master'Douwe Maan2018-06-131-1/+1
|\ \ \ \ \
| * | | | | Use Gitaly 0.105.1Francisco Javier López2018-06-131-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch '47823-fix-issue-boards-label-list-creation' into 'master'Phil Hughes2018-06-131-1/+2
|\ \ \ \ \
| * | | | | Add missing `entityType`Kushal Pandya2018-06-131-1/+2
* | | | | | Merge branch 'docs-coached-20180610-1' into 'master'Achilleas Pipinellis2018-06-131-31/+116
|\ \ \ \ \ \
| * | | | | | resolving MR 19611-fix/enhance start-using-git docEdwin Torres2018-06-131-31/+116
|/ / / / / /
* | | | | | Merge branch '47501-link-scroll' into 'master'Clement Ho2018-06-135-26/+23
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Resolve "Scrolling tabs are broken on profile, activity, and projects"Simon Knox2018-06-135-26/+23
|/ / / / /
* | | | | Merge branch 'doc-add-overview-of-frontend-testing' into 'master'Tim Zallmann2018-06-131-2/+134
|\ \ \ \ \
| * | | | | Add documentation: Overview of Frontend TestingAndré Luís2018-06-131-2/+134
|/ / / / /
* | | | | Merge branch 'sql-buckets' into 'master'Stan Hu2018-06-133-2/+7
|\ \ \ \ \
| * | | | | Adjust SQL and transaction Prometheus bucketssql-bucketsYorick Peterse2018-06-113-2/+7
* | | | | | Merge branch '47145-quick-actions-confidential' into 'master'Rémy Coutable2018-06-135-0/+71
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Resolve "Add `/confidential` quick action for issues"Jan2018-06-135-0/+71
|/ / / / /
* | | | | Merge branch 'blackst0ne-rails5-fix-storage-counter-helper' into 'master'Rémy Coutable2018-06-131-10/+14
|\ \ \ \ \
| * | | | | [Rails5] Fix `storage_counter` helperblackst0ne2018-06-131-10/+14
* | | | | | Merge branch 'add-documentation-to-freeze' into 'master'Marin Jankovski2018-06-131-0/+1
|\ \ \ \ \ \
| * | | | | | Documentation does not need an exception to be pickedSean McGivern2018-06-131-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'fl-eslint-vue-house-keeping' into 'master'Tim Zallmann2018-06-13248-1087/+1165
|\ \ \ \ \ \
| * | | | | | Fix broken tests due to bad conflict resolutionFilipa Lacerda2018-06-133-3/+3
| * | | | | | Updates eslint rulesFilipa Lacerda2018-06-136-23/+23
| * | | | | | Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-1377-142/+1553
| |\ \ \ \ \ \
| * | | | | | | Fix conflicts caused by vue_shared/components/user_avatar/user_avatar_image.vueFilipa Lacerda2018-06-131-2/+1
| * | | | | | | Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-1359-860/+854
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-1237-191/+349
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into fl-eslint-vue-house-keepingfl-eslint-vue-house-keepingFilipa Lacerda2018-06-1280-165/+543
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-117-12/+21
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-11137-452/+1159
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Updates eslint vue plugin versionFilipa Lacerda2018-06-11242-1065/+1140
* | | | | | | | | | | | Merge branch 'i18n-extract-app/views/award_emoji' into 'master'Rémy Coutable2018-06-132-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | i18n: externalize strings from 'app/views/award_emoji'Tao Wang2018-06-132-4/+7
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '47679-fix-failed-jobs-tab-ie11-again' into 'master'Phil Hughes2018-06-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix incorrect nesting in scss for ie11André Luís2018-06-131-1/+1
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jr-11-0-web-ide-docs' into 'master'Tim Zallmann2018-06-131-0/+21
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Add Web IDE CI logs and MR switching docsjr-11-0-web-ide-docsJames Ramsay2018-06-121-0/+21
* | | | | | | | | | | Merge branch '45575-invalid-characters-signup' into 'master'Rémy Coutable2018-06-132-5/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Resolve "Bug: When creating an account with invalid characters the error is "...Jan2018-06-132-5/+9
|/ / / / / / / / / / /