Commit Graph

21 Commits

Author SHA1 Message Date
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
Douwe Maan 79e889122b Merge branch 'bvl-group-trees' into 'master'
Show collapsible tree on the project show page

Closes #30343

See merge request gitlab-org/gitlab-ce!14055
2017-10-17 10:03:03 +00:00
Mike Greiling 53e11239ce
Merge branch 'master' into sh-headless-chrome-support
* master: (104 commits)
  Update licenses
  fix a wrong method call in the refactor
  fix a whitespace
  fix for discussion
  Update templates via:
  Update doc accordingly to:
  Cache issuable template names
  Fix the format of rugged alternate directory list
  Match full file path in FileDetector
  Fixes from CSS refactor
  Resolve "Prometheus service page shows error"
  Explicit state integration deletion
  Move all API authentication code to APIGuard
  Shorten example translation for inclusive language
  [ci-skip] add changelog
  fix the merger override to remove source branch
  add spec
  Removed d3.js  from the users and graphs bundle
  Cleanup data-page attribute after each Karma test
  Update template description wording
  ...
2017-10-12 17:52:09 -05:00
Bob Van Landuyt d2a9d95a22 Skip some nested group specs when using MySQL 2017-10-12 11:36:55 +02:00
Robert Speicher be3facd9ff Fix a feature spec failing only on MySQL 2017-10-11 13:38:12 +02:00
Bob Van Landuyt 17dccc35ca Update feature specs for updated group lists 2017-10-05 13:50:09 +02:00
Kushal Pandya de55396134 Groups tree enhancements for Groups Dashboard and Group Homepage 2017-10-04 22:49:42 +02:00
Bob Van Landuyt 3a4dc55f29 Reuse the groups tree for explore and dashboard. 2017-10-04 22:49:41 +02:00
Phil Hughes 27c00d2ed3
fixed spec/features/dashboard/groups_list_spec.rb 2017-09-27 12:40:24 +01:00
Stan Hu 408df2edcb Merge branch 'master' into sh-headless-chrome-support 2017-08-02 16:58:28 -07:00
Alexander Randa 1c84f668bc Replaces dashboard/dashboard.feature spinach with rspec 2017-07-17 11:16:41 +03:00
Robert Speicher e939bf7be1 Change gitlab_sign_in to sign_in where possible 2017-06-29 12:18:23 -04:00
Stan Hu 0f943c941b Merge branch 'master' into sh-headless-chrome-support 2017-06-21 09:43:58 -07:00
Robert Speicher 45fb1f9542 Change `login_as` uses to `gitlab_sign_in` 2017-06-19 18:59:01 -05:00
Stan Hu 5854ab2f7d Convert variants of trigger('click') -> click 2017-06-16 23:08:27 -07:00
Alfredo Sumaran ff05275797 Add feature tests for Dashboard Groups page 2017-06-07 22:42:41 -05:00
Oswaldo Ferreira 2338785ec9 Use wait_for_requests to wait all JS request 2017-05-22 20:39:49 -03:00
Jacopo ff76adb547 Unnecessary "include WaitForAjax" and "include ApiHelpers"
Removed all the unnecessary include of `WaitForAjax` and `ApiHelpers` in the specs.
Removed unnecessary usage of `api:true`
2017-04-21 22:32:02 +02:00
Dmitriy Zaporozhets f440bfd247
Improve groups list specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-03-02 14:10:37 +02:00
Filipa Lacerda 0a10d85927 Update JS to use new standards 2017-03-02 11:05:48 +00:00
Dmitriy Zaporozhets b7c30cae4e
Add filter and sorting to dashboard groups page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-03-01 15:39:59 +02:00