Skip to content
This repository was archived by the owner on Feb 22, 2024. It is now read-only.

Pullrequest template fixes #339

Merged
jwgmeligmeyling merged 4 commits into from
May 9, 2016
Merged

Pullrequest template fixes #339

jwgmeligmeyling merged 4 commits into from
May 9, 2016

Conversation

@AZWN
Copy link
Contributor

@AZWN AZWN commented May 9, 2016

In this branch I fixed 3 issues regarding the pull request frontend:

  1. In The message after a merge succeeded it said that the branch was not merged, while in fact it was.
  2. In The message after a merge failed a single quote was not parsed correctly by the translator.
  3. When going back after creating a pull-request, there was still a button "Create pull request", which gave a 404 error when clicked. This is fixed by adding no-store to the Cache-Control header.

@jwgmeligmeyling jwgmeligmeyling self-assigned this May 9, 2016
@jwgmeligmeyling jwgmeligmeyling added this to the 3.2.2 milestone May 9, 2016
jwgmeligmeyling
jwgmeligmeyling reviewed May 9, 2016
View reviewed changes
src/main/resources/i18n/devhub_en.properties Outdated
pull-request.merged = Merged
pull-request.failed-to-merge = Failed to merge
pull-request.failed-to-merge.message = We can’t automatically merge this pull request due to merge conflicts. \
pull-request.failed-to-merge.message = We can\\''t automatically merge this pull request due to merge conflicts. \
Copy link
Member

@jwgmeligmeyling jwgmeligmeyling May 9, 2016

Choose a reason for hiding this comment

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

Shouldn't this be \\'?

Copy link
Contributor Author

@AZWN AZWN May 9, 2016

Choose a reason for hiding this comment

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

Whoops, that is old. The \ can completely be removed.

jwgmeligmeyling
jwgmeligmeyling reviewed May 9, 2016
View reviewed changes
...main/java/nl/tudelft/ewi/devhub/server/web/resources/repository/AbstractProjectResource.java
}

@GET
@Cache(noStore = true)
Copy link
Member

@jwgmeligmeyling jwgmeligmeyling May 9, 2016

Choose a reason for hiding this comment

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

We like it non-verbose 😄

@jwgmeligmeyling jwgmeligmeyling merged commit 04ba789 into master May 9, 2016
@jwgmeligmeyling jwgmeligmeyling deleted the pullrequest_template_fixes branch May 9, 2016 22:49
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

@jwgmeligmeyling jwgmeligmeyling

Labels

None yet

Projects

None yet

Milestone

3.2.2

Development

Successfully merging this pull request may close these issues.

3 participants

@AZWN @jwgmeligmeyling