Commit Graph

303 Commits

Author SHA1 Message Date
Tim Zallmann 4f0b2079de Upgraded Vue to 2.6.8
Upgrade to latest Version
2019-03-27 21:33:20 +00:00
Natalia Tepluhina a72241f4a9 Fixed commit logic to pick a branch
- fixed getter spec with correct getter name
2019-03-25 09:16:41 +00:00
Winnie Hellmann 514ee63826 Move some tests from Karma to Jest 2019-03-23 17:53:46 +01:00
Denys Mishunov 1a2bdb4366 Implemented trimming for item's name in Web IDE
Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/57540
2019-03-18 13:59:16 +01:00
Paul Slaughter c49d4a4985 Improve files_decorator performance
**How?**
Previously the files_decorator inserted parent folders inefficiently.
It started at the first part and ensured each was inserted.

Since the file entries are given to use in alphabetical order, we can
start at the last part of the blob's parents. If this exists, we can
short circuit and be done inserting parents.

**What else?**
- Improve performance of decorateData. The object spread operator is
not needed because the object is brand new.
2019-03-07 09:22:05 +00:00
Phil Hughes 1caa760f5d Merge branch '49663-branch-to-mr-connection' into 'master'
Link to the MR from current branch in Web IDE

Closes #49663

See merge request gitlab-org/gitlab-ce!25689
2019-03-05 08:43:44 +00:00
Denys Mishunov a1b0b3e4eb Extended Web IDE API to get MRs for a certain branch in a project
New `Api.projectMergeRequests` allows:
 - to query for all MRs on a project without specifying `mergeRequestId`
 - to filter the returned MRs using parameters from
 https://bit.ly/2H7We4V

 The new API request is used for fetching information about MRs
 associated with a particular branch in Web IDE to have IdeSidebar
 behave consistently in both scenarios:
 - getting to a branch from and MR (where we already have info about
 relevant MR), or
 - getting to a branch somehow differently directly

For cases where there are several merge requests that the current branch
is associated with, mark the most recent one as 'current'

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/49663
2019-03-04 18:10:55 +01:00
Natalia Tepluhina d9ba40aa04 Fixed mutation for root
- fixed test spec
- added warning only if file is deleted
2019-03-04 11:39:55 +00:00
Sam Bigelow b82b1667c4 Dont show file template options for new directory 2019-02-13 08:57:34 -05:00
Phil Hughes 6e5461d67f
Added fuzzy file finder to merge requests
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53304
2019-02-05 11:29:49 +00:00
Jose 2375f7ff68 Resolve "Add Avatar from author of the last commit to WebIDE status bar" 2019-01-31 08:22:29 +00:00
Mike Greiling ef6311d689 Upgrade webpack and monaco-editor to latest 2019-01-25 08:22:35 +00:00
Phil Hughes 5b8c806bee
Changed failing karma spec 2019-01-07 10:29:26 +00:00
Paul Slaughter 95c795de39 Resolve "Bug - Web Based IDE - The "Merge" Requests Selection displays Merge Requests from other projects" 2018-11-28 15:09:38 +00:00
Kushal Pandya 7002752d47 Merge branch 'fix-typos-occured' into 'master'
Fix typos occured to occurred

See merge request gitlab-org/gitlab-ce!23105
2018-11-22 14:02:52 +00:00
Takuya Noguchi e902f462c2 Eliminate duplicated words
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2018-11-22 01:01:23 +09:00
Hiroyuki Sato 692f87215d Merge remote-tracking branch 'origin/master' into fix-typos-occured
Conflicts:
- app/assets/javascripts/ide/stores/modules/pipelines/actions.js
- spec/javascripts/ide/stores/modules/pipelines/actions_spec.js
2018-11-21 11:58:52 +09:00
Phil Hughes b24316b2fe
Added a test for open merge request files 2018-11-20 15:11:33 +00:00
Phil Hughes ac8895b741
Open first 10 merge request files in IDE
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51635
2018-11-20 11:44:42 +00:00
jumpyoshim 75815769b0 Fix typo pipline to pipeline 2018-11-16 06:29:53 +09:00
Hiroyuki Sato b689b20f20 Fix typos occured to occurred 2018-11-16 00:34:24 +09:00
Jacques Erasmus d1fb29e573 Remove base64 encoding from files that contain plain text 2018-10-22 08:28:36 +00:00
George Tsiolis e7763a58b5 Remove empty spec describe blocks 2018-10-18 19:02:55 +03:00
Mike Greiling f666026d71
Prettify all spec files 2018-10-17 11:18:17 -05:00
Johann Hubert Sonntagbauer 6f5723a169 enable jasmine/new-line-before-expect 2018-10-17 06:57:29 +02:00
Phil Hughes ff55aa7ebb
Fixed file templates not clearing in Web IDE
This fixes a bug where the file templates would not be cleared
after changing the template type.
Previously the templates would get pushed into the array
creating a list of templates for the different types.
This changes that by clearing the templates array
when the template type gets changed.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52487
2018-10-15 10:02:40 +01:00
Phil Hughes 33c4c5b8f3
Added file tree to merge request diffs
This file tree displays all the diff files in a tree like format
Each file is taken and converted into a tree with folders
Each folder can be toggled open & closed
Clicking a file will scroll to the diff file & highlight with a glow affect

Searching the tree list will search only files & return a list of the
files without any folders

Each file row contains an icon to show changed, new file or deleted
Each row will also contain the added & removed lines count

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14249
2018-10-03 10:05:43 +01:00
Phil Hughes aac9d70a8c Merge branch 'ide-keep-right-pane-tabs-alive' into 'master'
Keep IDE RightPane views alive

See merge request gitlab-org/gitlab-ce!21980
2018-10-01 13:00:08 +00:00
Paul Slaughter adbf6149cf Keep IDE RightPane views alive
**Why?**
- This is needed for the Web Terminal feature.
  https://gitlab.com/gitlab-org/gitlab-ee/issues/5426

**Notes:**
- Introduces a `pane` Vuex module.
- Some views should not be kept alive (i.e. job details).
  This is why a `keepAlive` flag was introduced for views.
2018-09-28 15:03:39 -05:00
Phil Hughes 17735dc876
Fixed file templates not being fully fetched in Web IDE
Closes #51912
2018-09-28 19:12:45 +01:00
Clement Ho 2a6cd526ac Add gitlab-ui skeleton loading 2018-09-25 20:03:40 +00:00
Phil Hughes b328218a71
Updated specs to account for removed buttons 2018-09-21 06:51:23 +01:00
Phil Hughes 163ec966c1
Decouple file row from IDE
This makes the file row component re-usable ouside of the Web IDE

Pre-request for https://gitlab.com/gitlab-org/gitlab-ce/issues/14249
2018-09-17 12:17:00 +01:00
Phil Hughes feae897552
karma fixes 2018-09-07 11:28:03 +01:00
Phil Hughes 9badf9e723
fixed `list_item_spec.js` 2018-09-07 11:28:03 +01:00
Phil Hughes 93e84c8f28
fixed tests 2018-09-07 11:28:02 +01:00
Phil Hughes 1f808ffe9e
update components to match designs in commit section 2018-09-07 11:28:01 +01:00
Phil Hughes 21ed2da067
fixed double scroll
improved variable & prop names
2018-09-07 08:24:42 +01:00
Phil Hughes 3f6500383f
fixed some bugs around with the template dropdowns 2018-09-07 08:24:42 +01:00
Phil Hughes 5b84c2fbc2
added component specs 2018-09-07 08:24:01 +01:00
Phil Hughes c883b52686
renames file when template type is changed 2018-09-07 08:24:00 +01:00
Phil Hughes 27bce7ad2c
Fixed IDE file row jumping into view on hover
Closes #50751
2018-08-31 10:27:44 +01:00
Phil Hughes 3a283fa861
Enabled multiple uploads in the Web IDE
Closes #50405
2018-08-29 16:05:30 +01:00
Paul Slaughter 6bb0854257 Resolve "It's impossible to commit twice to the same branch" 2018-08-28 08:06:40 +00:00
Filipa Lacerda 726f5cdc2b Merge branch 'ide-file-templates-store' into 'master'
Added store for file templates in the Web IDE

See merge request gitlab-org/gitlab-ce!21272
2018-08-22 10:26:15 +00:00
Filipa Lacerda ccdd16dcd3 Merge branch 'ide-live-preview-merge-requests' into 'master'
Fixed Web IDE live preview crashing when loading from merge request

Closes #50392

See merge request gitlab-org/gitlab-ce!21252
2018-08-17 08:40:40 +00:00
Phil Hughes d80149e60e
Added store for file templates in the Web IDE
#47947
2018-08-17 09:29:59 +01:00
Phil Hughes 0ac3cd801d
fixed karma spec 2018-08-16 16:42:37 +01:00
Phil Hughes 177a5e69b6
Fixed deleting new files creating wrong state in IDE
Closes #50255
2018-08-15 14:17:44 +01:00
Filipa Lacerda 632d3a9412 Merge branch 'ide-header-buttons-tooltip' into 'master'
Added tooltips to tree list header buttons in Web IDE

Closes #50141

See merge request gitlab-org/gitlab-ce!21138
2018-08-13 08:58:03 +00:00