summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into refactor-environments-folderrefactor-environments-folderClement Ho2018-02-2623-241/+159
|\
| * Refactor wildcard dispatcher importsClement Ho2018-02-2614-188/+89
| * Move EE-specific JavaScript files to ee/app/assets/javascriptsRémy Coutable2018-02-266-13/+15
| * Merge branch 'refactor/move-board-new-issue-vue-component' into 'master'Filipa Lacerda2018-02-263-40/+55
| |\
| | * Move BoardNewIssue vue componentGeorge Tsiolis2018-02-083-40/+55
* | | Remove environments folder webpack entry pointClement Ho2018-02-262-2/+5
|/ /
* | Merge branch 'issue-edit-shortcut' into 'master'Filipa Lacerda2018-02-261-4/+3
|\ \
| * | Fixed issue edit shortcut not workingissue-edit-shortcutPhil Hughes2018-02-261-4/+3
* | | Merge branch 'kp-ce-port-5013-fix-multiple-assignee-avatar-alignment' into 'm...Clement Ho2018-02-261-1/+11
|\ \ \ | |/ / |/| |
| * | Fix assignee avatar and notes icon alignmentkp-ce-port-5013-fix-multiple-assignee-avatar-alignmentKushal Pandya2018-02-231-1/+11
* | | Use imported `DropdownUtils`Kushal Pandya2018-02-261-1/+1
* | | Merge branch 'backport-qa_78' into 'master'Grzegorz Bizon2018-02-252-2/+3
|\ \ \
| * | | test merge request rebaseFelipe Artur2018-02-192-2/+3
* | | | Merge branch 'refactor/move-filtered-search-vue-component' into 'master'Clement Ho2018-02-243-104/+106
|\ \ \ \
| * | | | Move RecentSearchesDropdownContent vue componentGeorge Tsiolis2018-02-223-104/+106
* | | | | Merge branch 'master' into 'boards-bundle-refactor'Jacob Schatz2018-02-2372-474/+337
|\ \ \ \ \
| * \ \ \ \ Merge branch 'project-deploy-keys-bundle-tag-refactor' into 'master'Jacob Schatz2018-02-232-3/+7
| |\ \ \ \ \
| | * | | | | Refactored webpack bundle tag for deploy keysproject-deploy-keys-bundle-tag-refactorConstance Okoghenun2018-02-232-3/+7
| * | | | | | remove issue_show webpack bundle in favor of pages/projects/issues/show/index.jsremove-issues-showMike Greiling2018-02-231-0/+1
| |/ / / / /
| * | | | | Merge branch 'dispatcher-if' into 'master'Mike Greiling2018-02-231-24/+27
| |\ \ \ \ \
| | * | | | | Convert switch into if statementdispatcher-ifClement Ho2018-02-221-24/+27
| * | | | | | Merge branch 'users-autocomplete' into 'master'Douwe Maan2018-02-232-3/+0
| |\ \ \ \ \ \
| | * | | | | | Removed pagination from AutocompleteUsersFinderYorick Peterse2018-02-222-3/+0
| | |/ / / / /
| * | | | | | Add Tip about Push to Create project on New Project pageAndré Luís2018-02-235-8/+53
| | |_|_|/ / | |/| | | |
| * | | | | Merge branch '42431-add-auto-devops-and-clusters-button-to-projects' into 'ma...Rémy Coutable2018-02-226-33/+46
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch 'master' into 42431-add-auto-devops-and-clusters-button-to-projectsEric Eastwood2018-02-22237-1345/+1132
| | |\ \ \ \
| | * | | | | Add Auto DevOps and Kubernetes cluster button to project pageEric Eastwood2018-02-166-33/+46
| * | | | | | Use dynamic imports in dispatcher (Part 3)Clement Ho2018-02-2222-131/+32
| | |/ / / / | |/| | | |
| * | | | | Harmonize CE and EE JS codereduce-ce-ee-disrepancies-in-jsRémy Coutable2018-02-2222-44/+58
| * | | | | Fix the groupLabelsPath in app/assets/javascripts/api.jsRémy Coutable2018-02-221-1/+1
| * | | | | Merge branch '42886-followup-to-new-design-for-cancel-stop-pipeline-confirmat...Filipa Lacerda2018-02-225-148/+93
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into 42886-followup-to-new-design-for-cancel-stop-pipel...42886-followup-to-new-design-for-cancel-stop-pipeline-confirmationShah El-Rahman2018-02-21174-823/+615
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | Remove use of callback in pipeline stop/retry modalsShah El-Rahman2018-02-165-148/+93
| * | | | | | Merge branch 'dispatcher-import-batch-1' into 'master'Jacob Schatz2018-02-2112-80/+20
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Use dynamic imports in dispatcherClement Ho2018-02-2112-80/+20
* | | | | | | Removed named importConstance Okoghenun2018-02-211-2/+2
* | | | | | | Resolved conflicts with masterConstance Okoghenun2018-02-21140-613/+560
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Rest of Dispatcher RefactorJacob Schatz2018-02-2133-182/+187
| |/ / / / /
| * | | | | Use dynamic imports for project dispatcher pathsClement Ho2018-02-2112-75/+39
| * | | | | #28481: Display time tracking totals on milestone pageRiccardo Padovani2018-02-213-0/+31
| * | | | | Merge branch 'fix/new-project-path-input-overlapping' into 'master'Clement Ho2018-02-212-2/+2
| |\ \ \ \ \
| | * | | | | Fix new project path input overlappingGeorge Tsiolis2018-02-142-2/+2
| * | | | | | Merge branch 'fix/change-event-body-label-font-size' into 'master'Clement Ho2018-02-215-8/+10
| |\ \ \ \ \ \
| | * | | | | | Apply new default and inline label designGeorge Tsiolis2018-02-155-8/+10
| * | | | | | | Merge branch '35418-remove-underline-for-avatar' into 'master'Clement Ho2018-02-211-0/+4
| |\ \ \ \ \ \ \
| | * | | | | | | 35418 - remove avatar underlineKen2018-02-201-0/+4
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'ce-3776-ci-view-for-sast' into 'master'Phil Hughes2018-02-214-8/+16
| |\ \ \ \ \ \ \
| | * | | | | | | CE port of changes made to the pipeline bundle in EE - Fixes typos and adds i18nce-3776-ci-view-for-sastFilipa Lacerda2018-02-204-8/+16
| * | | | | | | | use DOMContentLoaded event over jQuery .ready to ensure execution ordermore-dispatcher-refactoringMike Greiling2018-02-211-1/+1
| * | | | | | | | migrate admin:* to static bundleMike Greiling2018-02-212-4/+1
View Lorry Controller Status