summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '38178-fl-mr-notes-components' into 'master'Phil Hughes2017-10-255-12/+56
|\
| * Moves placeholders components into shared folder with documentation. Makes th...38178-fl-mr-notes-componentsFilipa Lacerda2017-10-195-12/+56
* | Merge branch 'ph-multi-file-editor-new-file-folder-dropdown' into 'master'Filipa Lacerda2017-10-2413-28/+338
|\ \
| * \ Merge branch 'master' into ph-multi-file-editor-new-file-folder-dropdownph-multi-file-editor-new-file-folder-dropdownPhil Hughes2017-10-236-6/+182
| |\ \
| * | | spec fixesPhil Hughes2017-10-231-1/+1
| * | | moved to eventHub to manage creating new filesPhil Hughes2017-10-236-49/+70
| * | | fixed eslint :see_no_evil:Phil Hughes2017-10-231-3/+1
| * | | added feature specPhil Hughes2017-10-231-3/+8
| * | | fixed failing title testPhil Hughes2017-10-231-0/+1
| * | | fixed bug with tabs not switching correctlyPhil Hughes2017-10-235-12/+52
| * | | failing spec fixesPhil Hughes2017-10-235-30/+31
| * | | correctly creates file in currently viewed directoryPhil Hughes2017-10-233-0/+3
| * | | changed adding temp files/directories code to match new structurePhil Hughes2017-10-232-20/+37
| * | | fixed new file/directory modal using methods that no longer existPhil Hughes2017-10-233-46/+47
| * | | Add new files & directories in the multi-file editorPhil Hughes2017-10-2311-31/+254
* | | | Merge branch 'remove-new-sidebar-stuff' into 'master'Phil Hughes2017-10-242-5/+5
|\ \ \ \
| * | | | Rename new_sidebar in JSremove-new-sidebar-stuffAnnabel Dunstone Gray2017-10-202-5/+5
* | | | | Merge branch 'sticky-perf' into 'master'Filipa Lacerda2017-10-244-10/+16
|\ \ \ \ \
| * | | | | fixed karma testssticky-perfPhil Hughes2017-10-231-1/+2
| * | | | | calculate the stickyTop instead of hard coding a variablePhil Hughes2017-10-233-4/+13
| * | | | | Fix performance of sticky.jsPhil Hughes2017-10-232-7/+3
| | |/ / / | |/| | |
* | | | | Merge branch '37860-pipelines-page' into 'master'Phil Hughes2017-10-236-74/+120
|\ \ \ \ \
| * | | | | Changes after review37860-pipelines-pageFilipa Lacerda2017-10-233-3/+3
| * | | | | Merge branch 'master' into 37860-pipelines-pageFilipa Lacerda2017-10-2317-342/+318
| |\ \ \ \ \
| * | | | | | Make pipelines table in MR view usableFilipa Lacerda2017-10-186-74/+120
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '39299-sidebar-links' into 'master'Phil Hughes2017-10-231-10/+9
|\ \ \ \ \ \
| * | | | | | Fix CSS in load more participantsFilipa Lacerda2017-10-231-10/+9
| | |_|/ / / | |/| | | |
* | | | | | Removes group_avatar & group_label_subscription from global namespaceFilipa Lacerda2017-10-234-33/+20
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'fix-escaped-text-replacement' into 'master'Filipa Lacerda2017-10-231-3/+5
|\ \ \ \ \
| * | | | | notes.js: use the original content when resetting the formBen Boeckel2017-10-191-2/+2
| * | | | | notes.js: also return the original content when getting form dataBen Boeckel2017-10-191-1/+3
| | |_|_|/ | |/| | |
* | | | | Create new branch from dropdown.Jacob Schatz2017-10-235-3/+177
| |/ / / |/| | |
* | | | 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
* | | | Merge branch '38869-diff' into 'master'Phil Hughes2017-10-235-23/+16
|\ \ \ \
| * | | | Remove Diff class from globalnamespaceFilipa Lacerda2017-10-195-23/+16
| | |_|/ | |/| |
* | | | Merge branch 'sh-fix-container-registry-destroy' into 'master'Filipa Lacerda2017-10-231-4/+2
|\ \ \ \
| * | | | Fix deletion of container registry or images returning an errorStan Hu2017-10-231-4/+2
| | |_|/ | |/| |
* | | | Merge branch 'multi-file-editor-submodules' into 'master'Filipa Lacerda2017-10-203-2/+25
|\ \ \ \
| * | | | Added submodule support in multi-file editorPhil Hughes2017-10-203-2/+25
| |/ / /
* | | | Use title as placeholder instead of issue title for reusabilityClement Ho2017-10-201-4/+4
* | | | URI decode Page-Title header to preserve UTF-8 charactersToon Claes2017-10-201-1/+1
|/ / /
* | | Merge branch 'sh-fix-broken-docker-delete' into 'master'Grzegorz Bizon2017-10-192-2/+2
|\ \ \
| * | | Fix broken function invocationsh-fix-broken-docker-deleteFilipa Lacerda2017-10-192-2/+2
| |/ /
* | | Remove dropzoneInput from global namespaceFilipa Lacerda2017-10-195-306/+268
|/ /
* | Merge branch 'add-lazy-option-to-user-avatar-image-component' into 'master'Tim Zallmann2017-10-181-8/+23
|\ \
| * | Add lazy option to UserAvatarImageadd-lazy-option-to-user-avatar-image-componentEric Eastwood2017-10-171-8/+23
| |/
* | Fix PikadayFilipa Lacerda2017-10-188-46/+70
* | Merge branch 'sh-security-fix-backports-master' into 'master'Robert Speicher2017-10-181-2/+2
|\ \
| * \ Merge branch 'master' into sh-security-fix-backports-masterStan Hu2017-10-1739-999/+1261
| |\ \ | | |/
View Lorry Controller Status