diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-08 12:45:42 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-08 12:45:42 +0000 |
| commit | bb11a062eb19f08dd692da7e54ca9ae13fb23f36 (patch) | |
| tree | a3c313258a95270d429c5c8a89b6c760e682aa66 /spec/helpers/gitlab_markdown_helper_spec.rb | |
| parent | 4cbc39bfab32f7c9ac038ba9dcecf14efebb2b9d (diff) | |
| parent | 685e261f0a9f2495b29e552489e174987101f1f9 (diff) | |
| download | gitlab-ce-bb11a062eb19f08dd692da7e54ca9ae13fb23f36.tar.gz | |
Merge branch 'master' into 20450-fix-ujs-actions
* master: (184 commits)
fixed user_access_request_spec
Fixed changelog and a haml condition project.html.haml
Fixed some typos inside the _project.html.haml partial
Added MR number to changelog
Removed the settings gear button inside the Project to a tab
Add changelog for filtered-search-visual-tokens
Fix edit last visual token
Fix filtered search visual token editing dropdown
Code improvements
Add filtered search visual tokens
Fix transient failure in TodoService spec
Returns correct header data for commits endpoint
Fix pagination headers for repository commits api endpoint
Manually set total_count when paginating commits
Fix go-get support for projects in nested groups
Remove unecessary endpoint from repository, add compatibility endpoints for v3 and several improvements
Add configuration instructions for Container Registry Notifications.[ci skip]
Update API endpoints for raw files
Clear AR connections before starting Sidekiq
API V4 is no longer in Beta
...
Diffstat (limited to 'spec/helpers/gitlab_markdown_helper_spec.rb')
| -rw-r--r-- | spec/helpers/gitlab_markdown_helper_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb index b8ec3521edb..9ffd4b9371c 100644 --- a/spec/helpers/gitlab_markdown_helper_spec.rb +++ b/spec/helpers/gitlab_markdown_helper_spec.rb @@ -113,7 +113,7 @@ describe GitlabMarkdownHelper do it 'replaces commit message with emoji to link' do actual = link_to_gfm(':book:Book', '/foo') expect(actual). - to eq %Q(<img class="emoji" title=":book:" alt=":book:" src="http://#{Gitlab.config.gitlab.host}/assets/1F4D6.png" height="20" width="20" align="absmiddle"><a href="/foo">Book</a>) + to eq '<gl-emoji data-name="book" data-unicode-version="6.0">📖</gl-emoji><a href="/foo">Book</a>' end end |