Commit graph

24 commits

Author SHA1 Message Date
GitLab Bot
b3a736ed88 Add latest changes from gitlab-org/gitlab@master 2020-02-14 15:09:08 +00:00
GitLab Bot
22e9af3c8b Add latest changes from gitlab-org/gitlab@master 2020-01-27 12:08:35 +00:00
GitLab Bot
7480d774df Add latest changes from gitlab-org/gitlab@master 2019-12-17 00:07:59 +00:00
GitLab Bot
00bfd2d81d Add latest changes from gitlab-org/gitlab@master 2019-11-16 21:06:10 +00:00
Paul Slaughter
d4cc92db09
FE remove create branch call in IDE commit
Previously `start_sha` was intercepted on the frontend to create the
correct branch in a separate API call. Now that the commits API supports
the `start_sha` parameter directly this workaround is not needed
anymore.
2019-07-18 09:19:18 +02:00
Paul Slaughter
894ad6f6e9
Fix IDE commit to use start_ref
**Why?**
The branch HEAD could be changed since the
IDE was opened. This leads to user's unintentionally
creating commits that overwrite other changes.

https://gitlab.com/gitlab-org/gitlab-ce/issues/59023
2019-06-17 14:04:35 -05: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
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
Phil Hughes
3f4aaea26c
correctly show renaming and deleting entries
for folders, it shows all the files in commit mode
for files, nothing changes, the behaviour is the same
2018-08-01 17:16:21 +01:00
Phil Hughes
832dcd6c90 Fixed IDE not opening JSON files 2018-07-26 08:34:05 +00:00
Phil Hughes
5428e91374
only include _html fields when asked for 2018-07-05 15:44:54 +01:00
Phil Hughes
fa8c82c7ec
added specs for file actions
in this it also removes Vue Resource from the IDE, axios is nicer to test
2018-06-29 09:29:30 +01:00
Phil Hughes
5c483fd865
specs 2018-06-27 10:44:54 +01:00
Douwe Maan
fbc749a96e Reuse viewer param and move logic to blob controller 2018-06-15 09:42:56 +00:00
Tim Zallmann
3b2a909ac2 Makes the html attribute in the json output optional with the option html_render=false 2018-06-14 19:37:16 +02:00
André Luís
c53890548e Resolve "Show CI pipeline status in Web IDE" 2018-05-25 10:08:53 +00:00
Tim Zallmann
8f7cf2ede5 Fixed Code review Comments 2018-03-28 12:17:30 +02:00
Tim Zallmann
0ea359d2cf Fixes to Formatting to all Files 2018-03-28 12:17:02 +02:00
Tim Zallmann
f00a971a6d ESLint + Karma fixes 2018-03-28 12:17:02 +02:00
Tim Zallmann
b452bdead4 Actual MR diff displayed 2018-03-28 12:17:02 +02:00
Tim Zallmann
f62359c23b Basic Setup for MR Showing 2018-03-28 12:17:02 +02:00
Phil Hughes
f527e6e185
Move IDE to CE
This also makes the IDE generally available
2018-03-20 14:12:48 +00:00
Phil Hughes
4927cb75e6
Remove IDE from CE 2018-03-02 08:42:02 +00:00
Tim Zallmann
213e91d439 Resolve "Decouple multi-file editor from file list" 2017-12-21 15:05:47 +00:00