Commit Graph

3390 Commits

Author SHA1 Message Date
Phil Hughes 84de687a7e
Fixed failing note actions spec 2018-11-09 13:38:51 +00:00
Sean McGivern b3b9817e51 Merge branch 'osw-revert-comment-in-any-diff-line' into 'master'
Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"

See merge request gitlab-org/gitlab-ce!22891
2018-11-08 08:51:30 +00:00
Fatih Acet cd5ddc4f2e Discussions redesign 2018-11-08 07:58:45 +00:00
Oswaldo Ferreira 198402b38b Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"
This reverts commit a82a595728, reversing
changes made to e7df959b8f.
2018-11-07 19:57:26 -02:00
Constance Okoghenun baa37edd93 Resolve "Issue board card design" 2018-11-07 17:20:17 +00:00
Grzegorz Bizon 5dc0577b84 Merge branch 'triggermesh-phase1-knative' into 'master'
Allow to install Knative as cluster application

See merge request gitlab-org/gitlab-ce!22593
2018-11-07 15:00:38 +00:00
Phil Hughes e354a64e89
Show expand all button on merge request diffs
This restores the behaviour of showing the expand all button on diffs
even when only a single file is collapsed.
Previously the button would only show when all files are collapsed.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51737
2018-11-07 13:03:13 +00:00
Douwe Maan a82a595728 Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'
Comment on any expanded diff line on MRs

See merge request gitlab-org/gitlab-ce!22398
2018-11-07 11:56:46 +00:00
Jeremy Watson 28840d3f5c Copy changes for abuse clarity 2018-11-07 11:24:36 +00:00
Filipa Lacerda b1fae097bd Merge branch 'winh-delayed-jobs-dynamic-timer' into 'master'
Add dynamic timer to delayed jobs

See merge request gitlab-org/gitlab-ce!22382
2018-11-07 10:27:54 +00:00
Filipa Lacerda e1e315ee28 Merge branch 'mr-image-commenting' into 'master'
Re-implemented image commenting on diffs

Closes #48956

See merge request gitlab-org/gitlab-ce!22443
2018-11-07 10:04:54 +00:00
Winnie Hellmann b678e07e99 Run yarn prettier-all-save 2018-11-07 10:00:25 +01:00
Winnie Hellmann 997d70eaf9 Add dynamic timer for delayed jobs in job sidebar 2018-11-07 10:00:25 +01:00
Winnie Hellmann 53a28e80e3 Add dynamic timer for delayed jobs in pipeline graph 2018-11-07 10:00:25 +01:00
Winnie Hellmann ff72bba12c Add dynamic timer for delayed jobs on single job page 2018-11-07 10:00:25 +01:00
Winnie Hellmann 74f22d26a9 Add Vue mixin for delayed job timers 2018-11-07 10:00:25 +01:00
Oswaldo Ferreira ec66ef1b74 Comment on any expanded diff line on MRs 2018-11-06 17:39:31 -02:00
Phil Hughes 15f1952e30 Merge branch '53535-sticky-archived' into 'master'
Renders a warning block for archived job

Closes #53535

See merge request gitlab-org/gitlab-ce!22811
2018-11-06 18:18:07 +00:00
Filipa Lacerda 0cf721bdd2 Disable stop environment button while deployment is running 2018-11-06 15:14:42 +00:00
Phil Hughes d19a6f686c Merge branch '7737-ci-pipeline-view-slowed-down-massivly-if-security-tabs-has-many-entries' into 'master'
Improve performance of rendering large reports

See merge request gitlab-org/gitlab-ce!22835
2018-11-06 12:08:29 +00:00
Filipa Lacerda 0c24995766 Renders unescaped `sprinft` string 2018-11-06 11:57:23 +00:00
Lukas Eipert 26ab92d3f3
Improve performance of rendering large reports
Instead of rendering all report items in 4 big lists, we make use of
vue-virtual-scroll-list and render only few dozens at once. This
improves the performance in several metrics:

- Initial load time
- Memory Pressure
- CPU Load
- DOM node count

In an example with around 11k reported security vulnerabilities:

- Initial load time: 27s -> 4.1s
- Memory Pressure: ~750 MB -> ~270 MB
- CPU Load (time spent on executing JS/Rendering): 22s -> 2.5s
- DOM node count: 430k -> 7k up to 30k while scrolling
2018-11-06 11:39:11 +01:00
Phil Hughes 35faecb06b
Restored width & height properties 2018-11-06 10:17:59 +00:00
Stan Hu a22fd26e4f Fix save button not activating when original setting started as null 2018-11-06 08:48:03 +00:00
Filipa Lacerda 00c7d78d49
[ci skip] Renders a warning block for archieved job
When the job is archieved we render a affixed warning
on the top of the job log
2018-11-05 17:16:29 +00:00
Phil Hughes f7df9ddb52
Re-implemented image commenting on diffs
This re-implements image commenting in merge request diffs.
This feature was previously lost when the merge request
page was refactored into Vue.

With this, we create an overlay component. The overlay
component handles displaying the comment badges
and the comment form badge.
Badges are displayed based on the position attribute
sent with the discussion.

Comment forms for diff files are controlled through
a different state property. This is so we don't
tie comment forms to diff files directly creating
deep nested state. Instead we create a flat array
which holds the file hash & the X & Y position of
the comment form.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48956
2018-11-05 14:02:41 +00:00
Felipe Artur b4d005eb7b Add 'only history' option to notes filter 2018-11-05 12:30:14 +00:00
Tim Zallmann 425ddcc5a8 Merge branch 'scheduled-manual-jobs-environment-play-buttons' into 'master'
Add the Play button for delayed jobs in environment page

Closes #52129

See merge request gitlab-org/gitlab-ce!22106
2018-11-05 11:45:36 +00:00
Chris Baumbauer c10452d285 Resolve issues raised by Kamil 2018-11-03 10:48:48 -07:00
Chris Baumbauer aa44393e8f Merge branch 'master' into triggermesh-phase1-knative 2018-11-03 10:13:35 -07:00
Chris Baumbauer dc078c2417 Merge branch 'master' into triggermesh-phase1-knative 2018-11-02 08:39:25 -07:00
Kamil Trzciński 473262a04b Merge branch '28249-add-pagination' into 'master'
Adds pagination to pipelines table in merge request & commit page

Closes #28249

See merge request gitlab-org/gitlab-ce!22696
2018-11-02 12:09:03 +00:00
Achilleas Pipinellis 7f47e13218 Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'
Fix typos in comments and specs

See merge request gitlab-org/gitlab-ce!22683
2018-11-01 10:34:23 +00:00
George Tsiolis 733ae94921 Fix typos in comments and specs 2018-11-01 08:59:20 +02:00
Mike Greiling 3d13d369f9
Fix eslint violations 2018-10-31 14:33:12 -05:00
Mike Greiling 160157a92b
Prettify remaining files with differences in CE and EE 2018-10-31 14:33:12 -05:00
Filipa Lacerda 87444fb6ed
Adds pagination to pipelines table in merge request page 2018-10-31 17:10:36 +00:00
Filipa Lacerda e89534796d Merge branch '41545-gitlab-merge-request-status-could-not-connect-to-the-ci-server-please-check-your-settings-and-try-again' into 'master'
Resolve "Reword error message for internal CI unknown pipeline status"

Closes #53056

See merge request gitlab-org/gitlab-ce!22474
2018-10-31 10:29:44 +00:00
Chris Baumbauer 0a62588be7 Fix remaining domainname -> hostname rebranding 2018-10-30 22:15:23 -07:00
Chris Baumbauer 6aa0645fa7 Rename knative domainname field to hostname and fix changelog entry 2018-10-30 14:12:10 -07:00
Phil Hughes 912741cfea Merge branch '53227-empty-list' into 'master'
Resolve "Empty list for links to changed pages in Review App from MR Widget"

Closes #53227

See merge request gitlab-org/gitlab-ce!22665
2018-10-30 13:11:10 +00:00
Filipa Lacerda e10ca5eb84 Merge branch 'winh-pipeline-actions-dynamic-timer' into 'master'
Add dynamic timer for delayed jobs in pipelines list

See merge request gitlab-org/gitlab-ce!22621
2018-10-30 12:49:55 +00:00
Filipa Lacerda 15db499757
Runs prettier on changed files 2018-10-30 11:03:11 +00:00
Filipa Lacerda 0ccacd7bbd
Prevents review app to render an empty dropdown.
When a deployment has no files to show in the dropdown we
fallback to the regular single button for the review app link.

This commit moves the review app link into a component since it's
used twice.
2018-10-30 10:45:54 +00:00
Phil Hughes 605e7fddc8
Fixes diff discussions not being fully removed
This fixes a bug where a discussion on a none changed line
would not get fully removed and therefore leave the comment row
empty. This was caused by the discussiob being added
to the right when it shouldnt of been

This also fixes a very rare edge case where discussions would get added
twice to diff lines causing a Vue rendering warning

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53317
2018-10-30 10:41:25 +00:00
Marcel Amirault 14fc739c94 Renaming Secret Variables in the codebase 2018-10-30 08:49:26 +00:00
Winnie Hellmann 38a4a8bf43 Delete job_spec.js 2018-10-29 17:21:35 +00:00
Jacques Erasmus 4508343d16 Fix broken "Show whitespace changes" button on MR "Changes" tab 2018-10-29 16:16:40 +00:00
Phil Hughes 274d33803a Merge branch 'ce-7103-show-milestone-dates-within-tooltips' into 'master'
CE Backport: Show actual Milestone dates within tooltips for Milestones in Epics sidebar

See merge request gitlab-org/gitlab-ce!22653
2018-10-29 11:49:07 +00:00
Alessio Caiazza dadc046d3a post merge pipeline and environments status 2018-10-29 11:34:41 +00:00