Commit Graph

102 Commits

Author SHA1 Message Date
Thomas Pathier 4567713985 WebIDE: Make Ctrl+Enter automatically commit when commit textarea is focused 2018-11-26 08:40:18 +00:00
Mike Greiling 5b9495c5db
Prettify all the things 2018-11-20 09:30:01 -06:00
Tim Zallmann 6947890e37 Merge branch 'prettify-all-the-things-5' into 'master'
Prettify all the things (part 5)

See merge request gitlab-org/gitlab-ce!22255
2018-10-10 18:17:50 +00:00
Mike Greiling 69b7c032ec
Prettify ide modules 2018-10-10 01:57:50 -05:00
Mark Lapierre d36055cbef Add tests of adding file templates
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.
2018-10-09 11:17:02 -04: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
Filipa Lacerda a615994fdb Merge branch 'ide-remove-stage-buttons' into 'master'
Remove stage/unstage buttons from IDE commit list items

Closes #51695

See merge request gitlab-org/gitlab-ce!21845
2018-09-25 15:07:43 +00:00
Phil Hughes 6ed79d608a
Fixed alignment of changed icon in commit head 2018-09-25 09:13:50 +01:00
Phil Hughes b46ec15138
Remove stage/unstage buttons from IDE commit list items
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51695
2018-09-20 21:26:27 +01:00
Mike Greiling f829b181bc
Resolve eslint-plugin-vue errors
The eslint-plugin-vue upgrade had some breaking changes to
vue/attribute-order which needed to be resolved in order to avoid
disabling the rule entirely
2018-09-20 02:39:50 -05:00
Phil Hughes 9ab61e17bb
i18n on some strings
moved heights into variables
2018-09-07 11:28:04 +01:00
Phil Hughes 04f4b86826
update state when staging/unstaging all 2018-09-07 11:28:02 +01:00
Phil Hughes cfb67193bf
fixed discard modal not showing 2018-09-07 11:28:02 +01:00
Phil Hughes ebc15f4318
design improvements 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 2aa47e10d4
Improved IDE commit flow
Closes #48182
2018-09-07 11:28:01 +01:00
Sam Beckham 321d3e0483 Resolve "The comparison list for the modified icons" 2018-07-27 09:27:20 +00:00
Felipe Artur 13ea4b387d Merge remote-tracking branch 'dev/master' 2018-07-26 18:30:50 -03:00
Phil Hughes cded268ca1 Enable deleting files in the Web IDE 2018-07-26 14:56:56 +00:00
Phil Hughes 0a59ccac61
Fixed XSS in branch name in Web IDE
#2691
2018-07-10 09:44:42 +01:00
Phil Hughes 2635a691ed restore double quotes 2018-06-27 16:03:38 +00:00
Phil Hughes fbca6825c2 use single quotes 2018-06-27 15:50:10 +00:00
Phil Hughes 53ccf9389e
fixed commit action radio buttons getting into a weird state 2018-06-27 14:03:53 +01:00
Phil Hughes dd6a7ec165
🐛 fix bug where currentBranch would actually be null 2018-06-27 09:49:23 +01:00
Phil Hughes 433ad2d0f5
karma fixes 2018-06-27 09:49:22 +01:00
Phil Hughes 0531631ce1
disable current branch option in commit form is user does not have permissions to push 2018-06-27 09:49:21 +01:00
Phil Hughes 44484cfc88
use a pre-built commit message for when no user specified message exists 2018-06-27 09:49:20 +01:00
Phil Hughes e08ce52a29
Improve Web IDE commit form
Closes #47307
2018-06-27 09:49:20 +01:00
Paul Slaughter fe1203b59d Resolve "Introduce hover, active, focus states for files in sidebar of Web IDE" 2018-06-25 18:24:48 +00:00
James Ramsay fed8ee0790 Add ellipsis to Web IDE commit button
The blue shortcut commit button opens the commit interface to
actually perform the commit. The ellipsis indicates the button doesn't
immediately perform the commit.
2018-06-20 08:46:23 -04:00
Rémy Coutable 52dea971e9 Merge branch 'bvl-i18n-validation' into 'master'
Updates to `.po` & `.pot` linting

Closes #46096 et #39292

See merge request gitlab-org/gitlab-ce!18779
2018-06-18 17:10:26 +00:00
Phil Hughes 7e8e5229cc
fixed discard dropdown being off the screen 2018-06-15 17:24:55 +01:00
Bob Van Landuyt a9ebcfa5f5 Interpolate named counts in JS
Even though JS does the `%d` interpolation in `n__` using a string
replacement. This would not be compatible with the ruby
implementation.

Therefore using named variables instead.
2018-06-15 14:58:46 +02:00
Phil Hughes 38db5f0706
added computed prop for file list length 2018-06-15 13:12:59 +01:00
Phil Hughes 7483872416
fixed tooltip boundary 2018-06-14 15:42:56 +01:00
Phil Hughes b084dceb79
alignment updates
added tooltip to more actions
2018-06-14 15:42:56 +01:00
Phil Hughes 664003f509
fixed eslint 2018-06-14 15:42:56 +01:00
Phil Hughes 30ef254521
fixed hover styling caused by dropdown
fixed karma specs
added CHANGELOG item
2018-06-14 15:42:55 +01:00
Phil Hughes 2d5e47bfc3
Improve commit flow in Web IDE
Closes #46122
2018-06-14 15:42:55 +01:00
Filipa Lacerda e29c0da8c5
Updates eslint rules 2018-06-13 11:58:51 +01:00
Filipa Lacerda 26137130d9
Merge branch 'master' into fl-eslint-vue-house-keeping
* master: (27 commits)
  Resolve "Bug: When creating an account with invalid characters the error is "Username already taken" not "Invalid characters used""
  Resolve "Provide ability to retrieve `visibility` level via Snippets API"
  Resolve "Quick actions are case sensitive"
  Image Diff Viewing + Download Diff Viewing
  Link to release post for group issue board docs
  moved strings into constants file
  Typo fix
  fixed condition check
  Loosen the 'newly created MR' matcher
  Ensure we look into the correct setion only when expanding a settings' section
  Rails5 fix expected `issuable.reload.updated_at` to have changed
  [Rails5] Pass class references instead of strings to middleware builder
  Sidebar Milestone - Fix wrong URL when selecting a parent group milestone
  Fix Banzai reference for milestones belonging to parent groups
  apply feedback
  fixed eslint
  added specs for is-active class added spec for openPendingTab in component
  more karma fixes
  karma updates
  Override exclusive_lease_key method in RecordsUpload
  ...
2018-06-13 11:53:01 +01:00
Phil Hughes 9d9d952c11
moved strings into constants file 2018-06-13 10:10:24 +01:00
Phil Hughes e1ec70cf8e
more karma fixes 2018-06-12 10:02:15 +01:00
Phil Hughes 6139050e3d
Add active class to active file in IDE commit panel
Closes #46051
2018-06-11 17:03:18 +01:00
Filipa Lacerda 647a4d6a3b
Updates eslint vue plugin version 2018-06-11 15:36:54 +01:00
Phil Hughes e5dddae1c5 Fixed typo in commit message help popover
Closes #47060
2018-06-01 14:40:52 +00:00
Jose cf3f7601b0 Remove form-horizontal class where applicable 2018-05-31 13:35:50 -05:00
Clement Ho 4d6f6f9347 Convert remaining pull-* to float-* 2018-05-29 18:54:05 -05:00
Clement Ho 425fdd7972 Replace help-block with form-text.text-muted 2018-05-29 09:58:31 -05:00
Filipa Lacerda 9a030afd91 Merge branch 'ide-sidebar-spacing' into 'master'
Fixed inconsistent spacing in web IDE  sidebar

Closes #46162

See merge request gitlab-org/gitlab-ce!18827
2018-05-18 13:45:59 +00:00