summaryrefslogtreecommitdiff
path: root/spec/javascripts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ph-ajax-into-axios' into 'master'Filipa Lacerda2018-01-302-54/+100
|\
| * fixed issuable_spec.jsPhil Hughes2018-01-291-4/+22
| * Converted integration_settings_form to axiosPhil Hughes2018-01-291-50/+78
* | Merge branch 'update-create-item-dropdown-with-create-new-item-option' into '...Filipa Lacerda2018-01-301-31/+108
|\ \
| * | Add createNewItemFromValue option and clearDropdown methodupdate-create-item-dropdown-with-create-new-item-optionEric Eastwood2018-01-301-31/+108
* | | Merge branch 'fl-vue-mr-widget' into 'master'Phil Hughes2018-01-291-111/+97
|\ \ \
| * \ \ [ci skip] Merge branch 'master' into fl-vue-mr-widgetFilipa Lacerda2018-01-294-81/+136
| |\ \ \ | | | |/ | | |/|
| * | | Move mr_widget_merged into a vue fileFilipa Lacerda2018-01-261-111/+97
* | | | Disable MR check out button when source branch is deletedJacopo2018-01-291-11/+27
* | | | Merge branch 'followup-to-40744-idempotent-ids' into 'master'Nick Thomas2018-01-291-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix JS equality rules in some specsNick Thomas2018-01-261-2/+2
| |/ /
* | | Merge branch 'generalize-js-toggle-buttons' into 'master'Filipa Lacerda2018-01-264-81/+136
|\ \ \ | |/ / |/| |
| * | Generalize toggle_buttons.jsgeneralize-js-toggle-buttonsEric Eastwood2018-01-264-81/+136
* | | Merge branch 'fl-mr-widget-components' into 'master'Phil Hughes2018-01-262-151/+103
|\ \ \
| * \ \ Merge branch 'master' into fl-mr-widget-componentsFilipa Lacerda2018-01-2510-50/+132
| |\ \ \ | | |/ /
| * | | Moves components into vue files:fl-mr-widget-componentsFilipa Lacerda2018-01-252-151/+103
* | | | Merge branch 'winh-check-axios-restore' into 'master'Filipa Lacerda2018-01-261-0/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | Make sure that axios adapater is restored after mockingwinh-check-axios-restoreWinnie Hellmann2018-01-251-0/+10
* | | | Merge branch '40028-special-characters-on-issuable-templates' into 'master'Rémy Coutable2018-01-251-2/+2
|\ \ \ \
| * | | | Handle special characters on API request of issuable templatesTakuya Noguchi2018-01-251-2/+2
| | |_|/ | |/| |
* | | | Merge branch 'update-secret-values-to-support-dynamic-elements' into 'master'Filipa Lacerda2018-01-251-14/+96
|\ \ \ \
| * | | | Update secret_values to support dynamic elements within parentupdate-secret-values-to-support-dynamic-elementsEric Eastwood2018-01-241-14/+96
| |/ / /
* | | | Merge branch 'default-to-https-for-gravatar-urls' into 'master'Rémy Coutable2018-01-258-34/+34
|\ \ \ \ | |_|_|/ |/| | |
| * | | Default to HTTPS for all Gravatar URLsdefault-to-https-for-gravatar-urlsAchilleas Pipinellis2018-01-258-34/+34
| |/ /
* | | Merge branch 'fl-more-mr-widget' into 'master'Phil Hughes2018-01-253-33/+78
|\ \ \
| * | | Update missing pathsfl-more-mr-widgetFilipa Lacerda2018-01-251-2/+2
| * | | Merge branch 'master' into fl-more-mr-widgetFilipa Lacerda2018-01-256-160/+137
| |\ \ \ | | | |/ | | |/|
| * | | Moves status icon into a vue file and adds testsFilipa Lacerda2018-01-243-33/+78
* | | | Add modal for deleting a milestonewinh-delete-milestone-modalWinnie Hellmann2018-01-251-0/+95
| |/ / |/| |
* | | Merge branch 'fl-mr-widget-refactor' into 'master'Phil Hughes2018-01-253-153/+127
|\ \ \ | |_|/ |/| |
| * | Moves more mr widget components into vue filesfl-mr-widget-refactorFilipa Lacerda2018-01-243-153/+127
| |/
* | Avoid array indices to fixtures in JS specsNick Thomas2018-01-243-8/+11
* | Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'Nick Thomas2018-01-243-8/+8
|/
* Merge branch 'winh-axios-mock-restore' into 'master'Filipa Lacerda2018-01-249-14/+14
|\
| * Use restore() instead of reset() for removing axios MockAdapterwinh-axios-mock-restoreWinnie Hellmann2018-01-239-14/+14
* | Upgrade jasmine + raven to newer versionsTim Zallmann2018-01-234-42/+21
|/
* Upgraded all vue librariesTim Zallmann2018-01-2313-42/+56
* Merge branch 'master' into vue-mr-widget-stateFilipa Lacerda2018-01-222-4/+11
|\
| * Merge branch '42225-mr-icons' into 'master'Phil Hughes2018-01-221-4/+4
| |\
| | * Backport to match EE icons42225-mr-iconsFilipa Lacerda2018-01-191-4/+4
| * | Merge branch '41206-show-signin-pane-after-email-confirmation' into 'master'Clement Ho2018-01-201-0/+7
| |\ \ | | |/ | |/|
| | * Fix Shows signin tab after new user email confirmationJacopo2018-01-181-0/+7
* | | Merge branch 'master' into vue-mr-widget-stateFilipa Lacerda2018-01-198-31/+192
|\ \ \ | |/ /
| * | Merge branch 'mr-widget-vue' into 'master'Phil Hughes2018-01-191-12/+25
| |\ \
| | * | Move archived component to vue fileFilipa Lacerda2018-01-181-12/+25
| | |/
| * | WebIDE: Fix Commit bugsTim Zallmann2018-01-194-19/+15
| * | Merge branch '42157-41989-fix-duplicate-in-create-item-dropdown' into 'master'Phil Hughes2018-01-192-0/+119
| |\ \
| | * | Fix duplicate item in protected branch/tag dropdown42157-41989-fix-duplicate-in-create-item-dropdownEric Eastwood2018-01-182-0/+119
| * | | Add confirm when navigating away from page with tests.Jacob Schatz2018-01-181-0/+33
| | |/ | |/|
* | | Move mr_widget_auto_merge_failed component into a vue fileFilipa Lacerda2018-01-181-21/+36
|/ /