Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Bring changes from EE for lib/system_check/simple_executor.rbunify-simple_executor | Lin Jen-Shin | 2018-06-14 | 1 | -5/+25 |
* | Merge branch 'bvl-missing-message-on-access-denied' into 'master' | Robert Speicher | 2018-06-13 | 4 | -3/+22 |
|\ | |||||
| * | Render access denied without message | Bob Van Landuyt | 2018-06-13 | 4 | -3/+22 |
* | | Merge branch 'mk/rake-task-verify-remote-files' into 'master' | Stan Hu | 2018-06-13 | 10 | -41/+147 |
|\ \ | |||||
| * | | Add support for verifying remote uploads, artifacts, and LFS objects in check... | Michael Kozono | 2018-06-13 | 10 | -41/+147 |
|/ / | |||||
* | | Merge branch 'qa-clear-session-only-if-block-given-and-no-errors' into 'master' | Rémy Coutable | 2018-06-13 | 1 | -13/+1 |
|\ \ | |||||
| * | | Only clear the sessions if block_given? and no error | Lin Jen-Shin | 2018-06-13 | 1 | -13/+1 |
* | | | Merge branch 'ab-document-migration-needs-changelog' into 'master' | Yorick Peterse | 2018-06-13 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | Database migrations should have a changelog entry. | Andreas Brandl | 2018-06-13 | 1 | -0/+2 |
|/ / / | |||||
* | | | Merge branch 'gl-remove-window-scope' into 'master' | Phil Hughes | 2018-06-13 | 6 | -56/+41 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into gl-remove-window-scope | Filipa Lacerda | 2018-06-13 | 261 | -1105/+1399 |
| |\ \ \ | |||||
| * | | | | Removes merge conflicts vue code from globalnamespace | Filipa Lacerda | 2018-06-13 | 6 | -57/+42 |
* | | | | | Merge branch 'fix-ux-handbook-link' into 'master' | Stan Hu | 2018-06-13 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix UX handbook link in contribution guide | Andreas Kämmerle | 2018-06-13 | 1 | -1/+1 |
* | | | | | | Merge branch 'zj-empty-batch-no-rpc' into 'master' | Rémy Coutable | 2018-06-13 | 2 | -0/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | ListCommitByOid isn't called with an empty batch | Zeger-Jan van de Weg | 2018-06-13 | 2 | -0/+12 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'fj-use-gitaly-0-105-1' into 'master' | Douwe Maan | 2018-06-13 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use Gitaly 0.105.1 | Francisco Javier López | 2018-06-13 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch '47823-fix-issue-boards-label-list-creation' into 'master' | Phil Hughes | 2018-06-13 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add missing `entityType` | Kushal Pandya | 2018-06-13 | 1 | -1/+2 |
* | | | | | | | Merge branch 'docs-coached-20180610-1' into 'master' | Achilleas Pipinellis | 2018-06-13 | 1 | -31/+116 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | resolving MR 19611-fix/enhance start-using-git doc | Edwin Torres | 2018-06-13 | 1 | -31/+116 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch '47501-link-scroll' into 'master' | Clement Ho | 2018-06-13 | 5 | -26/+23 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Resolve "Scrolling tabs are broken on profile, activity, and projects" | Simon Knox | 2018-06-13 | 5 | -26/+23 |
|/ / / / / / | |||||
* | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |