Commit Graph

21 Commits

Author SHA1 Message Date
Luke Bennett 4878ef2fa7 CE port gitlab-ee!6112 2018-06-27 11:41:16 +00:00
Lin Jen-Shin 14d1efc0e9 Bring changes from EE 2018-06-21 23:15:59 +08:00
Clement Ho 5955caed32 Merge branch 'master' into bootstrap4 2018-05-08 10:49:30 -05:00
Winnie Hellmann 244f511eec Load branches on new merge request page asynchronously 2018-05-02 22:23:48 +00:00
Clement Ho 2272e95acd Merge branch 'master' into 'bootstrap4'
# Conflicts:
#   app/views/ci/variables/_variable_row.html.haml
2018-04-30 16:13:13 +00:00
Rémy Coutable 8d381b359f
Ensure member notifications are sent after the member actual creation/update in the DB
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-04-26 08:28:05 +02:00
Clement Ho c7dd05e968 Fix protected branches access control spec 2018-04-23 16:49:07 -05:00
Rémy Coutable 799cd47109
Improve MR feature specs and reduce duplication
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-01-18 15:07:57 +01:00
James Edwards-Jones 96106287db Deduplicate protected ref human_access_levels
Previously these were duplicated so they could be different for push/merge,
but this was no longer necessary after
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11232
2017-11-24 13:47:03 +00:00
Jose Ivan Vargas 3ac444b8da Fix trigger elements and element is not clickable at this position 2017-10-11 16:54:05 -05:00
Jose Ivan Vargas 02838d5be2 Merge branch 'master' into sh-headless-chrome-support 2017-10-06 17:15:44 -05:00
Vitaliy @blackst0ne Klachkov 2fc45e4d7e Replace the 'project/merge_requests.feature' spinach test with an rspec analog 2017-10-05 09:31:34 +11:00
Mike Greiling 27a28d9970 Merge branch 'master' into sh-headless-chrome-support
* master: (97 commits)
  Eliminate N+1 queries in loading discussions.json endpoint
  Clean up read_registry scope changes
  Add missing import statements
  Improve “New project“ page description
  Fix notification message when admin label was modified
  Remove gaps under nav on build page
  Replace the 'project/snippets.feature' spinach test with an rspec analog
  Use correct group members path for members flyout link
  Fix docs for lightweight tag creation via API
  Replace the 'project/commits/revert.feature' spinach test with an rspec analog
  Merge branch 'rs-incoming-email-domain-docs' into 'security-10-0'
  Replace the 'project/archived.feature' spinach test with an rspec analog
  Fix broken link in docs/api/wiki.md
  Fixed the new sidebars width when browser has scrollbars
  Improve 'spec/features/profiles/*' specs
  Replace the 'search.feature' spinach test with an rspec analog
  dedupe yarn packages
  add dependency approvals (all MIT license)
  update build image to latest with node 8.x, yarn 1.0.2, and chrome 61
  Ensure we use `Entities::User` for non-admin `users/:id` API requests
  ...
2017-09-18 13:05:34 -05:00
Vitaliy @blackst0ne Klachkov b3d79b1ff4 Replace the 'search.feature' spinach test with an rspec analog 2017-09-16 20:02:30 +11:00
Rémy Coutable b06d5b963a
Return only group's members in user dropdowns on issuables list pages
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-09-14 18:04:21 +02:00
Stan Hu 408df2edcb Merge branch 'master' into sh-headless-chrome-support 2017-08-02 16:58:28 -07:00
kushalpandya de7db606c1 Use JS class for selector 2017-07-19 18:17:55 +05:30
Douwe Maan fe13f11041 Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
Tim Zallmann 8900bd9d26 Merge branch 'fix-sidebar-showing-mobile-merge-requests' into 'master'
Fixed sidebar not collapsing on merge request in mobile screens

Closes #32759

See merge request !12489
2017-06-30 07:07:18 +00:00
Jose Ivan Vargas a7335c1188 Refactored tests and added a breakpoint to the merge_request_tabs 2017-06-29 13:13:42 -05:00
Rémy Coutable 5545d4dc87
Move share examples to their correct location
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-27 18:34:34 +02:00