Commit Graph

226 Commits

Author SHA1 Message Date
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
Phil Hughes c56100b3ec Add top level items to fly-out navigation
This only appears when in the collapsed sidebar. If the sidebar is expanded, then these items are hidden & no fly-out navigation is displayed.

Closes #36294
2017-09-06 14:54:17 +01:00
Toon Claes ddf892b9f2 Put loggers in before_action for easier overriding in EE
Make it easier to override the set of loggers, by putting them in a
separate method.

Also modify spec so it tests for links, instead of checking for
regular text.
2017-09-06 15:25:51 +02:00
Stan Hu 41e5ec8f74 Merge branch 'master' into sh-headless-chrome-support 2017-09-05 11:33:09 -07:00
Robert Speicher 223849fa17 Merge branch '17849-allow-admin-to-restrict-min-key-length-and-techno' into 'master'
Add settings for minimum key strength and allowed key type

Closes #17849

See merge request !13712
2017-09-01 19:23:08 +00:00
Stan Hu f045903541 Merge branch 'master' into sh-headless-chrome-support 2017-08-31 20:50:05 -07:00
Nick Thomas 6847060266 Rework the permissions model for SSH key restrictions
`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.
2017-08-30 20:50:44 +01:00
Nick Thomas b0f982fbdf Add settings for minimum key strength and allowed key type
This is an amalgamation of:

* Cory Hinshaw: Initial implementation !5552
* Rémy Coutable: Updates !9350
* Nick Thomas: Resolve conflicts and add ED25519 support !13712
2017-08-30 20:50:44 +01:00
Phil Hughes 669fb299c7 fixed up a bunch of specs
some caused by webkit prefixes
2017-08-29 15:35:49 +01:00
Mehdi Lahmam 55f4ddad2b Add an option to list only archived projects
Closes #35994
2017-08-24 10:11:07 +02:00
Stan Hu 3e75b7fa81 Merge branch 'master' into sh-headless-chrome-support 2017-08-17 00:15:35 -07:00
Robert Speicher 4edfad9678 Enable Layout/TrailingWhitespace cop and auto-correct offenses 2017-08-15 13:44:37 -04:00
Stan Hu 07f8105f97 Merge branch 'master' into sh-headless-chrome-support 2017-08-11 23:22:20 -07:00
Robin Bobbitt 649d042dbc Add option to disable project export on instance 2017-08-11 12:22:37 -04:00
Stan Hu 4b5483321a Change trigger('focus') -> click 2017-08-09 23:06:28 -07:00
Bob Van Landuyt 3899d07f9e Move hostname to Gitlab::Environment 2017-08-04 15:38:49 +02:00
Bob Van Landuyt 3598e60bf2 Add a Circuitbreaker for storage paths 2017-08-04 15:38:48 +02:00
Filipa Lacerda 57aa5d6314 Merge branch 'fix-oauth-checkboxes' into 'master'
Fixed sign-in restrictions buttons not toggling active state

Closes #35882

See merge request !13270
2017-08-03 16:03:23 +00:00
Phil Hughes 42feb55f20
Fixed sign-in restrictions buttons not toggling active state
Closes #35882
2017-08-03 12:08:10 +01:00
Robert Speicher 72a7b30c9f Change all `:empty_project` to `:project` 2017-08-02 17:47:31 -04:00
Rémy Coutable d783dcd0f2 Merge branch '35643-impersonate-spec' into '9-4-stable-patch-2'
Resolve "Impersonation Tokens creation spec failure in admin_users_impersonation_tokens_spec.rb"

See merge request !13145
2017-07-28 21:04:48 +00:00
Rémy Coutable 8626cdc3b3 Merge branch 'rs-empty_project-features' into 'master'
Use `:empty_project` where possible in feature specs

See merge request !13118
2017-07-28 10:00:05 +00:00
Robert Speicher 75319d973b Use `empty_project` where possible in spec/features/admin 2017-07-27 13:12:15 -04:00
Oswaldo Ferreira e561b142fa Backport gitlab-ee!2456 2017-07-27 12:09:46 -04:00
Keifer Furzland 7e113b6824 Remove superfluous type defs in specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-27 14:31:52 +02:00
Tim Zallmann 52b8a0db68 Resolve "Lazy load images on the Frontend" 2017-07-24 17:36:52 +00:00
Grzegorz Bizon 729ac897fd Merge branch '20817-please-add-coordinator-url-to-admin-area-runner-page' into 'master'
Add coordinator url to admin area runner page

Closes #20817

See merge request !11603
2017-07-20 20:04:15 +00:00
Alexander Randa e0ab5618a0 Wrong data type when testing webhooks 2017-07-20 15:12:06 +00:00
Shinya Maeda 2b8c46fe1d Add #registration_token for %code 2017-07-20 17:42:45 +09:00
Shinya Maeda acaf13d6f3 Add an id for the tag(#registration_token). Wrap long lines. 2017-07-20 15:14:22 +09:00
Shinya Maeda 96fe285cfb Fix spec 2017-07-20 15:04:52 +09:00
Shinya Maeda 3f66d3bd63 Add coordinator url to admin area runner page
Use partial and shring same UI

Swap two. Like the project runner section.

Fix tests
2017-07-20 15:04:52 +09:00
Bob Van Landuyt 458f3cf9b0 Update specs for new upload path 2017-07-18 15:38:54 +02:00