delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \|	Merge branch 'cleanup-repository-initialize' into 'master'	Douwe Maan	2016-02-16	3	-3/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleaned up Repository#initialize The "default_branch" argument is never used and the "project" argument isn't optional. See merge request !2832
\| * \| \| \| \| \|	Cleaned up Repository#initializecleanup-repository-initialize	Yorick Peterse	2016-02-16	3	-3/+3
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The "default_branch" argument is never used and the "project" argument isn't optional.
* \| \| \| \| \|	Merge branch 'fix/13458-eager-load-blob-data' into 'master'	Douwe Maan	2016-02-16	1	-0/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eager-load image blob data in diffs Since gitlab_git 8.0, blob data are lazy-loaded so we have to call `blob.load_all_data!(repo)` to eager-load them. Fixes #13458. /cc @jacobvosmaer @dblessing @rspeicher ### New image in commit view #### Before ![Screen_Shot_2016-02-16_at_11.28.18](/uploads/01c2afa2d25f3249b27744154ab2069b/Screen_Shot_2016-02-16_at_11.28.18.png) #### After ![Screen_Shot_2016-02-16_at_11.30.56](/uploads/5ef72f717f22dfd0c1efa9e6d8ed926f/Screen_Shot_2016-02-16_at_11.30.56.png) ### Replaced image in commit view #### Before ![Screen_Shot_2016-02-16_at_11.28.20](/uploads/39bb61851608643a86d9d7616139fc6c/Screen_Shot_2016-02-16_at_11.28.20.png) #### After ![Screen_Shot_2016-02-16_at_11.30.59](/uploads/27e754fe8b57a838ac695bace27618c3/Screen_Shot_2016-02-16_at_11.30.59.png) ### Deleted image in commit view #### Before ![Screen_Shot_2016-02-16_at_11.28.22](/uploads/3648dcc2c36bc644556080e203a29fca/Screen_Shot_2016-02-16_at_11.28.22.png) #### After ![Screen_Shot_2016-02-16_at_11.31.01](/uploads/2585915d994bb6e245dd8c8553730bbf/Screen_Shot_2016-02-16_at_11.31.01.png) ### Image diff in merge request diff view #### Before ![Screen_Shot_2016-02-16_at_11.28.37](/uploads/a7963f7139fc91975ca40568570ce4f0/Screen_Shot_2016-02-16_at_11.28.37.png) #### After ![Screen_Shot_2016-02-16_at_11.31.04](/uploads/6773dbf3b870f082f0262febc9722d20/Screen_Shot_2016-02-16_at_11.31.04.png) See merge request !2830
\| * \| \| \| \| \|	Eager-load image blob data in diffsfix/13458-eager-load-blob-data	Rémy Coutable	2016-02-16	1	-0/+2
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since gitlab_git 8.0, blob data are lazy-loaded so we have to call blob.load_all_data!(repo) to eager-load them. Fixes #13458.
* \| \| \| \| \|	Merge branch 'fix/cross-reference-notes-forks' into 'master'	Douwe Maan	2016-02-16	3	-5/+30
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix cross reference notes on forks Updates `cross_reference_exists?` to match on commit only. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/5849 See merge request !2731
\| * \| \| \| \| \|	updated system note service and spec based on feedback	James Lopez	2016-02-16	2	-5/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix rubocop warning	James Lopez	2016-02-12	1	-2/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	woo hoo - getting there with the cross-reference issue. Should fix the ↵	James Lopez	2016-02-12	2	-8/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	problem and updated spec
\| * \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-02-12	52	-213/+622
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix/cross-reference-notes-forks
\| * \ \ \ \ \ \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-02-10	155	-759/+1952
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix/cross-reference-notes-forks
\| * \| \| \| \| \| \| \|	update changelog	James Lopez	2016-02-08	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fixed spec - at last!	James Lopez	2016-02-05	1	-3/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-02-05	47	-245/+733
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix/cross-reference-notes-forks
\| * \| \| \| \| \| \| \| \|	WIP - fix and spec for cross reference issue with forks	James Lopez	2016-02-04	2	-2/+18
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'rs-issue-13467' into 'master'	Douwe Maan	2016-02-16	2	-2/+39
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure Commit#show responds 404 instead of 500 when given an invalid ID Closes #13467 See merge request !2823
\| * \| \| \| \| \| \| \| \| \|	Ensure Commit#show responds 404 instead of 500 when given an invalid IDrs-issue-13467	Robert Speicher	2016-02-15	2	-2/+39
\| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13467
* \| \| \| \| \| \| \| \| \|	Merge branch 'rs-git_not_found' into 'master'	Douwe Maan	2016-02-16	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Properly render the `errors/git_not_found` page See merge request !2824
\| * \| \| \| \| \| \| \| \|	Provide explicit html format when rendering git_not_found pagers-git_not_found	Robert Speicher	2016-02-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prior, if the request format was, for example, .zip, we'd get an `ActionView::MissingTemplate` error.
\| * \| \| \| \| \| \| \| \|	Properly render the `errors/git_not_found` page	Robert Speicher	2016-02-15	1	-1/+1
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Updates to git flow documentation.	Sytse Sijbrandij	2016-02-15	1	-5/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'rs-gitlab-database-module' into 'master'	Robert Speicher	2016-02-15	2	-6/+34
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix undefined method `postgresql?` during migration See merge request !2820
\| * \| \| \| \| \| \| \|	Fix undefined method `postgresql?` during migrationrs-gitlab-database-module	Robert Speicher	2016-02-15	2	-6/+34
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'offline-migration-docs' into 'master'	Douwe Maan	2016-02-15	1	-1/+5
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add notice about offline migrations /cc @sytses See merge request !1723
\| * \| \| \| \| \| \|	Add notice about offline migrationsoffline-migration-docs	Kamil Trzciński	2015-11-02	1	-1/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-me-me-me-me' into 'master'	Valery Sizov	2016-02-15	4	-2/+39
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji Steps to reproduce: 1. Go to a MR or issue 2. Click on "thumbsup" Emoji 3 times 3. Observe the tooltip becomes "me, me" Closes #13374, #12788 See merge request !2804
\| * \| \| \| \| \| \| \|	Add spinach tests for award emojifix-me-me-me-me	Stan Hu	2016-02-13	2	-1/+36
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji	Stan Hu	2016-02-13	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Steps to reproduce: 1. Go to a MR or issue 2. Click on "thumbsup" Emoji 3 times 3. Observe the tooltip becomes "me, me" Closes #13374, #12788
* \| \| \| \| \| \| \| \|	Merge branch 'update-omniauth-1-3-1' into 'master'	Robert Speicher	2016-02-13	2	-4/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update omniauth to 1.3.1 for memory performance OmniAuth 1.3.1 may improve memory performance (~ 70% according to [intridea/omniauth!774](https://github.com/intridea/omniauth/pull/774)). Closes #2404. See merge request !2805
\| * \| \| \| \| \| \| \| \|	Update omniauth to 1.3.1 for memory performance	Takuya Noguchi	2016-02-13	2	-4/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix/ci-emails-broken-link' into 'master'	Douwe Maan	2016-02-13	8	-279/+302
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken link in CI build notification emails Closes #13199 See merge request !2785
\| * \| \| \| \| \| \| \| \| \|	Move profile notifications specs to separate filefix/ci-emails-broken-link	Grzegorz Bizon	2016-02-12	2	-98/+107
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Move build emails specs to separate file	Grzegorz Bizon	2016-02-12	3	-177/+186
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This also extracts shared examples for notification emails to separate file.
\| * \| \| \| \| \| \| \| \| \|	Add Changelog entry for links fixes in build emails	Grzegorz Bizon	2016-02-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix broken link in CI build notification emails	Grzegorz Bizon	2016-02-12	4	-46/+50
\| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13199
* \| \| \| \| \| \| \| \| \|	Merge branch 'ben.boeckel/gitlab-ce-fixup-links-in-generic-docs' into 'master'	Douwe Maan	2016-02-13	8	-32/+46
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix relative links in other markup formats _Originally opened at !1845 by @ben.boeckel._ - - - The RelativeLinkFilter was not applied to other document formats, e.g., reStructuredText, so links from the Files view or the Project view did not work. Fixes #3533. See merge request !2798
\| * \| \| \| \| \| \| \| \|	Fix relative links in other markup formatsben.boeckel/gitlab-ce-fixup-links-in-generic-docs	Ben Boeckel	2016-02-12	8	-32/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Apply the RelativeLinkFilter filter to other formats, e.g., reStructuredText so links from the Files view or the Project view work - Remove the AsciidocPipeline pipeline Fixes #3533.
* \| \| \| \| \| \| \| \| \|	Merge branch 'backup_ci_rm' into 'master'	Achilleas Pipinellis	2016-02-12	1	-2/+0
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove note on backing up GitLab CI as a separate service Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13405 See merge request !2803
\| * \| \| \| \| \| \| \| \|	Remove note on backing up GitLab CI as a separate service	Achilleas Pipinellis	2016-02-13	1	-2/+0
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	Merge branch 'fix-duplicate-hook-notifications' into 'master'	Douwe Maan	2016-02-12	3	-10/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix duplicated branch creation/deletion Web hooks/service notifications when using Web UI Similar to 423d2d6, except duplicates occurred only if a Web service (e.g. Slack) were configured. When deleting a branch, this is what was happening: 1. DeleteBranchService calls execute_hooks and execute_services 2. The call to repository.rm_branch triggers the GitHooksService. 3. This, in turn, calls GitPushService and then calls the same hooks/services again. 5145706 now makes it no longer necessary for DeleteBranchService and CreateBranchService to execute the branch hooks/services. Note that tags behave differently in GitTagPushService and GitPushService is not called. Closes #10330 See merge request !2763
\| * \| \| \| \| \| \| \| \|	Fix duplicated branch creation/deletion Web hooks/service notifications when ↵	Stan Hu	2016-02-09	3	-10/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	using Web UI Similar to 423d2d6, except duplicates occurred only if a Web service (e.g. Slack) were configured. When deleting a branch, this is what was happening: 1. DeleteBranchService calls execute_hooks and execute_services 2. The call to repository.rm_branch triggers the GitHooksService. 3. This, in turn, calls GitPushService and then calls the same hooks/services again. 5145706 now makes it no longer necessary for DeleteBranchService and CreateBranchService to execute the branch hooks/services. Note that tags behave differently in GitTagPushService and GitPushService is not called. Closes #10330
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix_500-commit-null' into 'master'	Douwe Maan	2016-02-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't try to mark broken MR as mergable In case merge request is broken, we shouldn't check if the sha is mergable, as it will be null, and there's no point, as we know that it's not mergable. See merge request !2783
\| * \| \| \| \| \| \| \| \| \|	Don't try to mark broken MR as mergable	Nemanja Boric	2016-02-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In case merge request is broken, we shouldn't check if the sha is mergable, as it will be null, and there's no point, as we know that it's not mergable.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-issue-merge-requests' into 'master'	Douwe Maan	2016-02-12	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct indentation for `issues/merge_requests` partial render Prior, it would only be shown if the issue had been edited. See merge request !2789
\| * \| \| \| \| \| \| \| \| \|	Correct indentation for `issues/merge_requests` partial renderrs-issue-merge-requests	Robert Speicher	2016-02-11	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prior, it would only be shown if the issue had been edited.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-loosen-nokogiri' into 'master'	Dmitriy Zaporozhets	2016-02-12	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Loosen Nokogiri version requirement Closes #13218 See merge request !2791
\| * \| \| \| \| \| \| \| \| \|	Loosen Nokogiri version requirementrs-loosen-nokogiri	Robert Speicher	2016-02-11	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13218
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'workhorse-0.6.4' into 'master'	Rémy Coutable	2016-02-12	3	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use gitlab-workhorse 0.6.4 This fixes a bug in 8.5.0.rc1 where downloading Git blobs through the API is broken. See merge request !2794
\| * \| \| \| \| \| \| \| \| \| \|	Use gitlab-workhorse 0.6.4workhorse-0.6.4	Jacob Vosmaer	2016-02-12	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 're-add-update-configuration-files-in-latest-upgrade-guide' ↵	Rémy Coutable	2016-02-12	1	-2/+12
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Re-add "Update configuration files" section in the 8.4 to 8.5 upgrade guide Needed because of !2782. See merge request !2796
\| * \| \| \| \| \| \| \| \| \| \| \|	Re-add "Update configuration files" section in the 8.4 to 8.5 upgrade guide	Rémy Coutable	2016-02-12	1	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Needed because of !2782. [ci skip]