summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/ide
Commit message (Collapse)AuthorAgeFilesLines
* Set tree list accounting for already-opened files57668-create-file-from-urlDenys Mishunov2019-04-042-4/+38
| | | | | | | | | | | | 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/+5
|
* Merge branch 'feature/webide_escaping' of gitlab.com:hiddentiger/gitlab-ce ↵Kieran Andrews2019-04-031-2/+4
| | | | into feature/webide_escaping
* Fixed commit logic to pick a branchNatalia Tepluhina2019-03-252-5/+6
| | | | - fixed getter spec with correct getter name
* Implemented trimming for item's name in Web IDEDenys Mishunov2019-03-181-1/+1
| | | | Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/57540
* Improve files_decorator performancePaul Slaughter2019-03-075-152/+160
| | | | | | | | | | | | | | **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-053-11/+53
|\ | | | | | | | | | | | | 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-043-11/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-044-23/+73
|/ | | | | - fixed test spec - added warning only if file is deleted
* Replaced part of diff file properties with diff viewerNatalia Tepluhina2019-02-151-0/+16
| | | | | | - replaced file.too_large - replaced file.text - replaced file.collapsed
* Merge branch 'web-ide-commit-header-icon-alignment-fix' into 'master'Filipa Lacerda2019-02-141-1/+1
|\ | | | | | | | | | | | | Fixes alignment of changed icon in Web IDE Closes #57649 See merge request gitlab-org/gitlab-ce!25202
| * Fixes alignment of changed icon in Web IDEPhil Hughes2019-02-131-1/+1
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57649
* | Dont show file template options for new directorySam Bigelow2019-02-131-4/+10
|/
* Fixes diff web worker not loading in stagingPhil Hughes2019-02-081-10/+1
| | | | https://gitlab.com/gitlab-org/quality/staging/issues/34
* Added fuzzy file finder to merge requestsPhil Hughes2019-02-054-363/+19
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53304
* accured -> occurred, as suggested in…Yaron Shahrabani2019-02-041-1/+1
|
* Resolve "Add Avatar from author of the last commit to WebIDE status bar"Jose2019-01-311-3/+10
|
* Upgrade webpack and monaco-editor to latestMike Greiling2019-01-251-3/+3
|
* Merge branch 'fix-loose-typo' into 'master'Nick Thomas2019-01-242-2/+2
|\ | | | | | | | | | | | | Fix 'loose' typo Closes #56248 See merge request gitlab-org/gitlab-ce!24330
| * Fix 'loose' typoMax Raab2019-01-112-2/+2
| |
* | Merge branch 'mg-upgrade-prettier-again' into 'master'Clement Ho2019-01-1519-37/+37
|\ \ | | | | | | | | | | | | Upgrade prettier to v1.15.3 See merge request gitlab-org/gitlab-ce!24312
| * | Upgrade prettier and reformat files as necessaryMike Greiling2019-01-1419-37/+37
| |/ | | | | | | | | | | Upgrades prettier to 1.15.3 Runs `yarn prettier-save-all` against the codebase Most changes are due to https://github.com/prettier/prettier/pull/5519
* | Generate searchable JSDoc documentationWinnie Hellmann2019-01-141-1/+8
|/
* Upgraded various Vue packagesTim Zallmann2019-01-091-1/+1
| | | | | | | | | | This upgrades the following packages: - Vue - Vue Loader - Vue Resource - Vue Router - Vue template compiler - Vue Jest
* Fixed renamed and mode changed diff viewersPhil Hughes2018-12-061-0/+1
| | | | | | | Renders mode changed and renamed file merge request diff viewers on the frontend. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52607
* Update IDE index.js with 'extendStore'Paul Slaughter2018-12-051-5/+5
|
* CE Port of "Add empty and disabled web terminal tab"Paul Slaughter2018-12-031-1/+1
|
* Resolve "Bug - Web Based IDE - The "Merge" Requests Selection displays Merge ↵Paul Slaughter2018-11-282-6/+12
| | | | Requests from other projects"
* Replace convertPermissionToBoolean with parseBooleanWinnie Hellmann2018-11-271-2/+2
|
* WebIDE: Make Ctrl+Enter automatically commit when commit textarea is focusedThomas Pathier2018-11-262-0/+7
|
* Merge remote-tracking branch 'origin/master' into fix-typos-occuredHiroyuki Sato2018-11-2160-999/+326
|\ | | | | | | | | | | Conflicts: - app/assets/javascripts/ide/stores/modules/pipelines/actions.js - spec/javascripts/ide/stores/modules/pipelines/actions_spec.js
| * Merge branch 'mg-upgrade-prettier' into 'master'Clement Ho2018-11-2157-984/+307
| |\ | | | | | | | | | | | | Upgrade prettier to v1.15.2 See merge request gitlab-org/gitlab-ce!22893
| | * Prettify all the thingsMike Greiling2018-11-2057-984/+307
| | |
| * | Added a test for open merge request filesPhil Hughes2018-11-201-1/+1
| | |
| * | Open first 10 merge request files in IDEPhil Hughes2018-11-202-2/+6
| |/ | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51635
| * Use @gitlab npm namespaceClement Ho2018-11-1611-11/+11
| |
| * Fix typo pipline to pipelinejumpyoshim2018-11-161-1/+1
| |
* | Fix typos occured to occurredHiroyuki Sato2018-11-165-10/+10
|/
* Remove gitlab-ui loading icon from globalClement Ho2018-11-079-0/+20
|
* Fix typos in IDE propsGeorge Tsiolis2018-10-304-7/+7
|
* Update gitlab-ui to 1.9.0Clement Ho2018-10-292-6/+6
|
* Remove all tables from Pipeline page when there is no job for the PipelineTakuya Noguchi2018-10-291-1/+1
|
* Remove base64 encoding from files that contain plain textJacques Erasmus2018-10-221-13/+25
|
* Fixed file templates not clearing in Web IDEPhil Hughes2018-10-151-0/+1
| | | | | | | | | | | 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
* Merge branch 'prettify-all-the-things-5' into 'master'Tim Zallmann2018-10-1014-128/+93
|\ | | | | | | | | Prettify all the things (part 5) See merge request gitlab-org/gitlab-ce!22255
| * Prettify ide modulesMike Greiling2018-10-1014-128/+93
| |
* | Merge branch 'ml-qa-add-file-templates' into 'master'Sean McGivern2018-10-106-9/+9
|\ \ | |/ |/| | | | | Add test of adding file templates via Web IDE and Files view See merge request gitlab-org/gitlab-ce!21914
| * Add tests of adding file templatesMark Lapierre2018-10-096-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | Adds tests that adds new files via file templates via the Files view and the Web IDE. Includes changes to page objects and associated code Fetches template content from the API rather than hardcoding strings that will need to be updated if the templates change. Some of the content is stored as flat files but we can't use them because they're not included in the docker images gitlab-qa uses.
* | Resolve "Harmonize prettier and eslint configs"Mike Greiling2018-10-091-3/+3
|/
* Backport project template API to CENick Thomas2018-10-051-4/+8
|
View Lorry Controller Status