Jeroen van Baarsen 1eb3dde45b Merge branch 'add-custom-text-to-help' into 'master' ...

Allow custom info to be added to Help page

Fixes #2536

**Admin screen**

![image](https://gitlab.com/jeroenvanbaarsen/gitlab-ce/uploads/e62f3e0ff40558fb955f09e469293521/image.png)

**Text on the Help page**

![image](https://gitlab.com/jeroenvanbaarsen/gitlab-ce/uploads/ba315fb418e1698d8f44b88c7cc6c29a/image.png)

/cc @DouweM

See merge request !1309

2015-09-18 09:24:15 +00:00

..

admin

Allow custom info to be added to Help page

2015-09-18 10:15:40 +02:00

ci

Merge branch 'fix-ci-non-public-project' into 'master'

2015-09-18 09:18:49 +00:00

concerns

Refactor SessionsController to use a controller concern

2015-05-14 14:24:05 -04:00

dashboard

Clean up overlap between dashboard and explore.

2015-09-08 14:49:20 +01:00

explore

Clean up overlap between dashboard and explore.

2015-09-08 14:49:20 +01:00

groups

Use before_actions

2015-07-31 14:15:49 +02:00

import

Use fixed version of fogbugz gem

2015-09-15 15:23:30 -04:00

oauth

Move helpers back to original directory

2015-09-09 14:37:34 +02:00

profiles

Allow user to specify content he wants to see on project page

2015-07-13 18:24:15 +02:00

projects

Move partial locals out of controller

2015-09-17 07:24:45 -07:00

abuse_reports_controller.rb

Improve wording in abuse report form

2015-08-06 15:15:17 +02:00

application_controller.rb

Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g

2015-09-09 14:56:02 +02:00

autocomplete_controller.rb

Sorted autocomplete users list by name

2015-09-15 22:48:24 +01:00

confirmations_controller.rb

Add invites controller.

2015-04-14 12:07:33 +02:00

dashboard_controller.rb

Clean up overlap between dashboard and explore.

2015-09-08 14:49:20 +01:00

groups_controller.rb

Merge branch 'public_profiles' into 'master'

2015-09-14 15:28:42 +00:00

help_controller.rb

Make Help accessible for guests.

2015-09-08 14:42:30 +01:00

invites_controller.rb

Use new routing helper

2015-09-08 17:53:16 +01:00

namespaces_controller.rb

Allow access to group from root url

2015-09-14 11:16:54 +02:00

omniauth_callbacks_controller.rb

Allow custom label to be set for authentication providers.

2015-07-23 15:20:12 +02:00

passwords_controller.rb

Use User#two_factor_enabled instead of otp_required_for_login

2015-06-19 15:14:37 -04:00

profiles_controller.rb

Merge branch 'audit_log' into 'master'

2015-07-06 10:09:53 +00:00

projects_controller.rb

Use new routing helper

2015-09-08 17:53:16 +01:00

registrations_controller.rb

Fix error when deleting a user who has projects

2015-06-23 04:39:49 -07:00

root_controller.rb

Fix RootController

2015-09-09 09:25:49 +01:00

search_controller.rb

Move helpers back to original directory

2015-09-09 14:37:34 +02:00

sessions_controller.rb

Crowd integration

2015-09-02 12:42:01 +03:00

snippets_controller.rb

Move partial to right place and fix tests.

2015-09-08 15:14:14 +01:00

uploads_controller.rb

Don't symbolize params.

2015-05-11 11:55:02 +02:00

users_controller.rb

Make all profile public

2015-08-27 13:06:14 +03:00