summaryrefslogtreecommitdiff
path: root/app/views/admin/application_settings
Commit message (Collapse)AuthorAgeFilesLines
* Users can accept terms during registrationBob Van Landuyt2018-06-082-5/+5
| | | | | | | | | | When a user checks the `accept` checkbox, we will track that acceptance as usual. That way they don't need to accept again after they complete the registration. When an unauthenticated user visits the `/-/users/terms` page, there is no button to accept, decline or continue. The 'current-user menu' is also hidden from the top bar.
* Update settings section titlesAndreas Kämmerle2018-06-081-2/+2
|
* Add form-check-input class to checkbox input for visibility levels and ↵47266-visiblity-import-sources-checkbox-stylingtauriedavis2018-06-041-2/+2
| | | | import sources in admin area
* Merge branch 'jivl-update-form-horizontal-usage' into 'master'Annabel Gray2018-05-312-7/+7
|\ | | | | | | | | | | | | Remove form-horizontal class where applicable Closes #46744 See merge request gitlab-org/gitlab-ce!19262
| * Remove form-horizontal class where applicableJose2018-05-312-7/+7
| |
* | Fix checkbox/radio button structureClement Ho2018-05-3124-84/+84
|/
* Merge branch 'bootstrap-help-block' into 'master'Annabel Gray2018-05-292-3/+3
|\ | | | | | | | | | | | | Replace help-block with form-text.text-muted Closes #46745 See merge request gitlab-org/gitlab-ce!19206
| * Replace help-block with form-text.text-mutedClement Ho2018-05-292-3/+3
| |
* | Merge branch '46758-fallout-of-cacheable-attribute' into 'master'Douwe Maan2018-05-291-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Ensure ApplicationSetting#performance_bar_allowed_group_id is properly set when retrieved from cache Closes #46758 See merge request gitlab-org/gitlab-ce!19144
| * | Ensure ApplicationSetting#performance_bar_allowed_group_id is properly set ↵Rémy Coutable2018-05-291-2/+2
| | | | | | | | | | | | | | | | | | when retrieved from cache Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Add bootstrap fixes that were in EE but were mismatching in CEClement Ho2018-05-291-1/+1
| |/ |/|
* | include groups in descriptionDavin Walker2018-05-281-1/+1
|/
* Replace remaining .radio and .checkbox with .form-checkClement Ho2018-05-242-2/+2
|
* Merge branch 'master' into bootstrap4Clement Ho2018-05-231-1/+1
|\
| * removed "(Beta)" from "Auto DevOps" messagesfix/devops-remove-betaPaul Slaughter2018-05-211-1/+1
| |
* | Merge branch 'master' into bootstrap4Clement Ho2018-05-084-51/+111
|\ \ | |/
| * Merge branch '42099-port-push-mirroring-to-ce-ce-port-v-2' into 'master'Douwe Maan2018-05-072-0/+27
| |\ | | | | | | | | | | | | | | | | | | CE backport of Backports Push Mirrors to CE Closes #42099 See merge request gitlab-org/gitlab-ce!18715
| | * Adds changelog entry, changes RemoteMirror#sync? to be semantically sound ↵Tiago Botelho2018-05-071-1/+1
| | | | | | | | | | | | and remove reference to pull mirrors in view
| | * Adds remote mirror table migrationTiago Botelho2018-05-072-0/+27
| | |
| * | Update link to the official git websiteToon Claes2018-05-071-1/+1
| |/
| * Enforces terms in the web applicationBob Van Landuyt2018-05-041-52/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enforces the terms in the web application. These cases are specced: - Logging in: When terms are enforced, and a user logs in that has not accepted the terms, they are presented with the screen. They get directed to their customized root path afterwards. - Signing up: After signing up, the first screen the user is presented with the screen to accept the terms. After they accept they are directed to the dashboard. - While a session is active: - For a GET: The user will be directed to the terms page first, after they accept the terms, they will be directed to the page they were going to - For any other request: They are directed to the terms, after they accept the terms, they are directed back to the page they came from to retry the request. Any information entered would be persisted in localstorage and available on the page.
| * Store application wide termsBob Van Landuyt2018-05-042-3/+14
| | | | | | | | | | | | | | | | This allows admins to define terms in the application settings. Every time the terms are adjusted, a new version is stored and becomes the 'active' version. This allows tracking which specific version was accepted by a user.
| * Add `Term` model to keep track of termsBob Van Landuyt2018-05-041-0/+22
| | | | | | | | That way we can link a users acceptance of terms directly to a terms record.
* | Merge branch 'master' into 'bootstrap4'Clement Ho2018-04-241-1/+1
|\ \ | |/ | | | | # Conflicts: # app/views/projects/jobs/index.html.haml
| * Update repository storages documentation URLAsh McKenzie2018-04-231-1/+1
| |
* | Merge branch 'master' into 'bootstrap4'Clement Ho2018-04-162-1/+3
|\ \ | |/ | | | | # Conflicts: # app/views/admin/application_settings/_signin.html.haml
| * Don't reset application settings oauth providers by mistakeDmitriy Zaporozhets2018-04-131-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Don't reset application settings import sourcesDmitriy Zaporozhets2018-04-131-0/+1
| | | | | | | | | | | | | | | | If form does not have import sources checkboxes we should not reset import sources to empty. This fixes issue when import sources got reset after user modifies unrelated settings section like GitLab pages Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | [skip ci] Replace col-*-offset-* with offset-*-*Clement Ho2018-04-1322-35/+35
| |
* | [skip ci] .form-horizontal => .form-group.rowClement Ho2018-04-1227-134/+134
| |
* | [skip ci] .control-label to .col-form-labelClement Ho2018-04-1122-72/+72
| |
* | [skip ci] .help-block to .form-text.text-mutedClement Ho2018-04-1124-73/+73
| |
* | [skip ci] Replace .radio with .form-checkClement Ho2018-04-111-2/+2
| |
* | [skip ci] Convert .checkbox to .form-checkClement Ho2018-04-1122-40/+40
|/
* Merge branch 'fix-typo-in-application_settings-page' into 'master'Robert Speicher2018-04-041-1/+1
|\ | | | | | | | | Fix typo in application settings page See merge request gitlab-org/gitlab-ce!18181
| * Fix a typo in an externalized message: 'amd' -> 'and'Rémy Coutable2018-04-041-1/+1
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Remove unused form for admin application settingsdz-improve-app-settings-6Dmitriy Zaporozhets2018-04-042-8/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Move the rest of application settings to expandable blocksDmitriy Zaporozhets2018-04-0411-169/+297
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move network related app settings to expandable blocksDmitriy Zaporozhets2018-04-044-60/+88
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move repository, storage, abuse settings and logging settings to expandable ↵Dmitriy Zaporozhets2018-04-026-153/+212
| | | | | | | | sections Also reorganize application settings related to repository in more maninful sections Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move background jobs, spam and performance bar app settings to expandable ↵dz-improve-app-settings-3Dmitriy Zaporozhets2018-03-295-114/+154
| | | | | | sections Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move ci/cd, influx and prometheus app settings to expandable sectionsDmitriy Zaporozhets2018-03-275-134/+176
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Put forms from expandable sections into fieldset to ensure proper animationDmitriy Zaporozhets2018-03-266-222/+237
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove gray background from app setting expandable sectionsDmitriy Zaporozhets2018-03-267-24/+18
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Improve application settings page according to feedbackDmitriy Zaporozhets2018-03-267-12/+12
| | | | | | | * Replace btn-save with btn-success * Add id to each section so it can be directly linked Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move UI of several application settings to expandable blockdz-improve-app-settingsDmitriy Zaporozhets2018-03-268-251/+328
| | | | | | | | | | | | | | | To make design consistent with project settings Next admin area application settings are afected by this commit: * Visibility and access control * Account and limit settings * Sign in * Sign up * Help page * Pages Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'Douwe Maan2018-03-211-0/+9
| | | | | Server Side Request Forgery in Services and Web Hooks See merge request gitlab/gitlabhq!2337
* Clarify version check in admin settings43486-update-language-about-version-check-in-admin-settings-and-docsSean McGivern2018-03-071-2/+4
|
* Merge branch ↵Sean McGivern2018-03-021-7/+7
|\ | | | | | | | | | | | | | | | | '43548-update-language-about-usage-ping-in-admin-settings-and-docs' into 'master' Resolve "Update language about usage ping in admin settings" Closes #43548 See merge request gitlab-org/gitlab-ce!17468
| * Clarify usage ping wording in admin areaSean McGivern2018-03-021-7/+7
| |