Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JENKINS-62448] Enhance information displayed in approval page #300

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
cbfedb6
[JENKINS-62448] Enhance information displayed in approval page
Wadeck May 25, 2020
b7a3312
Update src/main/java/org/jenkinsci/plugins/scriptsecurity/scripts/Scr…
Wadeck May 29, 2020
4c583a4
Update src/main/java/org/jenkinsci/plugins/scriptsecurity/scripts/Scr…
Wadeck May 29, 2020
349ac04
Update src/main/java/org/jenkinsci/plugins/scriptsecurity/scripts/met…
Wadeck May 29, 2020
c559fe8
Update src/main/java/org/jenkinsci/plugins/scriptsecurity/scripts/met…
Wadeck May 29, 2020
1d39eff
Update src/main/resources/org/jenkinsci/plugins/scriptsecurity/script…
Wadeck May 29, 2020
de369d6
Update src/main/resources/org/jenkinsci/plugins/scriptsecurity/script…
Wadeck May 29, 2020
e4708f7
Update src/main/resources/org/jenkinsci/plugins/scriptsecurity/script…
Wadeck May 29, 2020
380deda
Update src/main/resources/org/jenkinsci/plugins/scriptsecurity/script…
Wadeck May 29, 2020
79b1995
Update src/main/resources/org/jenkinsci/plugins/scriptsecurity/script…
Wadeck May 29, 2020
0ea0c93
Update src/main/resources/org/jenkinsci/plugins/scriptsecurity/script…
Wadeck May 29, 2020
e978559
Update src/main/resources/org/jenkinsci/plugins/scriptsecurity/script…
Wadeck May 29, 2020
eadf75f
Apply suggestions from code review
Wadeck May 29, 2020
9bcceb4
Various updates after reviews
Wadeck Aug 18, 2020
1c5493f
Merge branch 'master' into UX_revamp
Wadeck Aug 18, 2020
3ee25d8
Adjust wording with Josh's proposal
Wadeck Aug 18, 2020
d934b69
Merge remote-tracking branch 'origin/UX_revamp' into UX_revamp
Wadeck Aug 18, 2020
0b0b624
Adding migration tests
Wadeck Aug 19, 2020
fa17df8
Adjusting existing tests
Wadeck Aug 19, 2020
8f55c06
Adjusting existing tests
Wadeck Aug 20, 2020
65926ce
Adjust grammar
Wadeck Aug 20, 2020
9dc032c
Adjust another wording
Wadeck Aug 20, 2020
18bcb49
Merge remote-tracking branch 'origin/UX_revamp' into UX_revamp
Wadeck Aug 20, 2020
fcb41b7
Adjustment after review
Wadeck Sep 2, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ StaticWhitelist.from and loading a text file listing whitelisted methods.

### Classpath for evaluating scripts
When constructing a GroovyShell to evaluate a script, or calling
`ecureGroovyScript.evaluate`, you must pass a `ClassLoader` which represents the effective
`secureGroovyScript.evaluate`, you must pass a `ClassLoader` which represents the effective
classpath for the script. You could use the loader of Jenkins core, or your plugin, or
`Jenkins.getInstance().getPluginManager().uberClassLoader`.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
import jenkins.model.Jenkins;
import org.kohsuke.stapler.DataBoundConstructor;

import java.util.Objects;

/**
* Represents background information about who requested that a script or signature be approved and for what purpose.
* When created from a thread that generally carries authentication, such as within a {@link DataBoundConstructor}, be sure to use {@link #withCurrentUser}.
Expand Down Expand Up @@ -125,4 +127,22 @@ public ApprovalContext withItemAsKey(@CheckForNull Item item) {
return new ApprovalContext(user, n, n);
}

@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
ApprovalContext that = (ApprovalContext) o;
return Objects.equals(user, that.user) &&
Objects.equals(item, that.item) &&
Objects.equals(key, that.key);
}

@Override
public int hashCode() {
return Objects.hash(user, item, key);
}
}
Loading