Commit Graph

258 Commits

Author SHA1 Message Date
Clement Ho 46031d63cd [skip ci] Convert panel related class names to card 2018-04-10 12:11:34 -05:00
Dmitriy Zaporozhets 442528e577
Move the rest of application settings to expandable blocks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-04-04 12:44:32 +03:00
Dmitriy Zaporozhets e0a73d70f9
Move background jobs, spam and performance bar app settings to expandable sections
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-03-29 18:06:29 +03:00
Dmitriy Zaporozhets 528758f326
Fix admin settings spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-03-27 19:20:03 +03:00
Dmitriy Zaporozhets 42040e61ec Move ci/cd, influx and prometheus app settings to expandable sections
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-03-27 18:13:16 +03:00
Dmitriy Zaporozhets e4587cf0e6 Move UI of several application settings to expandable block
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>
2018-03-26 15:10:56 +03:00
Dmitriy Zaporozhets 001a28d042 Merge branch 'dz-plugins-project-integrations' into 'master'
Show plugins list on system hooks page

Closes #40812

See merge request gitlab-org/gitlab-ce!17518
2018-03-07 12:03:43 +00:00
Dmitriy Zaporozhets 30b76e4b29
Add feature test for plugins on system hooks page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-03-06 18:24:24 +02:00
Dmitriy Zaporozhets 8fe9995f11
Replace deprecated name_with_namespace with full_name in app and spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-03-05 16:15:26 +02:00
Douwe Maan 11d275e24a Merge branch 'feature/move_oauth_modules_to_auth_dir_structure' into 'master'
Moved o_auth/saml/ldap modules under gitlab/auth

See merge request gitlab-org/gitlab-ce!17359
2018-03-01 17:47:01 +00:00
Horatiu Eugen Vlad 1ad5df49b1 Moved o_auth/saml/ldap modules under gitlab/auth 2018-02-28 16:53:02 +01:00
Mayra Cabrera 3364d5f408 Resolve "Error 500 on route "/admin/application_settings/services/1882/edit" -> edit Prometheus Service Template" 2018-02-26 22:07:17 +00:00
Oswaldo Ferreira f2709915d7 Add a button to deploy a runner to a Kubernetes cluster in the settings page 2018-02-23 13:26:51 -03:00
Shah El-Rahman 3cb19dd42c Resolve "New design for user deletion confirmation in admin area" 2018-02-08 05:17:12 +00:00
Matija Čupić 56bcb3e8c8
Use Gitlab::CurrentSettings instead of current_application_settings 2018-02-03 12:20:59 +01:00
Matija Čupić 40753029e4
Merge branch 'master' into 38175-add-domain-field-to-auto-devops-application-setting 2018-02-02 21:56:22 +01:00
Mario de la Ossa eaada9d706 use Gitlab::UserSettings directly as a singleton instead of including/extending it 2018-02-02 18:39:55 +00:00
Matija Čupić 5706029503
Expose auto_devops_domain in admin settings view 2018-01-22 19:31:03 +01:00
Douwe Maan 8e9c073a14 Merge branch 'feature/merge-request-system-hook' into 'master'
System hooks for Merge Requests

See merge request gitlab-org/gitlab-ce!14387
2018-01-18 11:37:16 +00:00
Phil Hughes 2af0b083c6 Merge branch 'winh-stop-jobs-modal' into 'master'
Add modal for stopping jobs in admin area

Closes #41305

See merge request gitlab-org/gitlab-ce!16283
2018-01-18 10:53:18 +00:00
Winnie Hellmann 76f16bbf71 Add modal for stopping jobs in admin area 2018-01-18 10:05:40 +01:00
Alexis Reigel 6ef1b94ccf accept_confirm requires js driver 2018-01-17 09:55:00 +01:00
Douwe Maan 536a47b4b7 Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into '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
2018-01-16 17:04:51 -08:00
Alexis Reigel 57e2488085 we only need a test for the happy path
the failure case is already covered by the test in
spec/services/test_hooks/system_service_spec.rb
2018-01-04 09:33:41 +01:00
Alexis Reigel a2655e3fbd use sentence case for "Merge request events" 2018-01-04 09:33:41 +01:00
Alexis Reigel 630c338051 merge requests on system hook admin page 2018-01-04 09:33:41 +01:00
blackst0ne 27c95364b5 Replace '.team << [user, role]' with 'add_role(user)' in specs 2017-12-22 19:18:28 +11:00
Robert Speicher 627a96875e Merge branch 'rc/use-factory_bot_rails' into 'master'
Replace factory_girl_rails with factory_bot_rails

See merge request gitlab-org/gitlab-ce!15919
2017-12-15 16:32:34 +00:00
Gilbert Roulot dd4b6db23e Fix UX issues in system info page 2017-12-15 12:37:01 +00:00
Rémy Coutable 4af9d592c5 Replace factory_girl_rails with factory_bot_rails
I've followed the [upgrade guide](https://github.com/thoughtbot/factory_bot/blob/4-9-0-stable/UPGRADE_FROM_FACTORY_GIRL.md) and ran these two commands:

```
grep -e FactoryGirl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|FactoryGirl|FactoryBot|"
grep -e factory_girl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|factory_girl|factory_bot|"
```

Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-12-14 15:01:55 +01:00
Bob Van Landuyt f1ae1e39ce Move the circuitbreaker check out in a separate process
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.
2017-12-08 09:11:39 +01:00
Markus Koller b8a3931925
Add custom brand text on new project pages 2017-12-04 17:22:59 +01:00
Tiago Botelho 053a198846 Impersonation no longer gets stuck on password change. 2017-11-20 18:02:41 +01:00
Mike Greiling 1cf167fc3e
Merge branch 'master' into sh-headless-chrome-support
* master: (84 commits)
  Migrate Gitlab::Git::Wiki#page to Gitaly
  Load participants async
  Normalize LDAP DN when looking up identity
  Improve the maintenance policy page
  add changelog
  fix spec failure
  Allow promoting project milestones to group milestones
  fix specs
  Be able to bundle gems with newer rubies
  Upgrade Ruby to 2.3.5
  fixed up upload feature after master merge
  fix missing issue assignees
  Migrate Gitlab::Git::Wiki#delete_page to Gitaly
  Enable eslint
  Make `#hashed_storage?` require feature argument
  Adds callback function to inital cluster request
  Fix example typo.
  Upload files through the multi-file editor
  get branch name from the DOM
  Resolve "Convert autosize.js library to be a Yarn managed library"
  ...
2017-10-31 16:08:11 -05:00
Rémy Coutable d7942f223c Allow to disable the Performance Bar and document the `p b` shortcut in its doc page
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-10-30 16:13:15 +01:00
Mike Greiling 8b7672697f
accept modal confirm dialog when disabling 2FA 2017-10-26 18:57:57 +02:00
Mike Greiling 519ffa1ebf
Merge branch 'master' into sh-headless-chrome-support
* master: (297 commits)
  Fix deletion of container registry or images returning an error
  The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This merge requests update the gem to v0.2.0 which contains the fix:
  Decrease ABC threshold to 54.28
  Update VERSION to 10.2.0-pre
  Update CHANGELOG.md for 10.1.0
  Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT`
  Fix the external URLs generated for online view of HTML artifacts
  Use title as placeholder instead of issue title for reusability
  Fix failure in current_settings_spec.rb
  Clarify the difference between project_update and project_rename
  URI decode Page-Title header to preserve UTF-8 characters
  Update Gitaly version to v0.49.0
  Decrease Perceived Complexity threshold to 14
  Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)"
  Force non diff resolved discussion to display when collapse toggled
  Added submodule support in multi-file editor
  add note about after_script being run separately
  Check for element before evaluate_script
  Merge branch 'master-i18n' into 'master'
  Update Prometheus gem to fix problems with other files overwriting current file
  ...
2017-10-23 10:32:14 +03:00
Bob Van Landuyt 619021fd7a Read circuitbreaker settings from `Gitlab::CurrentSettings`
Instead of from the configuration file
2017-10-17 11:50:32 +02:00
Mike Greiling 4f5fda8b34
accept javascript confirm dialog on admin delete label link 2017-10-13 19:04:09 -05:00
Jose Ivan Vargas 8ee9843e35 Add accept_confirm for admin_users_impersonation_tokens_spec 2017-10-13 17:39:28 -05:00
Mike Greiling f783798825
Merge branch 'master' into sh-headless-chrome-support
* master: (113 commits)
  Introduce new hook data builders for Issue and MergeRequest
  Don't create todos for old issue assignees
  Start adding Gitlab::HookData::IssuableBuilder
  Include the changes in issuable webhook payloads
  Rename the `codeclimate` job to `codequality`
  Don't show an "Unsubscribe" link in snippet comment notifications
  Add QA::Scenario::Gitlab::Group::Create
  Removes CommitsList from global namespace
  Fix wiki empty page translation namespace not being removed
  Fixes mini graph in commit view
  Fix link to new i18n index page
  Update i18n docs
  Move i18n/introduction to i18n/index
  Resolve "Simple documentation update - backup to restore in restore section"
  Remove AjaxLoadingSpinner and CreateLabelDropdown from global namespace
  Move cycle analytics banner into a vue file
  Updated Icons + Fix for Collapsed Groups Angle
  Don't create fork networks for root projects that are deleted
  Remove executable permissions on images to make docs lint happy
  Sync up hard coded DN class in migration
  ...
2017-10-09 15:00:00 -05:00
Jacopo 0ce6785851 Replaces `tag: true` into `:tag` in the specs
Replaces all the explicit include metadata syntax in the specs (tag:
true) into the implicit one (:tag).
Added a cop to prevent future errors and handle autocorrection.
2017-10-07 13:57:54 +02:00
Jose Ivan Vargas 10c70b19d0 fix admin_settings_spec 2017-10-04 16:52:06 -05:00
Jose Ivan Vargas ac417cb39f fix admin_uses_repository_checks 2017-10-03 12:05:57 -05:00
Jose Ivan Vargas bea4b0a8df fix admin_hooks_spec 2017-10-03 12:02:48 -05:00
Phil Hughes 7a090d59a3
fixed spec/features/admin/admin_groups_spec.rb 2017-09-27 12:36:05 +01:00
Phil Hughes 9d48177c8e
fixed spec/features/admin/admin_users_spec.rb 2017-09-27 12:34:41 +01:00
Jose Ivan Vargas 4c0beb6c02 Merge branch 'master' into sh-headless-chrome-support 2017-09-13 12:21:33 -05:00
Filipa Lacerda b8adc0d042 Merge branch 'fly-out-top-level-item' into 'master'
Add top level items to fly-out navigation

Closes #36294

See merge request !13981
2017-09-07 13:26:48 +00:00
Dmitriy Zaporozhets 8a2aab447a Merge branch 'tc-test-admin-log-links' into 'master'
Put Admin loggers in before_action for easier overriding in EE

See merge request !14081
2017-09-06 15:56:12 +00:00