GitLab FOSS merge requestshttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests2014-03-26T11:19:30Zhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/41Fix Unicorn-Sidekiq Confusion In GitLab Init Script2014-03-26T11:19:30Zusername-removed-19935Fix Unicorn-Sidekiq Confusion In GitLab Init ScriptThis merge request fixes issue #126 by updating a few sections of the included GitLab init file where Unicorn was referred to as Sidekiq and vice-versa.This merge request fixes issue #126 by updating a few sections of the included GitLab init file where Unicorn was referred to as Sidekiq and vice-versa.https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/42Fix reopened merge request's code reload2014-03-12T06:51:28Zusername-removed-20168Fix reopened merge request's code reloadhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/43Fixing package name2016-11-28T16:53:03Zusername-removed-21559Fixing package nameI noticed while trying to install GitLab (as well as GitLab CI) that they refer to libxslt-dev, but I believe it should be libxslt1-dev.I noticed while trying to install GitLab (as well as GitLab CI) that they refer to libxslt-dev, but I believe it should be libxslt1-dev.https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/44update changelog2014-03-15T17:53:21Zusername-removed-15305update changelogUpdate the changelog to add the 6.6.X entriesUpdate the changelog to add the 6.6.X entrieshttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/45Update/Changelog2014-03-17T06:47:09Zusername-removed-15305Update/ChangelogUpdate the changelog to add the remaining 6.6.X entriesUpdate the changelog to add the remaining 6.6.X entrieshttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/46Update/Deploy.Sh2015-01-05T15:57:17Zusername-removed-15305Update/Deploy.ShUpdate deploy.sh
add variable for home directory
use `/bin/bash` for the scriptUpdate deploy.sh
add variable for home directory
use `/bin/bash` for the scripthttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/47Merge Request Versions (1st take)2020-03-16T23:24:28Zusername-removed-20168Merge Request Versions (1st take)This adds patch versioning support for merge requests by generating a new `MergeRequestDiff` entity each time a `MergeRequest#target_branch` is updated (via `git-push`).
This feature, aims to greatly improve code review by allowing th...This adds patch versioning support for merge requests by generating a new `MergeRequestDiff` entity each time a `MergeRequest#target_branch` is updated (via `git-push`).
This feature, aims to greatly improve code review by allowing the reviewers to see the progress of the patch across updates.
A reviewer could approve most changes in a patch version and then just do a `interdiff` with future versions instead of having to review the entire patch again.
This workflow is inspired by _ReviewCode_ and derived from my comment on: http://feedback.gitlab.com/forums/176466-general/suggestions/3896541-preserve-conversations-on-merge-requests-after-com
Currently, only _diffs_ are displayed, not _interdiffs_. But you can manually get an `interdiff` by downloading both _raw diffs_ versions to compare; for example, to compare versions 1 and 2 of a merge request you would do something like this:
```bash
interdiff \
<(curl -s -H 'Cookie: ....' 'http://your.gitlab.installation/<group-name>/<project-name>/merge_requests/<mr-iid>.diff?version=1') \
<(curl -s -H 'Cookie: ....' 'http://your.gitlab.installation/<group-name>/<project-name>/merge_requests/<mr-iid>.diff?version=2')
```
You could also pipe the _interdiff_ through _colordiff_ to get a better output.
I'm currently test driving this feature in my daily workflow and would really like know what you think about it too.https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/48In section 5. Database, added a line to set a password for psql user.2019-06-09T14:27:11Zusername-removed-22610In section 5. Database, added a line to set a password for psql user.Added step for postgresql database & user creation.Added step for postgresql database & user creation.https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/49Use monospace fonts for GFM inputs2017-03-17T00:57:33Zusername-removed-23026Use monospace fonts for GFM inputsThis is an MR for [this feedback suggestion](http://feedback.gitlab.com/forums/176466-general/suggestions/5593468-use-monospace-font-in-wiki-edit-content-textarea).
I'm not sure exactly where the best place for the fix is, but I opted...This is an MR for [this feedback suggestion](http://feedback.gitlab.com/forums/176466-general/suggestions/5593468-use-monospace-font-in-wiki-edit-content-textarea).
I'm not sure exactly where the best place for the fix is, but I opted for the typography.scss file. Basically, all ``textarea.js-gfm-input`` elements are styled with ``font-family: $monospace_font;``.
*PS: this being my first MR to gitlab, I apologize if I missed any steps in the process; let me know what's missing and I'll correct it here & in future MRs*https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/50Add Author ID To Issue API2014-04-05T06:12:19Zusername-removed-23134Add Author ID To Issue APIAllow `author_id` to be specified when creating an issue via the API.
I'm using this to aid importing issues from other services, such as GitHubAllow `author_id` to be specified when creating an issue via the API.
I'm using this to aid importing issues from other services, such as GitHubhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/51Fix 500 Error When Creating Issue For Project With No Commits2016-04-05T08:59:31Zusername-removed-19935Fix 500 Error When Creating Issue For Project With No CommitsThis merge request fixes issue #153, where trying to create an issue for a project with no commits results in a 500 error. This was done by:
1. Checking that a commit exists before attempting to load its sha
2. Handling the exception...This merge request fixes issue #153, where trying to create an issue for a project with no commits results in a 500 error. This was done by:
1. Checking that a commit exists before attempting to load its sha
2. Handling the exception thrown by Rugged when attempting to load a nil SHAhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/52Fix 500 Error When Creating Issue For Project With No Commits 2014-03-27T13:12:33Zusername-removed-19935Fix 500 Error When Creating Issue For Project With No Commits This merge request fixes issue #153, where trying to create an issue for a project with no commits results in a 500 error. This was done by updating the form to check that the repository wasn't empty before trying to load the contributio...This merge request fixes issue #153, where trying to create an issue for a project with no commits results in a 500 error. This was done by updating the form to check that the repository wasn't empty before trying to load the contribution guide.https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/53Master2014-04-24T00:53:07Zusername-removed-17670MasterImplement color of diff mail.Implement color of diff mail.https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/54Fix Architecture Img2016-04-05T08:59:29Z🚄 Job van der Voort 🚀Fix Architecture ImgImage in architecture doc was not showing correctly. Now it is.Image in architecture doc was not showing correctly. Now it is.Marin JankovskiMarin Jankovskihttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/55Update Contribution Guidelines: Specify Merge Request To Master2014-03-28T09:01:02Zusername-removed-19935Update Contribution Guidelines: Specify Merge Request To MasterThere have been occasions where contributors submitted merge requests to stable branches thinking that was the way to get changes into specific releases. This results in wasted time and effort of the GitLab team responding to the merge r...There have been occasions where contributors submitted merge requests to stable branches thinking that was the way to get changes into specific releases. This results in wasted time and effort of the GitLab team responding to the merge request requesting that it be to master, as well as the developer who needs to redo the changes.
This merge request very simply updates the contribution guidelines to specify that MRs should only be to master, and that getting changes into stable branches will be determined by the GitLab Team.
cc @JobVMarin JankovskiMarin Jankovskihttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/56Add an internal API to get info on user by userID2016-05-24T07:14:31Zusername-removed-24369Add an internal API to get info on user by userIDAdd an internal API to get info on user by userID.
It is only to get the merge request https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/2 on gitlab-shell to work. (commit https://gitlab.com/wargre/gitlab-shell/commit/1931e6d...Add an internal API to get info on user by userID.
It is only to get the merge request https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/2 on gitlab-shell to work. (commit https://gitlab.com/wargre/gitlab-shell/commit/1931e6df234236ac71e66d8d4a66b31e250408b1)https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/57Add One Line Upgrader Command2016-10-14T14:14:48Zusername-removed-2435Add One Line Upgrader Commandhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/58Add One Line Upgrader Command2016-04-05T08:59:32Zusername-removed-2435Add One Line Upgrader CommandThis is related to my previous MR from one month ago. I've done a fresh checkout of master and reapplied the path so that the tree is clean again, as requested.This is related to my previous MR from one month ago. I've done a fresh checkout of master and reapplied the path so that the tree is clean again, as requested.https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/62Merge Request Officer2016-04-05T08:59:33ZSid SijbrandijMerge Request OfficerDrew BlessingDrew Blessinghttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/63Update status of IRC in PROCESS doc2016-04-05T08:59:33ZDrew BlessingUpdate status of IRC in PROCESS docJust a small fix to update the official status of the IRC channel in the PROCESS.md doc.Just a small fix to update the official status of the IRC channel in the PROCESS.md doc.