summaryrefslogtreecommitdiff
path: root/spec/javascripts/ide
Commit message (Collapse)AuthorAgeFilesLines
* Create constants for IDE commit action valuesPaul Slaughter2019-04-242-11/+13
| | | | | | | | | | **Why?** These values will be used to help build the mirroring diff. It is helpful keeping it controlled in a constant. **Links:** - https://gitlab.com/gitlab-org/gitlab-ee/issues/10232 - https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/11478
* Revert "Increased page size to 100"Natalia Tepluhina2019-04-231-42/+12
| | | | This reverts commit 2869a61f3b7aeb8b6d79c74332c93e32cec20caa.
* Stores 'binary' and 'rawPath' attr after uploadDenys Mishunov2019-04-181-0/+4
| | | | | | | | | | - When uploading a file, we need to flag binary files correspondingly so that it gets propagated all the way to RepoEditor as it decides on whether to show editor for this or that file or not (shouldHideEditor()) - rawPath needs to be propagate all the way to ContentViewer as well so that uploaded images could be rendered as a base64 image right away instead of raw base64 string
* Merge branch '57482-shortcut-to-create-merge-request-from-web-ide' into 'master'Phil Hughes2019-04-053-28/+138
|\ | | | | | | | | | | | | Resolve "Shortcut to create merge request from Web IDE" Closes #57482 See merge request gitlab-org/gitlab-ce!26792
| * Shortcut to create MR in web IDE57482-shortcut-to-create-merge-request-from-web-ideSam Bigelow2019-04-043-28/+138
| | | | | | | | | | | | | | | | | | Before the user had to choose between committing to a new branch, committing to a new branch AND creating an MR, or committing to the current branch regardless of whether or not it already has an MR. This commit separates the creation of an MR from whether or not they commit to an existing or new branch
* | Merge branch '57668-create-file-from-url' into 'master'Phil Hughes2019-04-054-13/+223
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Support creating new file from URL in the Web IDE" Closes #57668 See merge request gitlab-org/gitlab-ce!26622
| * | Set tree list accounting for already-opened files57668-create-file-from-urlDenys Mishunov2019-04-043-13/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we can create files from URL now, this means that these files will not exist in the tree returned from API: they exist on the client only before the first commit. In order to still show the newly-created files in the tree, we should not override the tree, but merge the tree existing on the client and the one coming from API. Changelog entry Moved trees merging into mutation
| * | Create a new file if URL references non-existent oneDenys Mishunov2019-04-041-0/+17
| |/
* | Merge branch '60021-fix-ide-file-dropdown' into 'master'Phil Hughes2019-04-052-3/+3
|\ \ | | | | | | | | | | | | | | | | | | Fix IDE file dropdown Closes #60021 See merge request gitlab-org/gitlab-ce!27015
| * | Refactor new_dropdown/index to receive isOpen prop60021-fix-ide-file-dropdownPaul Slaughter2019-04-042-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** Previously it managed this as an internal data property, but there was extra complexity involved because the component doesn't have all the information it needs (i.e. the `mouseOver` prop). This is a good opportunity to colocate the data prop with the component that has the information to change it (i.e. `file_row`) and let `new_dropdown/index` receive this value as a prop.
* | | Fix IDE detecting MR from fork branchPaul Slaughter2019-04-051-35/+40
|/ / | | | | | | | | | | | | | | | | **Why?** Currently the IDE loads a merge request based on only the `source_branch` name. This means it loads MR's from forks that have the same branch name (not good). - This required updating the BE API to accept `source_project_id`
* | Fix vue render error for IDE status barPaul Slaughter2019-04-042-56/+81
|/ | | | | | | | | | | | | | | | | | | | | **What?** A Vue warning that `ide_status_bar` sent a `Boolean` to a `String` property (`img-src). **What was the fix?** Previously, `latestPipeline` could be one of the following values: | | | |----------|--------| | `null` | The pipeline hasn't loaded yet | | `false` | The pipeline has loaded, but nothing was returned. | | `Object` | The piepline has loaded. | Giving a semantic meaning to different falsey values hurts maintainability. This commit fixes the above problem by removing the `false` value and introducing a `hasLoadedPipeline` state property.
* Upgraded Vue to 2.6.8Tim Zallmann2019-03-272-48/+28
| | | | Upgrade to latest Version
* Fixed commit logic to pick a branchNatalia Tepluhina2019-03-253-5/+12
| | | | - fixed getter spec with correct getter name
* Move some tests from Karma to JestWinnie Hellmann2019-03-2312-626/+0
|
* Implemented trimming for item's name in Web IDEDenys Mishunov2019-03-181-0/+12
| | | | Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/57540
* Improve files_decorator performancePaul Slaughter2019-03-072-0/+84
| | | | | | | | | | | | | | **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.
* Merge branch '49663-branch-to-mr-connection' into 'master'Phil Hughes2019-03-052-0/+94
|\ | | | | | | | | | | | | Link to the MR from current branch in Web IDE Closes #49663 See merge request gitlab-org/gitlab-ce!25689
| * Extended Web IDE API to get MRs for a certain branch in a projectDenys Mishunov2019-03-042-0/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Fixed mutation for rootNatalia Tepluhina2019-03-043-9/+88
|/ | | | | - fixed test spec - added warning only if file is deleted
* Dont show file template options for new directorySam Bigelow2019-02-131-0/+9
|
* Added fuzzy file finder to merge requestsPhil Hughes2019-02-053-512/+0
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53304
* Resolve "Add Avatar from author of the last commit to WebIDE status bar"Jose2019-01-311-0/+3
|
* Upgrade webpack and monaco-editor to latestMike Greiling2019-01-251-2/+2
|
* Changed failing karma specPhil Hughes2019-01-071-1/+0
|
* Resolve "Bug - Web Based IDE - The "Merge" Requests Selection displays Merge ↵Paul Slaughter2018-11-281-3/+53
| | | | Requests from other projects"
* Merge branch 'fix-typos-occured' into 'master'Kushal Pandya2018-11-224-9/+9
|\ | | | | | | | | Fix typos occured to occurred See merge request gitlab-org/gitlab-ce!23105
| * Merge remote-tracking branch 'origin/master' into fix-typos-occuredHiroyuki Sato2018-11-212-4/+29
| |\ | | | | | | | | | | | | | | | Conflicts: - app/assets/javascripts/ide/stores/modules/pipelines/actions.js - spec/javascripts/ide/stores/modules/pipelines/actions_spec.js
| * | Fix typos occured to occurredHiroyuki Sato2018-11-164-9/+9
| | |
* | | Eliminate duplicated wordsTakuya Noguchi2018-11-223-3/+3
| |/ |/| | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | Added a test for open merge request filesPhil Hughes2018-11-201-3/+27
| |
* | Open first 10 merge request files in IDEPhil Hughes2018-11-201-0/+1
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51635
* | Fix typo pipline to pipelinejumpyoshim2018-11-161-1/+1
|/
* Remove base64 encoding from files that contain plain textJacques Erasmus2018-10-221-23/+17
|
* Remove empty spec describe blocksGeorge Tsiolis2018-10-181-2/+0
|
* Prettify all spec filesMike Greiling2018-10-1717-95/+60
|
* enable jasmine/new-line-before-expectJohann Hubert Sonntagbauer2018-10-1710-0/+17
|
* Fixed file templates not clearing in Web IDEPhil Hughes2018-10-151-0/+8
| | | | | | | | | | | 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
* Added file tree to merge request diffsPhil Hughes2018-10-033-52/+6
| | | | | | | | | | | | | | | 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
* Merge branch 'ide-keep-right-pane-tabs-alive' into 'master'Phil Hughes2018-10-018-20/+215
|\ | | | | | | | | Keep IDE RightPane views alive See merge request gitlab-org/gitlab-ce!21980
| * Keep IDE RightPane views aliveide-keep-right-pane-tabs-alivePaul Slaughter2018-09-288-20/+215
| | | | | | | | | | | | | | | | | | | | | | **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.
* | Fixed file templates not being fully fetched in Web IDEPhil Hughes2018-09-281-4/+42
|/ | | | Closes #51912
* Add gitlab-ui skeleton loadingClement Ho2018-09-251-63/+0
|
* Updated specs to account for removed buttonsPhil Hughes2018-09-212-63/+0
|
* Decouple file row from IDEPhil Hughes2018-09-172-145/+159
| | | | | | 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
* karma fixesPhil Hughes2018-09-071-4/+22
|
* fixed `list_item_spec.js`Phil Hughes2018-09-071-1/+1
|
* fixed testsPhil Hughes2018-09-071-15/+0
|
* update components to match designs in commit sectionPhil Hughes2018-09-072-4/+4
|
* fixed double scrollPhil Hughes2018-09-072-3/+5
| | | | improved variable & prop names