diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-12-01 20:42:27 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-12-01 20:42:27 +0000 |
commit | 24ed24cf545ed3796336815d863c92a2c6fa8d5f (patch) | |
tree | da6923e92ebd391a82aa0211ff37523824f73cc5 /spec | |
parent | 783f8a0ef0d9c855d5d65dac9ea94de9dab4df4e (diff) | |
parent | 1f6ec183154369f8a11d63713970cded0b1474fa (diff) | |
download | gitlab-ce-24ed24cf545ed3796336815d863c92a2c6fa8d5f.tar.gz |
Merge branch '24281-issue-merge-request-sidebar-subscribe-button-style-improvement' into 'master'
Remove the help text under the sidebar subscribe button and style it inline
## What does this MR do?
Remove the help text under the sidebar subscribe button and style it inline
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
Current help text is over obvious and pushes references too far down. Also the subscribe button is now consistently styled and not a complete block button anymore. approved by @awhildy
## Screenshots (if relevant)
before:
![image](/uploads/0c9543d2bf184a73b65773caa5f9fc62/image.png)
after:
![image](/uploads/765338823376267427f4a16737e39998/image.png)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #24281
See merge request !7389
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/boards/sidebar_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/boards/sidebar_spec.rb b/spec/features/boards/sidebar_spec.rb index f160052a844..c16aafa1470 100644 --- a/spec/features/boards/sidebar_spec.rb +++ b/spec/features/boards/sidebar_spec.rb @@ -304,8 +304,8 @@ describe 'Issue Boards', feature: true, js: true do page.within('.subscription') do click_button 'Subscribe' - - expect(page).to have_content("You're receiving notifications because you're subscribed to this thread.") + wait_for_ajax + expect(page).to have_content("Unsubscribe") end end end |