News for hackers. Stuff that matters.
Re:GitLab 8.11 Released with Issue Boards and Merge Conflict... by nickysielicki on Monday August 22, 2016 @04:31PM (#12339205)
With both GitHub and gitlab, I wish there was more work in making it easy to create pull requests without having to click around on a website.

I'll often check out software, notice something small that I can easily fix, and spend 5 minutes fixing and testing it. But then I have to spend another 5 minutes going on GitHub, forking the repository to my profile, going back into my shell, changing the URL for origin, pushing the change, going back to GitHub, creating the pull request on the project, and then going back to my profile and deleting the fork that I have no interest in maintaining. This should be so much easier.

That being said, I run Gitlab under a small docker box and I couldn't be happier with it. It's so darn easy to setup. Grats to gitlab team.

Re:GitLab 8.11 Released with Issue Boards and Merge Conflict... by AaronBBrown on Tuesday August 23, 2016 @10:07AM (#12343813)
Have you tried `hub`? https://github.com/github/hub

    ~/src/bar (foo =)$ hub pull-request
    https://github.com/foo/bar/pull/5
There is also `hub fork` and others:

    These GitHub commands are provided by hub:

       pull-request   Open a pull request on GitHub
       fork           Make a fork of a remote repository on GitHub and add as remote
       create         Create this repository on GitHub and add GitHub as origin
       browse         Open a GitHub page in the default browser
       compare        Open a compare page on GitHub
       release        List or create releases (beta)
       issue          List or create issues (beta)
       ci-status      Show the CI status of a commit
Re:GitLab 8.11 Released with Issue Boards and Merge Conflict... by mweilgart on Monday August 22, 2016 @06:01PM (#12339773)
You mean something like this? GitLab just added the feature; it looks like what you're asking for.

https://about.gitlab.com/2016/08/22/gitlab-8-11-released/#mr...

Re:GitLab 8.11 Released with Issue Boards and Merge Conflict... by DouweM on Monday August 22, 2016 @04:49PM (#12339327)
Depending how small the fix is, you can edit a file in any project right from the GitLab interface, and a fork and merge request will be created automatically in the background! The only thing left to do is to remove the fork after the MR has been accepted.
Re:GitLab 8.11 Released with Issue Boards and Merge Conflict... by carussell on Monday August 22, 2016 @08:49PM (#12340531)
This doesn't really help for anything except for content editing (e.g., markdown). Consider the above example: the original poster now has all these files they've changed on disk. The best case scenario now involves opening all those files up one by one and pasting them into the browser's textarea. (Can you change multiple files this way and wrap it up into a single atomic commit? Whatever the case, this actually results in a lot more pointy-clicky, not less.)

A patch is a unit of change. Historically, that's the type of unit that the open source world has operated with. The only reason we're having this conversation right now is because GitHub decided to build on top of pull requests instead of patches for lock-in reasons. GitLab has no such motivations, so it's silly to continue following them, especially since Git has had native support for patches from the beginning.

Just support patches already.

Re:GitLab 8.11 Released with Issue Boards and Merge Conflict... by knownothing on Monday August 22, 2016 @05:01PM (#12339412)
You can use GitHub's web UI to do all of that.
Re:GitLab 8.11 Released with Issue Boards and Merge Conflict... by nickysielicki on Monday August 22, 2016 @05:11PM (#12339477)
Right. But what I'm saying is that you have to use GitHub's web UI to do all of that.
Re:GitLab 8.11 Released with Issue Boards and Merge Conflict... by swsieber on Monday August 22, 2016 @06:45PM (#12339985)
GitLab has an API, and a it's possible to create merge requests through it. I scripted 'turn a commit into merge request' as a Gradle command at the company where I work. So, it's doable.

Someone else in this thread also linked to command line tools, I haven't looked at them, but those might promising.