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-72222] Fix inconsistent wording between login page and security configuration #8633

Merged
merged 4 commits into from
Oct 30, 2023

Conversation

mustafau
Copy link
Contributor

The option in the login page was reworded as "Keep me signed in" in the past however the wording in the security configuration was never updated. This PR only changes the help text and the Javadoc to refer to the correct option.

I'm marking this PR as draft but I believe it's complete. I just want to make sure this is the best way to address the inconsistency.

See JENKINS-72222.

Testing done

Screen Shot 2023-10-22 at 22 39 14 Screen Shot 2023-10-22 at 22 38 40

Proposed changelog entries

Proposed upgrade guidelines

N/A

Submitter checklist

Before the changes are marked as ready-for-merge:

Maintainer checklist

@mustafau mustafau marked this pull request as ready for review October 26, 2023 21:26
@daniel-beck
Copy link
Member

Might be better to change the entire UI label instead of only the help? Perhaps phrased as

Disable "Keep me signed in"

(with typographic quotes) to make it easier to read?

@mustafau
Copy link
Contributor Author

@daniel-beck I've updated the label. Here's updated screenshot:

Screen Shot 2023-10-27 at 00 54 36

…ation/index.properties

Co-authored-by: Daniel Beck <1831569+daniel-beck@users.noreply.github.com>
@NotMyFault NotMyFault added the bug For changelog: Minor bug. Will be listed after features label Oct 29, 2023
Copy link
Member

@NotMyFault NotMyFault left a comment

Choose a reason for hiding this comment

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

/label ready-for-merge


This PR is now ready for merge. We will merge it after ~24 hours if there is no negative feedback.
Please see the merge process documentation for more information about the merge process.
Thanks!

@comment-ops-bot comment-ops-bot bot added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Oct 29, 2023
@NotMyFault NotMyFault merged commit e70dc62 into jenkinsci:master Oct 30, 2023
17 checks passed
@mustafau mustafau deleted the jenkins-72222 branch October 30, 2023 12:36
flabrie pushed a commit to flabrie/jenkins that referenced this pull request Oct 30, 2023
* master: (72 commits)
  [JENKINS-72189] fix drag&drop handle for existing repeatables (jenkinsci#8613)
  [JENKINS-72222] Fix inconsistent wording between login page and security configuration (jenkinsci#8633)
  More helpful error message for `ExtensionList.lookupSingleton` (jenkinsci#8646)
  Turkish localization fixes for build page (jenkinsci#8651)
  Update dependabot branch for LTS 2.426.x (jenkinsci#8659)
  Update dependency node to v20.9.0 (jenkinsci#8656)
  Update dependency sass to v1.69.5 (jenkinsci#8657)
  Bump org.jenkins-ci.main:jenkins-test-harness from 2096.vcfd8fa_a_67f86 to 2099.vc95b_86578f37 (jenkinsci#8653)
  Bump org.jenkins-ci.main:remoting from 3190.va_7870fc137d9 to 3192.v713e3b_039fb_e (jenkinsci#8654)
  Bump org.jenkins-ci.plugins:credentials from 1304.v5ec13eecef46 to 1307.v3757c78f17c3 (jenkinsci#8655)
  Bump commons-io:commons-io from 2.14.0 to 2.15.0 (jenkinsci#8647)
  Update Yarn to v4 (jenkinsci#8641)
  Bump org.jenkins-ci.plugins:credentials from 1293.vff276f713473 to 1304.v5ec13eecef46 (jenkinsci#8650)
  Bump org.jenkins-ci.main:remoting from 3186.vc3b_7249b_87eb_ to 3190.va_7870fc137d9 (jenkinsci#8649)
  Fix issues with help texts under security configuration (jenkinsci#8630)
  Turkish localization fixes for login and users management pages (jenkinsci#8631)
  Bump com.github.eirslett:frontend-maven-plugin from 1.14.0 to 1.14.2 (jenkinsci#8648)
  Bump org.jenkins-ci.main:remoting from 3181.v78543a_987053 to 3186.vc3b_7249b_87eb_ (jenkinsci#8643)
  Bump org.jenkins-ci.main:jenkins-test-harness from 2090.v6d1706e434a_b_ to 2096.vcfd8fa_a_67f86 (jenkinsci#8642)
  [maven-release-plugin] prepare for next development iteration
  ...

# Conflicts:
#	core/src/main/resources/lib/form/repeatable.jelly
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug For changelog: Minor bug. Will be listed after features ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants