summaryrefslogtreecommitdiff
path: root/app/controllers/admin
Commit message (Collapse)AuthorAgeFilesLines
* Allow custom text on 'almost there' pageSean McGivern2016-06-081-0/+1
| | | | | | | | Add a new application setting, after_sign_up_text. This is text to be rendered as Markdown and shown on the 'almost there' page after a user signs up, but before they've confirmed their account. Tweak the styles for that page so that centered lists look reasonable.
* Add Application Setting to configure Container Registry token expire delay ↵Kamil Trzcinski2016-05-311-0/+1
| | | | (default 5min)
* Minor runner-related code refactoringsGrzegorz Bizon2016-05-191-9/+10
|
* Display validation errors when admin edits a runnerGrzegorz Bizon2016-05-191-10/+16
|
* Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage'Dmitriy Zaporozhets2016-05-185-5/+5
|\ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Change deprecated usage of rendering without response bodyMehmet Emin İNAÇ2016-03-165-5/+5
| | | | | | | | | | `render nothing: true` has been deprecated. For more information see [pr](https://github.com/rails/rails/pull/20336)
* | Merge branch 'issue_14684' into 'master' Douwe Maan2016-05-161-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Toggle email signup confirmation in admin settings Implements toggling verification email #14684 See merge request !3862
| * | Change skip_user_confirmation_email to send_user_confirmation_emailFelipe Artur2016-05-161-1/+1
| | |
| * | Toggle email signup confirmation in admin settingsFelipe Artur2016-05-161-0/+1
| | |
* | | Force password change after admin reset13691-allow-admin-to-reset-user-password-and-force-password-reset-on-next-loginSean McGivern2016-05-161-0/+1
|/ / | | | | | | | | | | When an admin changes a user's password for them, force the user to reset the password after logging in by expiring the new password immediately.
* | Merge branch 'health-check-route'Douwe Maan2016-05-122-0/+11
|\ \ | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | Add Changelog entryhealth-check-routeDJ Mountney2016-05-121-5/+1
| | | | | | | | | | | | and drop exception handling around HealthCheck::Utils.process_checks, it wasn't needed
| * | Add health_check access token, and enforce on the health_check endpointDJ Mountney2016-05-102-0/+15
| | | | | | | | | | | | Also added a health check page to the admin section for resetting the token.
* | | Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources'Douwe Maan2016-05-121-1/+8
|\ \ \
| * | | delete the enabled_oauth_sign_in_sources after getting it's value into ↵Andrei Gliga2016-05-121-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | enabled_oauth_sign_in_sources just delete enabled_oauth_sign_in_sources and get it's value
| * | | Array(enabled_oauth_sign_in_sources) instead of the ifAndrei Gliga2016-05-121-1/+1
| | | |
| * | | enabled_oauth_sign_in_sources param doesn't need permitAndrei Gliga2016-05-121-1/+0
| | | |
| * | | On Application Settings Page let the user select the enabled OAuth Sign in ↵Andrei Gliga2016-05-121-8/+8
| | | | | | | | | | | | | | | | sources instead of the disabled ones
| * | | disabled_oauth_sign_in_sources parameter handling in ↵Andrei Gliga2016-05-121-1/+11
| |/ / | | | | | | | | | ApplicationSettingsController
* | | Share form editable attributes mf runner via modelGrzegorz Bizon2016-05-101-1/+1
|/ /
* | Log to application.log when an admin starts and stops impersonating a userStan Hu2016-05-042-0/+4
| | | | | | | | Closes gitlab-org/gitlab-ee#536
* | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-05-024-45/+41
|\ \
| * | Store original user in variableDouwe Maan2016-04-221-2/+2
| | |
| * | Remove unused methodDouwe Maan2016-04-221-4/+0
| | |
| * | Fix issue with impersonationDouwe Maan2016-04-224-45/+45
| | |
* | | Added UI to define secret_token for webhook and systemhookfeature/backport-safewebhooksGabriel Mazetto2016-05-021-1/+7
|/ / | | | | | | Codestyle changes to easy EE merge
* | Configuring of points per UDP packettoggle-points-per-packetYorick Peterse2016-04-191-0/+1
| | | | | | | | | | | | | | | | | | This allows users to configure the number of points stored in a single UDP packet. This in turn can be used to reduce the number of UDP packets being sent at the cost of these packets being somewhat larger. The default setting is 1 point per packet so nothing changes for existing users.
* | Merge branch 'configurable-shared-runners-text' into 'master' Kamil Trzciński2016-04-191-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Add configurable shared runners text cc @axil @rspeicher @grzesiek See merge request !3750
| * | Add configurable shared runners textKamil Trzcinski2016-04-181-0/+1
| | |
* | | Add push events to permit params in system hooksdz/system-hooks-uiDmitriy Zaporozhets2016-04-191-1/+1
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Clear repository check columns asynchronouslyJacob Vosmaer2016-04-132-7/+3
| |
* | BastaJacob Vosmaer2016-04-122-2/+2
| |
* | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer2016-04-121-1/+1
|\ \
| * | Fixes #14638.PotHix2016-04-061-1/+1
| | | | | | | | | | | | The SQL query was ambiguous and in this case we want to filter projects.
* | | Move 'clear checks' button to applicatoin settingsJacob Vosmaer2016-04-122-12/+14
| | |
* | | Rename almost all the thingsJacob Vosmaer2016-04-061-9/+9
| | |
* | | Rebase repo check MRJacob Vosmaer2016-04-041-1/+23
|/ /
* | Remove "Congratulations!" tweet button on newly-created project.connorshea2016-03-311-1/+0
| | | | | | | | | | | | | | I’ve removed everything related to the feature based on this commit: ce08f919f34fd8849834365 Resolves #10857.
* | Merge branch 'master' into issue_12658Douwe Maan2016-03-213-7/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb
| * | Use the configured Kaminari "per page" defaultrs-use-kaminari-defaultRobert Speicher2016-03-193-7/+7
| | |
* | | Add specs and add visibility level to admin groupsFelipe Artur2016-03-211-1/+1
| | |
* | | Fix some specsDouwe Maan2016-03-201-1/+0
| | |
* | | Merge branch 'master' into issue_12658Douwe Maan2016-03-202-3/+3
|\ \ \ | |/ /
| * | Merge branch '4009-external-users' into 'master' Douwe Maan2016-03-171-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | External Users The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects. Partially fix for both #4009 and #13938 (except the LDAP sync or a pattern to detect external users) ![Screen_Shot_2016-03-14_at_22.02.52](/uploads/486a84ab3acb98c6cfb71a4ec7d268e2/Screen_Shot_2016-03-14_at_22.02.52.png) See merge request !3171
| * | | Clearify who deletes the userZeger-Jan van de Weg2016-03-151-1/+1
| | | |
| * | | Fix broken specsZeger-Jan van de Weg2016-03-151-1/+1
| | | |
| * | | Add ability to delete a user with forceZeger-Jan van de Weg2016-03-151-1/+1
| | | |
| * | | A worker deletes a user, so the request doesn't time outZeger-Jan van de Weg2016-03-151-1/+1
| | |/ | |/| | | | | | | Fixes #13261
* | | Merge 4009-external-users into issue_12658Felipe Artur2016-03-161-1/+1
|\ \ \ | | |/ | |/|
| * | External UsersZeger-Jan van de Weg2016-03-131-1/+1
| |/ | | | | | | | | The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects.