Commit Graph

76 Commits

Author SHA1 Message Date
Rémy Coutable d434c62a83 Move EE-specific JavaScript files to ee/app/assets/javascripts 2018-02-26 19:43:34 +00:00
Phil Hughes 94c8bd9f47
fixed more unhandled promise rejections 2018-01-30 09:12:57 +00:00
Phil Hughes 3bf550bf24
fixed unhandled promise rejection 2018-01-30 09:12:57 +00:00
Phil Hughes e0b4d919cd
spec fixes after API axios change 2018-01-30 09:12:56 +00:00
Tim Zallmann 4167f19b0a Upgraded all vue libraries 2018-01-23 09:37:07 +00:00
Tim Zallmann 91477f6dae Resolve "Helpful and instructing Empty state for multi file editor" 2018-01-05 17:35:34 +00:00
Winnie Hellmann 2c47f0924f Add id to modal.vue to support data-toggle="modal" 2018-01-05 12:47:38 +01:00
Tim Zallmann 3a727aa6d4 Multi File Editor File icons 2018-01-03 10:08:14 +00:00
Tim Zallmann 213e91d439 Resolve "Decouple multi-file editor from file list" 2017-12-21 15:05:47 +00:00
Phil Hughes e0bbadc2d2
use exported methods instead of gl.utils 2017-12-08 08:54:51 +00:00
Phil Hughes 386cbf22ee
Merge branch 'master' into multi-file-editor-dirty-diff-indicator 2017-11-30 09:52:58 +00:00
Phil Hughes d22bb0397b
fixed failing specs 2017-11-28 16:51:37 +00:00
Phil Hughes 8f7ec95b86
added specs
fixed scss-lint
2017-11-24 15:55:08 +00:00
Phil Hughes 4119e92be5
correctly updates commit data after committing changes
also merges data in after a fetch to save overriting all data.
changed the render keys to save a full re-render when any data changes
2017-11-06 10:52:03 +00:00
Phil Hughes 984f3b7dff
Fix binary files not showing anything in edit mode 2017-11-01 13:03:19 +00:00
Phil Hughes f2f24f05f8
fixed up upload feature after master merge 2017-10-31 12:13:29 +00:00
Phil Hughes e6a1a798f5
Merge branch 'master' into multi-file-editor-vuex 2017-10-31 11:24:42 +00:00
Phil Hughes 68d1e9d1c4 Upload files through the multi-file editor 2017-10-31 10:47:10 +00:00
Phil Hughes 662f87ca37
spec fixes 2017-10-31 09:06:23 +00:00
Phil Hughes 098a98055a
spec fixes
increased perf of scrolling tabs into view
2017-10-30 16:25:32 +00:00
Phil Hughes 5c75d750cf
addressed feedback from review
spec fixes
2017-10-30 14:36:24 +00:00
Phil Hughes 47c906eb57
updated karma specs 2017-10-27 18:16:28 +01:00
Phil Hughes c147bccc45
Merge branch 'master' into ph-multi-file-editor-new-file-folder-dropdown 2017-10-23 14:01:22 +01:00
Phil Hughes 133e66d22d
spec fixes 2017-10-23 13:12:05 +01:00
Jacob Schatz 07a8c54355 Create new branch from dropdown. 2017-10-23 10:57:23 +00:00
Phil Hughes 4699cf77b6
added feature spec 2017-10-23 10:47:22 +01:00
Phil Hughes 4c186f99f2
fixed failing title test 2017-10-23 10:46:53 +01:00
Phil Hughes 60ce5155c8
fixed bug with tabs not switching correctly
clears all tmp files after cancelling edit mode
2017-10-23 10:46:27 +01:00
Phil Hughes 10dcaea1c3
failing spec fixes 2017-10-23 10:45:44 +01:00
Phil Hughes 389c852d12
correctly creates file in currently viewed directory
specs
2017-10-23 10:45:44 +01:00
Phil Hughes 741233321d
Added submodule support in multi-file editor 2017-10-20 11:31:57 +01:00
Phil Hughes bdbcf58ac0
fixed Karam test because of event name change 2017-10-17 11:46:00 +01:00
Phil Hughes c3dec96e83
Fixed bug when clicking file link causing user to navigate away
Adds a test for flattenedFiles
Changes the data method to not be an arrow method
Various other review fixes
2017-10-17 11:03:12 +01:00
Phil Hughes 5e5e9c1928
fixed karma spec with prev directory button 2017-10-16 15:27:23 +01:00
Phil Hughes 5f80d04271
Spec updates
Updated as best as possible, a lot of tests still change the store
and never reset the state back which can cause some issues with other
tests.
2017-10-16 11:29:30 +01:00
Phil Hughes b1b91aa065
Refactored multi-file data structure
This moves away from storing in a single array just to render the table.
It now stores in a multi-dimensional array/object type where each entry
in the array can have its own tree. This makes storing the data for
future feature a little easier as there is only one way to store the
data.

Previously to insert a directory the code had to insert the directory
& then the file at the right point in the array. Now the directory
can be inserted anywhere & then a file can be quickly added into this
directory.

The rendering is still done with a single array, but this is handled
through underscore. Underscore takes the array & then goes through
each item to flatten it into one. It is done this way to save changing
the markup away from table, keeping it as a table keeps it semantically
correct.
2017-10-16 11:29:30 +01:00
Jacob Schatz c3195e83a8 Add create merge checkbox. 2017-10-12 21:04:17 +00:00
Fatih Acet 10e3342a06 Merge branch 'ide-fix-back-btn' into 'master'
Repo Editor : Fixes Back Button for files + line number jumping for preview and editor

See merge request gitlab-org/gitlab-ce!14508
2017-10-06 17:39:32 +00:00
James Ramsay 8f2b109363 Fix inconsistent use of sentence case 2017-10-04 15:44:18 -04:00
Tim Zallmann 0a671c8223 Fixes the unhandled promise rejection 2017-10-04 17:27:56 +02:00
Tim Zallmann a0d238066e Fixed RepoFile Test 2017-10-04 17:27:56 +02:00
Tim Zallmann 25186c7aee Fixed Repo Sidebar Tests 2017-10-04 17:27:56 +02:00
Tim Zallmann 1429e5b57d Added Test for Back Button Behaviour 2017-10-04 17:27:56 +02:00
Jacob Schatz 5307844c9a Merge branch 'dm-json-page-title' into 'master'
Use backend-provided page title in repo editor

Closes #36029

See merge request gitlab-org/gitlab-ce!13763
2017-09-29 13:22:27 +00:00
Tim Zallmann ef22b0dc81 Title has now its own test 2017-09-29 13:43:39 +02:00
Tim Zallmann 705a840d2e Not the Test will also work with other tests before 2017-09-29 12:02:43 +02:00
Filipa Lacerda a481337b6a Merge branch 'remove-target-dd' into 'master'
Remove target dd

Closes #38485

See merge request gitlab-org/gitlab-ce!14558
2017-09-29 08:33:10 +00:00
Tim Zallmann 0647484c61 Added Test for PageTitle / Removed Gitlab Part from TItle 2017-09-29 09:59:09 +02:00
Jacob Schatz 42218fcaa7 Fix karma test 2017-09-28 21:24:14 -04:00
Fatih Acet c25e83b536 RepoEditor: Prevent extra network call for already opened files. 2017-09-27 23:19:02 +03:00