summaryrefslogtreecommitdiff
path: root/spec/javascripts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ph-multi-file-editor-new-file-folder-dropdown' into 'master'Filipa Lacerda2017-10-245-20/+280
|\
| * Merge branch 'master' into ph-multi-file-editor-new-file-folder-dropdownph-multi-file-editor-new-file-folder-dropdownPhil Hughes2017-10-233-0/+228
| |\
| * | spec fixesPhil Hughes2017-10-233-138/+145
| * | added feature specPhil Hughes2017-10-231-0/+16
| * | fixed failing title testPhil Hughes2017-10-231-0/+1
| * | fixed bug with tabs not switching correctlyPhil Hughes2017-10-231-1/+1
| * | failing spec fixesPhil Hughes2017-10-231-17/+11
| * | correctly creates file in currently viewed directoryPhil Hughes2017-10-233-3/+245
* | | Merge branch '37860-pipelines-page' into 'master'Phil Hughes2017-10-233-7/+20
|\ \ \ | |_|/ |/| |
| * | Changes after review37860-pipelines-pageFilipa Lacerda2017-10-232-0/+4
| * | Merge branch 'master' into 37860-pipelines-pageFilipa Lacerda2017-10-236-8/+47
| |\ \
| * | | Make pipelines table in MR view usableFilipa Lacerda2017-10-181-7/+16
* | | | Merge branch 'fix-escaped-text-replacement' into 'master'Filipa Lacerda2017-10-231-0/+10
|\ \ \ \
| * | | | notes.js: use the original content when resetting the formBen Boeckel2017-10-191-0/+10
* | | | | Create new branch from dropdown.Jacob Schatz2017-10-232-0/+218
| |_|_|/ |/| | |
* | | | Merge branch 'add-shared-vue-loading-button' into 'master'Filipa Lacerda2017-10-231-0/+93
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add loading buttonadd-shared-vue-loading-buttonEric Eastwood2017-10-231-0/+93
* | | | Merge branch '38869-diff' into 'master'Phil Hughes2017-10-231-3/+2
|\ \ \ \
| * | | | Remove Diff class from globalnamespaceFilipa Lacerda2017-10-191-3/+2
| | |_|/ | |/| |
* | | | Added submodule support in multi-file editorPhil Hughes2017-10-203-2/+44
| |_|/ |/| |
* | | Remove dropzoneInput from global namespaceFilipa Lacerda2017-10-192-3/+1
|/ /
* | Merge branch 'add-lazy-option-to-user-avatar-image-component' into 'master'Tim Zallmann2017-10-181-20/+50
|\ \
| * | Add lazy option to UserAvatarImageadd-lazy-option-to-user-avatar-image-componentEric Eastwood2017-10-171-20/+50
| |/
* | Fix PikadayFilipa Lacerda2017-10-181-0/+29
* | Merge branch 'sh-security-fix-backports-master' into 'master'Robert Speicher2017-10-181-0/+23
|\ \
| * \ Merge branch 'master' into sh-security-fix-backports-masterStan Hu2017-10-1731-540/+1869
| |\ \ | | |/
| * | Merge branch 'security-10-1' into '10-1-stable'Jen-Shin Lin2017-10-171-0/+23
* | | Merge branch 'kt/bug/fix-revision-and-size-for-container-registry' into 'master'Grzegorz Bizon2017-10-181-4/+4
|\ \ \ | |_|/ |/| |
| * | Fix broken testkt/bug/fix-revision-and-size-for-container-registryFilipa Lacerda2017-10-171-2/+2
| * | Add short_revision and use total_sizeKamil Trzcinski2017-10-171-2/+2
* | | Merge branch 'ph-multi-file-editor-restructure-data' into 'master'Filipa Lacerda2017-10-1712-227/+164
|\ \ \
| * | | fixed Karam test because of event name changeph-multi-file-editor-restructure-dataPhil Hughes2017-10-171-2/+2
| * | | Fixed bug when clicking file link causing user to navigate awayPhil Hughes2017-10-172-2/+15
| * | | fixed karma spec with prev directory buttonPhil Hughes2017-10-161-0/+1
| * | | fixed karma build because of a removed methodPhil Hughes2017-10-161-1/+1
| * | | fixed rendering bugsPhil Hughes2017-10-161-0/+1
| * | | Spec updatesPhil Hughes2017-10-1611-195/+150
| * | | Refactored multi-file data structurePhil Hughes2017-10-161-33/+0
| | |/ | |/|
* | | Add inline edit button to issue_show appClement Ho2017-10-172-3/+47
* | | Merge branch 'move-user-avatar-specs' into 'master'Phil Hughes2017-10-173-0/+0
|\ \ \
| * | | Move user avatar specs to folder to mimic javascript directorymove-user-avatar-specsClement Ho2017-10-163-0/+0
* | | | Improve sprite icon specClement Ho2017-10-171-10/+18
* | | | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-1713-303/+1639
|\ \ \ \
| * | | | Add support for `archived` paramkushalpandya2017-10-133-5/+9
| * | | | Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-1042-438/+2783
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Groups tree enhancements for Groups Dashboard and Group HomepageKushal Pandya2017-10-0413-303/+1635
* | | | | Merge branch 'sprite-icon-class' into 'master'convert-js-modulesPhil Hughes2017-10-171-1/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add ability to pass class name to spriteIcon helpersprite-icon-classClement Ho2017-10-121-1/+5
* | | | | Move retry button to sidebarFilipa Lacerda2017-10-161-7/+0
* | | | | Merge branch 'ph-shortcut-js-modules' into 'master'Filipa Lacerda2017-10-132-9/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |