Skip to content

fix: Fixes pluralization of "Callback URL" #421

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

Merged
merged 6 commits into from
Dec 11, 2020
Merged

fix: Fixes pluralization of "Callback URL" #421

merged 6 commits into from
Dec 11, 2020

Conversation

cbaudouinjr
Copy link
Member

Simply adds an "s" to the Callback URL table header.

fixes #420

Copy link
Contributor

@peterkos peterkos left a comment

Choose a reason for hiding this comment

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

Can you also change it on the edit page? Maybe Redirect URIs, or Redirect URI(s) if we want to make it explicit that its optional to have more than one

Screen Shot 2020-12-09 at 1 22 59 AM

@peterkos peterkos added the 2.1 label Dec 11, 2020
@cbaudouinjr cbaudouinjr requested review from peterkos and removed request for JeremyRudman December 11, 2020 08:14
@peterkos
Copy link
Contributor

Called "URIs" somewhere and "URLs" elsewhere "because doorkeeper" - @cbaudouinjr 2k20

Copy link
Contributor

@peterkos peterkos left a comment

Choose a reason for hiding this comment

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

:shipit:

@peterkos peterkos merged commit 93d95de into 2.1 Dec 11, 2020
@peterkos peterkos deleted the hm-420 branch December 11, 2020 08:34
cbaudouinjr added a commit that referenced this pull request Dec 11, 2020
* Fixed issue on desktop

* Map overflow scroll

Signed-off-by: Peter Kos <[email protected]>

* Fix scroll issue

Signed-off-by: Peter Kos <[email protected]>

* Fixed toggle button; fits screen, sidebar width

Sidebar width is better
Toggle button fills height of navbar

Signed-off-by: Peter Kos <[email protected]>

* fix: Allows optional assets to be unset

* Fixes test

* feat: Redesigns OAuth2 portal (#404)

* feat: Redesigns OAuth2 portal

* fix: Some Hound issues

* Changes application verbiage

* Fixes ID issue

* Fixes table link and sign out button

* Peter's wishes

* fix: Fixes MyMLH branding in config (#412)

* feat(settings): Simplifies Config (#409)

* feat(settings): Simplifies Config

* Resolves Hound issues

* Update app/views/manage/configs/index.html.haml

Co-authored-by: Peter Kos <[email protected]>

* design: Increases the font-weight and reorganizes the page

* fix: Hound issues

Co-authored-by: Peter Kos <[email protected]>

* feat: Adds support for digital-only hackathons (#395)

* feat: Adds support for digital-only hackathons

* fix: Provides clarity for what is removed from digital hackathons

Co-authored-by: Peter Kos <[email protected]>

* feat: Adds GitHub Action for releases (#426)

* feat: Adds GitHub Action CI testing (#423)

* feat: Adds GitHub Action CI testing

* fix: Adds sudo

* refactor: Changes naming

* Removes travis.yml

* docs: Adds ruby version comment

* feat: Adds Legal Agreements object for dynamic agreements (#429)

* feat: Adds Legal Agreements object for dynamic agreements

* fix: Fixes several bugs with agreement error checking

* fix: Fixes several Hound issues

* fix: Fixes some more Hound issues

* Update app/views/application/_unaccepted_agreements_notice.html.haml

Co-authored-by: Peter Kos <[email protected]>

* fix: Fixes Peter's requests

* Fix agreement checkbox wrap with small names

Signed-off-by: Peter Kos <[email protected]>

* Fix straggling merge conflict error

Signed-off-by: Peter Kos <[email protected]>

* Removed agreements card

Signed-off-by: Peter Kos <[email protected]>

* Force validation for agreement on questionnaire pg

FRONTEND

Signed-off-by: Peter Kos <[email protected]>

Co-authored-by: Peter Kos <[email protected]>

* refactor: Changes hackathon_manager to HackathonManager (#417)

Co-authored-by: Peter Kos <[email protected]>

* feat: Adds GitLab VCS URL support (#415)

* feat: Adds GitLab VCS URL support

* fix: Corrects Bitbucket capitalization

* Update schema.rb

Removes events

* Update test/models/questionnaire_test.rb

Co-authored-by: Peter Kos <[email protected]>

* Update test/models/questionnaire_test.rb

Co-authored-by: Peter Kos <[email protected]>

Co-authored-by: Peter Kos <[email protected]>

* fix: Fixes pluralization of "Callback URL" (#421)

* fix: Fixes pluralization of "Callback URL"

* refactor: Adds "(s)" to Callback URLs

Co-authored-by: Peter Kos <[email protected]>

* refactor: Removes legal section from config (#440)

* refactor: Removes legal section from config

* refactor: Removes agreement asset from locals

* Removes additional PDF asset messages

Co-authored-by: Peter Kos <[email protected]>

* fix(map): changed map overflow from scroll to auto (#428)

changed the map div from overflow scroll to overflow auto so that the
scroll bars do not show up when the map is large enough to not need them

Co-authored-by: Peter Kos <[email protected]>

* build(deps-dev): Bump semantic-release from 17.2.1 to 17.2.3 (#435)

Bumps [semantic-release](https://github.com/semantic-release/semantic-release) from 17.2.1 to 17.2.3.
- [Release notes](https://github.com/semantic-release/semantic-release/releases)
- [Commits](semantic-release/semantic-release@v17.2.1...v17.2.3)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Peter Kos <[email protected]>

Co-authored-by: Peter Kos <[email protected]>
Co-authored-by: JeremyRudman <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fill pluralization of "Callback URL" in table header of Doorkeeper
2 participants