#2144 Minor text fixes
Merged by slaznick@redhat.com. Opened by stlaz.
stlaz/pagure text_fixes  into  master

Download 2144.patch

In issues display:
- A typo, substitute "on" with "of"
It's called a "pull request" and people are used to it, don't try
to be smarter than the industry. Also, be consistent of how you call
it across the whole system.

rebased

don't try to be smarter than the industry

So nice...

This PR makes it incosistent :)

pagure/ui/fork.py:125:            'Fork is empty, there are no commits to request pulling'
pagure/ui/fork.py:446:            flask.flash('Request pull edited!')
pagure/ui/fork.py:858:            flask.flash('Request pull canceled!')

@pingou:
I might have overreacted when I saw the nightmare of "Request pull". However, I heard about you calling "pull requests" this way in your api as well and could not believe until I saw.
I suggest you rename it at all spots in the system to something people are used to till you can (backward compatibility will be a big pain once you've reached stable), this can only create frustrations such as mine in the future as people will be confused with what you are doing there by just calling it differently.
If not anything else, please, think about how bad/rude "Request pull" sounds. It reads much more like something you would request from your girl/boyfriend.

Well, have you tried running git request-pull --help in a shell?

Just as an extra data point: Gitlab calls the same thing Merge request.

Though I do think we should be consistent and that's likely mean going with pull-request since that's what we use in our URLs, though I kinda like the idea of being closer to git itself.

@pingou I believe the people behind GitHub know that "requesting a pull" sounds nasty and that's exactly the reason why they are not calling it that. "Merge request" is also fine as far as I am concerned.
I haven't seen anyone ever use git request-pull although that of course does not mean people are not using it, that just means I haven't seen anyone using it.
Rebased.

rebased

If we're going with it, we should address the point raised by @mbasti above (and likely check if the tests are affected)

It affects tests and also docstrings

rebased

The test issues should be resolved now, sorry it took me such a long time, had to do some of my work first. Also rebased on current master so that there are no merge issues.
I too reworded the commit message to something more sane, hope you'll like it better :)

rebased

Looking good!

I'm going to merge this manually to save you the rebase :)

slaznick@redhat.com commented

Commit 14c8c31e fixes this pull-request

Pull-Request has been merged by slaznick@redhat.com

Metadata