summaryrefslogtreecommitdiff
path: root/app/controllers/admin
Commit message (Collapse)AuthorAgeFilesLines
* Gitaly Server info for admin panelZeger-Jan van de Weg2018-01-311-0/+5
| | | | | | | | | | | | Implements the client side for gitlab-org/gitaly#819. Which is a server info command. This checks the server version and git binairy version on the server. A small UI was added for administrators, so they can check the status of the Gitaly server. This is done for each storage the monolith knows. Because of this commit, gitlab-org/gitlab-ce!15580 is now closed. That MR removed the Git version too, but didn't replace it with anything.
* Merge branch 'feature/merge-request-system-hook' into 'master'Douwe Maan2018-01-181-4/+2
|\ | | | | | | | | System hooks for Merge Requests See merge request gitlab-org/gitlab-ce!14387
| * reference triggers.values for permitted parametersAlexis Reigel2018-01-171-5/+2
| |
| * add missing permitted paramAlexis Reigel2018-01-171-0/+1
| |
* | Merge branch 'winh-stop-jobs-modal' into 'master'Phil Hughes2018-01-181-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Add modal for stopping jobs in admin area Closes #41305 See merge request gitlab-org/gitlab-ce!16283
| * | Add modal for stopping jobs in admin areaWinnie Hellmann2018-01-181-1/+1
| | |
* | | Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into ↵Douwe Maan2018-01-161-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | 'security-10-3' [10.3] Migrate `can_push` column from `keys` to `deploy_keys_project` See merge request gitlab/gitlabhq!2276 (cherry picked from commit f6ca52d31bac350a23938e0aebf717c767b4710c) 1f2bd3c0 Backport to 10.3
* | Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-111-0/+1
|/
* Present member collection at the controller leveltmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenterRémy Coutable2017-12-122-5/+14
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Move the circuitbreaker check out in a separate processbvl-circuitbreaker-processBob Van Landuyt2017-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Moving the check out of the general requests, makes sure we don't have any slowdown in the regular requests. To keep the process performing this checks small, the check is still performed inside a unicorn. But that is called from a process running on the same server. Because the checks are now done outside normal request, we can have a simpler failure strategy: The check is now performed in the background every `circuitbreaker_check_interval`. Failures are logged in redis. The failures are reset when the check succeeds. Per check we will try `circuitbreaker_access_retries` times within `circuitbreaker_storage_timeout` seconds. When the number of failures exceeds `circuitbreaker_failure_count_threshold`, we will block access to the storage. After `failure_reset_time` of no checks, we will clear the stored failures. This could happen when the process that performs the checks is not running.
* Add custom brand text on new project pagesMarkus Koller2017-12-041-3/+3
|
* Merge branch 'refactor-services-for-audit-events-ce' into 'master'Grzegorz Bizon2017-11-031-10/+5
|\ | | | | | | | | | | | | [CE] Refactor controller calls into services Closes gitlab-ee#3544 See merge request gitlab-org/gitlab-ce!15023
| * fix typorefactor-services-for-audit-events-ceJames Lopez2017-11-021-1/+1
| |
| * fix specsJames Lopez2017-11-021-1/+1
| |
| * fix specsJames Lopez2017-11-021-1/+1
| |
| * refactor codeJames Lopez2017-10-311-1/+1
| |
| * add applications controller logicJames Lopez2017-10-311-10/+5
| |
* | Add sudo API scopeDouwe Maan2017-11-021-1/+1
|/
* Merge branch '38720-sort-admin-runners' into 'master'Rémy Coutable2017-10-111-1/+2
|\ | | | | | | | | | | | | Add sort runners on admin runners Closes #38720 See merge request gitlab-org/gitlab-ce!14661
| * Add sort runners on admin runnersTakuya Noguchi2017-10-041-1/+2
| |
* | 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
| |
View Lorry Controller Status