app/controllers · 1eb3dde45b55afb723954e577b7bd12946aeb3ca · Forest Godfrey / gitlab-ce

Merge branch 'add-custom-text-to-help' into 'master' · 1eb3dde4

authored Sep 18, 2015

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

1eb3dde4

Name	Last commit	Last update
..
admin		Loading commit data...
ci		Loading commit data...
concerns		Loading commit data...
dashboard		Loading commit data...
explore		Loading commit data...
groups		Loading commit data...
import		Loading commit data...
oauth		Loading commit data...
profiles		Loading commit data...
projects		Loading commit data...
abuse_reports_controller.rb		Loading commit data...
application_controller.rb		Loading commit data...
autocomplete_controller.rb		Loading commit data...
confirmations_controller.rb		Loading commit data...
dashboard_controller.rb		Loading commit data...
groups_controller.rb		Loading commit data...
help_controller.rb		Loading commit data...
invites_controller.rb		Loading commit data...
namespaces_controller.rb		Loading commit data...
omniauth_callbacks_controller.rb		Loading commit data...
passwords_controller.rb		Loading commit data...
profiles_controller.rb		Loading commit data...
projects_controller.rb		Loading commit data...
registrations_controller.rb		Loading commit data...
root_controller.rb		Loading commit data...
search_controller.rb		Loading commit data...
sessions_controller.rb		Loading commit data...
snippets_controller.rb		Loading commit data...
uploads_controller.rb		Loading commit data...
users_controller.rb		Loading commit data...