summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix diff_ntoes_specjivl-fix-diff-comment-button-positionJose2018-06-141-4/+4
* fix diff comment button positionJose2018-06-131-1/+1
* 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
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '35158-snippets-api-visibility' into 'master'Rémy Coutable2018-06-135-2/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Resolve "Provide ability to retrieve `visibility` level via Snippets API"Jan2018-06-135-2/+15
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '47050-quick-actions-case-insensitive' into 'master'Rémy Coutable2018-06-134-5/+26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Resolve "Quick actions are case sensitive"Jan2018-06-134-5/+26
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'ide-commit-section-file-active-indicator' into 'master'Filipa Lacerda2018-06-138-6/+81
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | moved strings into constants fileide-commit-section-file-active-indicatorPhil Hughes2018-06-135-5/+18
| * | | | | | | | | | fixed eslintPhil Hughes2018-06-121-3/+5
| * | | | | | | | | | added specs for is-active classPhil Hughes2018-06-122-0/+25
| * | | | | | | | | | more karma fixesPhil Hughes2018-06-123-4/+9
| * | | | | | | | | | karma updatesPhil Hughes2018-06-124-4/+7
| * | | | | | | | | | Add active class to active file in IDE commit panelPhil Hughes2018-06-114-2/+29
* | | | | | | | | | | Merge branch '47735-milestone-regression' into 'master'Phil Hughes2018-06-137-4/+44
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Sidebar Milestone - Fix wrong URL when selecting a parent group milestone47735-milestone-regressionMario de la Ossa2018-06-125-2/+34
| * | | | | | | | | | | Fix Banzai reference for milestones belonging to parent groupsMario de la Ossa2018-06-122-2/+10
* | | | | | | | | | | | Merge branch '47513-upload-migration-lease-key-is-incorrect-for-non-mounted-u...Sean McGivern2018-06-134-8/+32
|\ \ \ \ \ \ \ \ \ \ \ \