summaryrefslogtreecommitdiff
path: root/app/controllers/admin
Commit message (Collapse)AuthorAgeFilesLines
* Add Let's Encrypt clientVladimir Shushlin2019-05-161-0/+7
| | | | | | | | | | | | | | Part of adding Let's Encrypt certificates for pages domains Add acme-client gem Client is being initialized by private key stored in secrets.yml Let's Encrypt account is being created lazily. If it's already created, Acme::Client just gets account_kid by calling new_account method Make Let's Encrypt client an instance Wrap order and challenge classes
* Check instance cluster feature at policy levelJames Fargher2019-05-073-19/+6
| | | | Try to simplify feature flag checks by using policies
* Allow projects to use instance level clustersJames Fargher2019-05-071-2/+10
| | | | | | There are two cluster hierarchies one for the deployment platform and one for controllers. The main difference is that deployment platforms do not check user permissions and only return the first match.
* Instance level kubernetes clusters adminJames Fargher2019-05-072-0/+26
| | | | | Instance level clusters were already mostly supported, this change adds admin area controllers for cluster CRUD
* Add Let's Encrypt application settingsVladimir Shushlin2019-04-271-0/+10
| | | | | Store Let's Encrypt account email in application settings Also add explicit terms of service consent
* Merge branch 'forbid-the-usage-of-reload' into 'master'Lin Jen-Shin2019-04-151-1/+1
|\ | | | | | | | | | | | | Forbid the usage of reload Closes #60218 See merge request gitlab-org/gitlab-ce!27125
| * Forbid the use of `#reload` and prefer `#reset`forbid-the-usage-of-reloadKamil Trzciński2019-04-151-1/+1
| | | | | | | | | | | | | | The `#reload` makes to load all objects into memory, and the main purpose of `#reload` is to drop the association cache. The `#reset` seems to solve exactly that case.
* | Added write_repository scope for personal access tokenHoratiu Eugen Vlad2019-04-151-1/+1
|/
* Move Contribution Analytics related spec in ↵Imre Farkas2019-04-091-1/+3
| | | | spec/features/groups/group_page_with_external_authorization_service_spec to EE
* Add part of needed codeGosia Ksionek2019-04-051-1/+2
| | | | | | | | | | | | | | | | | Add columns to store project creation settings Add project creation level column in groups and default project creation column in application settings Remove obsolete line from schema Update migration with project_creation_level column existence check Rename migrations to avoid conflicts Update migration methods Update migration method
* Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'"Andreas Brandl2019-04-051-3/+1
| | | This reverts merge request !26823
* Move Contribution Analytics related spec in ↵Imre Farkas2019-04-051-1/+3
| | | | spec/features/groups/group_page_with_external_authorization_service_spec to EE
* Externalize strings in admin controllersMartin Wortschack2019-03-2115-61/+61
| | | - Update PO file
* Fix undefined variable error on json project viewsAlejandro Rodríguez2019-03-181-1/+1
| | | | | | This mistake seems to have always been there, but it only resulted in errors on the `/explore*.json` since they were the one that _actually_ relied on the local variables.
* Merge branch '56863-system-messages-in-email' into 'master'Douglas Barbosa Alexandre2019-02-281-0/+1
|\ | | | | | | | | | | | | Show header and footer system messages in email Closes #56863 See merge request gitlab-org/gitlab-ce!25474
| * Show header and footer system messages in emailAlexandru Croitor2019-02-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | * Add email_header_and_footer_enabled flag to appearances table * Set email_header_and_footer_enabled default value to false * Add checkbox to appearance to toggle show header and footer in emails * Add email_header_and_footer_enabled to allowed params in controller * Add header and footer messages to the html and text email layouts * Remove the color styling for emails header and footer * Add empty_mailer layout for emails without layout, to have the header and footer applied
* | don't filter tags by taggable typeAlexis Reigel2019-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | Due to performance reasons we cannot use the type filter on the tags. The table for ActsAsTaggableOn is too big and too unoptimized, such that the queries time out on production. See the discussion https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19740#note_120087938 for more info.
* | use lazy ajax filter dropdown for runner tagsAlexis Reigel2019-02-271-1/+3
| | | | | | | | | | | | the potential number of available runner tags is too large to load it statically to a dropdown. we use the same lazy loaded dropdown as is used for the users dropdown already.
* | add tag filter to admin runners pageAlexis Reigel2019-02-271-1/+5
|/
* Merge branch 'sh-fix-users-controller-ruby-2.6-compat' into 'master'Douwe Maan2019-02-251-1/+1
|\ | | | | | | | | Make Admin::UsersController work with Ruby 2.6 See merge request gitlab-org/gitlab-ce!25316
| * Make Admin::UsersController work with Ruby 2.6Stan Hu2019-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | Ruby 2.6 introduced `Enumerable#filter`, which takes no arguments. Attempting to call `filter` on an `ActiveRecord::Relation` with a scope will fail with a `wrong number of arguments (given 1, expected 0)` message because the `Enumerable#filter` implementation overrides the delegated `ActiveRecord::Relation#filter` method. To make Admin::UsersController compatible with Ruby 2.6, rename `User.filter` to `User.filter_items`.
* | Port EE System Header And Footer feature to CEDouwe Maan2019-02-211-0/+4
|/ | | | | | | | remove EE specific code remove EE licence checks move migration from EE to CE folder structure move specs from EE to CE folder structure remove EE specific flag specs
* Admin section finds users case-insensitivelyRobert Speicher2019-02-121-3/+7
| | | | | | | Previously, if you entered a username in the URL manually to view a specific user, the lookup was done case-sensitively, despite usernames being case-insensitive, often resulting in a 404. We now use the same `find_routable!` logic as the non-admin Users controller.
* Fix requests profiler in admin page not rendering HTML properlyStan Hu2019-01-091-1/+1
| | | | | | | | By default in Rails 5, content passed to `render` will be escaped. This doesn't work for the HTML profile output, which should be considered safe HTML already. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56152
* Fix deprecation: redirect_to :back is deprecatedJasper Maes2019-01-021-1/+1
|
* Make Admin::HealthCheckController EE-compatibleRémy Coutable2018-12-171-1/+7
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'render-text-deprecated' into 'master'Robert Speicher2018-12-031-1/+1
|\ | | | | | | | | Fix deprecation: render :text is deprecated because it does not actually render… See merge request gitlab-org/gitlab-ce!23425
| * Fix deprecation: render :text is deprecated because it does not actually ↵Jasper Maes2018-11-291-1/+1
| | | | | | | | render a text/plain response
* | Add config to disable impersonationImre Farkas2018-11-292-12/+6
|/ | | | | | | | Adds gitlab.impersonation_enabled config option defaulting to true to keep the current default behaviour. Only the act of impersonation is modified, impersonation token management is not affected.
* Merge branch 'if-53347_fix_impersonation_tokens' into 'master'Stan Hu2018-11-151-0/+3
|\ | | | | | | | | Display impersonation token value only after creation See merge request gitlab-org/gitlab-ce!22916
| * Display impersonation token value only after creationif-53347_fix_impersonation_tokensImre Farkas2018-11-121-0/+3
| | | | | | | | | | Since we migrated all PersonlAccessTokens to store only its hash in the DB, the token value can no longer be shown to the user.
* | Remove display of local Sidekiq process in /admin/sidekiqStan Hu2018-11-151-5/+0
|/ | | | | | | | | | In a cloud-native or high-availability configuration, Sidekiq may not be running on the same node as the Web worker. The output of the `ps` output does not work in this case and can mislead admins that Sidekiq isn't running. Remove it in favor of the Sidekiq dashboard, which shows local processes using the Redis information. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/46133
* Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'Achilleas Pipinellis2018-11-011-3/+3
|\ | | | | | | | | Fix typos in comments and specs See merge request gitlab-org/gitlab-ce!22683
| * Fix typos in comments and specsGeorge Tsiolis2018-11-011-3/+3
| |
* | Make Highlight accept language paramMark Chao2018-10-301-1/+1
|/ | | | | | | | | | This replaces the repository param. This allows more flexiblity as sometimes we have highlight content not related to repository. Sometimes we know ahead of time the language of the content. Lastly language determination seems better fit as a logic in the Blob class. `repository` param is only used to determine the language, which seems to be the responsiblity of Blob.
* Merge branch '52559-applications-api-get-delete' into 'master'Rémy Coutable2018-10-221-6/+2
|\ | | | | | | | | | | | | Add Applications API endpoints for listing and deleting entries. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52559 See merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22296
| * Remove useless braces !22296JB Vasseur2018-10-181-1/+1
| |
| * Use ApplicationsFinder !22296JB Vasseur2018-10-181-6/+2
| |
* | Remove the `ForkedProjectLink` modelBob Van Landuyt2018-10-191-2/+2
|/ | | | | | | | | | | | | | This removes the `ForkedProjectLink` model that has been replaced by the `ForkNetworkMember` and `ForkNetwork` combination. All existing relations have been adjusted to use these new models. The `forked_project_link` table has been dropped. The "Forks" count on the admin dashboard has been updated to count all `ForkNetworkMember` rows and deduct the number of `ForkNetwork` rows. This is because now the "root-project" of a fork network also has a `ForkNetworkMember` row. This count could become inaccurate when the root of a fork network is deleted.
* Remove Git circuit breakerZeger-Jan van de Weg2018-10-101-7/+0
| | | | | | | Was introduced in the time that GitLab still used NFS, which is not required anymore in most cases. By removing this, the API it calls will return empty responses. This interface has to be removed in the next major release, expected to be 12.0.
* Simplify runner registration token resettingTomasz Maczukin2018-10-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | This icommit adds several changes related to the same topic - resetting a Runner registration token: 1. On Project settings page it adds a button for resetting the registration token and it removes the Runner token field that was confusing all GitLab users. 2. On Group settings page it adds the same button for resetting the registration token. 3. On Admin Runners settings page it moves the button to the same place as in Project and Group settings and it changes slightly the page layout to make it more similar to Group and Project setting pages. 4. It refactorizes a little the partial that prints runner registration description. Thanks to this Project, Group and Admin settings of the Runner are re-using the same code to generate the button. 5. Updates the translations of changed text.
* Remove background job throttling feature51509-remove-sidekiq-limit-fetchValery Sizov2018-09-241-2/+1
| | | | We remove this feature as it never worked properly
* Merge branch 'frozen-string-app-controller' into 'master'Stan Hu2018-09-2028-0/+56
|\ | | | | | | | | Enable frozen string in app/controllers/**/*.rb See merge request gitlab-org/gitlab-ce!21736
| * Enable frozen string in app/controllers/**/*.rbrepo-forks/gitlab-ce-frozen-string-app-controllergfyoung2018-09-1828-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | Enables frozen string for the following: * app/controllers/*.rb * app/controllers/admin/**/*.rb * app/controllers/boards/**/*.rb * app/controllers/ci/**/*.rb * app/controllers/concerns/**/*.rb Partially addresses #47424.
* | Merge branch '44998-split-admin-settings-into-multiple-sub-pages' into 'master'Dmitriy Zaporozhets2018-09-201-1/+31
|\ \ | |/ |/| | | | | | | | | Resolve "Split admin settings into multiple sub pages" Closes #44998 See merge request gitlab-org/gitlab-ce!21467
| * Add empty controller actions and utilize referer_path helperMartin Wortschack2018-09-191-2/+24
| |
| * Parse request.referer properlyMartin Wortschack2018-09-181-1/+1
| |
| * Adds empty methods for 'geo' and 'templates'Martin Wortschack2018-09-141-0/+6
| |
| * merge master and resolve conflictsMartin Wortschack2018-09-112-6/+21
| |\
| * | use referer for redirect instead of hidden field param from partialsMartin Wortschack2018-09-101-1/+1
| | |