summaryrefslogtreecommitdiff
path: root/spec/javascripts
Commit message (Expand)AuthorAgeFilesLines
* Fix broken test38869-issueFilipa Lacerda2017-10-301-1/+2
* Merge branch 'master' into 38869-importer_statusFilipa Lacerda2017-10-306-27/+117
|\
| * Merge branch 'add-user-avatar-username-link' into 'master'Fatih Acet2017-10-271-0/+39
| |\
| | * Remove repetitive karma specadd-user-avatar-username-linkClement Ho2017-10-271-4/+0
| | * Improve spec to check hidden componentClement Ho2017-10-271-2/+6
| | * Add configurable option to display username in user avatar link componentClement Ho2017-10-181-0/+39
| * | Change default disabled merge request widget message to "Merge is not allowed...39188-change-default-disabled-merge-messageEric Eastwood2017-10-271-0/+46
| * | Merge branch '38178-fl-mr-notes-components' into 'master'Phil Hughes2017-10-254-27/+32
| |\ \
| | * | Moves placeholders components into shared folder with documentation. Makes th...38178-fl-mr-notes-componentsFilipa Lacerda2017-10-194-27/+32
* | | | Remove issuable form from global namespaceFilipa Lacerda2017-10-261-1/+0
* | | | Remove issuableContext from global namespaceFilipa Lacerda2017-10-262-3/+2
* | | | Improves issuable testsFilipa Lacerda2017-10-261-69/+33
|/ / /
* | | 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
| | |/ / | |/| |