summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_shared
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'multi-file-editor-separate-commits-call' into 'master'Filipa Lacerda2017-11-071-0/+37
|\
| * fixed karma testmulti-file-editor-separate-commits-callPhil Hughes2017-11-061-1/+1
| * moved key into data structurePhil Hughes2017-11-061-3/+8
| * correctly updates commit data after committing changesPhil Hughes2017-11-061-0/+32
* | Merge branch '2518-saved-configuration-for-issue-board' into 'master'Sean McGivern2017-11-071-36/+66
|\ \
| * | unused propSimon Knox2017-11-061-7/+1
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 2518-saved-conf...Simon Knox2017-11-065-72/+60
| |\ \ | | |/
| * | resolve conflictsSimon Knox2017-10-311-42/+17
| * | match UX guide for submit/cancel buttonsSimon Knox2017-10-311-2/+2
| * | apply changes for JS and CSS from gitlab-ee!2912Simon Knox2017-10-312-20/+81
* | | Merge branch 'fix-md-form-tabs-double-click-toggle' into 'master'Clement Ho2017-11-062-22/+37
|\ \ \
| * | | Fix karmaLuke "Jared" Bennett2017-11-021-2/+2
| * | | Separate preview and write tabs into seperate eventsLuke "Jared" Bennett2017-11-022-24/+26
| * | | Fix markdown-preview events for new isPreview varLuke "Jared" Bennett2017-11-011-5/+12
| * | | Let field.vue handle the changing of previewLuke "Jared" Bennett2017-11-012-11/+11
| * | | Dont emit toggle-markdown event if current target is already active and add s...Luke "Jared" Bennett2017-11-011-5/+11
* | | | Resolve "Editor icons"Tim Zallmann2017-11-063-22/+22
| |_|/ |/| |
* | | Merge branch 'icons-ci-icons' into 'master'Filipa Lacerda2017-11-025-72/+60
|\ \ \ | |_|/ |/| |
| * | Updated icon.vue to be more inline with other components + added spec for itTim Zallmann2017-10-302-8/+4
| * | Fixes for TestsTim Zallmann2017-10-302-24/+4
| * | Update Action IconsTim Zallmann2017-10-301-1/+1
| * | Fixing IconsTim Zallmann2017-10-303-50/+62
* | | Revert "Merge branch '2518-saved-configuration-for-issue-board' into 'master'"revert-2573818fDmitriy Zaporozhets2017-10-302-72/+37
|/ /
* | [CE backport] Saved configuration for issue boardOswaldo Ferreira2017-10-302-37/+72
* | Merge branch 'add-user-avatar-username-link' into 'master'Fatih Acet2017-10-271-3/+26
|\ \
| * | Rename to shouldShowUsernameClement Ho2017-10-271-3/+3
| * | Add configurable option to display username in user avatar link componentClement Ho2017-10-181-3/+26
* | | Merge branch '38178-fl-mr-notes-components' into 'master'Phil Hughes2017-10-253-0/+172
|\ \ \
| * | | Moves placeholders components into shared folder with documentation. Makes th...38178-fl-mr-notes-componentsFilipa Lacerda2017-10-193-0/+172
| | |/ | |/|
* | | Merge branch 'ph-multi-file-editor-new-file-folder-dropdown' into 'master'Filipa Lacerda2017-10-241-5/+6
|\ \ \
| * | | Add new files & directories in the multi-file editorPhil Hughes2017-10-231-5/+6
* | | | Merge branch '37860-pipelines-page' into 'master'Phil Hughes2017-10-232-68/+80
|\ \ \ \ | |/ / / |/| | |
| * | | Changes after review37860-pipelines-pageFilipa Lacerda2017-10-231-1/+1
| * | | Make pipelines table in MR view usableFilipa Lacerda2017-10-182-68/+80
| |/ /
* | | Merge branch 'add-shared-vue-loading-button' into 'master'Filipa Lacerda2017-10-231-0/+71
|\ \ \ | |/ / |/| |
| * | Add loading buttonadd-shared-vue-loading-buttonEric Eastwood2017-10-231-0/+71
| |/
* | Add lazy option to UserAvatarImageadd-lazy-option-to-user-avatar-image-componentEric Eastwood2017-10-171-8/+23
|/
* Add create merge checkbox.Jacob Schatz2017-10-121-1/+12
* Moves form related JS modules out of globalPhil Hughes2017-10-111-1/+2
* Flash is now a ES6 modulePhil Hughes2017-10-101-1/+1
* Show confirmation modal before deleting accountWinnie Hellmann2017-10-061-2/+4
* Merge branch '18608-lock-issues-v2' into 'master'Sean McGivern2017-10-063-16/+64
|\
| * UX review18608-lock-issues-v2Luke "Jared" Bennett2017-10-061-1/+1
| * Fix wording in the js messagesJarka Kadlecova2017-10-061-1/+1
| * FE review changes app codeLuke "Jared" Bennett2017-10-012-1/+5
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issuesJarka Kadlecova2017-09-252-7/+8
| |\
| * | Merge FELuke "Jared" Bennett2017-09-143-16/+60
* | | Merge branch '31050-registry-image-lists' into 'master'Grzegorz Bizon2017-10-041-0/+32
|\ \ \
| * \ \ Merge branch 'master' into 31050-registry-image-listsFilipa Lacerda2017-09-261-4/+6
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' into 31050-registry-image-listsFilipa Lacerda2017-09-221-3/+2
| |\ \ \
View Lorry Controller Status