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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #9341 from rumpelsepp/rouge	Stan Hu	2015-07-28	2	-6/+6
\|\ \| \| \| \|	Switch back to rouge gem for synthax highlighting
\| *	Add HTMLGitlab formatter	Stefan Tatschner	2015-07-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This custom formatter for rouge is needed to generate HTML output specifically for gitlab. Since its usecase is mostly suitable for gitlab it had been rejected upstream: https://github.com/jneen/rouge/pull/268 Thanks a lot to @stanhu, @jneen and @tsigo for review!
\| *	Replace Rugments with Rouge	Stefan Tatschner	2015-07-29	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I have mainly created the rugments fork for the purpose of improving gitlab's highlighting. Nowadays IMO it works way better than the old highlight.js solution. But the development is stuck on my side because of a couple of personal reasons: * I have finished my studies; last months I was writing my master thesis. So there was a huge time problem. I am sorry for that. * I had to move to Munich due to getting a (paid) job. Searching a flat here is horrible... :) * Last but not least, maintaining the same code base in two seperate projects is a mess. I have decided to switch back to rouge due to several reasons: * In the beginning I was quite motivated, but since I start working on my new job next week, the best solution IMO is switching back to upstream rouge. * Rouge is continously improving: https://github.com/jneen/rouge/blob/master/CHANGELOG.md http://rouge.jneen.net/ * There should be absolutely no regressions with this change. Most likely this pull request will almost fix some minor bugs. * One less gem in gitlab is a good thing. since Gitlab is quite a huge bundle of gems. Reducing complexity should be a major milestone. Thanks a lot to @stanhu and @jneen for the review!
* \|	Merge branch 'rs-issue-2107' into 'master'	Robert Speicher	2015-07-28	1	-1/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make `hr`s more visible in note bodies Closes #2107 See merge request !1054
\| * \|	Make `hr`s more visible in note bodiesrs-issue-2107	Robert Speicher	2015-07-27	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #2107
* \| \|	Merge branch 'bitbucket-re-authorize' into 'master'	Robert Speicher	2015-07-28	1	-0/+1
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug causing Bitbucket importer to crash when OAuth application had been removed. Fixes gitlab-com/support-forum#241. See merge request !1057
\| * \|	Fix bug causing Bitbucket importer to crash when OAuth application had been ↵bitbucket-re-authorize	Douwe Maan	2015-07-28	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|	removed.
* \| \|	Merge branch 'timestamp-wikis' into 'master'	Job van der Voort	2015-07-28	1	-1/+5
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added a timestamp to the wikis page just below the title Now it looks like this: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/813f85496db915cf14ee223c8b15478f/image.png) See merge request !1055
\| * \|	Added a timestamp to the wikis page just below the titletimestamp-wikis	Darby	2015-07-27	1	-1/+5
\| \| \|
* \| \|	Merge branch 'fix-quotes-in-branch' into 'master'	Douwe Maan	2015-07-28	3	-4/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix commit data retrieval when branch name has single quotes Quotes in ref names need to be escaped properly in JavaScript. Closes #1724 See merge request !1046
\| * \| \|	Fix commit data retrieval when branch name has single quotes	Stan Hu	2015-07-26	3	-4/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #1724
* \| \| \|	Merge branch 'rs-issue-2010' into 'master'	Valery Sizov	2015-07-28	3	-16/+12
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Render Note field hints consistently for "new" and "edit" forms - The "Edit" form didn't have Markdown hints. - The "New" form had a paperclip icon for attachments, the "edit" form didn't. Closes #2010 Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2525 See merge request !1049
\| * \| \|	Render Note field hints consistently for "new" and "edit" formsrs-issue-2010	Robert Speicher	2015-07-26	3	-16/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- The "Edit" form didn't have Markdown hints. - The "New" form had a paperclip icon for attachments, the "edit" form didn't. Closes #2010 Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2525
* \| \| \|	Merge branch 'rs-dev-issue-306' into 'master'	Valery Sizov	2015-07-27	1	-0/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create project services on Project creation Closes internal https://dev.gitlab.org/gitlab/gitlab-ee/issues/306#note_53354 See merge request !1045
\| * \| \|	Create project services on Project creationrs-dev-issue-306	Robert Speicher	2015-07-25	1	-0/+2
\| \| \| \|
* \| \| \|	Fix live notes refresh in relative URL deployments	Stan Hu	2015-07-26	1	-1/+0
\| \|/ / \|/\| \|
* \| \|	Merge branch 'fix-reload-with-full-diff-url' into 'master'	Stan Hu	2015-07-25	3	-13/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the "Reload with full diff" URL button On the first load, the merge request tabs would be requested in JSON format to render the HTML. This would cause the "Reload with full diff" button to create a link to `diff.json`. Instead, generate the path in HTML mode. Closes #2041 See merge request !1019
\| * \| \|	Fix the "Reload with full diff" URL button	Stan Hu	2015-07-23	3	-13/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On the first load, the merge request tabs would be requested in JSON format to render the HTML. This would cause the "Reload with full diff" button to create a link to diff.json. Closes #2041
* \| \| \|	Merge branch 'rs-issue-2092' into 'master'	Douwe Maan	2015-07-25	6	-5/+27
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dynamically check `:admin_*` ability in two more spots. Closes #2092 Depends on !1037 See merge request !1042
\| * \| \| \|	Dynamically check `:admin_*` ability in IssuableBaseServicers-issue-2092	Robert Speicher	2015-07-24	3	-2/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2092
\| * \| \| \|	Dynamically check `:admin_*` ability on issuable form	Robert Speicher	2015-07-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2092
\| * \| \| \|	Add Issuable#to_ability_name	Robert Speicher	2015-07-24	2	-2/+12
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Stan Hu	2015-07-24	2	-1/+5
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Gitlab Issue 707: Indent unfolded code 1 character	ngentile	2015-07-22	2	-1/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-error-500-when-no-head' into 'master'	Valery Sizov	2015-07-24	1	-1/+2
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix error 500 when no HEAD is available Steps to reproduce: 1. Create a project with a README 2. In the actual remote, type: `git symbolic-ref HEAD refs/heads/nowhere` 3. Check that HEAD is gone via `git ls-remote .` 4. Go to the projects page and see the Error 500 Error: ``` NoMethodError - undefined method `sha' for nil:NilClass: app/helpers/projects_helper.rb:281:in `readme_cache_key' app/views/projects/_readme.html.haml:10:in `_app_views_projects__readme_html_haml___2036282917939462960_70154565285700' actionview (4.1.11) lib/action_view/template.rb:145:in `block in render' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications/instrumenter.rb:20:in `instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `instrument' actionview (4.1.11) lib/action_view/template.rb:339:in `instrument' actionview (4.1.11) lib/action_view/template.rb:143:in `render' rack-mini-profiler (0.9.0) lib/mini_profiler/profiling_methods.rb:108:in `block in profile_method' actionview (4.1.11) lib/action_view/renderer/partial_renderer.rb:306:in `render_partial' actionview (4.1.11) lib/action_view/renderer/partial_renderer.rb:279:in `block in render' actionview (4.1.11) lib/action_view/renderer/abstract_renderer.rb:38:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications/instrumenter.rb:20:in `instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `instrument' actionview (4.1.11) lib/action_view/renderer/abstract_renderer.rb:38:in `instrument' actionview (4.1.11) lib/action_view/renderer/partial_renderer.rb:278:in `render' actionview (4.1.11) lib/action_view/renderer/renderer.rb:47:in `render_partial' actionview (4.1.11) lib/action_view/helpers/rendering_helper.rb:35:in `render' haml (4.0.5) lib/haml/helpers/action_view_mods.rb:10:in `block in render_with_haml' haml (4.0.5) lib/haml/helpers.rb:89:in `non_haml' haml (4.0.5) lib/haml/helpers/action_view_mods.rb:10:in `render_with_haml' app/views/projects/show.html.haml:47:in `_app_views_projects_show_html_haml__1458303859692972698_70154948164180' actionview (4.1.11) lib/action_view/template.rb:145:in `block in render' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument' ``` Closes https://github.com/gitlabhq/gitlabhq/issues/9484, but there may be some other issue there. See merge request !1041
\| * \| \| \|	Fix Error 500 when browsing projects with no HEAD	Stan Hu	2015-07-24	1	-1/+2
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Steps to reproduce: 1. Create a project with a README 2. In the actual remote, type: `git symbolic-ref HEAD refs/heads/nowhere` 3. Check that HEAD is gone via `git ls-remote .` 4. Go to the projects page and see the Error 500 Closes https://github.com/gitlabhq/gitlabhq/issues/9484
* \| \| \|	Add admin_merge_request ability to Developer level and up	Robert Speicher	2015-07-24	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was necessary because this permission is checked dynamically by `app/views/shared/issuable/_context` when on a Merge Request. Closes #2058
* \| \| \|	Merge branch 'auth-icons-labels' into 'master'	Valery Sizov	2015-07-24	19	-69/+72
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow custom label to be set for authentication providers. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2341 Beside the above, I've: - Refactored `OauthHelper` to have clearer method names and behaviour - Moved some of `OauthHelper` behaviour to `Gitlab::OAuth::Provider` - Renamed `OauthHelper` to `AuthHelper` since LDAP, SAML, Kerberos aren't OAuth - Updated the icons for GitHub and GitLab In the examples below, "OurAuth" is a SAML provider with a custom label. ![Screen_Shot_2015-07-02_at_16.29.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7d425bde69dc34e1667ebd5375d0266d/Screen_Shot_2015-07-02_at_16.29.52.png) ![Screen_Shot_2015-07-02_at_16.31.40](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cbb273321ecdf4cab3d3ef0dc35553e7/Screen_Shot_2015-07-02_at_16.31.40.png) ![Screen_Shot_2015-07-02_at_16.32.39](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d8dd6e1d0dc45a788e869cdcdc99e178/Screen_Shot_2015-07-02_at_16.32.39.png) ![Screen_Shot_2015-07-02_at_16.33.18](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7dbfe8b0ae229c32a08d6c7442976d83/Screen_Shot_2015-07-02_at_16.33.18.png) See merge request !927
\| * \| \| \|	Allow custom label to be set for authentication providers.auth-icons-labels	Douwe Maan	2015-07-23	19	-69/+72
\| \|/ / /
* \| \| \|	Merge branch 'rs-changes-suppressed-link' into 'master'	Douwe Maan	2015-07-24	4	-5/+18
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix and style the "Changes suppressed" link. At some point the "Changes suppressed. Click to show" link stopped behaving as expected, so this fixes it. I also thought it looked bad: ![Screen_Shot_2015-07-23_at_4.06.49_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0a1552e4edb659f065bd202b93bc61ef/Screen_Shot_2015-07-23_at_4.06.49_PM.png) So I gave it some room to breathe: ![Screen_Shot_2015-07-23_at_4.00.25_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/abc0704e597ed010cade81782ac9099e/Screen_Shot_2015-07-23_at_4.00.25_PM.png) See merge request !1038
\| * \| \| \|	Fix and style the "Changes suppressed" link.rs-changes-suppressed-link	Robert Speicher	2015-07-23	4	-5/+18
\| \| \| \| \|
* \| \| \| \|	Merge branch 'rs-issue-2012' into 'master'	Douwe Maan	2015-07-24	1	-0/+4
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make username parameter for Users#show case-insensitive Closes #2012 See merge request !996
\| * \| \| \|	Add User.find_by_username!rs-issue-2012	Robert Speicher	2015-07-23	2	-1/+5
\| \| \| \| \|
\| * \| \| \|	Make username parameter for Users#show case-insensitive	Robert Speicher	2015-07-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2012
* \| \| \| \|	Merge branch 'changes_for_gmail_inbox_actions' into 'master'	Douwe Maan	2015-07-23	1	-1/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes for gmail inbox actions Related to the ongoing efforts to get Gmail inbox actions for GitLab.com in #1517 Not using `mdash` would break the rendering of the html email by switching `Content-Transfer-Encoding` to `quoted-printable` for every email. Removed the rake task and docs to prevent users from sending dummy emails which might cause application rejection. See merge request !1024
\| * \| \| \|	Use mdash to prevent breaking html emails.	Marin Jankovski	2015-07-22	1	-1/+1
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'remove-source-branch' into 'master'	Valery Sizov	2015-07-23	3	-2/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug causing "Remove source-branch" option not to work for merge requests from the same project. Fixes #2049. See merge request !1025
\| * \| \| \|	Return true/false from AutoMergeService#merge!remove-source-branch	Douwe Maan	2015-07-23	1	-0/+4
\| \| \| \| \|
\| * \| \| \|	Fix Remove source-branch for MRs from same project	Douwe Maan	2015-07-22	3	-2/+10
\| \| \| \| \|
* \| \| \| \|	revert cache for eventsrevert_even_cache	Valery Sizov	2015-07-23	1	-8/+7
\| \| \| \| \|
* \| \| \| \|	Merge branch 'label_caching' into 'master'	Valery Sizov	2015-07-23	1	-37/+36
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert cache issue It reverts https://dev.gitlab.org/gitlab/gitlabhq/commit/40e31e1db31e6ba9a1cd6255afc2f09df61f4060 and fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/2048 and https://gitlab.com/gitlab-org/gitlab-ce/issues/2043 See merge request !1028
\| * \| \| \| \|	revert cache issuelabel_caching	Valery Sizov	2015-07-22	1	-37/+36
\| \|/ / / /
* \| \| \| \|	Fix link to 2fa help page. Closes #2055	Achilleas Pipinellis	2015-07-22	1	-1/+1
\|/ / / /
* \| \| \|	Merge branch 'revert_note_caching' into 'master'	Valery Sizov	2015-07-22	1	-4/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	revert caching of note text This MR reverts the caching of note texts because what is rendered as a link in Markdown depends on the user's access to other projects and groups. Until we find a solution that doesn't decrease security, let's not use the cache for this. See discussion in gitlab-org/gitlab-ce!911 for more information. /cc @DouweM @stanhu @vsizov See merge request !1014
\| * \| \|	revert caching of note text	Hannes Rosenögger	2015-07-21	1	-4/+3
\| \| \| \|
* \| \| \|	Merge branch 'fix-404-empty-repo' into 'master'	Stan Hu	2015-07-22	1	-1/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 404 error in files view after deleting the last file in a repository Here's the logic: 1. In `TreeController`, `require_non_empty_project` will prevent `show` from being called if the project is empty. That means all calls to `show` will be guaranteed to have at least 1 commit. 2. If the ref name is not valid, then return a 404. This ensures that at least the controller is looking at a valid branch/tag/SHA ID. 3. This leaves a number of cases: ``` 3a. Valid ref, valid directory 3b. Valid ref, valid filename 3c. Valid ref, invalid path 3d. Valid ref, no files ``` Case 3a: The tree will not be `empty?` and will pass through the whole function. Case 3b: The tree will be `empty?` but the `blob_at` will resolve properly and trigger a redirect to the file. Case 3c: In this case, a path is given. Return 404 if it cannot be resolved neither as a tree nor a blob. Case 3d: In this case, no path is given. If the tree is empty, this means it's an empty branch and just fall through. Example broken branch: https://gitlab.com/gitlab-org/gitlab-test/tree/empty-branch Closes #1362 See merge request !1010
\| * \| \| \|	Fix 404 error in files view after deleting the last file in a repository	Stan Hu	2015-07-21	1	-1/+3
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Closes #1362
* \| \| \|	Fix full screen mode for snippet comments	Daniel Gerhardt	2015-07-21	1	-1/+4
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ZenMode is now initialized for snippet pages. Fixes #2036.
* \| \|	Merge branch 'fix-disabled-feature-access' into 'master'	Stan Hu	2015-07-20	1	-23/+31
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix (i.e. prevent) access to disabled features for unauthenticated users Unauthenticated users had access to disabled features of public projects. The code has been slightly refactored so that feature checks are done in a separate method and can also be applied for public access. See merge request !1006
\| * \| \|	Fix access to disabled features for unauthenticated users	Daniel Gerhardt	2015-07-20	1	-23/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unauthenticated users had access to disabled features of public projects. The code has been slightly refactored so that feature checks are done in a separate method and can also be applied for public access.