Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab FOSS
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Jira
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

Admin message

Do not update/delete: Banner broadcast message test data

Admin message

Do not update/delete: Notification broadcast message test data

e622259d

There was a problem fetching the pipeline summary.

Commit e622259d authored 9 years ago by Valery Sizov

Downloads
- Plain Diff

Merge branch 'emoji-picker-fix' into 'master'

Emoji picker: better alias handling

related to https://gitlab.com/gitlab-org/gitlab-ce/issues/3576

See merge request !2198

parents 75c3a2f8 09c5968f

No related branches found

No related tags found

No related merge requests found

Pipeline #

Changes 9
Pipelines 1

Expand all Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/awards_handler.coffee 11 additions, 5 deletions

app/assets/javascripts/awards_handler.coffee
app/helpers/issues_helper.rb 2 additions, 1 deletion

app/helpers/issues_helper.rb
app/views/votes/_votes_block.html.haml 2 additions, 2 deletions

app/views/votes/_votes_block.html.haml
db/migrate/20151224123230_rename_emojis.rb 15 additions, 0 deletions

db/migrate/20151224123230_rename_emojis.rb
db/schema.rb 1 addition, 1 deletion

db/schema.rb
fixtures/emojis/aliases.json 367 additions, 0 deletions

fixtures/emojis/aliases.json
fixtures/emojis/index.json 13376 additions, 0 deletions

fixtures/emojis/index.json
lib/award_emoji.rb 17 additions, 36 deletions

lib/award_emoji.rb
spec/models/note_spec.rb 2 additions, 2 deletions

spec/models/note_spec.rb

with 13793 additions and 47 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment