summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'move-last-ee-specific-js-files-to' into 'master'Clement Ho2018-02-2814-26/+26
|\
| * Move the remaining EE-specific JS files to ee/move-last-ee-specific-js-files-toRémy Coutable2018-02-2814-26/+26
* | Merge branch '43643-fix-mr-label-filtering' into 'master'Filipa Lacerda2018-02-281-12/+28
|\ \
| * | Make label filter URL dynamicKushal Pandya2018-02-281-12/+28
| |/
* | Merge branch 'refactor/move-assignees-vue-component' into 'master'Filipa Lacerda2018-02-284-228/+235
|\ \ | |/ |/|
| * Move Assignees vue componentGeorge Tsiolis2018-02-274-228/+235
* | Merge branch 'remove-merge-conflicts-bundle' into 'master'Jacob Schatz2018-02-283-6/+7
|\ \
| * | refactor merge conflicts bundle to reduce side effectsMike Greiling2018-02-272-4/+7
| * | remove merge_conflicts bundle in favor of pages directory entry pointMike Greiling2018-02-272-3/+1
* | | Render MR Notes with Vue with behind a cookieFatih Acet2018-02-2837-215/+1067
|/ /
* | Remove snippet bundle webpack entry pointClement Ho2018-02-275-12/+25
* | Resolved conflicts in dispatcher.jsprofile-bundle-tag-refactorConstance Okoghenun2018-02-2737-227/+160
|\ \
| * \ Merge branch 'remove-sidebar-bundle' into 'master'Jacob Schatz2018-02-275-6/+12
| |\ \
| | * \ Merge branch 'master' into remove-sidebar-bundleremove-sidebar-bundleClement Ho2018-02-232-2/+4
| | |\ \
| | * | | Remove sidebar bundle webpack entry pointClement Ho2018-02-235-6/+12
| * | | | Merge branch '24774-clear-the-Labels-dropdown-search-filter' into 'master'Phil Hughes2018-02-271-0/+6
| |\ \ \ \
| | * | | | Clear "Labels" dropdown search filter after selectionKushal Pandya2018-02-271-0/+6
| * | | | | Merge branch 'refactor-commit-show' into 'master'Phil Hughes2018-02-271-0/+2
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into 'refactor-commit-show'refactor-commit-showPhil Hughes2018-02-276-4/+13
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into refactor-commit-showClement Ho2018-02-2623-241/+159
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | Remove diff notes webpack entry pointClement Ho2018-02-261-0/+2
| * | | | | | | Merge branch 'master' into 'ph-webpack-bundle-tags'ph-webpack-bundle-tagsPhil Hughes2018-02-2730-249/+175
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge branch 'refactor-pipelines-list' into 'master'Phil Hughes2018-02-274-2/+8
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' into refactor-pipelines-listrefactor-pipelines-listClement Ho2018-02-2623-241/+159
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | * | | | | | Remove commit_pipelines webpack entry pointClement Ho2018-02-264-2/+8
| | | | |/ / / / | | | |/| | | |
| | * | | | | | 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
| | * | | | | | Remove environments folder webpack entry pointClement Ho2018-02-262-2/+5
| | | |/ / / / | | |/| | | |
| * | | | | | Converted webpack_bundle_tag to be automatic webpack bundlesPhil Hughes2018-02-267-23/+25
* | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into profile...Constance Okoghenun2018-02-2616-180/+207
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | 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
| * | | | | | Fixed issue edit shortcut not workingissue-edit-shortcutPhil Hughes2018-02-261-4/+3
| | |/ / / / | |/| | | |
| * | | | | 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-2366-441/+281
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | 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
| * | | | | | | Removed named importConstance Okoghenun2018-02-211-2/+2
| * | | | | | | Resolved conflicts with masterConstance Okoghenun2018-02-21131-600/+538
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Resolved conflicts with masterConstance Okoghenun2018-02-2036-217/+56
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into boards-...Constance Okoghenun2018-02-1630-195/+300
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fixed failing testConstance Okoghenun2018-02-161-0/+1