Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'doc-add-overview-of-frontend-testing' into 'master' | Tim Zallmann | 2018-06-13 | 1 | -2/+134 |
|\ | |||||
| * | Add documentation: Overview of Frontend Testing | André Luís | 2018-06-13 | 1 | -2/+134 |
|/ | |||||
* | Merge branch 'sql-buckets' into 'master' | Stan Hu | 2018-06-13 | 3 | -2/+7 |
|\ | |||||
| * | Adjust SQL and transaction Prometheus bucketssql-buckets | Yorick Peterse | 2018-06-11 | 3 | -2/+7 |
* | | Merge branch '47145-quick-actions-confidential' into 'master' | Rémy Coutable | 2018-06-13 | 5 | -0/+71 |
|\ \ | |||||
| * | | Resolve "Add `/confidential` quick action for issues" | Jan | 2018-06-13 | 5 | -0/+71 |
|/ / | |||||
* | | Merge branch 'blackst0ne-rails5-fix-storage-counter-helper' into 'master' | Rémy Coutable | 2018-06-13 | 1 | -10/+14 |
|\ \ | |||||
| * | | [Rails5] Fix `storage_counter` helper | blackst0ne | 2018-06-13 | 1 | -10/+14 |
* | | | Merge branch 'add-documentation-to-freeze' into 'master' | Marin Jankovski | 2018-06-13 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Documentation does not need an exception to be picked | Sean McGivern | 2018-06-13 | 1 | -0/+1 |
* | | | | Merge branch 'fl-eslint-vue-house-keeping' into 'master' | Tim Zallmann | 2018-06-13 | 248 | -1087/+1165 |
|\ \ \ \ | |||||
| * | | | | Fix broken tests due to bad conflict resolution | Filipa Lacerda | 2018-06-13 | 3 | -3/+3 |
| * | | | | Updates eslint rules | Filipa Lacerda | 2018-06-13 | 6 | -23/+23 |
| * | | | | Merge branch 'master' into fl-eslint-vue-house-keeping | Filipa Lacerda | 2018-06-13 | 77 | -142/+1553 |
| |\ \ \ \ | |||||
| * | | | | | Fix conflicts caused by vue_shared/components/user_avatar/user_avatar_image.vue | Filipa Lacerda | 2018-06-13 | 1 | -2/+1 |
| * | | | | | Merge branch 'master' into fl-eslint-vue-house-keeping | Filipa Lacerda | 2018-06-13 | 59 | -860/+854 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into fl-eslint-vue-house-keeping | Filipa Lacerda | 2018-06-12 | 37 | -191/+349 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into fl-eslint-vue-house-keepingfl-eslint-vue-house-keeping | Filipa Lacerda | 2018-06-12 | 80 | -165/+543 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into fl-eslint-vue-house-keeping | Filipa Lacerda | 2018-06-11 | 7 | -12/+21 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into fl-eslint-vue-house-keeping | Filipa Lacerda | 2018-06-11 | 137 | -452/+1159 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Updates eslint vue plugin version | Filipa Lacerda | 2018-06-11 | 242 | -1065/+1140 |
* | | | | | | | | | | Merge branch 'i18n-extract-app/views/award_emoji' into 'master' | Rémy Coutable | 2018-06-13 | 2 | -4/+7 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | i18n: externalize strings from 'app/views/award_emoji' | Tao Wang | 2018-06-13 | 2 | -4/+7 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch '47679-fix-failed-jobs-tab-ie11-again' into 'master' | Phil Hughes | 2018-06-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix incorrect nesting in scss for ie11 | André Luís | 2018-06-13 | 1 | -1/+1 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jr-11-0-web-ide-docs' into 'master' | Tim Zallmann | 2018-06-13 | 1 | -0/+21 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | Add Web IDE CI logs and MR switching docsjr-11-0-web-ide-docs | James Ramsay | 2018-06-12 | 1 | -0/+21 |
* | | | | | | | | | | Merge branch '45575-invalid-characters-signup' into 'master' | Rémy Coutable | 2018-06-13 | 2 | -5/+9 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Resolve "Bug: When creating an account with invalid characters the error is "... | Jan | 2018-06-13 | 2 | -5/+9 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch '35158-snippets-api-visibility' into 'master' | Rémy Coutable | 2018-06-13 | 5 | -2/+15 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Resolve "Provide ability to retrieve `visibility` level via Snippets API" | Jan | 2018-06-13 | 5 | -2/+15 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch '47050-quick-actions-case-insensitive' into 'master' | Rémy Coutable | 2018-06-13 | 4 | -5/+26 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Resolve "Quick actions are case sensitive" | Jan | 2018-06-13 | 4 | -5/+26 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'ide-commit-section-file-active-indicator' into 'master' | Filipa Lacerda | 2018-06-13 | 8 | -6/+81 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | moved strings into constants fileide-commit-section-file-active-indicator | Phil Hughes | 2018-06-13 | 5 | -5/+18 |
| * | | | | | | | | | | fixed eslint | Phil Hughes | 2018-06-12 | 1 | -3/+5 |
| * | | | | | | | | | | added specs for is-active class | Phil Hughes | 2018-06-12 | 2 | -0/+25 |
| * | | | | | | | | | | more karma fixes | Phil Hughes | 2018-06-12 | 3 | -4/+9 |
| * | | | | | | | | | | karma updates | Phil Hughes | 2018-06-12 | 4 | -4/+7 |
| * | | | | | | | | | | Add active class to active file in IDE commit panel | Phil Hughes | 2018-06-11 | 4 | -2/+29 |
* | | | | | | | | | | | Merge branch '47735-milestone-regression' into 'master' | Phil Hughes | 2018-06-13 | 7 | -4/+44 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Sidebar Milestone - Fix wrong URL when selecting a parent group milestone47735-milestone-regression | Mario de la Ossa | 2018-06-12 | 5 | -2/+34 |
| * | | | | | | | | | | | Fix Banzai reference for milestones belonging to parent groups | Mario de la Ossa | 2018-06-12 | 2 | -2/+10 |
* | | | | | | | | | | | | Merge branch '47513-upload-migration-lease-key-is-incorrect-for-non-mounted-u... | Sean McGivern | 2018-06-13 | 4 | -8/+32 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | fixed condition check | Jan Provaznik | 2018-06-13 | 1 | -1/+1 |
| * | | | | | | | | | | | | Override exclusive_lease_key method in RecordsUpload47513-upload-migration-lease-key-is-incorrect-for-non-mounted-uploaders | Jan Provaznik | 2018-06-12 | 1 | -6/+10 |
| * | | | | | | | | | | | | Use upload ID instead of model ID in lease key | Jan Provaznik | 2018-06-12 | 4 | -8/+28 |
* | | | | | | | | | | | | | Merge branch 'tz-diff-blob-image-viewer' into 'master' | Phil Hughes | 2018-06-13 | 26 | -36/+1204 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Image Diff Viewing + Download Diff Viewing | Tim Zallmann | 2018-06-13 | 26 | -36/+1204 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'docs-link-to-release-post-for-group-issue-board' into 'master' | Sean McGivern | 2018-06-13 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |