Skip to content

[master] Expose licensing details before loading - #1400

Merged
crosbymichael merged 3 commits into
docker:masterfrom
dhiltgen:activate_ux_master
Oct 1, 2018
Merged

[master] Expose licensing details before loading#1400
crosbymichael merged 3 commits into
docker:masterfrom
dhiltgen:activate_ux_master

Conversation

@dhiltgen

Copy link
Copy Markdown
Contributor

forward port #1387 to master

Daniel Hiltgenand others added 3 commits September 28, 2018 14:37
Help the user understand which license they're about
to load in case they have multiple licenses they need to
figure out.
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
(cherry picked from commit 5a97a93)
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
(cherry picked from commit 41910b6)
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit a7488d1)
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
@codecov-io

Copy link
Copy Markdown

Codecov Report

Merging #1400 into master will decrease coverage by 0.01%.
The diff coverage is 52.38%.

@@ Coverage Diff @@## master #1400 +/- ##
==========================================
- Coverage 54.31% 54.29% -0.02% 
==========================================
Files 289 289 Lines 19318 19326 +8 ==========================================
+ Hits 10492 10494 +2 - Misses 8148 8154 +6 
Partials 678 678

@dhiltgen

dhiltgen commented Sep 28, 2018

Copy link
Copy Markdown
ContributorAuthor

Once this goes in I'll forward port #1388 to master as well.

@thaJeztahthaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@andrewhsuandrewhsu changed the title Forward port #1387 to master[master] Expose licensing details before loadingOct 1, 2018
@crosbymichael

Copy link
Copy Markdown
Contributor

LGTM

@crosbymichael
crosbymichael merged commit ea5f4c4 into docker:masterOct 1, 2018
@GordonTheTurtleGordonTheTurtle added this to the 19.03.0 milestone Oct 1, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

@dhiltgen@codecov-io@crosbymichael@seemethere@thaJeztah@GordonTheTurtle@andrewhsu