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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix labels for git clone/git fetch Project CI settingrs-git-fetch-labels	Robert Speicher	2016-02-16	1	-2/+2
\|
*	Merge branch 'redis_installation' into 'master'	Achilleas Pipinellis	2016-02-16	2	-15/+70
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix Redis installation guide See merge request !2839
\| *	Fix Redis installation guide	Achilleas Pipinellis	2016-02-16	2	-15/+70
\| \| \| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'bugfix/jschatz1/sidebar-fixes-13215' into 'master'	Jacob Schatz	2016-02-16	2	-1/+26
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sidebar fixes Fixes #13215 * when editing a dropdown, but not changing anything you end up in an ugly state * the hover-over state for the subscribe and other buttons are veeery subtle * the collapse button needs some sort of hover-over state * the reference gets shortened. It always got shortened. Not an issue with this in particular. * the minimized sidebar is not functional. The copy button doesn't do anything * looks all funky in safari (not for me) See merge request !2736
\| * \|	Make copy button in collapsed sidebar work.bugfix/jschatz1/sidebar-fixes-13215	Jacob Schatz	2016-02-05	2	-1/+14
\| \| \|
\| * \|	Fix span margin issues	Jacob Schatz	2016-02-05	1	-1/+5
\| \| \|
\| * \|	Add hover for gutter toggle button	Jacob Schatz	2016-02-05	1	-5/+8
\| \| \|
\| * \|	Change hover color of sidebar buttons	Jacob Schatz	2016-02-05	1	-0/+5
\| \| \|
\| * \|	Fix ugly state of dropdown	Jacob Schatz	2016-02-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	when editing a dropdown, but not changing anything you end up in an ugly state Fixes #13215
* \| \|	Merge branch 'bugagazavr/gitlab-ce-extend-hooks' into 'master'	Douwe Maan	2016-02-16	12	-98/+309
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add new data to project in push, issue, merge-request and note webhooks data _Originally opened at !2738 by @bugagazavr._ - - - What does this MR do? Adds more data to hooks, makes repository data in all hook more dry ( use one hook_attrs method for repository data in all hooks ) Are there points in the code the reviewer needs to double check? 1. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/project.rb#L738 2. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/concerns/issuable.rb#L132 3. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/push_data_builder.rb#L52 4. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/note_data_builder.rb#L56 Why was this MR needed? More information about user for push events, and more data about repositiry ( project ) What are the relevant issue numbers? No Screenshots (if relevant) No See merge request !2788
\| * \| \|	Use project.web_url instead deprecated repository.homepage in PushoverService	Rémy Coutable	2016-02-16	1	-1/+1
\| \| \| \|
\| * \| \|	Add new data to project in push, issue, merge-request and note webhooks databugagazavr/gitlab-ce-extend-hooks	Kirill Zaitsev	2016-02-11	11	-97/+308
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add `avatar_url`, `description`, `git_ssh_url`, `git_http_url`, `path_with_namespace` and `default_branch` in `project` in push, issue, merge-request and note webhooks data - Deprecate the `ssh_url` in favor of `git_ssh_url` and `http_url` in favor of `git_http_url` in `project` for push, issue, merge-request and note webhooks data - Deprecate the `repository` key in push, issue, merge-request and note webhooks data, use `project` instead
* \| \| \|	Merge branch 'fix/13356-issuable-index-of-total-in-sidebar' into 'master'	Douwe Maan	2016-02-16	8	-95/+84
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the "x of y" displayed at the top of Issuables' sidebar 1. We now display the index of the current issuable among all its project's issuables, of the same type and with the same state. 1. Also, refactored a bit the Issuable helpers into a new `IssuablesHelper` module. 1. Added acceptance specs for the sidebar counter. Note: I didn't add a CHANGELOG item since it's a bug fix for an unreleased version. Fixes #13356. See merge request !2818
\| * \| \| \|	Display "iid of max_iid" in Issuables' sidebar	Rémy Coutable	2016-02-16	3	-19/+5
\| \| \| \| \|
\| * \| \| \|	Fix the "x of y" displayed at the top of Issuables' sidebarfix/13356-issuable-index-of-total-in-sidebar	Rémy Coutable	2016-02-15	9	-96/+99
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. We now display the index of the current issuable among all its project's issuables, of the same type and with the same state. 2. Also, refactored a bit the Issuable helpers into a new IssuablesHelper module. 3. Added acceptance specs for the sidebar counter.
* \| \| \| \|	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