summaryrefslogtreecommitdiff
path: root/app/helpers/application_settings_helper.rb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-08-261-0/+17
|\ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Import sources: settings in the admin interfaceArtem Sidorenko2015-08-201-0/+17
| |
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-07-141-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/autocomplete_controller.rb app/controllers/omniauth_callbacks_controller.rb app/controllers/projects/services_controller.rb app/helpers/projects_helper.rb app/services/audit_event_service.rb db/schema.rb doc/api/users.md doc/update/6.x-or-7.x-to-7.13.md features/project/project.feature
| * Changed to using the btn classvis_btn_color_changeDarby2015-07-101-1/+1
| |
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-06-051-0/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: VERSION app/controllers/admin/application_settings_controller.rb app/controllers/omniauth_callbacks_controller.rb app/controllers/projects/project_members_controller.rb app/helpers/application_settings_helper.rb app/models/user.rb app/services/files/base_service.rb app/views/profiles/accounts/show.html.haml db/schema.rb doc/install/installation.md doc/update/6.x-or-7.x-to-7.11.md doc/workflow/README.md lib/gitlab/markdown/external_issue_reference_filter.rb lib/gitlab/reference_extractor.rb lib/gitlab/upgrader.rb
| * Add option to disallow users from registering any application to use GitLab ↵user-oauth-applicationsDouwe Maan2015-05-291-0/+4
| | | | | | | | as an OAuth provider
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-03-161-0/+17
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock app/controllers/admin/application_settings_controller.rb app/controllers/groups/application_controller.rb app/controllers/groups/group_members_controller.rb app/controllers/projects/team_members_controller.rb app/helpers/application_settings_helper.rb app/helpers/projects_helper.rb app/helpers/tab_helper.rb app/models/application_setting.rb app/models/user.rb app/views/devise/shared/_signin_box.html.haml app/views/groups/projects.html.haml app/views/profiles/keys/_key.html.haml app/views/projects/team_members/_form.html.haml app/views/projects/team_members/index.html.haml config/routes.rb db/schema.rb spec/lib/gitlab/ldap/access_spec.rb
| * More restricted visibility changesVinnie Okada2015-03-101-1/+2
| | | | | | | | Bug fixes and new tests for the restricted visibility changes.
| * Move restricted visibility settings to the UIVinnie Okada2015-03-071-0/+16
| | | | | | | | | | Add checkboxes to the application settings page for restricted visibility levels, and remove those settings from gitlab.yml.
* | Add help_text to help text, login and static error pages.Marin Jankovski2015-02-261-0/+4
|/
* Add link to share via twitter to "created project" event.Douwe Maan2015-02-131-0/+4
|
* Finally fix stuff related to dynamic configDmitriy Zaporozhets2015-01-081-2/+6
|
* Improve application settings and write testsDmitriy Zaporozhets2015-01-081-0/+11
|
* Init ApplicationSettings resource with defaults from config fileDmitriy Zaporozhets2015-01-081-0/+2
View Lorry Controller Status