Commit Graph

3484 Commits

Author SHA1 Message Date
Mike Greiling 7c4e996c74 Merge branch 'winh-merge-request-diff-discussion-commit-id' into 'master'
Pass commit when posting diff discussions

See merge request gitlab-org/gitlab-ce!23371
2018-12-07 09:06:14 +00:00
Oswaldo Ferreira 26b94bcc7d Remove unused data from discussions endpoint
We don't need a series of attributes to render diff files on
discussions.json request. Therefore this MR removes lots of unnecessary
attributes from the request, mainly the highlighted diff lines, which
are pretty expensive.
2018-12-06 17:07:49 -08:00
Nick Thomas 9395d198f9
Use BFG object maps to clean projects 2018-12-06 18:58:00 +00:00
Filipa Lacerda 2e3cefa6cd Merge branch 'diff-file-moved-view' into 'master'
Fixed renamed and mode changed diff viewers not rendering on merge requests

Closes #52607

See merge request gitlab-org/gitlab-ce!23600
2018-12-06 17:11:20 +00:00
Phil Hughes 2ed65be1c3
Fixed renamed and mode changed diff viewers
Renders mode changed and renamed file merge request diff
viewers on the frontend.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52607
2018-12-06 14:39:29 +00:00
Kushal Pandya 62d971129d Merge branch 'mg-fix-knative-application-row' into 'master'
Disable Knative for group clusters

See merge request gitlab-org/gitlab-ce!23577
2018-12-06 09:35:50 +00:00
Phil Hughes 71da313cd4 Merge branch '5426-fe-web-terminal-init-store-ce' into 'master'
CE Port of "Setup IDE terminal store for environment checks"

See merge request gitlab-org/gitlab-ce!23575
2018-12-06 09:31:55 +00:00
Winnie Hellmann e7439c3104 Pass commit when posting diff discussions 2018-12-05 22:36:51 +01:00
Scott Hampton a611eab942 Resolve "Include tags into pipeline detail view" 2018-12-05 21:36:18 +00:00
Mike Greiling 1f7e067256
Update test to ensure the correct applications are shown 2018-12-05 15:24:47 -06:00
Paul Slaughter 8ce8303fa9
Add projectRunners to api.js
- This is needed by the Web Terminal to check environment
2018-12-05 14:40:08 -06:00
Filipa Lacerda cfe484795d Merge branch 'diff-expand-commit-file' into 'master'
Fixed expanding diff commit files

Closes #50662

See merge request gitlab-org/gitlab-ce!23591
2018-12-05 18:04:35 +00:00
Phil Hughes d3a8fb6e79
Fixed expanding diff commit files
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50662
2018-12-05 14:12:51 +00:00
Phil Hughes 6dfede5a6d
Fixed multiple discussions getting added to diff lines
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/8195
2018-12-05 11:42:41 +00:00
Filipa Lacerda 2cd710732e Merge branch 'expand-diff-bug' into 'master'
Fixed diff files not expanding

Closes #54868

See merge request gitlab-org/gitlab-ce!23555
2018-12-05 09:11:31 +00:00
Phil Hughes 9afc3069b0
Fixed diff files not expanding
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54868
2018-12-04 17:51:57 +00:00
Phil Hughes 7aa8803083 Updated variable name to forceExpanded 2018-12-04 13:27:18 +00:00
Phil Hughes b8ee8c2787
Fixed multiple diff line discussions not expanding
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53600
2018-12-04 10:58:02 +00:00
Winnie Hellmann 1cae0af4b8 Fix collapsing discussion replies 2018-12-04 10:09:51 +00:00
Clement Ho 04a6ed6970 Merge branch '54514-tooltips' into 'master'
Fixes tooltip overflowing in mini pipeline

Closes #54514

See merge request gitlab-org/gitlab-ce!23486
2018-12-03 15:40:34 +00:00
Phil Hughes d32f368072 Merge branch '1979-redesign-mr-widget-approvals-ce' into 'master'
Redesign of MR header sections (CE Port)

See merge request gitlab-org/gitlab-ce!23465
2018-12-03 12:52:29 +00:00
Filipa Lacerda 699e1180f6
Fixes race condition in delayed job spec 2018-12-03 11:43:43 +00:00
Filipa Lacerda 5a7a221f9b
Fixes tooltip overflowing in mini pipeline 2018-11-30 17:32:15 +00:00
Paul Slaughter 75d94c4cd0
Redesign of MR header sections (CE Port)
- https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8593
- Create mr-widget-icon to encapsulate circle icons
- Decouple workflow L&F from mr-widget-heading
- Decouple container L&F from mr-widget-heading
2018-11-30 08:17:13 -06:00
Thomas Holder fe76827f17 Resolve "mergeUrlParams wrong with fragment url" 2018-11-30 09:49:22 +00:00
Kushal Pandya b6e70c8ae4 Merge branch 'winh-timeline-entry-component' into 'master'
Extract shared timeline entry component

See merge request gitlab-org/gitlab-ce!23447
2018-11-30 09:27:27 +00:00
Sam Bigelow 44a0121ad4 Resolve "Merge request refactor does not highlight selected line" 2018-11-30 08:48:47 +00:00
Winnie Hellmann e3bddb6223 Replace existing uses of timeline-entry with timeline entry component 2018-11-29 23:15:40 +01:00
Jose Ivan Vargas 40bb1bb363 Add empty state for graphs with no values 2018-11-29 19:22:43 +00:00
Winnie Hellmann 99862050de Create shared timeline entry component 2018-11-29 19:10:28 +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
Filipa Lacerda eb7c16dee4
Adds bottom margin to the environment info block 2018-11-28 12:06:42 +00:00
Filipa Lacerda 822fa649eb Merge branch 'discussion-perf-fixes' into 'master'
Improve discussion rendering performance

Closes #51506

See merge request gitlab-org/gitlab-ce!22935
2018-11-28 09:45:36 +00:00
Sam Bigelow 153dddefed Resolve "Jump to top in merge request" 2018-11-27 18:05:16 +00:00
Filipa Lacerda a99f342b42 Merge branch 'issuable-suggestions' into 'master'
Suggest issues when typing title

Closes #22071

See merge request gitlab-org/gitlab-ce!22866
2018-11-27 17:58:27 +00:00
Phil Hughes 50e21a89a0
Suggests issues when typing title
This suggests possibly related issues when the user types a title.

This uses GraphQL to allow the frontend to request the exact
data that is requires. We also get free caching through the Vue Apollo
plugin.

With this we can include the ability to import .graphql files in JS
and Vue files.
Also we now have the Vue test utils library to make testing
Vue components easier.

Closes #22071
2018-11-27 15:10:40 +00:00
Phil Hughes 397fd09ac4 Merge branch 'winh-parse-boolean' into 'master'
Add parseBoolean helper function

See merge request gitlab-org/gitlab-ce!23283
2018-11-27 11:51:34 +00:00
Phil Hughes adf8ad9eee
Improve discussion rendering performance
Improve the renderign of new and existing discussions
by reducing the number of watchers on each object & array.
Previously every discussion change would trigger an update for every
discussion component.

Also tidied up some components to get them closer to our docs.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51506
2018-11-27 11:40:39 +00:00
Kamil Trzciński 3a3a767c4a Merge branch 'triggermesh-phase2-external-ip' into 'master'
Expose External IP address for Knative's gateway

See merge request gitlab-org/gitlab-ce!23162
2018-11-27 10:37:48 +00:00
Sam Bigelow 5b7b482274 Resolve "Warn in Web Editor when user navigates away" 2018-11-27 10:05:25 +00:00
Winnie Hellmann 47fad3353f Add parseBoolean helper function 2018-11-27 09:18:48 +01:00
Chris Baumbauer 2937be7b0c Expose external_ip to knative cluster application 2018-11-26 12:46:00 -08:00
Luke Bennett 1877eb49c0 Attempt to fix lazy loader spec transient failure 2018-11-26 08:57:21 +00:00
Kamil Trzciński 9c98e2a922 Merge branch 'certmanager-temp' into 'master'
Deploy cert-manager to managed cluster for SSL certificates

See merge request gitlab-org/gitlab-ce!23036
2018-11-23 15:24:32 +00:00
Phil Hughes ab0828cf0f Merge branch '_acet-fix-unable-to-reply-resolved-nondiff-discussion' into 'master'
Allow commenting to resolved non-diff discussions

Closes #54330

See merge request gitlab-org/gitlab-ce!23279
2018-11-23 09:22:11 +00:00
Fatih Acet e6cf3c7a6f
Allow commenting to resolved non-diff discussions 2018-11-22 15:45:28 +01:00
Filipa Lacerda 19e9438d34 Merge branch 'mr-file-tree-commit' into 'master'
Show toggle tree button on merge request commits

Closes #53019

See merge request gitlab-org/gitlab-ce!23238
2018-11-22 14:32:49 +00:00
Kushal Pandya 7002752d47 Merge branch 'fix-typos-occured' into 'master'
Fix typos occured to occurred

See merge request gitlab-org/gitlab-ce!23105
2018-11-22 14:02:52 +00:00
Phil Hughes 93c614ce92
Show toggle tree button on merge request commits
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53019
2018-11-22 12:04:18 +00:00
George Tsiolis 88e8ee0f6c Remove redundant specs for tooltip 2018-11-21 23:11:41 +02:00