diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-08-17 08:30:12 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-08-17 08:30:12 +0300 |
| commit | ec4549e4b5ffcc608041fd7f71cf0aa8dc18151f (patch) | |
| tree | 3cdd2b646a0a4a03de900fbbd72d4e1005a64f5b /spec/helpers | |
| parent | 74c5f82fb034f3d25f4c32fb0fac93beb6b4623f (diff) | |
| parent | 1b338d59f641ce629cbecb839b64c9fd65561276 (diff) | |
Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showing-pipeline
* upstream/master: (99 commits)
Update CHANGELOG for 8.10.6, 8.9.7, and 8.8.8
Updated Akismet documentation
Add hover state to todos (!5361)
Load issues and merge requests templates from repository
Backport EE assertions in protected branch related specs.
Revert "Merge branch '19957-write-tests-for-adding-comments-for-different-line-types-in-diff' into 'master'"
Fix a missed `before_action` for `AutocompleteController`.
Backport `AutocompleteController#load_project` from EE!581.
Fix API::BranchesSpec.
Fix failing tests relating to backporting ee!581.
Revert unrelevant changes
Fix the protected branches factory.
Improve EE compatibility with protected branch access levels.
Move the "update" portion of the protected branch view into a partial.
Don't select an access level if already selected.
Backport changes from gitlab-org/gitlab-ee!581 to CE.
Further refactor and syntax fixes.
Upgrade httpclient gem from 2.7.0.1 to 2.8.2.
Make rubocop happy
Make rubocop happy
...
Diffstat (limited to 'spec/helpers')
| -rw-r--r-- | spec/helpers/notes_helper_spec.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/helpers/notes_helper_spec.rb b/spec/helpers/notes_helper_spec.rb index 853b8b2f7f7..9c577501f00 100644 --- a/spec/helpers/notes_helper_spec.rb +++ b/spec/helpers/notes_helper_spec.rb @@ -39,8 +39,7 @@ describe NotesHelper do describe '#preload_max_access_for_authors' do before do - # #preload_max_access_for_authors would read cache from RequestStore, - # so we should make sure it's clean. + # This method reads cache from RequestStore, so make sure it's clean. RequestStore.clear! end |