summaryrefslogtreecommitdiff
path: root/app/helpers/application_settings_helper.rb
Commit message (Collapse)AuthorAgeFilesLines
* Don't reset application settings oauth providers by mistakeDmitriy Zaporozhets2018-04-131-1/+3
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Show gitaly address instead of disk pathJacob Vosmaer2018-03-231-1/+1
|
* Merge branch 'mark-legacy-git-access' into 'master'Sean McGivern2018-03-231-1/+1
|\ | | | | | | | | Route path lookups through legacy_disk_path See merge request gitlab-org/gitlab-ce!17743
| * Route path lookups through legacy_disk_pathmark-legacy-git-accessJacob Vosmaer2018-03-211-1/+1
| |
* | Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'Douwe Maan2018-03-211-1/+2
|/ | | | | Server Side Request Forgery in Services and Web Hooks See merge request gitlab/gitlabhq!2337
* Moved o_auth/saml/ldap modules under gitlab/authHoratiu Eugen Vlad2018-02-281-1/+1
|
* Add DNS verification to Pages custom domainsNick Thomas2018-02-231-0/+1
|
* Merge branch 'master' into ↵Matija Čupić2018-02-021-8/+6
|\ | | | | | | 38175-add-domain-field-to-auto-devops-application-setting
| * use Gitlab::UserSettings directly as a singleton instead of ↵Mario de la Ossa2018-02-021-8/+6
| | | | | | | | including/extending it
* | Merge branch 'master' into ↵Matija Čupić2018-02-021-2/+2
|\ \ | |/ | | | | 38175-add-domain-field-to-auto-devops-application-setting
| * Refactor repository_storages_options_for_selectNick Thomas2018-01-311-2/+2
| |
* | Expose auto_devops_domain in admin settings viewMatija Čupić2018-01-221-0/+1
|/
* Permits 'password_authentication_enabled_for_git' parameter for ↵Mark Fletcher2018-01-191-0/+1
| | | | ApplicationSettingsController
* Backport option to disable writing to `authorized_keys` fileMichael Kozono2018-01-081-0/+1
| | | | | | | | | | | | | | | | Originally branch 'mk-toggle-writing-to-auth-keys-1631' See merge request !2004 Squashed commits: Add authorized_keys_enabled to Application Settings Ensure default settings are exposed in UI Without this change, `authorized_keys_enabled` is unchecked when it is nil, even if it should be checked by default. Add “Speed up SSH operations” documentation Clarify the reasons for disabling writes Add "How to go back" section Tweak copy Update Application Setting screenshot
* Move the circuitbreaker check out in a separate processbvl-circuitbreaker-processBob Van Landuyt2017-12-081-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* Merge branch '39455-clone-dropdown-should-not-have-a-tooltip' into 'master'Tim Zallmann2017-11-301-2/+2
|\ | | | | | | | | | | | | Resolve "Clone dropdown should not have a tooltip" Closes #39455 See merge request gitlab-org/gitlab-ce!15334
| * UX adjustments and spec correctionsJose Ivan Vargas2017-11-271-2/+2
| |
* | Add timeouts for Gitaly callsAndrew Newdigate2017-11-291-0/+3
|/
* Allow password authentication to be disabled entirelyMarkus Koller2017-11-231-4/+4
|
* Add request throttlesMichael Kozono2017-11-171-0/+9
|
* Allow configuring new circuitbreaker settings from the UI and APIBob Van Landuyt2017-10-231-0/+11
|
* Allow configuring the circuitbreaker through the API and UIBob Van Landuyt2017-10-171-0/+32
|
* Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-041-0/+16
|\
| * Merge branch '17849-allow-admin-to-restrict-min-key-length-and-techno' into ↵Robert Speicher2017-09-011-0/+16
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add settings for minimum key strength and allowed key type Closes #17849 See merge request !13712
| | * Rework the permissions model for SSH key restrictionsNick Thomas2017-08-301-15/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `allowed_key_types` is removed and the `minimum_<type>_bits` fields are renamed to `<tech>_key_restriction`. A special sentinel value (`-1`) signifies that the key type is disabled. This also feeds through to the UI - checkboxes per key type are out, inline selection of "forbidden" and "allowed" (i.e., no restrictions) are in. As with the previous model, unknown key types are disallowed, even if the underlying ssh daemon happens to support them. The defaults have also been changed from the lowest known bit size to "no restriction". So if someone does happen to have a 768-bit RSA key, it will continue to work on upgrade, at least until the administrator restricts them.
| | * Add settings for minimum key strength and allowed key typeNick Thomas2017-08-301-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | This is an amalgamation of: * Cory Hinshaw: Initial implementation !5552 * Rémy Coutable: Updates !9350 * Nick Thomas: Resolve conflicts and add ED25519 support !13712
* | | Implement the implied CI/CD config for AutoDevOpsZeger-Jan van de Weg2017-08-311-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | Behind an application setting, which defaults to false, this commit implements the implied CI/CD config. Which means that in the case we can't find the `.gitlab-ci.yml` on the commit we want to start a pipeline for, we fall back to an implied configuration. For now the Bash template has been copied to `Auto-Devops.gitlab-ci.yml` so the tests actually work. Fixes #34777
* | `current_application_settings` belongs on `Gitlab::CurrentSettings`Sean McGivern2017-08-311-0/+3
|/ | | | | | | | | | | | | | | | The initializers including this were doing so at the top level, so every object loaded after them had a `current_application_settings` method. However, if someone had rack-attack enabled (which was loaded before these initializers), it would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't have that method. To fix this: 1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need `Object.new.current_application_settings` to work. 2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it like that in several places. 3. Change the initializers to use that new form.
* Enable automatic hashed storage for new projects by application settingsGabriel Mazetto2017-08-221-0/+1
|
* Add option to disable project export on instanceRobin Bobbitt2017-08-111-0/+1
|
* Make the attribute list for application settings reusableBob Van Landuyt2017-07-271-0/+85
|
* Merge branch 'fixes-for-internal-auth-disabled' into 'master'Sean McGivern2017-07-141-1/+1
|\ | | | | | | | | Fixes needed when GitLab sign-in is not enabled See merge request !12491
| * 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
* | Fix wrong helper used for adding context for translations.34780-restricted-visibility-levels-in-admin-application-settings-looks-offRuben Davila2017-07-121-2/+2
|/ | | | Additionally some missing translations were added
* Allow admin to disable all restricted visibility levels32408-enable-disable-all-restricted-visibility-levelsTiago Botelho2017-07-051-4/+4
|
* Update storage settings to allow extra values per shard28447-hybrid-repository-storagesAlejandro Rodríguez2017-03-031-2/+2
| | | | | | | This will be necessary when adding gitaly settings. This version doesn't make any functional changes, but allows us to include this breaking change in 9.0 and add the needed extra settings in the future with backwards compatibility
* Enable Rails/DelegateDouwe Maan2017-02-231-19/+6
|
* Merge branch ↵Fatih Acet2016-11-221-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24161-non-intuitive-buttons-for-import-sources-in-administrator-settings-enable-disable' into 'master' Import sources buttons to checkboxes ## What does this MR do? Swaps the `/application_settings` `Import Sources` buttons to checkboxes. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![2016-11-19_14.42.39](/uploads/5bf53ecb54765bd80ab275714208ee9a/2016-11-19_14.42.39.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24161 See merge request !7598
| * Swapped buttons for checkboxes24161-non-intuitive-buttons-for-import-sources-in-administrator-settings-enable-disableLuke "Jared" Bennett2016-11-211-4/+4
| |
* | Removed button styling from restricted visibility levels and added ↵18136-ui-for-restricting-global-visibility-levels-is-unclearLuke "Jared" Bennett2016-11-211-5/+5
|/ | | | | | checkboxes with icons Review changes
* Allow the Sidekiq queues to throttle and the factor by which to throttle ↵Patricio Cano2016-11-101-0/+4
| | | | them to be configurable
* Allow multiple repository storage shards to be enabled, and automatically ↵Nick Thomas2016-11-041-2/+2
| | | | round-robin between them
* Enable CacheMarkdownField for the remaining modelsNick Thomas2016-10-071-12/+0
| | | | | | | | | | | | | | | | | | | | This commit alters views for the following models to use the markdown cache if present: * AbuseReport * Appearance * ApplicationSetting * BroadcastMessage * Group * Issue * Label * MergeRequest * Milestone * Project At the same time, calls to `escape_once` have been moved into the `single_line` Banzai pipeline, so they can't be missed out by accident and the work is done at save, rather than render, time.
* Support integration with Koding (online IDE)Gokmen Goksel2016-08-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Koding: #index: landing page for Koding integration If enabled it will provide a link to open remote Koding instance url for now we are also providing the sneak preview video for how integration works in detail. Repository: check whether .koding.yml file exists on repository Projects: landing page: show Run in IDE (Koding) button if repo has stack file Projects: MR: show Run in IDE Koding button if repo has stack file on active branch ProjectHelpers: add_koding_stack: stack generator for provided project With this helper we will auto-generate the required stack template for a given project. For the feature we can request this base template from the running Koding instance on integration. Currently this will provide users to create a t2.nano instance on aws and it'll automatically configures the instance for basic requirements. Projects: empty state and landing page provide shortcuts to create stack projects_helper: use branch on checkout and provide an entry point This ${var.koding_queryString_branch} will be replaced with the branch provided in query string which will allow us to use same stack template for different branches of the same repository. ref: https://github.com/koding/koding/pull/8597/commits/b8c0e43c4c24bf132670aa8a3cfb0d634acfd09b projects_helper: provide sha info in query string to use existing vms With this change we'll be able to query existing vms on Koding side based on the commit id that they've created. ref: https://github.com/koding/koding/pull/8597/commits/1d630fadf31963fa6ccd3bed92e526761a30a343 Integration: Docs: Koding documentation added Disable /koding route if integration is disabled Use application settings to enable Koding Projects_helper: better indentation with strip_heredoc usage Projects_helper: return koding_url as is if there is no project provided current_settings: set koding_enabled: false by default Koding_Controller: to render not_found once integration is disabled Dashboard_specs: update spec for Koding enabled case Projects_Helper: make repo dynamic ref: https://github.com/koding/koding/pull/8597/commits/4d615242f45aaea4c4986be84ecc612b0bb1514c Updated documentation to have right format
* Use keyword arguments for boolean values and use `span` instead of `a` for ↵allow-disabling-of-git-access-protocolPatricio Cano2016-07-051-2/+2
| | | | clone "button"
* Default Git access protocol to `web`Patricio Cano2016-07-051-7/+3
|
* Rename `enabled_git_access_protocols` to singular.Patricio Cano2016-07-051-2/+2
|
* Only allow Git Access on the allowed protocolPatricio Cano2016-07-051-2/+2
|
* Refactor clone button sanitation to its own method to avoid duplication.Patricio Cano2016-07-051-2/+6
|
* Add setting that allows admins to choose which Git access protocols are enabledPatricio Cano2016-07-051-0/+22
|