summaryrefslogtreecommitdiff
path: root/app/controllers/admin
Commit message (Collapse)AuthorAgeFilesLines
* Create idea of read-only databasetc-geo-read-only-ideaToon Claes2017-10-061-0/+14
| | | | | | | | | | | | In GitLab EE, a GitLab instance can be read-only (e.g. when it's a Geo secondary node). But in GitLab CE it also might be useful to have the "read-only" idea around. So port it back to GitLab CE. Also having the principle of read-only in GitLab CE would hopefully lead to less errors introduced, doing write operations when there aren't allowed for read-only calls. Closes gitlab-org/gitlab-ce#37534.
* Merge branch 'master' into ↵Douwe Maan2017-10-052-5/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | digitalmoksha/gitlab-ce-feature/verify_secondary_emails # Conflicts: # app/controllers/admin/users_controller.rb # app/controllers/confirmations_controller.rb # app/controllers/profiles/emails_controller.rb # app/models/user.rb # app/services/emails/base_service.rb # app/services/emails/destroy_service.rb # app/views/devise/mailer/confirmation_instructions.html.haml # lib/api/users.rb # spec/services/emails/destroy_service_spec.rb
| * refactor emails servicerefactor-servicesJames Lopez2017-09-281-1/+1
| |
| * refactor users update serviceJames Lopez2017-09-281-2/+2
| |
| * refactor some controllers to make them EE friendlyJames Lopez2017-09-281-2/+8
| |
| * refactor services to match EE signatureJames Lopez2017-09-281-3/+3
| |
* | fix calls to Emails::DestroyServiceBrett Walker2017-09-231-1/+1
|/
* Fix notification message when admin label was modifiedfix-label-messageRobert Schilling2017-09-181-1/+1
|
* created services for keyshaseeb2017-09-151-3/+2
|
* Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-111-0/+1
| | | This reverts merge request !14148
* Revert "Merge branch ↵revert-f2421b2bRubén Dávila2017-09-081-1/+0
| | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619
* Merge branch '23079-remove-default-scope-in-sortable' into 'master'Douwe Maan2017-09-073-5/+5
|\ | | | | | | | | | | | | Removes default scope from sortable Closes #23079 See merge request !13558
| * Removes default scope from sortable23079-remove-default-scope-in-sortableTiago Botelho2017-09-073-5/+5
| |
* | Merge branch ↵Sean McGivern2017-09-071-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master' Add option to change navigation color palette Closes #35012 See merge request !13619
| * | Restore some changes from !9199Rubén Dávila2017-09-061-0/+1
| | |
* | | Remove the `pretty` parameter for `usage_data`rs-remove-usage-ping-prettyRobert Speicher2017-09-061-2/+1
|/ /
* | Merge branch 'tc-test-admin-log-links' into 'master'Dmitriy Zaporozhets2017-09-061-1/+8
|\ \ | |/ |/| | | | | Put Admin loggers in before_action for easier overriding in EE See merge request !14081
| * Put loggers in before_action for easier overriding in EEtc-test-admin-log-linksToon Claes2017-09-061-1/+8
| | | | | | | | | | | | | | | | Make it easier to override the set of loggers, by putting them in a separate method. Also modify spec so it tests for links, instead of checking for regular text.
* | Merge branch '28938-password-change-workflow-for-admins' into 'master'Sean McGivern2017-08-311-4/+11
|\ \ | |/ |/| | | | | | | | | Changes the password change workflow for admins. Closes #28938 See merge request !13901
| * Changes the password change workflow for admins.28938-password-change-workflow-for-adminsTiago Botelho2017-08-311-4/+11
| |
* | Refactor Admin::ProjectsFinder by extracting finders as private methodsMehdi Lahmam2017-08-241-3/+3
|/
* Refactor `Admin::LogsController#show`rs-fix-admin-logs-timeoutRobert Speicher2017-08-221-0/+9
| | | | | We should be defining the list of loggers in the controller, not the view.
* Cache Appearance instances in Redisappearances-caching-and-schemaYorick Peterse2017-08-101-1/+1
| | | | | | | | This caches the result of Appearance.first in a similar fashion to how ApplicationSetting instances are cached. We also add some NOT NULL constraints to the table and correct the timestamp types. Fixes gitlab-org/gitlab-ce#36066, fixes gitlab-org/gitlab-ce#31698
* Add a Circuitbreaker for storage pathsBob Van Landuyt2017-08-041-0/+7
|
* Merge branch 'bvl-add-all-settings-to-api' into 'master'Robert Speicher2017-07-271-78/+3
|\ | | | | | | | | Add all ApplicationSettings attributes to the API See merge request !12851
| * Make the attribute list for application settings reusableBob Van Landuyt2017-07-271-78/+3
| |
* | Use params#require instead params[] accessOswaldo Ferreira2017-07-271-1/+1
| |
* | Backport gitlab-ee!2456Oswaldo Ferreira2017-07-271-1/+1
|/
* Merge branch '35453-pending-delete-projects-error-in-admin-dashboard-fix' ↵Sean McGivern2017-07-261-1/+1
|\ | | | | | | | | | | | | | | | | into 'master' Fixes 500 error caused by pending delete projects in admin dashboard Closes #35453 See merge request !13067
| * Fixes 500 error caused by pending delete projects in admin dashboard35453-pending-delete-projects-error-in-admin-dashboard-fixTiago Botelho2017-07-251-1/+1
| |
* | Merge branch 'backport-ee-2328' into 'master'Sean McGivern2017-07-251-2/+2
|\ \ | |/ |/| | | | | Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2328 See merge request !13022
| * Backport changes from ↵Nick Thomas2017-07-211-2/+2
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2328
* | Decrease ABC threshold to 56.96Maxim Rydkin2017-07-241-12/+3
|/
* Wrong data type when testing webhooksAlexander Randa2017-07-202-15/+4
|
* Fixes needed when GitLab sign-in is not enabledRobin Bobbitt2017-07-131-1/+1
| | | | | | | | | When sign-in is disabled: - skip password expiration checks - prevent password reset requests - don’t show Password tab in User Settings - don’t allow login with username/password for Git over HTTP requests - render 404 on requests to Profiles::PasswordsController
* Allow to enable the Performance Bar for a group from the admin areaRémy Coutable2017-07-061-0/+2
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '32408-enable-disable-all-restricted-visibility-levels' into ↵Douwe Maan2017-07-051-0/+2
|\ | | | | | | | | | | | | | | | | 'master' Resolve "Unable to disable all restricted visibility levels" Closes #32408 See merge request !12649
| * Allow admin to disable all restricted visibility levels32408-enable-disable-all-restricted-visibility-levelsTiago Botelho2017-07-051-0/+2
| |
* | Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-051-2/+2
|/
* fix spec failuresJames Lopez2017-06-231-1/+1
|
* update code based on feedbackJames Lopez2017-06-231-4/+2
|
* refactor update user service not to do auth checksJames Lopez2017-06-231-2/+2
|
* fix specsJames Lopez2017-06-231-3/+3
|
* add missing action to blockJames Lopez2017-06-231-3/+3
|
* more refactoring based on feedbackJames Lopez2017-06-231-2/+2
|
* refactor emails serviceJames Lopez2017-06-231-6/+2
|
* update to use emails destroy serviceJames Lopez2017-06-231-1/+1
|
* fix api and controller issuesJames Lopez2017-06-231-2/+2
|
* fix specsJames Lopez2017-06-231-7/+8
|
* finish off refactoring users controllerJames Lopez2017-06-231-10/+25
|
View Lorry Controller Status