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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Cleanup bootstrap variable example filerefactor-css	Dmitriy Zaporozhets	2015-03-17	1	-741/+4
\|
*	More use of sass variables. Reject flatly gray colors	Dmitriy Zaporozhets	2015-03-17	5	-24/+17
\|
*	Align services like in EE for easier merging	Dmitriy Zaporozhets	2015-03-17	1	-4/+22
\|
*	Move CHANGELOG item to correct milestone	Dmitriy Zaporozhets	2015-03-17	1	-1/+1
\|
*	Merge branch 'external_wiki' into 'master'	Dmitriy Zaporozhets	2015-03-18	7	-2/+102
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for external wikis ## What does this MR do? This MR adds the possibility to replace the link to the internal wiki of gitlab with a custom link. Currently this is realised as a service. ## What Use Case does this MR solve? In my Company we already have a wiki System (Confluence). We have a policy to use the existing wiki, so we can't switch to the internal wiki Gitlab provides. This currently only leaves us two choices: 1. Disable the gitlab wiki. That means we completly loose the connection between wiki and code from the gitlab ui. 2. Create a simple wiki page with a link to our external wiki and hope that no one uses the internal one. Both solutions are not really good. So what can be done to improve the situation while making it as easy as possible for new developers to access both, wiki and gitlab? Replacing the wiki link kinda like the JIRA integration replaces the issues link looks like a good first step to me. :) This can probably be extended later to completly prevent access to the internal wiki (currently that's still possible if you know the link) or maybe to check if the link really points to a wiki. ## Screenshot: ![external_wiki_service](https://gitlab.com/uploads/gitlab-org/gitlab-ce/89b27cf068/external_wiki_service.png) See merge request !291
\| *	Add a service to support external wikis	Hannes Rosenögger	2015-03-12	7	-2/+102
\| \|
* \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-03-17	2	-2/+2
\|\ \
\| * \	Merge branch 'replace-linux-with-gnu-linux' into 'master'	Dmitriy Zaporozhets	2015-03-18	2	-2/+2
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace linux with gnu linux To recognize the work of Dr. Stallman. See merge request !391
\| \| * \|	Replace linux with GNU/Linux to recognize the work of Dr. Stallman.replace-linux-with-gnu-linux	Sytse Sijbrandij	2015-03-15	2	-2/+2
\| \| \| \|
* \| \| \|	Fix email template css for project moved emails	Dmitriy Zaporozhets	2015-03-17	1	-2/+2
\| \| \| \|
* \| \| \|	Merge branch 'css-vars' into 'master'	Dmitriy Zaporozhets	2015-03-18	10	-31/+31
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More actively use css variabled to prevent colors duplication See merge request !1715
\| * \| \|	More actively use css variabled to prevent colors duplication	Dmitriy Zaporozhets	2015-03-17	10	-31/+31
\| \| \| \|
* \| \| \|	Fix scroll for last push widget	Dmitriy Zaporozhets	2015-03-17	1	-1/+3
\| \| \| \|
* \| \| \|	Merge branch 'update-grack' into 'master'	Dmitriy Zaporozhets	2015-03-18	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Grack. See merge request !1712
\| * \| \| \|	Update Grack.	Douwe Maan	2015-03-17	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'update-omniauth-ldap' into 'master'	Dmitriy Zaporozhets	2015-03-18	2	-5/+5
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update omniauth-ldap. See merge request !1713
\| * \| \| \|	Update omniauth-ldap.	Douwe Maan	2015-03-17	2	-5/+5
\| \|/ / /
* \| \| \|	Its time for 7.10.0.pre	Dmitriy Zaporozhets	2015-03-17	2	-1/+3
\| \| \| \|
* \| \| \|	Merge branch 'update_install_documentation' into 'master'	Marin Jankovski	2015-03-17	4	-21/+24
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update installation and upgrade documentation See merge request !1714
\| * \| \| \|	Update upgrade and installation docs for 7.9.	Marin Jankovski	2015-03-17	2	-15/+18
\| \| \| \| \|
\| * \| \| \|	Merge branch 'fix_service_trigger_ui' into 'master'	Douwe Maan	2015-03-17	2	-6/+6
\| \|\ \ \ \ \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix service UI There was a small bug in the service UI that caused an empty 'Trigger' label to be shown. After this change the 'Trigger' field is not shown when only one event type of supported. Before: ![Screen Shot 2015-03-16 at 7.40.31 PM](https://gitlab.com/uploads/dblessing/gitlab-ce/0457a0b918/Screen_Shot_2015-03-16_at_7.40.31_PM.png) I think in the future there are other things we can do to enforce at least one selected event type and also show the user what the singular event type is if only one is supported. That will take time to work out and this is definitely acceptable for the time. See merge request !395
\| * \| \| \|	Fix UI bug regarding services	Drew Blessing	2015-03-17	2	-6/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-03-17	8	-19/+53
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Fix changelog.	Douwe Maan	2015-03-17	1	-3/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'atom-xhtml-squashed' into 'master'	Douwe Maan	2015-03-17	8	-19/+55
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix invalid Atom feeds when using emoji, horizontal rules, or images This is a fix for issues #880, #723, #1113. Markdown must be rendered to XHTML, not HTML, when generating summary content for Atom feeds. Otherwise, content-less tags like img and hr are not terminated and make the Atom XML invalid. Such tags are generated when issue descriptions, merge request descriptions, comments, or commit messages use emoji, horizontal rules, or images. To pass this option through from the relevant Haml templates to the proper place in the `gfm()` method, a new method `gfm_with_options()` is introduced. It reuses the options dictionary passed to `markdown()` and interprets options `xhtml` and `parse_tasks` from it (the latter was a convenient replacement for `gfm_with_tasks()`). `xhtml` is already interpreted by Redcarpet::Render::HTML, but that alone was not sufficient, because the post-processing in `gfm()` would convert its XHTML tags back to HTML. I found no way of passing additional optional options to the existing `gfm()` method without requiring updates to existing callers and without getting in the way of the existing optional arguments, but maybe someone who knows more about Ruby than I can think of one. Thorough review appreciated since this is the first time I have used Ruby. See merge request !344
\| \| * \| \|	Fix invalid Atom feeds when using emoji, horizontal rules, or images.	Christian Walther	2015-03-16	8	-19/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes issues #880, #723, #1113: Markdown must be rendered to XHTML, not HTML, when generating summary content for Atom feeds. Otherwise, content-less tags like <img> and <hr>, generated when issue descriptions, merge request descriptions, comments, or commit messages use emoji, horizontal rules, or images, are not terminated and make the Atom XML invalid.
* \| \| \| \|	Merge branch 'last-deploy-key' into 'master'	Dmitriy Zaporozhets	2015-03-17	4	-2/+44
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delete deploy key when last connection to a project is destroyed. Addresses #1959. See merge request !1710
\| * \| \| \| \|	Satisfy Rubocop.	Douwe Maan	2015-03-17	1	-2/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Delete deploy key when last connection to a project is destroyed.	Douwe Maan	2015-03-17	4	-2/+45
\| \|/ / / /
* \| \| \| \|	Merge branch 'issue_subscription' into 'master'	Dmitriy Zaporozhets	2015-03-17	17	-4/+245
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Subscription to issue/mr Fixes #1911 and #1909 ![joxi_screenshot_1426601822159](https://dev.gitlab.org/gitlab/gitlabhq/uploads/53021bc5783271322ab2dfba7598eaa3/joxi_screenshot_1426601822159.png) ![joxi_screenshot_1426601836423](https://dev.gitlab.org/gitlab/gitlabhq/uploads/244ff360fbd6f30980f8dad699400814/joxi_screenshot_1426601836423.png) See merge request !1702
\| * \| \| \|	improve UI	Valery Sizov	2015-03-17	5	-22/+30
\| \| \| \| \|
\| * \| \| \|	tests	Valery Sizov	2015-03-16	15	-25/+115
\| \| \| \| \|
\| * \| \| \|	fix specs	Valery Sizov	2015-03-16	3	-12/+22
\| \| \| \| \|
\| * \| \| \|	rename table subscribe; make it polymorfic	Valery Sizov	2015-03-16	11	-44/+41
\| \| \| \| \|
\| * \| \| \|	update changelog	Valery Sizov	2015-03-16	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	code folding fix	Valery Sizov	2015-03-16	5	-8/+19
\| \| \| \| \|
\| * \| \| \|	Subscription	Valery Sizov	2015-03-15	11	-3/+127
\| \| \| \| \|
* \| \| \| \|	Properly align save user profile button	Dmitriy Zaporozhets	2015-03-17	1	-2/+4
\| \| \| \| \|
* \| \| \| \|	Revert "Merge branch 'backup-permissions' into 'master'"	Dmitriy Zaporozhets	2015-03-16	3	-48/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit c42262b43b009af990e5769840391862d64a1c2d, reversing changes made to c6586b1283a94c8f08bc669f4d8a9384b263073e.
* \| \| \| \|	Fix button color inside alert	Dmitriy Zaporozhets	2015-03-16	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-03-16	1	-1/+1
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'relative-sematic-versioning' into 'master'	Dmitriy Zaporozhets	2015-03-17	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Relative sematic versioning Note to indicate that semantic versioning is not absolute or allows you to fly blind. See merge request !286
\| \| * \| \| \| \|	Add note about semantic versioning not being absolute.relative-sematic-versioning	Sytse Sijbrandij	2015-01-10	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'backup-permissions' into 'master'	Dmitriy Zaporozhets	2015-03-17	3	-7/+48
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change permissions on backup files Use more restrictive permissions for backup tar files and for the db, uploads, and repositories directories inside the tar files. See #1894. Now the backup task recursively `chmod`s the `db/`, `uploads/`, and `repositories/` folders with 0700 permissions, and the tar file is created as 0600. cc @sytse See merge request !1703
\| * \| \| \| \| \| \|	Change permissions on backup files	Vinnie Okada	2015-03-15	3	-7/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use more restrictive permissions for backup tar files and for the db, uploads, and repositories directories inside the tar files.
* \| \| \| \| \| \| \|	Merge branch 'unicorn-workers' into 'master'	Dmitriy Zaporozhets	2015-03-17	1	-1/+4
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation about unicorn settings. Helps with https://news.ycombinator.com/item?id=9213180 See merge request !1704
\| * \| \| \| \| \| \|	Documentation about unicorn settings.	Sytse Sijbrandij	2015-03-16	1	-1/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-null-visibility' into 'master'	Dmitriy Zaporozhets	2015-03-17	3	-5/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle null restricted_visibility_levels setting Fix a 500 error when the `restricted_visibility_levels` setting is null in the database - see #2134. See merge request !1705
\| * \| \| \| \| \| \| \|	Fix restricted visibility bugs	Vinnie Okada	2015-03-16	2	-4/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check for nil values in the restricted_visibility_level validation method, and set the restricted visibility request parameter to `[]` when it's missing from the request.
\| * \| \| \| \| \| \| \|	Handle null restricted_visibility_levels setting	Vinnie Okada	2015-03-16	1	-1/+1
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a 500 error when the `restricted_visibility_levels` setting is null in the database.