summaryrefslogtreecommitdiff
path: root/app/views/admin
Commit message (Collapse)AuthorAgeFilesLines
* Removes EE differences12532-services-formFilipa Lacerda2019-07-011-1/+1
|
* Merge branch 'refactor/remove-sentry-from-app-settings' into 'master'Stan Hu2019-06-262-49/+0
|\ | | | | | | | | Remove Sentry settings from application settings See merge request gitlab-org/gitlab-ce!28447
| * refactor: remove Sentry from application settingsRoger Meier2019-06-252-49/+0
| |
* | New RecaptchaExperimentHelper modulesAsh McKenzie2019-06-251-1/+4
|/ | | | | RecaptchaExperimentHelper contains helper methods to assist in the controller and view layers.
* Merge branch ↵Filipa Lacerda2019-06-251-1/+1
|\ | | | | | | | | | | | | | | | | '63177-follow-up-from-use-scoped-routes-for-labels-and-milestones' into 'master' Resolve "Follow-up from "Use scoped routes for labels and milestones"" Closes #63177 See merge request gitlab-org/gitlab-ce!29983
| * Remove baseEndpoint from search dropdwon63177-follow-up-from-use-scoped-routes-for-labels-and-milestonesDmitriy Zaporozhets2019-06-241-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Rename to time_tracking_limit_to_hours30355-use-hours-only-for-time-trackingHeinrich Lee Yu2019-06-251-3/+4
| | | | | | | | Changes migration and all other places the attribute is used
* | Limit time tracking values to hoursJon Kolb2019-06-251-0/+6
|/ | | | | Adds an instance setting to limit display of time tracking values to hours only
* Merge branch '49814-display-in-admin-area-if-emails-are-verified-or-not' ↵Mike Greiling2019-06-211-2/+3
|\ | | | | | | | | | | | | | | | | into 'master' Resolve "Display in admin area if emails are verified or not" Closes #49814 See merge request gitlab-org/gitlab-ce!29669
| * Add verification badge to users emails49814-display-in-admin-area-if-emails-are-verified-or-notBrandon Labuschagne2019-06-201-2/+3
| | | | | | | | | | | | | | | | This is being applied to the admin users view, when an admin selects a user profile tp view. It gives admins the ability to see an email verification status without the need of impersonating a user.
* | Update application settings using correct actionBrett Walker2019-06-1923-23/+23
|/ | | | | | | Updating multiple application settings panels through a single action causes the incorrect action to be shown when there are errors. Instead, make each panel action handle both updating and display.
* Make KubernetesService readonlyJames Fargher2019-06-183-2/+9
| | | | | | | | We are deprecating this service in favor of instance wide clusters. Therefore we removed some code that is not anymore needed for a readonly cluster and also we added some flags to allow for this deprecation. These flags are to be removed in the next release when we finally completelly remove KubernetesService.
* Merge branch '8429-enforce-template-inclusion-in-pipelines-fe-backport' into ↵Filipa Lacerda2019-06-171-0/+2
|\ | | | | | | | | | | | | 'master' Backporting required template form on admin CI/CD See merge request gitlab-org/gitlab-ce!29154
| * Backporting an EE admin form8429-enforce-template-inclusion-in-pipelines-fe-backportScott Hampton2019-06-131-0/+2
| | | | | | | | | | EE added a required template form on the CI/CD page. This is a backport for that change.
* | Add EE backport for the admin viewMałgorzata Ksionek2019-06-111-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into patch-56Sean McGivern2019-06-1016-73/+112
|\ \ | |/
| * Merge dev.gitlab.org master into GitLab.com masterYorick Peterse2019-06-031-0/+8
| |\
| | * Add DNS rebinding protection settingsOswaldo Ferreira2019-05-301-0/+8
| | |
| * | Merge branch '62487-external-policy-desc' into 'master'Phil Hughes2019-05-301-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Move text under p tag Closes #62487 See merge request gitlab-org/gitlab-ce!28901
| | * | Move text under p tag62487-external-policy-descJarek Ostrowski2019-05-291-1/+1
| | | | | | | | | | | | | | | | Add changelog
| * | | Fix for #61788 predefined colours dont have descriptive labelsChris Toynbee2019-05-301-4/+1
| |/ /
| * | Redirect to admin projects index if project was deleted from admin pageLuke Picciau2019-05-291-2/+2
| | |
| * | Show if a user is using a license seattpresa-using-license-seatThiago Presa2019-05-281-0/+2
| |/
| * Fix col-sm-* in forms to keep layoutTakuya Noguchi2019-05-278-54/+78
| | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * Merge branch 'admin-users-form-scb' into 'master'Phil Hughes2019-05-221-0/+6
| |\ | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in admin users form Closes gitlab-ee#10508 See merge request gitlab-org/gitlab-ce!28520
| | * Resolve CE/EE diffs in admin users formadmin-users-form-scbLuke Bennett2019-05-211-0/+6
| | | | | | | | | | | | Part of single codebase changes.
| * | Update broadcast message icons39304-broadcast-message-buttonsJarek Ostrowski2019-05-211-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | Add icons from gitlab-svgs Remove btn-sm class for better sizing Add changelog Update mr number changelog Change to sprite_icon
| * Resolve CE/EE diffs in admin users headadmin-users-head-scbLuke Bennett2019-05-171-0/+1
| | | | | | | | Part of single codebase changes.
| * Merge branch 'admin-groups-form-scb' into 'master'Phil Hughes2019-05-171-1/+1
| |\ | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in admin groups form Closes gitlab-ee#11042 See merge request gitlab-org/gitlab-ce!28365
| | * Resolve CE/EE diffs in admin groups formadmin-groups-form-scbLuke Bennett2019-05-161-1/+1
| | | | | | | | | | | | Part of single codebase changes.
| * | Merge branch 'admin-user-access-levels-scb' into 'master'Phil Hughes2019-05-161-0/+2
| |\ \ | | |/ | |/| | | | | | | | | | | | | Resolve CE/EE diffs in admin user access levels Closes gitlab-ee#10507 See merge request gitlab-org/gitlab-ce!28359
| | * Resolve CE/EE diffs in admin user access levelsadmin-user-access-levels-scbLuke Bennett2019-05-161-0/+2
| | | | | | | | | | | | Part of single codebase changes.
| * | Fix an error in projects admin when statistics are missingRémy Coutable2019-05-162-5/+5
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Add Let's Encrypt clientVladimir Shushlin2019-05-161-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Resolve CE/EE diffs in health checkhealth-check-scbLuke Bennett2019-05-111-1/+1
| | | | | | | | Part of single codebase changes.
* | Clarify that performance bar is not always onBen Bodenmiller2019-06-092-2/+2
|/
* Resolve CE/EE diffs in admin/projects/show viewadmin-projects-show-scbLuke Bennett2019-05-081-0/+2
| | | | Part of single codebase changes.
* Minor review fixesEzekiel Kigbo2019-05-061-1/+1
| | | | | | | | | | Externalize strings Simplify locals passed through views Ensure we can still filter when logged out Cleanup conditional rendering for explore filters
* Add packages_size to ProjectStatisticsAlessio Caiazza2019-05-022-13/+6
| | | | | This new field will allow to keep track of the storage used by the packages features, it provides also aggregation at namespace level.
* Merge branch ↵Filipa Lacerda2019-05-021-2/+2
|\ | | | | | | | | | | | | | | | | '59898-fix-the-following-style-lint-errors-and-warnings-for-app-assets-stylesheets-pages-commits-scss' into 'master' Resolve "Fix the following style-lint errors and warnings for `app/assets/stylesheets/pages/commits.scss`" Closes #59898 See merge request gitlab-org/gitlab-ce!27647
| * Fix commits.scss style-lint errors59898-fix-the-following-style-lint-errors-and-warnings-for-app-assets-stylesheets-pages-commits-scssScott Hampton2019-04-251-2/+2
| | | | | | | | Updating class names, and using existing utility classes.
* | Allow Sentry client-side DSN to be passed on gitlab.ymlDouglas Barbosa Alexandre2019-05-011-1/+0
| |
* | style: fix typoRoger Meier2019-04-301-1/+1
| |
* | feat: allow Sentry configuration to be passed on gitlab.ymlRoger Meier2019-04-301-0/+7
| |
* | Add Let's Encrypt application settingsVladimir Shushlin2019-04-271-6/+23
| | | | | | | | | | Store Let's Encrypt account email in application settings Also add explicit terms of service consent
* | Add auto direction to support rtl languagesAhmad Haghighi2019-04-251-0/+1
|/
* Move scoped_label into label presenterJan Provaznik2019-04-231-1/+1
| | | | | | | When rendering a label we want to check 'scoped_label' feature availability on a project/group where label is being used. For this reason a label presenter is used in UI and information about context project/group is passed to this presenter.
* Add QA tests for the performance bar60356-add-qa-tests-for-the-performance-barSean McGivern2019-04-162-3/+3
| | | | | | | | These are very high-level. Currently, they test: 1. That the performance bar appears. 2. That it has detailed metrics for Postgres and Gitaly. 3. That AJAX requests are included in the request selector.
* Move Contribution Analytics related spec in ↵Imre Farkas2019-04-092-1/+52
| | | | spec/features/groups/group_page_with_external_authorization_service_spec to EE
* CE port: Move EE differences for `app/views/admin/users/show.html.haml`ce-6099-move-ee-differences-for-app-views-admin-users-show-html-hamlDennis Tang2019-04-092-1/+8
|
View Lorry Controller Status