Merge remote-tracking branch 'upstream/master' into new-issue-by-email

* upstream/master: (620 commits)
  Added '*.js.es6 gitlab-language=javascript' to .gitattributes
  Fix CI status icon link underline
  Update CHANGELOG after 8.10.1
  Add CHANGELOG
  Add es6 gem
  Instrument Nokogiri parsing methods
  Fix backup restore
  Use project ID in repository cache to prevent stale data from persisting across projects
  Add iid to MR API response
  `WikiPage` should have a slug even when not persisted.
  ES6ify all the things!
  Make fork counter always clickable (!5463)
  Revert "Merge branch '17073-tagscontroller-index-is-terrible-response-time-goes-up-to-5-…"
  Fix CHANGELOG
  Add spec for dashes in paths
  Fix Error 500 when creating Wiki pages with hyphens or spaces
  Add links to the real markdown.md file for all GFM examples
  Remove magic comments from Ruby files (!5456)
  Ignore invalid trusted proxies in X-Forwarded-For header
  remove search_id for label dropdown filter
  ...

811 files changed, 35189 insertions, 25282 deletions

diff --git a/.gitattributes b/.gitattributes
index 7e800609e6c..17cbaa5eef5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
-CHANGELOG merge=union
\ No newline at end of file
+CHANGELOG merge=union
+*.js.es6 gitlab-language=javascript
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff8aa351226..2d33bad5886 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,5 @@
 image: "ruby:2.1"
 
-services:
-  - mysql:latest
-  - redis:alpine
-
 cache:
   key: "ruby21"
   paths:
@@ -34,7 +30,6 @@ stages:
 - post-test
 
 # Prepare and merge knapsack tests
-
 .knapsack-state: &knapsack-state
   services: []
   variables:
@@ -68,8 +63,14 @@ update-knapsack:
 
 # Execute all testing suites
 
+.use-db: &use-db
+  services:
+    - mysql:latest
+    - redis:alpine
+
 .rspec-knapsack: &rspec-knapsack
   stage: test
+  <<: *use-db
   script:
     - bundle exec rake assets:precompile 2>/dev/null
     - JOB_NAME=( $CI_BUILD_NAME )
@@ -85,6 +86,7 @@ update-knapsack:
 
 .spinach-knapsack: &spinach-knapsack
   stage: test
+  <<: *use-db
   script:
     - bundle exec rake assets:precompile 2>/dev/null
     - JOB_NAME=( $CI_BUILD_NAME )
@@ -133,6 +135,7 @@ spinach 9 10: *spinach-knapsack
 # Execute all testing suites against Ruby 2.3
 .ruby-23: &ruby-23
   image: "ruby:2.3"
+  <<: *use-db
   only:
     - master
   cache:
@@ -148,7 +151,7 @@ spinach 9 10: *spinach-knapsack
 .spinach-knapsack-ruby23: &spinach-knapsack-ruby23
   <<: *spinach-knapsack
   <<: *ruby-23
-  
+
 rspec 0 20 ruby23: *rspec-knapsack-ruby23
 rspec 1 20 ruby23: *rspec-knapsack-ruby23
 rspec 2 20 ruby23: *rspec-knapsack-ruby23
@@ -183,22 +186,41 @@ spinach 9 10 ruby23: *spinach-knapsack-ruby23
 
 # Other generic tests
 
+.static-analyses-variables: &static-analyses-variables
+  variables:
+    SIMPLECOV: "false"
+    USE_DB: "false"
+    USE_BUNDLE_INSTALL: "true"
+
 .exec: &exec
+  <<: *static-analyses-variables
   stage: test
   script:
     - bundle exec $CI_BUILD_NAME
 
-teaspoon: *exec
 rubocop: *exec
 rake scss_lint: *exec
 rake brakeman: *exec
 rake flog: *exec
 rake flay: *exec
-rake db:migrate:reset: *exec
 license_finder: *exec
+rake downtime_check: *exec
+
+rake db:migrate:reset:
+  stage: test
+  <<: *use-db
+  script:
+    - rake db:migrate:reset
+
+teaspoon:
+  stage: test
+  <<: *use-db
+  script:
+    - teaspoon
 
 bundler:audit:
   stage: test
+  <<: *static-analyses-variables
   only:
     - master
   script:
diff --git a/.rubocop.yml b/.rubocop.yml
index 3aac8401848..6adbda53456 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -2,6 +2,8 @@ require:
   - rubocop-rspec
   - ./rubocop/rubocop
 
+inherit_from: .rubocop_todo.yml
+
 AllCops:
   TargetRubyVersion: 2.1
   # Cop names are not displayed in offense messages by default. Change behavior
@@ -52,14 +54,6 @@ Style/AlignArray:
 Style/AlignHash:
   Enabled: true
 
-# Align the parameters of a method call if they span more than one line.
-Style/AlignParameters:
-  Enabled: false
-
-# Use &&/|| instead of and/or.
-Style/AndOr:
-  Enabled: false
-
 # Use `Array#join` instead of `Array#*`.
 Style/ArrayJoin:
   Enabled: true
@@ -80,10 +74,6 @@ Style/Attr:
 Style/BeginBlock:
   Enabled: true
 
-# Checks if usage of %() or %Q() matches configuration.
-Style/BarePercentLiterals:
-  Enabled: false
-
 # Do not use block comments.
 Style/BlockComments:
   Enabled: true
@@ -97,14 +87,6 @@ Style/BlockEndNewline:
 Style/BlockDelimiters:
   Enabled: true
 
-# Enforce braces style around hash parameters.
-Style/BracesAroundHashParameters:
-  Enabled: false
-
-# Avoid explicit use of the case equality operator(===).
-Style/CaseEquality:
-  Enabled: false
-
 # Indentation of when in a case/when/[else/]end.
 Style/CaseIndentation:
   Enabled: true
@@ -133,24 +115,10 @@ Style/ClassMethods:
 Style/ClassVars:
   Enabled: true
 
-# Do not use :: for method call.
-Style/ColonMethodCall:
-  Enabled: false
-
-# Checks formatting of special comments (TODO, FIXME, OPTIMIZE, HACK, REVIEW).
-Style/CommentAnnotation:
-  Enabled: false
-
 # Indentation of comments.
 Style/CommentIndentation:
   Enabled: true
 
-# Use the return value of `if` and `case` statements for assignment to a
-# variable and variable comparison instead of assigning that variable
-# inside of each branch.
-Style/ConditionalAssignment:
-  Enabled: false
-
 # Constants should use SCREAMING_SNAKE_CASE.
 Style/ConstantName:
   Enabled: true
@@ -159,34 +127,14 @@ Style/ConstantName:
 Style/DefWithParentheses:
   Enabled: true
 
-# Checks for use of deprecated Hash methods.
-Style/DeprecatedHashMethods:
-  Enabled: false
-
 # Document classes and non-namespace modules.
 Style/Documentation:
   Enabled: false
 
-# Checks the position of the dot in multi-line method calls.
-Style/DotPosition:
-  Enabled: false
-
-# Checks for uses of double negation (!!).
-Style/DoubleNegation:
-  Enabled: false
-
-# Prefer `each_with_object` over `inject` or `reduce`.
-Style/EachWithObject:
-  Enabled: false
-
 # Align elses and elsifs correctly.
 Style/ElseAlignment:
   Enabled: true
 
-# Avoid empty else-clauses.
-Style/EmptyElse:
-  Enabled: false
-
 # Use empty lines between defs.
 Style/EmptyLineBetweenDefs:
   Enabled: false
@@ -215,10 +163,6 @@ Style/EmptyLinesAroundModuleBody:
 Style/EmptyLinesAroundMethodBody:
   Enabled: false
 
-# Prefer literals to Array.new/Hash.new/String.new.
-Style/EmptyLiteral:
-  Enabled: false
-
 # Avoid the use of END blocks.
 Style/EndBlock:
   Enabled: true
@@ -231,10 +175,6 @@ Style/EndOfLine:
 Style/EvenOdd:
   Enabled: true
 
-# Do not use unnecessary spacing.
-Style/ExtraSpacing:
-  Enabled: false
-
 # Use snake_case for source file names.
 Style/FileName:
   Enabled: true
@@ -252,31 +192,15 @@ Style/FlipFlop:
 Style/For:
   Enabled: true
 
-# Enforce the use of Kernel#sprintf, Kernel#format or String#%.
-Style/FormatString:
-  Enabled: false
-
 # Do not introduce global variables.
 Style/GlobalVars:
   Enabled: true
 
-# Check for conditionals that can be replaced with guard clauses.
-Style/GuardClause:
-  Enabled: false
-
 # Prefer Ruby 1.9 hash syntax `{ a: 1, b: 2 }`
 # over 1.8 syntax `{ :a => 1, :b => 2 }`.
 Style/HashSyntax:
   Enabled: true
 
-# Finds if nodes inside else, which can be converted to elsif.
-Style/IfInsideElse:
-  Enabled: false
-
-# Favor modifier if/unless usage when you have a single-line body.
-Style/IfUnlessModifier:
-  Enabled: false
-
 # Do not use if x; .... Use the ternary operator instead.
 Style/IfWithSemicolon:
   Enabled: true
@@ -299,22 +223,10 @@ Style/IndentationConsistency:
 Style/IndentationWidth:
   Enabled: true
 
-# Checks the indentation of the first element in an array literal.
-Style/IndentArray:
-  Enabled: false
-
-# Checks the indentation of the first key in a hash literal.
-Style/IndentHash:
-  Enabled: false
-
 # Use Kernel#loop for infinite loops.
 Style/InfiniteLoop:
   Enabled: true
 
-# Use the new lambda literal syntax for single-line blocks.
-Style/Lambda:
-  Enabled: false
-
 # Use lambda.call(...) instead of lambda.(...).
 Style/LambdaCall:
   Enabled: true
@@ -323,14 +235,6 @@ Style/LambdaCall:
 Style/LeadingCommentSpace:
   Enabled: true
 
-# Use \ instead of + or << to concatenate two string literals at line end.
-Style/LineEndConcatenation:
-  Enabled: false
-
-# Do not use parentheses for method calls with no arguments.
-Style/MethodCallParentheses:
-  Enabled: false
-
 # Checks if the method definitions have or don't have parentheses.
 Style/MethodDefParentheses:
   Enabled: true
@@ -389,37 +293,20 @@ Style/MultilineOperationIndentation:
 
 # Avoid multi-line `? :` (the ternary operator), use if/unless instead.
 Style/MultilineTernaryOperator:
-  Enabled: false
-
-# Do not assign mutable objects to constants.
-Style/MutableConstant:
-  Enabled: false
+  Enabled: true
 
 # Favor unless over if for negative conditions (or control flow or).
 Style/NegatedIf:
   Enabled: true
 
-# Favor until over while for negative conditions.
-Style/NegatedWhile:
-  Enabled: false
-
 # Avoid using nested modifiers.
 Style/NestedModifier:
   Enabled: true
 
-# Parenthesize method calls which are nested inside the argument list of
-# another parenthesized method call.
-Style/NestedParenthesizedCalls:
-  Enabled: false
-
 # Use one expression per branch in a ternary operator.
 Style/NestedTernaryOperator:
   Enabled: true
 
-# Use `next` to skip iteration instead of a condition at the end.
-Style/Next:
-  Enabled: false
-
 # Prefer x.nil? to x == nil.
 Style/NilComparison:
   Enabled: true
@@ -444,51 +331,10 @@ Style/OneLineConditional:
 Style/OpMethod:
   Enabled: true
 
-# Check for simple usages of parallel assignment. It will only warn when
-# the number of variables matches on both sides of the assignment.
-Style/ParallelAssignment:
-  Enabled: false
-
 # Don't use parentheses around the condition of an if/unless/while.
 Style/ParenthesesAroundCondition:
   Enabled: true
 
-# Use `%`-literal delimiters consistently.
-Style/PercentLiteralDelimiters:
-  Enabled: false
-
-# Checks if uses of %Q/%q match the configured preference.
-Style/PercentQLiterals:
-  Enabled: false
-
-# Avoid Perl-style regex back references.
-Style/PerlBackrefs:
-  Enabled: false
-
-# Check the names of predicate methods.
-Style/PredicateName:
-  Enabled: false
-
-# Use proc instead of Proc.new.
-Style/Proc:
-  Enabled: false
-
-# Checks the arguments passed to raise/fail.
-Style/RaiseArgs:
-  Enabled: false
-
-# Don't use begin blocks when they are not needed.
-Style/RedundantBegin:
-  Enabled: false
-
-# Checks for an obsolete RuntimeException argument in raise/fail.
-Style/RedundantException:
-  Enabled: false
-
-# Checks usages of Object#freeze on immutable objects.
-Style/RedundantFreeze:
-  Enabled: false
-
 # Checks for parentheses that seem not to serve any purpose.
 Style/RedundantParentheses:
   Enabled: true
@@ -497,24 +343,6 @@ Style/RedundantParentheses:
 Style/RedundantReturn:
   Enabled: true
 
-# Don't use self where it's not needed.
-Style/RedundantSelf:
-  Enabled: false
-
-# Use %r for regular expressions matching more than `MaxSlashes` '/'
-# characters. Use %r only for regular expressions matching more
-# than `MaxSlashes` '/' character.
-Style/RegexpLiteral:
-  Enabled: false
-
-# Avoid using rescue in its modifier form.
-Style/RescueModifier:
-  Enabled: false
-
-# Checks for places where self-assignment shorthand should have been used.
-Style/SelfAssignment:
-  Enabled: false
-
 # Don't use semicolons to terminate expressions.
 Style/Semicolon:
   Enabled: true
@@ -524,14 +352,6 @@ Style/SignalException:
   EnforcedStyle: only_raise
   Enabled: true
 
-# Enforces the names of some block params.
-Style/SingleLineBlockParams:
-  Enabled: false
-
-# Avoid single-line methods.
-Style/SingleLineMethods:
-  Enabled: false
-
 # Use spaces after colons.
 Style/SpaceAfterColon:
   Enabled: true
@@ -553,11 +373,6 @@ Style/SpaceAfterNot:
 Style/SpaceAfterSemicolon:
   Enabled: true
 
-# Checks that the equals signs in parameter default assignments have or don't
-# have surrounding space depending on configuration.
-Style/SpaceAroundEqualsInParameterDefault:
-  Enabled: false
-
 # Use a space around keywords if appropriate.
 Style/SpaceAroundKeyword:
   Enabled: true
@@ -566,10 +381,6 @@ Style/SpaceAroundKeyword:
 Style/SpaceAroundOperators:
   Enabled: true
 
-# Checks that the left block brace has or doesn't have space before it.
-Style/SpaceBeforeBlockBraces:
-  Enabled: false
-
 # No spaces before commas.
 Style/SpaceBeforeComma:
   Enabled: true
@@ -578,33 +389,14 @@ Style/SpaceBeforeComma:
 Style/SpaceBeforeComment:
   Enabled: true
 
-# Checks that exactly one space is used between a method name and the first
-# argument for method calls without parentheses.
-Style/SpaceBeforeFirstArg:
-  Enabled: false
-
 # No spaces before semicolons.
 Style/SpaceBeforeSemicolon:
   Enabled: true
 
-# Checks that block braces have or don't have surrounding space.
-# For blocks taking parameters, checks that the left brace has or doesn't
-# have trailing space.
-Style/SpaceInsideBlockBraces:
-  Enabled: false
-
-# No spaces after [ or before ].
-Style/SpaceInsideBrackets:
-  Enabled: false
-
 # Use spaces inside hash literal braces - or don't.
 Style/SpaceInsideHashLiteralBraces:
   Enabled: true
 
-# No spaces after ( or before ).
-Style/SpaceInsideParens:
-  Enabled: false
-
 # No spaces inside range literals.
 Style/SpaceInsideRangeLiteral:
   Enabled: true
@@ -614,10 +406,6 @@ Style/SpaceInsideStringInterpolation:
   EnforcedStyle: no_space
   Enabled: true
 
-# Avoid Perl-style global variables.
-Style/SpecialGlobalVars:
-  Enabled: false
-
 # Check for the usage of parentheses around stabby lambda arguments.
 Style/StabbyLambdaParentheses:
   EnforcedStyle: require_parentheses
@@ -627,25 +415,12 @@ Style/StabbyLambdaParentheses:
 Style/StringLiterals:
   Enabled: false
 
-# Checks if uses of quotes inside expressions in interpolated strings match the
-# configured preference.
-Style/StringLiteralsInInterpolation:
-  Enabled: false
-
 # Checks if configured preferred methods are used over non-preferred.
 Style/StringMethods:
   PreferredMethods:
     intern: to_sym
   Enabled: true
 
-# Use %i or %I for arrays of symbols.
-Style/SymbolArray:
-  Enabled: false
-
-# Use symbols as procs instead of blocks when possible.
-Style/SymbolProc:
-  Enabled: false
-
 # No hard tabs.
 Style/Tab:
   Enabled: true
@@ -654,40 +429,10 @@ Style/Tab:
 Style/TrailingBlankLines:
   Enabled: true
 
-# Checks for trailing comma in array and hash literals.
-Style/TrailingCommaInLiteral:
-  Enabled: false
-
-# Checks for trailing comma in argument lists.
-Style/TrailingCommaInArguments:
-  Enabled: false
-
-# Avoid trailing whitespace.
-Style/TrailingWhitespace:
-  Enabled: false
-
-# Checks for the usage of unneeded trailing underscores at the end of
-# parallel variable assignment.
-Style/TrailingUnderscoreVariable:
-  Enabled: false
-
-# Prefer attr_* methods to trivial readers/writers.
-Style/TrivialAccessors:
-  Enabled: false
-
-# Do not use unless with else. Rewrite these with the positive case first.
-Style/UnlessElse:
-  Enabled: false
-
 # Checks for %W when interpolation is not needed.
 Style/UnneededCapitalW:
   Enabled: true
 
-# TODO: Enable UnneededInterpolation Cop.
-# Checks for strings that are just an interpolated expression.
-Style/UnneededInterpolation:
-  Enabled: false
-
 # Checks for %q/%Q when single quotes or double quotes would do.
 Style/UnneededPercentQ:
   Enabled: false
@@ -717,12 +462,6 @@ Style/WhileUntilModifier:
 Style/WordArray:
   Enabled: false
 
-# TODO: Enable ZeroLengthPredicate Cop.
-# Use #empty? when testing for objects of length 0.
-Style/ZeroLengthPredicate:
-  Enabled: false
-
-
 #################### Metrics ################################
 
 # A calculated magnitude based on number of assignments,
@@ -776,15 +515,6 @@ Metrics/PerceivedComplexity:
 Lint/AmbiguousOperator:
   Enabled: true
 
-# Checks for ambiguous regexp literals in the first argument of a method
-# invocation without parentheses.
-Lint/AmbiguousRegexpLiteral:
-  Enabled: false
-
-# Don't use assignment in conditions.
-Lint/AssignmentInCondition:
-  Enabled: false
-
 # Align block ends correctly.
 Lint/BlockAlignment:
   Enabled: true
@@ -810,14 +540,6 @@ Lint/DefEndAlignment:
 Lint/DeprecatedClassMethods:
   Enabled: true
 
-# Check for duplicate method definitions.
-Lint/DuplicateMethods:
-  Enabled: false
-
-# Check for duplicate keys in hash literals.
-Lint/DuplicatedKey:
-  Enabled: false
-
 # Check for immutable argument given to each_with_object.
 Lint/EachWithObjectArgument:
   Enabled: true
@@ -830,10 +552,6 @@ Lint/ElseLayout:
 Lint/EmptyEnsure:
   Enabled: true
 
-# Checks for empty string interpolation.
-Lint/EmptyInterpolation:
-  Enabled: false
-
 # Align ends correctly.
 Lint/EndAlignment:
   Enabled: true
@@ -858,21 +576,11 @@ Lint/FloatOutOfRange:
 Lint/FormatParameterMismatch:
   Enabled: true
 
-# Don't suppress exception.
-Lint/HandleExceptions:
-  Enabled: false
-
 # Checks for adjacent string literals on the same line, which could better be
 # represented as a single string literal.
 Lint/ImplicitStringConcatenation:
   Enabled: true
 
-# TODO: Enable IneffectiveAccessModifier Cop.
-# Checks for attempts to use `private` or `protected` to set the visibility
-# of a class method, which does not work.
-Lint/IneffectiveAccessModifier:
-  Enabled: false
-
 # Checks for invalid character literals with a non-escaped whitespace
 # character.
 Lint/InvalidCharacterLiteral:
@@ -886,11 +594,6 @@ Lint/LiteralInCondition:
 Lint/LiteralInInterpolation:
   Enabled: true
 
-# Use Kernel#loop with break rather than begin/end/until or begin/end/while
-# for post-loop tests.
-Lint/Loop:
-  Enabled: false
-
 # Do not use nested method definitions.
 Lint/NestedMethodDefinition:
   Enabled: true
@@ -916,13 +619,8 @@ Lint/RequireParentheses:
 Lint/RescueException:
   Enabled: true
 
-# Do not use the same name as outer local variable for block arguments
-# or block local variables.
-Lint/ShadowingOuterLocalVariable:
-  Enabled: false
-
-# 'Checks for Object#to_s usage in string interpolation.
-Lint/StringConversionInInterpolation:
+# Checks for the order which exceptions are rescued to avoid rescueing a less specific exception before a more specific exception.
+Lint/ShadowedException:
   Enabled: false
 
 # Do not use prefix `_` for a variable that is used.
@@ -935,22 +633,10 @@ Lint/UnderscorePrefixedVariableName:
 Lint/UnneededDisable:
   Enabled: false
 
-# Checks for unused block arguments.
-Lint/UnusedBlockArgument:
-  Enabled: false
-
-# Checks for unused method arguments.
-Lint/UnusedMethodArgument:
-  Enabled: false
-
 # Unreachable code.
 Lint/UnreachableCode:
   Enabled: true
 
-# Checks for useless access modifiers.
-Lint/UselessAccessModifier:
-  Enabled: false
-
 # Checks for useless assignment to a local variable.
 Lint/UselessAssignment:
   Enabled: true
@@ -983,11 +669,6 @@ Performance/Casecmp:
 Performance/DoubleStartEndWith:
   Enabled: true
 
-# TODO: Enable EndWith Cop.
-# Use `end_with?` instead of a regex match anchored to the end of a string.
-Performance/EndWith:
-  Enabled: false
-
 # Use `strip` instead of `lstrip.rstrip`.
 Performance/LstripRstrip:
   Enabled: true
@@ -996,24 +677,6 @@ Performance/LstripRstrip:
 Performance/RangeInclude:
   Enabled: true
 
-# TODO: Enable RedundantBlockCall Cop.
-# Use `yield` instead of `block.call`.
-Performance/RedundantBlockCall:
-  Enabled: false
-
-# TODO: Enable RedundantMatch Cop.
-# Use `=~` instead of `String#match` or `Regexp#match` in a context where the
-# returned `MatchData` is not needed.
-Performance/RedundantMatch:
-  Enabled: false
-
-# TODO: Enable RedundantMerge Cop.
-# Use `Hash#[]=`, rather than `Hash#merge!` with a single key-value pair.
-Performance/RedundantMerge:
-  # Max number of key-value pairs to consider an offense
-  MaxKeyValuePairs: 2
-  Enabled: false
-
 # Use `sort` instead of `sort_by { |x| x }`.
 Performance/RedundantSortBy:
   Enabled: true
@@ -1082,18 +745,6 @@ Rails/ReadWriteAttribute:
 Rails/ScopeArgs:
   Enabled: true
 
-# Checks the correct usage of time zone aware methods.
-# http://danilenko.org/2012/7/6/rails_timezones
-Rails/TimeZone:
-  Enabled: false
-
-# Use validates :attribute, hash of validations.
-Rails/Validation:
-  Enabled: false
-
-Rails/UniqBeforePluck:
-  Enabled: false
-
 ##################### RSpec ##################################
 
 # Check that instances are not being stubbed globally.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
new file mode 100644
index 00000000000..b622b9239d4
--- /dev/null
+++ b/.rubocop_todo.yml
@@ -0,0 +1,458 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config --exclude-limit 0`
+# on 2016-07-13 12:36:08 -0600 using RuboCop version 0.41.2.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 154
+Lint/AmbiguousRegexpLiteral:
+  Enabled: false
+
+# Offense count: 43
+# Configuration parameters: AllowSafeAssignment.
+Lint/AssignmentInCondition:
+  Enabled: false
+
+# Offense count: 14
+Lint/HandleExceptions:
+  Enabled: false
+
+# Offense count: 21
+Lint/IneffectiveAccessModifier:
+  Enabled: false
+
+# Offense count: 2
+Lint/Loop:
+  Enabled: false
+
+# Offense count: 15
+Lint/ShadowingOuterLocalVariable:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Lint/StringConversionInInterpolation:
+  Enabled: false
+
+# Offense count: 44
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
+Lint/UnusedBlockArgument:
+  Enabled: false
+
+# Offense count: 129
+# Cop supports --auto-correct.
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
+Lint/UnusedMethodArgument:
+  Enabled: false
+
+# Offense count: 11
+Lint/UselessAccessModifier:
+  Enabled: false
+
+# Offense count: 12
+# Cop supports --auto-correct.
+Performance/PushSplat:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Performance/RedundantBlockCall:
+  Enabled: false
+
+# Offense count: 4
+# Cop supports --auto-correct.
+Performance/RedundantMatch:
+  Enabled: false
+
+# Offense count: 24
+# Cop supports --auto-correct.
+# Configuration parameters: MaxKeyValuePairs.
+Performance/RedundantMerge:
+  Enabled: false
+
+# Offense count: 60
+Rails/OutputSafety:
+  Enabled: false
+
+# Offense count: 128
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: strict, flexible
+Rails/TimeZone:
+  Enabled: false
+
+# Offense count: 12
+# Cop supports --auto-correct.
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
+Rails/Validation:
+  Enabled: false
+
+# Offense count: 217
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: with_first_parameter, with_fixed_indentation
+Style/AlignParameters:
+  Enabled: false
+
+# Offense count: 32
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: always, conditionals
+Style/AndOr:
+  Enabled: false
+
+# Offense count: 47
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: percent_q, bare_percent
+Style/BarePercentLiterals:
+  Enabled: false
+
+# Offense count: 258
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: braces, no_braces, context_dependent
+Style/BracesAroundHashParameters:
+  Enabled: false
+
+# Offense count: 5
+Style/CaseEquality:
+  Enabled: false
+
+# Offense count: 19
+# Cop supports --auto-correct.
+Style/ColonMethodCall:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: Keywords.
+# Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW
+Style/CommentAnnotation:
+  Enabled: false
+
+# Offense count: 34
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly.
+# SupportedStyles: assign_to_condition, assign_inside_condition
+Style/ConditionalAssignment:
+  Enabled: false
+
+# Offense count: 789
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: leading, trailing
+Style/DotPosition:
+  Enabled: false
+
+# Offense count: 13
+Style/DoubleNegation:
+  Enabled: false
+
+# Offense count: 3
+Style/EachWithObject:
+  Enabled: false
+
+# Offense count: 30
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: empty, nil, both
+Style/EmptyElse:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/EmptyLiteral:
+  Enabled: false
+
+# Offense count: 123
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
+Style/ExtraSpacing:
+  Enabled: false
+
+# Offense count: 7
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: format, sprintf, percent
+Style/FormatString:
+  Enabled: false
+
+# Offense count: 48
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Enabled: false
+
+# Offense count: 11
+Style/IfInsideElse:
+  Enabled: false
+
+# Offense count: 177
+# Cop supports --auto-correct.
+# Configuration parameters: MaxLineLength.
+Style/IfUnlessModifier:
+  Enabled: false
+
+# Offense count: 52
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_brackets
+Style/IndentArray:
+  Enabled: false
+
+# Offense count: 89
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_braces
+Style/IndentHash:
+  Enabled: false
+
+# Offense count: 12
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: line_count_dependent, lambda, literal
+Style/Lambda:
+  Enabled: false
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Style/LineEndConcatenation:
+  Enabled: false
+
+# Offense count: 13
+# Cop supports --auto-correct.
+Style/MethodCallParentheses:
+  Enabled: false
+
+# Offense count: 62
+# Cop supports --auto-correct.
+Style/MutableConstant:
+  Enabled: false
+
+# Offense count: 10
+# Cop supports --auto-correct.
+Style/NestedParenthesizedCalls:
+  Enabled: false
+
+# Offense count: 12
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
+# SupportedStyles: skip_modifier_ifs, always
+Style/Next:
+  Enabled: false
+
+# Offense count: 8
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedOctalStyle, SupportedOctalStyles.
+# SupportedOctalStyles: zero_with_o, zero_only
+Style/NumericLiteralPrefix:
+  Enabled: false
+
+# Offense count: 29
+# Cop supports --auto-correct.
+Style/ParallelAssignment:
+  Enabled: false
+
+# Offense count: 208
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Enabled: false
+
+# Offense count: 11
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: lower_case_q, upper_case_q
+Style/PercentQLiterals:
+  Enabled: false
+
+# Offense count: 13
+# Cop supports --auto-correct.
+Style/PerlBackrefs:
+  Enabled: false
+
+# Offense count: 32
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+Style/PredicateName:
+  Enabled: false
+
+# Offense count: 28
+# Cop supports --auto-correct.
+Style/PreferredHashMethods:
+  Enabled: false
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Style/Proc:
+  Enabled: false
+
+# Offense count: 20
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: compact, exploded
+Style/RaiseArgs:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/RedundantBegin:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantException:
+  Enabled: false
+
+# Offense count: 23
+# Cop supports --auto-correct.
+Style/RedundantFreeze:
+  Enabled: false
+
+# Offense count: 377
+# Cop supports --auto-correct.
+Style/RedundantSelf:
+  Enabled: false
+
+# Offense count: 94
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
+# SupportedStyles: slashes, percent_r, mixed
+Style/RegexpLiteral:
+  Enabled: false
+
+# Offense count: 17
+# Cop supports --auto-correct.
+Style/RescueModifier:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/SelfAssignment:
+  Enabled: false
+
+# Offense count: 2
+# Configuration parameters: Methods.
+# Methods: {"reduce"=>["a", "e"]}, {"inject"=>["a", "e"]}
+Style/SingleLineBlockParams:
+  Enabled: false
+
+# Offense count: 50
+# Cop supports --auto-correct.
+# Configuration parameters: AllowIfMethodIsEmpty.
+Style/SingleLineMethods:
+  Enabled: false
+
+# Offense count: 14
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: space, no_space
+Style/SpaceAroundEqualsInParameterDefault:
+  Enabled: false
+
+# Offense count: 119
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: space, no_space
+Style/SpaceBeforeBlockBraces:
+  Enabled: false
+
+# Offense count: 11
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment.
+Style/SpaceBeforeFirstArg:
+  Enabled: false
+
+# Offense count: 130
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
+# SupportedStyles: space, no_space
+Style/SpaceInsideBlockBraces:
+  Enabled: false
+
+# Offense count: 98
+# Cop supports --auto-correct.
+Style/SpaceInsideBrackets:
+  Enabled: false
+
+# Offense count: 60
+# Cop supports --auto-correct.
+Style/SpaceInsideParens:
+  Enabled: false
+
+# Offense count: 5
+# Cop supports --auto-correct.
+Style/SpaceInsidePercentLiteralDelimiters:
+  Enabled: false
+
+# Offense count: 36
+# Cop supports --auto-correct.
+# Configuration parameters: SupportedStyles.
+# SupportedStyles: use_perl_names, use_english_names
+Style/SpecialGlobalVars:
+  EnforcedStyle: use_perl_names
+
+# Offense count: 30
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiteralsInInterpolation:
+  Enabled: false
+
+# Offense count: 24
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoredMethods.
+# IgnoredMethods: respond_to, define_method
+Style/SymbolProc:
+  Enabled: false
+
+# Offense count: 23
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
+# SupportedStyles: comma, consistent_comma, no_comma
+Style/TrailingCommaInArguments:
+  Enabled: false
+
+# Offense count: 113
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
+# SupportedStyles: comma, consistent_comma, no_comma
+Style/TrailingCommaInLiteral:
+  Enabled: false
+
+# Offense count: 7
+# Cop supports --auto-correct.
+# Configuration parameters: AllowNamedUnderscoreVariables.
+Style/TrailingUnderscoreVariable:
+  Enabled: false
+
+# Offense count: 90
+# Cop supports --auto-correct.
+Style/TrailingWhitespace:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: ExactNameMatch, AllowPredicates, AllowDSLWriters, IgnoreClassMethods, Whitelist.
+# Whitelist: to_ary, to_a, to_c, to_enum, to_h, to_hash, to_i, to_int, to_io, to_open, to_path, to_proc, to_r, to_regexp, to_str, to_s, to_sym
+Style/TrivialAccessors:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/UnlessElse:
+  Enabled: false
+
+# Offense count: 13
+# Cop supports --auto-correct.
+Style/UnneededInterpolation:
+  Enabled: false
+
+# Offense count: 8
+# Cop supports --auto-correct.
+Style/ZeroLengthPredicate:
+  Enabled: false
diff --git a/CHANGELOG b/CHANGELOG
index 5ab16db31ce..534f57cb08e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,64 +1,132 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
-v 8.10.0 (unreleased)
+v 8.11.0 (unreleased)
+  - Remove magic comments (`# encoding: UTF-8`) from Ruby files !5456 (winniehell)
+  - Fix CI status icon link underline (ClemMakesApps)
+  - Fix of 'Commits being passed to custom hooks are already reachable when using the UI'
+  - Limit git rev-list output count to one in forced push check
+  - Add green outline to New Branch button !5447 (winniehell)
+  - Retrieve rendered HTML from cache in one request
+  - Nokogiri's various parsing methods are now instrumented
+  - Make fork counter always clickable !5463 (winniehell)
+  - Load project invited groups and members eagerly in ProjectTeam#fetch_members
+  - Add GitLab Workhorse version to admin dashboard (Katarzyna Kobierska Ula Budziszewska)
+  - Add ES6 gem
+
+v 8.10.2 (unreleased)
+  - User can now search branches by name. !5144
+  - Fix backup restore. !5459
+  - Use project ID in repository cache to prevent stale data from persisting across projects. !5460
+
+v 8.10.1
+  - Refactor repository storages documentation. !5428
+  - Gracefully handle case when keep-around references are corrupted or exist already. !5430
+  - Add detailed info on storage path mountpoints. !5437
+  - Fix Error 500 when creating Wiki pages with hyphens or spaces. !5444
+  - Fix bug where replies to commit notes displayed in the MR discussion tab wouldn't show up on the commit page. !5446
+  - Ignore invalid trusted proxies in X-Forwarded-For header. !5454
+  - Add links to the real markdown.md file for all GFM examples. !5458
+  - Remove `search_id` of labels dropdown filter to fix 'Missleading URI for labels in Merge Requests and Issues view' !5368 (Scott Le)
+
+v 8.10.1 (unreleased)
+ - Fix bug where replies to commit notes displayed in the MR discussion tab wouldn't show up on the commit page
+
+v 8.10.0
+  - Fix profile activity heatmap to show correct day name (eanplatter)
+  - Speed up ExternalWikiHelper#get_project_wiki_path
   - Expose {should,force}_remove_source_branch (Ben Boeckel)
+  - Add the functionality to be able to rename a file. !5049
   - Disable PostgreSQL statement timeout during migrations
-  - Fix projects dropdown loading performance with a simplified api cal. !5113 (tiagonbotelho)
+  - Fix projects dropdown loading performance with a simplified api cal. !5113
   - Fix commit builds API, return all builds for all pipelines for given commit. !4849
   - Replace Haml with Hamlit to make view rendering faster. !3666
   - Refresh the branch cache after `git gc` runs
+  - Allow to disable request access button on projects/groups
   - Refactor repository paths handling to allow multiple git mount points
-  - Optimize system note visibility checking by memoizing the visible reference count !5070
+  - Optimize system note visibility checking by memoizing the visible reference count. !5070
   - Add Application Setting to configure default Repository Path for new projects
   - Delete award emoji when deleting a user
-  - Remove pinTo from Flash and make inline flash messages look nicer !4854 (winniehell)
+  - Remove pinTo from Flash and make inline flash messages look nicer. !4854 (winniehell)
+  - Add an API for downloading latest successful build from a particular branch or tag. !5347
+  - Avoid data-integrity issue when cleaning up repository archive cache.
+  - Add link to profile to commit avatar. !5163 (winniehell)
   - Wrap code blocks on Activies and Todos page. !4783 (winniehell)
-  - Align flash messages with left side of page content !4959 (winniehell)
-  - Display tooltip for "Copy to Clipboard" button !5164 (winniehell)
-  - Use default cursor for table header of project files !5165 (winniehell)
-  - Display last commit of deleted branch in push events !4699 (winniehell)
-  - Escape file extension when parsing search results !5141 (winniehell)
+  - Align flash messages with left side of page content. !4959 (winniehell)
+  - Display tooltip for "Copy to Clipboard" button. !5164 (winniehell)
+  - Use default cursor for table header of project files. !5165 (winniehell)
+  - Store when and yaml variables in builds table
+  - Display last commit of deleted branch in push events. !4699 (winniehell)
+  - Escape file extension when parsing search results. !5141 (winniehell)
+  - Add "passing with warnings" to the merge request pipeline possible statuses, this happens when builds that allow failures have failed. !5004
+  - Add image border in Markdown preview. !5162 (winniehell)
   - Apply the trusted_proxies config to the rack request object for use with rack_attack
+  - Added the ability to block sign ups using a domain blacklist. !5259
   - Upgrade to Rails 4.2.7. !5236
+  - Extend exposed environment variables for CI builds
+  - Deprecate APIs "projects/:id/keys/...". Use "projects/:id/deploy_keys/..." instead
+  - Add API "deploy_keys" for admins to get all deploy keys
+  - Allow to pull code with deploy key from public projects
+  - Use limit parameter rather than hardcoded value in `ldap:check` rake task (Mike Ricketts)
   - Add Sidekiq queue duration to transaction metrics.
-  - Add a new column `artifacts_size` to table `ci_builds` !4964
+  - Add a new column `artifacts_size` to table `ci_builds`. !4964
   - Let Workhorse serve format-patch diffs
+  - Display tooltip for mentioned users and groups. !5261 (winniehell)
+  - Allow build email service to be tested
   - Added day name to contribution calendar tooltips
-  - Make images fit to the size of the viewport !4810
-  - Fix check for New Branch button on Issue page !4630 (winniehell)
+  - Refactor user authorization check for a single project to avoid querying all user projects
+  - Make images fit to the size of the viewport. !4810
+  - Fix check for New Branch button on Issue page. !4630 (winniehell)
+  - Fix GFM autocomplete not working on wiki pages
+  - Fixed enter key not triggering click on first row when searching in a dropdown
   - Fix MR-auto-close text added to description. !4836
-  - Fix issue, preventing users w/o push access to sort tags !5105 (redetection)
+  - Support U2F devices in Firefox. !5177
+  - Fix issue, preventing users w/o push access to sort tags. !5105 (redetection)
   - Add Spring EmojiOne updates.
-  - Add syntax for multiline blockquote using `>>>` fence !3954
+  - Added Rake task for tracking deployments. !5320
+  - Fix fetching LFS objects for private CI projects
+  - Add the new 2016 Emoji! Adds 72 new emoji including bacon, facepalm, and selfie. !5237
+  - Add syntax for multiline blockquote using `>>>` fence. !3954
   - Fix viewing notification settings when a project is pending deletion
   - Updated compare dropdown menus to use GL dropdown
+  - Redirects back to issue after clicking login link
   - Eager load award emoji on notes
+  - Allow to define manual actions/builds on Pipelines and Environments
   - Fix pagination when sorting by columns with lots of ties (like priority)
-  - The Markdown reference parsers now re-use query results to prevent running the same queries multiple times !5020
+  - The Markdown reference parsers now re-use query results to prevent running the same queries multiple times. !5020
   - Updated project header design
   - Issuable collapsed assignee tooltip is now the users name
+  - Fix compare view not changing code view rendering style
   - Exclude email check from the standard health check
-  - Updated layout for Projects, Groups, Users on Admin area !4424
+  - Updated layout for Projects, Groups, Users on Admin area. !4424
   - Fix changing issue state columns in milestone view
   - Update health_check gem to version 2.1.0
   - Add notification settings dropdown for groups
   - Render inline diffs for multiple changed lines following eachother
   - Wildcards for protected branches. !4665
   - Allow importing from Github using Personal Access Tokens. (Eric K Idema)
-  - API: Todos !3188 (Robert Schilling)
-  - API: Expose shared groups for projects and shared projects for groups !5050 (Robert Schilling)
+  - API: Expose `due_date` for issues (Robert Schilling)
+  - API: Todos. !3188 (Robert Schilling)
+  - API: Expose shared groups for projects and shared projects for groups. !5050 (Robert Schilling)
+  - API: Expose `developers_can_push` and `developers_can_merge` for branches. !5208 (Robert Schilling)
   - Add "Enabled Git access protocols" to Application Settings
   - Diffs will create button/diff form on demand no on server side
   - Reduce size of HTML used by diff comment forms
-  - Fix user creation with stronger minimum password requirements !4054 (nathan-pmt)
+  - Protected branches have a "Developers can Merge" setting. !4892 (original implementation by Mathias Vestergaard)
+  - Fix user creation with stronger minimum password requirements. !4054 (nathan-pmt)
   - Only show New Snippet button to users that can create snippets.
   - PipelinesFinder uses git cache data
+  - Track a user who created a pipeline
   - Actually render old and new sections of parallel diff next to each other
   - Throttle the update of `project.pushes_since_gc` to 1 minute.
-  - Allow expanding and collapsing files in diff view (!4990)
+  - Allow expanding and collapsing files in diff view. !4990
   - Collapse large diffs by default (!4990)
+  - Fix mentioned users list on diff notes
+  - Add support for inline videos in GitLab Flavored Markdown. !5215 (original implementation by Eric Hayes)
+  - Fix creation of deployment on build that is retried, redeployed or rollback
+  - Don't parse Rinku returned value to DocFragment when it didn't change the original html string.
   - Check for conflicts with existing Project's wiki path when creating a new project.
   - Show last push widget in upstream after push to fork
+  - Fix stage status shown for pipelines
   - Cache todos pending/done dashboard query counts.
   - Don't instantiate a git tree on Projects show default view
   - Bump Rinku to 2.0.0
@@ -66,8 +134,10 @@ v 8.10.0 (unreleased)
   - ObjectRenderer retrieve renderer content using Rails.cache.read_multi
   - Better caching of git calls on ProjectsController#show.
   - Avoid to retrieve MR closes_issues as much as possible.
-  - Add API endpoint for a group issues !4520 (mahcsig)
-  - Add Bugzilla integration !4930 (iamtjg)
+  - Hide project name in project activities. !5068 (winniehell)
+  - Add API endpoint for a group issues. !4520 (mahcsig)
+  - Add Bugzilla integration. !4930 (iamtjg)
+  - Fix new snippet style bug (elliotec)
   - Instrument Rinku usage
   - Be explicit to define merge request discussion variables
   - Metrics for Rouge::Plugins::Redcarpet and Rouge::Formatters::HTMLGitlab
@@ -78,24 +148,46 @@ v 8.10.0 (unreleased)
   - Don't render discussion notes when requesting diff tab through AJAX
   - Add basic system information like memory and disk usage to the admin panel
   - Don't garbage collect commits that have related DB records like comments
+  - Allow to setup event by channel on slack service
   - More descriptive message for git hooks and file locks
+  - Aliases of award emoji should be stored as original name. !5060 (dixpac)
   - Handle custom Git hook result in GitLab UI
+  - Allow to access Container Registry for Public and Internal projects
   - Allow '?', or '&' for label names
+  - Support redirected blobs for Container Registry integration
   - Fix importer for GitHub Pull Requests when a branch was reused across Pull Requests
   - Add date when user joined the team on the member page
   - Fix 404 redirect after validation fails importing a GitLab project
-  - Added setting to set new users by default as external !4545 (Dravere)
-  - Add min value for project limit field on user's form !3622 (jastkand)
+  - Added setting to set new users by default as external. !4545 (Dravere)
+  - Add min value for project limit field on user's form. !3622 (jastkand)
   - Reset project pushes_since_gc when we enqueue the git gc call
-  - Add reminder to not paste private SSH keys !4399 (Ingo Blechschmidt)
+  - Add reminder to not paste private SSH keys. !4399 (Ingo Blechschmidt)
+  - Collapsed diffs lines/size don't acumulate to overflow diffs.
   - Remove duplicate `description` field in `MergeRequest` entities (Ben Boeckel)
   - Style of import project buttons were fixed in the new project page. !5183 (rdemirbay)
   - Fix GitHub client requests when rate limit is disabled
   - Optimistic locking for Issues and Merge Requests (Title and description overriding prevention)
   - Redesign Builds and Pipelines pages
   - Change status color and icon for running builds
+  - Fix commenting issue in side by side diff view for unchanged lines
   - Fix markdown rendering for: consecutive labels references, label references that begin with a digit or contains `.`
+  - Project export filename now includes the project and namespace path
   - Fix last update timestamp on issues not preserved on gitlab.com and project imports
+  - Fix issues importing projects from EE to CE
+  - Fix creating group with space in group path
+  - Improve cron_jobs loading error messages. !5318 / !5360
+  - Prevent toggling sidebar when clipboard icon clicked
+  - Create Todos for Issue author when assign or mention himself (Katarzyna Kobierska)
+  - Limit the number of retries on error to 3 for exporting projects
+  - Allow empty repositories on project import/export
+  - Render only commit message title in builds (Katarzyna Kobierska Ula Budziszewska)
+  - Allow bulk (un)subscription from issues in issue index
+  - Fix MR diff encoding issues exporting GitLab projects
+  - Move builds settings out of project settings and rename Pipelines
+  - Add builds badge to Pipelines settings page
+  - Export and import avatar as part of project import/export
+  - Fix migration corrupting import data for old version upgrades
+  - Show tooltip on GitLab export link in new project page
 
 v 8.9.6
   - Fix importing of events under notes for GitLab projects. !5154
@@ -104,6 +196,7 @@ v 8.9.6
   - Fix broken migration in MySQL. !5005
   - Overwrite Host and X-Forwarded-Host headers in NGINX !5213
   - Keeps issue number when importing from Gitlab.com
+  - Add Pending tab for Builds (Katarzyna Kobierska, Urszula Budziszewska)
 
 v 8.9.7 (unreleased)
   - Fix import_data wrongly saved as a result of an invalid import_url
@@ -197,6 +290,7 @@ v 8.9.1
   - Remove width restriction for logo on sign-in page. !4888
   - Bump gitlab_git to 10.2.3 to fix false truncated warnings with ISO-8559 files. !4884
   - Apply selected value as label. !4886
+  - Change Retry to Re-deploy on Deployments page
   - Fix temp file being deleted after the request while importing a GitLab project. !4894
   - Fix pagination when sorting by columns with lots of ties (like priority)
   - Implement Subresource Integrity for CSS and JavaScript assets. This prevents malicious assets from loading in the case of a CDN compromise.
diff --git a/Gemfile b/Gemfile
index ee23f712f05..f2ac74a5976 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,6 +9,7 @@ gem 'responders', '~> 2.0'
 # Specify a sprockets version due to increased performance
 # See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069
 gem 'sprockets', '~> 3.6.0'
+gem 'sprockets-es6'
 
 # Default values for AR models
 gem 'default_value_for', '~> 3.0.0'
@@ -52,7 +53,7 @@ gem 'browser', '~> 2.2'
 
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem 'gitlab_git', '~> 10.2'
+gem 'gitlab_git', '~> 10.3.2'
 
 # LDAP Auth
 # GitLab fork with several improvements to original library. For full list of changes
@@ -61,7 +62,7 @@ gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: 'omniauth-ldap'
 
 # Git Wiki
 # Required manually in config/initializers/gollum.rb to control load order
-gem 'gollum-lib', '~> 4.1.0', require: false
+gem 'gollum-lib', '~> 4.2', require: false
 gem 'gollum-rugged_adapter', '~> 0.4.2', require: false
 
 # Language detection
@@ -105,7 +106,7 @@ gem 'seed-fu', '~> 2.3.5'
 # Markdown and HTML processing
 gem 'html-pipeline', '~> 1.11.0'
 gem 'task_list',     '~> 1.0.2', require: 'task_list/railtie'
-gem 'github-markup', '~> 1.3.1'
+gem 'github-markup', '~> 1.4'
 gem 'redcarpet',     '~> 3.3.3'
 gem 'RedCloth',      '~> 4.3.2'
 gem 'rdoc',          '~>3.6'
@@ -113,7 +114,7 @@ gem 'org-ruby',      '~> 0.9.12'
 gem 'creole',        '~> 0.5.0'
 gem 'wikicloth',     '0.8.1'
 gem 'asciidoctor',   '~> 1.5.2'
-gem 'rouge',         '~> 1.11'
+gem 'rouge',         '~> 2.0'
 
 # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
 # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
@@ -223,7 +224,7 @@ gem 'jquery-turbolinks', '~> 2.1.0'
 gem 'addressable',        '~> 2.3.8'
 gem 'bootstrap-sass',     '~> 3.3.0'
 gem 'font-awesome-rails', '~> 4.6.1'
-gem 'gemojione',          '~> 2.6'
+gem 'gemojione',          '~> 3.0'
 gem 'gon',                '~> 6.0.1'
 gem 'jquery-atwho-rails', '~> 1.3.2'
 gem 'jquery-rails',       '~> 4.1.0'
@@ -299,7 +300,7 @@ group :development, :test do
   gem 'spring-commands-spinach',  '~> 1.1.0'
   gem 'spring-commands-teaspoon', '~> 0.0.2'
 
-  gem 'rubocop', '~> 0.40.0', require: false
+  gem 'rubocop', '~> 0.41.2', require: false
   gem 'rubocop-rspec', '~> 1.5.0', require: false
   gem 'scss_lint', '~> 0.47.0', require: false
   gem 'simplecov', '~> 0.11.0', require: false
@@ -347,5 +348,5 @@ gem 'paranoia', '~> 2.0'
 gem 'health_check', '~> 2.1.0'
 
 # System information
-gem 'vmstat', '~> 2.1.0'
+gem 'vmstat', '~> 2.1.1'
 gem 'sys-filesystem', '~> 1.1.6'
diff --git a/Gemfile.lock b/Gemfile.lock
index 67c0645c3d9..bfa7e38da85 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -58,7 +58,7 @@ GEM
       faraday_middleware-multi_json (~> 0.0)
       oauth2 (~> 1.0)
     asciidoctor (1.5.3)
-    ast (2.2.0)
+    ast (2.3.0)
     attr_encrypted (3.0.1)
       encryptor (~> 3.0.0)
     attr_required (1.0.0)
@@ -85,6 +85,10 @@ GEM
       faraday (~> 0.9)
       faraday_middleware (~> 0.10)
       nokogiri (~> 1.6)
+    babel-source (5.8.35)
+    babel-transpiler (0.7.0)
+      babel-source (>= 4.0, < 6)
+      execjs (~> 2.0)
     babosa (1.0.2)
     base32 (0.3.2)
     bcrypt (3.1.11)
@@ -255,7 +259,7 @@ GEM
       ruby-progressbar (~> 1.4)
     gemnasium-gitlab-service (0.2.6)
       rugged (~> 0.21)
-    gemojione (2.6.1)
+    gemojione (3.0.1)
       json
     get_process_mem (0.2.0)
     gherkin-ruby (0.3.2)
@@ -264,7 +268,7 @@ GEM
       escape_utils (~> 1.1.0)
       mime-types (>= 1.19)
       rugged (>= 0.23.0b)
-    github-markup (1.3.3)
+    github-markup (1.4.0)
     gitlab-flowdock-git-hook (1.0.1)
       flowdock (~> 0.7)
       gitlab-grit (>= 2.4.1)
@@ -274,7 +278,7 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (>= 1.16, < 3)
       posix-spawn (~> 0.3)
-    gitlab_git (10.2.3)
+    gitlab_git (10.3.2)
       activesupport (~> 4.0)
       charlock_holmes (~> 0.7.3)
       github-linguist (~> 4.7.0)
@@ -287,13 +291,13 @@ GEM
       rubyntlm (~> 0.3)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
-    gollum-grit_adapter (1.0.0)
+    gollum-grit_adapter (1.0.1)
       gitlab-grit (~> 2.7, >= 2.7.1)
-    gollum-lib (4.1.0)
-      github-markup (~> 1.3.3)
+    gollum-lib (4.2.1)
+      github-markup (~> 1.4.0)
       gollum-grit_adapter (~> 1.0)
       nokogiri (~> 1.6.4)
-      rouge (~> 1.9)
+      rouge (~> 2.0)
       sanitize (~> 2.1.0)
       stringex (~> 2.5.1)
     gollum-rugged_adapter (0.4.2)
@@ -473,7 +477,7 @@ GEM
     orm_adapter (0.5.0)
     paranoia (2.1.4)
       activerecord (~> 4.0)
-    parser (2.3.1.0)
+    parser (2.3.1.2)
       ast (~> 2.2)
     pg (0.18.4)
     pkg-config (1.1.7)
@@ -578,7 +582,7 @@ GEM
       railties (>= 4.2.0, < 5.1)
     rinku (2.0.0)
     rotp (2.1.2)
-    rouge (1.11.0)
+    rouge (2.0.5)
     rqrcode (0.7.0)
       chunky_png
     rqrcode-rails3 (0.1.7)
@@ -606,8 +610,8 @@ GEM
     rspec-retry (0.4.5)
       rspec-core
     rspec-support (3.5.0)
-    rubocop (0.40.0)
-      parser (>= 2.3.1.0, < 3.0)
+    rubocop (0.41.2)
+      parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
@@ -700,6 +704,10 @@ GEM
     sprockets (3.6.3)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
+    sprockets-es6 (0.9.0)
+      babel-source (>= 5.8.11)
+      babel-transpiler
+      sprockets (>= 3.0.0)
     sprockets-rails (3.1.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
@@ -758,7 +766,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
-    unicode-display_width (1.0.5)
+    unicode-display_width (1.1.0)
     unicorn (4.9.0)
       kgio (~> 2.6)
       rack
@@ -775,7 +783,7 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    vmstat (2.1.0)
+    vmstat (2.1.1)
     warden (1.2.6)
       rack (>= 1.0)
     web-console (2.3.0)
@@ -857,14 +865,14 @@ DEPENDENCIES
   foreman (~> 0.78.0)
   fuubar (~> 2.0.0)
   gemnasium-gitlab-service (~> 0.2)
-  gemojione (~> 2.6)
+  gemojione (~> 3.0)
   github-linguist (~> 4.7.0)
-  github-markup (~> 1.3.1)
+  github-markup (~> 1.4)
   gitlab-flowdock-git-hook (~> 1.0.1)
-  gitlab_git (~> 10.2)
+  gitlab_git (~> 10.3.2)
   gitlab_meta (= 7.0)
   gitlab_omniauth-ldap (~> 1.2.1)
-  gollum-lib (~> 4.1.0)
+  gollum-lib (~> 4.2)
   gollum-rugged_adapter (~> 0.4.2)
   gon (~> 6.0.1)
   grape (~> 0.13.0)
@@ -933,11 +941,11 @@ DEPENDENCIES
   request_store (~> 1.3.0)
   rerun (~> 0.11.0)
   responders (~> 2.0)
-  rouge (~> 1.11)
+  rouge (~> 2.0)
   rqrcode-rails3 (~> 0.1.7)
   rspec-rails (~> 3.5.0)
   rspec-retry (~> 0.4.5)
-  rubocop (~> 0.40.0)
+  rubocop (~> 0.41.2)
   rubocop-rspec (~> 1.5.0)
   ruby-fogbugz (~> 0.2.1)
   sanitize (~> 2.0)
@@ -963,6 +971,7 @@ DEPENDENCIES
   spring-commands-spinach (~> 1.1.0)
   spring-commands-teaspoon (~> 0.0.2)
   sprockets (~> 3.6.0)
+  sprockets-es6
   state_machines-activerecord (~> 0.4.0)
   sys-filesystem (~> 1.1.6)
   task_list (~> 1.0.2)
@@ -980,7 +989,7 @@ DEPENDENCIES
   unicorn-worker-killer (~> 0.4.2)
   version_sorter (~> 2.0.0)
   virtus (~> 1.0.1)
-  vmstat (~> 2.1.0)
+  vmstat (~> 2.1.1)
   web-console (~> 2.0)
   webmock (~> 1.21.0)
   wikicloth (= 0.8.1)
diff --git a/MAINTENANCE.md b/MAINTENANCE.md
index d3d36670693..1efb2a35f6d 100644
--- a/MAINTENANCE.md
+++ b/MAINTENANCE.md
@@ -1,15 +1,35 @@
 # GitLab Maintenance Policy
 
-GitLab is a fast moving and evolving project. We currently don't have the resources to support many releases concurrently. We support exactly one stable release at any given time.
+GitLab follows the [Semantic Versioning](http://semver.org/) for its releases:
+`(Major).(Minor).(Patch)` in a [pragmatic way].
 
-GitLab follows the [Semantic Versioning](http://semver.org/) for its releases: `(Major).(Minor).(Patch)` in a [pragmatic way](https://gist.github.com/jashkenas/cbd2b088e20279ae2c8e).
+- **Major version**: Whenever there is something significant or any backwards
+  incompatible changes are introduced to the public API.
+- **Minor version**: When new, backwards compatible functionality is introduced
+  to the public API or a minor feature is introduced, or when a set of smaller
+  features is rolled out.
+- **Patch number**: When backwards compatible bug fixes are introduced that fix
+  incorrect behavior.
 
-- **Major version**: Whenever there is something significant or any backwards incompatible changes are introduced to the public API.
-- **Minor version**: When new, backwards compatible functionality is introduced to the public API or a minor feature is introduced, or when a set of smaller features is rolled out.
-- **Patch number**: When backwards compatible bug fixes are introduced that fix incorrect behavior.
+The current stable release will receive security patches and bug fixes
+(eg. `8.9.0` -> `8.9.1`). Feature releases will mark the next supported stable
+release where the minor version is increased numerically by increments of one
+(eg. `8.9 -> 8.10`).
 
-The current stable release will receive security patches and bug fixes (eg. `5.0` -> `5.0.1`).  Feature releases will mark the next supported stable release where the minor version is increased numerically by increments of one (eg. `5.0 -> 5.1`).
+Our current policy is to support one stable release at any given time, but for
+medium-level security issues, we may consider [backporting to the previous two
+monthly releases][rel-sec].
 
-We encourage everyone to run the latest stable release to ensure that you can easily upgrade to the most secure and feature rich GitLab experience. In order to make sure you can easily run the most recent stable release, we are working hard to keep the update process simple and reliable.
+We encourage everyone to run the latest stable release to ensure that you can
+easily upgrade to the most secure and feature-rich GitLab experience. In order
+to make sure you can easily run the most recent stable release, we are working
+hard to keep the update process simple and reliable.
 
-More information about the release procedures can be found in the doc/release directory.
+More information about the release procedures can be found in our
+[release-tools documentation][rel]. You may also want to read our
+[Responsible Disclosure Policy][disclosure].
+
+[rel-sec]: https://gitlab.com/gitlab-org/release-tools/blob/master/doc/security.md#backporting
+[rel]: https://gitlab.com/gitlab-org/release-tools/blob/master/doc/
+[disclosure]: https://about.gitlab.com/disclosure/
+[pragmatic way]: https://gist.github.com/jashkenas/cbd2b088e20279ae2c8e
diff --git a/VERSION b/VERSION
index 213504430f3..542e7824102 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.10.0-pre
+8.11.0-pre
diff --git a/app/assets/images/emoji.png b/app/assets/images/emoji.png
index 6bacb0e92b6..6f1a34a5591 100644
--- a/app/assets/images/emoji.png
+++ b/app/assets/images/emoji.png
diff --git a/app/assets/images/emoji@2x.png b/app/assets/images/emoji@2x.png
index 99588b56616..dc9cae1d44c 100644
--- a/app/assets/images/emoji@2x.png
+++ b/app/assets/images/emoji@2x.png
diff --git a/app/assets/javascripts/LabelManager.js b/app/assets/javascripts/LabelManager.js
new file mode 100644
index 00000000000..151455ce4a3
--- /dev/null
+++ b/app/assets/javascripts/LabelManager.js
@@ -0,0 +1,110 @@
+(function() {
+  this.LabelManager = (function() {
+    LabelManager.prototype.errorMessage = 'Unable to update label prioritization at this time';
+
+    function LabelManager(opts) {
+      var ref, ref1, ref2;
+      if (opts == null) {
+        opts = {};
+      }
+      this.togglePriorityButton = (ref = opts.togglePriorityButton) != null ? ref : $('.js-toggle-priority'), this.prioritizedLabels = (ref1 = opts.prioritizedLabels) != null ? ref1 : $('.js-prioritized-labels'), this.otherLabels = (ref2 = opts.otherLabels) != null ? ref2 : $('.js-other-labels');
+      this.prioritizedLabels.sortable({
+        items: 'li',
+        placeholder: 'list-placeholder',
+        axis: 'y',
+        update: this.onPrioritySortUpdate.bind(this)
+      });
+      this.bindEvents();
+    }
+
+    LabelManager.prototype.bindEvents = function() {
+      return this.togglePriorityButton.on('click', this, this.onTogglePriorityClick);
+    };
+
+    LabelManager.prototype.onTogglePriorityClick = function(e) {
+      var $btn, $label, $tooltip, _this, action;
+      e.preventDefault();
+      _this = e.data;
+      $btn = $(e.currentTarget);
+      $label = $("#" + ($btn.data('domId')));
+      action = $btn.parents('.js-prioritized-labels').length ? 'remove' : 'add';
+      $tooltip = $("#" + ($btn.find('.has-tooltip:visible').attr('aria-describedby')));
+      $tooltip.tooltip('destroy');
+      return _this.toggleLabelPriority($label, action);
+    };
+
+    LabelManager.prototype.toggleLabelPriority = function($label, action, persistState) {
+      var $from, $target, _this, url, xhr;
+      if (persistState == null) {
+        persistState = true;
+      }
+      _this = this;
+      url = $label.find('.js-toggle-priority').data('url');
+      $target = this.prioritizedLabels;
+      $from = this.otherLabels;
+      if (action === 'remove') {
+        $target = this.otherLabels;
+        $from = this.prioritizedLabels;
+      }
+      if ($from.find('li').length === 1) {
+        $from.find('.empty-message').removeClass('hidden');
+      }
+      if (!$target.find('li').length) {
+        $target.find('.empty-message').addClass('hidden');
+      }
+      $label.detach().appendTo($target);
+      if (!persistState) {
+        return;
+      }
+      if (action === 'remove') {
+        xhr = $.ajax({
+          url: url,
+          type: 'DELETE'
+        });
+        if (!$from.find('li').length) {
+          $from.find('.empty-message').removeClass('hidden');
+        }
+      } else {
+        xhr = this.savePrioritySort($label, action);
+      }
+      return xhr.fail(this.rollbackLabelPosition.bind(this, $label, action));
+    };
+
+    LabelManager.prototype.onPrioritySortUpdate = function() {
+      var xhr;
+      xhr = this.savePrioritySort();
+      return xhr.fail(function() {
+        return new Flash(this.errorMessage, 'alert');
+      });
+    };
+
+    LabelManager.prototype.savePrioritySort = function() {
+      return $.post({
+        url: this.prioritizedLabels.data('url'),
+        data: {
+          label_ids: this.getSortedLabelsIds()
+        }
+      });
+    };
+
+    LabelManager.prototype.rollbackLabelPosition = function($label, originalAction) {
+      var action;
+      action = originalAction === 'remove' ? 'add' : 'remove';
+      this.toggleLabelPriority($label, action, false);
+      return new Flash(this.errorMessage, 'alert');
+    };
+
+    LabelManager.prototype.getSortedLabelsIds = function() {
+      var sortedIds;
+      sortedIds = [];
+      this.prioritizedLabels.find('li').each(function() {
+        return sortedIds.push($(this).data('id'));
+      });
+      return sortedIds;
+    };
+
+    return LabelManager;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/LabelManager.js.coffee b/app/assets/javascripts/LabelManager.js.coffee
deleted file mode 100644
index 6d8faba40d7..00000000000
--- a/app/assets/javascripts/LabelManager.js.coffee
+++ /dev/null
@@ -1,92 +0,0 @@
-class @LabelManager
-  errorMessage: 'Unable to update label prioritization at this time'
-
-  constructor: (opts = {}) ->
-    # Defaults
-    {
-      @togglePriorityButton = $('.js-toggle-priority')
-      @prioritizedLabels = $('.js-prioritized-labels')
-      @otherLabels = $('.js-other-labels')
-    } = opts
-
-    @prioritizedLabels.sortable(
-      items: 'li'
-      placeholder: 'list-placeholder'
-      axis: 'y'
-      update: @onPrioritySortUpdate.bind(@)
-    )
-
-    @bindEvents()
-
-  bindEvents: ->
-    @togglePriorityButton.on 'click', @, @onTogglePriorityClick
-
-  onTogglePriorityClick: (e) ->
-    e.preventDefault()
-    _this = e.data
-    $btn = $(e.currentTarget)
-    $label = $("##{$btn.data('domId')}")
-    action = if $btn.parents('.js-prioritized-labels').length then 'remove' else 'add'
-
-    # Make sure tooltip will hide
-    $tooltip = $ "##{$btn.find('.has-tooltip:visible').attr('aria-describedby')}"
-    $tooltip.tooltip 'destroy'
-
-    _this.toggleLabelPriority($label, action)
-
-  toggleLabelPriority: ($label, action, persistState = true) ->
-    _this = @
-    url = $label.find('.js-toggle-priority').data 'url'
-
-    $target = @prioritizedLabels
-    $from = @otherLabels
-
-    # Optimistic update
-    if action is 'remove'
-      $target = @otherLabels
-      $from = @prioritizedLabels
-
-    if $from.find('li').length is 1
-      $from.find('.empty-message').removeClass('hidden')
-
-    if not $target.find('li').length
-      $target.find('.empty-message').addClass('hidden')
-
-    $label.detach().appendTo($target)
-
-    # Return if we are not persisting state
-    return unless persistState
-
-    if action is 'remove'
-      xhr = $.ajax url: url, type: 'DELETE'
-
-      # Restore empty message
-      $from.find('.empty-message').removeClass('hidden') unless $from.find('li').length
-    else
-      xhr = @savePrioritySort($label, action)
-
-    xhr.fail @rollbackLabelPosition.bind(@, $label, action)
-
-  onPrioritySortUpdate: ->
-    xhr = @savePrioritySort()
-
-    xhr.fail ->
-      new Flash(@errorMessage, 'alert')
-
-  savePrioritySort: () ->
-    $.post
-      url: @prioritizedLabels.data('url')
-      data:
-        label_ids: @getSortedLabelsIds()
-
-  rollbackLabelPosition: ($label, originalAction)->
-    action = if originalAction is 'remove' then 'add' else 'remove'
-    @toggleLabelPriority($label, action, false)
-
-    new Flash(@errorMessage, 'alert')
-
-  getSortedLabelsIds: ->
-    sortedIds = []
-    @prioritizedLabels.find('li').each ->
-      sortedIds.push $(@).data 'id'
-    sortedIds
diff --git a/app/assets/javascripts/activities.js b/app/assets/javascripts/activities.js
new file mode 100644
index 00000000000..1ab3c2197d8
--- /dev/null
+++ b/app/assets/javascripts/activities.js
@@ -0,0 +1,40 @@
+(function() {
+  this.Activities = (function() {
+    function Activities() {
+      Pager.init(20, true, false, this.updateTooltips);
+      $(".event-filter-link").on("click", (function(_this) {
+        return function(event) {
+          event.preventDefault();
+          _this.toggleFilter($(event.currentTarget));
+          return _this.reloadActivities();
+        };
+      })(this));
+    }
+
+    Activities.prototype.updateTooltips = function() {
+      return gl.utils.localTimeAgo($('.js-timeago', '#activity'));
+    };
+
+    Activities.prototype.reloadActivities = function() {
+      $(".content_list").html('');
+      return Pager.init(20, true);
+    };
+
+    Activities.prototype.toggleFilter = function(sender) {
+      var event_filters, filter;
+      $('.event-filter .active').removeClass("active");
+      event_filters = $.cookie("event_filter");
+      filter = sender.attr("id").split("_")[0];
+      $.cookie("event_filter", (event_filters !== filter ? filter : ""), {
+        path: '/'
+      });
+      if (event_filters !== filter) {
+        return sender.closest('li').toggleClass("active");
+      }
+    };
+
+    return Activities;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/activities.js.coffee b/app/assets/javascripts/activities.js.coffee
deleted file mode 100644
index ed5a5d0260c..00000000000
--- a/app/assets/javascripts/activities.js.coffee
+++ /dev/null
@@ -1,24 +0,0 @@
-class @Activities
-  constructor: ->
-    Pager.init 20, true, false, @updateTooltips
-    $(".event-filter-link").on "click", (event) =>
-      event.preventDefault()
-      @toggleFilter($(event.currentTarget))
-      @reloadActivities()
-
-  updateTooltips: ->
-    gl.utils.localTimeAgo($('.js-timeago', '#activity'))
-
-  reloadActivities: ->
-    $(".content_list").html ''
-    Pager.init 20, true
-
-
-  toggleFilter: (sender) ->
-    $('.event-filter .active').removeClass "active"
-    event_filters = $.cookie("event_filter")
-    filter = sender.attr("id").split("_")[0]
-    $.cookie "event_filter", (if event_filters isnt filter then filter else ""), { path: '/' }
-
-    if event_filters isnt filter
-      sender.closest('li').toggleClass "active"
diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js
new file mode 100644
index 00000000000..f8460beb5d2
--- /dev/null
+++ b/app/assets/javascripts/admin.js
@@ -0,0 +1,64 @@
+(function() {
+  this.Admin = (function() {
+    function Admin() {
+      var modal, showBlacklistType;
+      $('input#user_force_random_password').on('change', function(elem) {
+        var elems;
+        elems = $('#user_password, #user_password_confirmation');
+        if ($(this).attr('checked')) {
+          return elems.val('').attr('disabled', true);
+        } else {
+          return elems.removeAttr('disabled');
+        }
+      });
+      $('body').on('click', '.js-toggle-colors-link', function(e) {
+        e.preventDefault();
+        return $('.js-toggle-colors-container').toggle();
+      });
+      $('.log-tabs a').click(function(e) {
+        e.preventDefault();
+        return $(this).tab('show');
+      });
+      $('.log-bottom').click(function(e) {
+        var visible_log;
+        e.preventDefault();
+        visible_log = $(".file-content:visible");
+        return visible_log.animate({
+          scrollTop: visible_log.find('ol').height()
+        }, "fast");
+      });
+      modal = $('.change-owner-holder');
+      $('.change-owner-link').bind("click", function(e) {
+        e.preventDefault();
+        $(this).hide();
+        return modal.show();
+      });
+      $('.change-owner-cancel-link').bind("click", function(e) {
+        e.preventDefault();
+        modal.hide();
+        return $('.change-owner-link').show();
+      });
+      $('li.project_member').bind('ajax:success', function() {
+        return Turbolinks.visit(location.href);
+      });
+      $('li.group_member').bind('ajax:success', function() {
+        return Turbolinks.visit(location.href);
+      });
+      showBlacklistType = function() {
+        if ($("input[name='blacklist_type']:checked").val() === 'file') {
+          $('.blacklist-file').show();
+          return $('.blacklist-raw').hide();
+        } else {
+          $('.blacklist-file').hide();
+          return $('.blacklist-raw').show();
+        }
+      };
+      $("input[name='blacklist_type']").click(showBlacklistType);
+      showBlacklistType();
+    }
+
+    return Admin;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/admin.js.coffee b/app/assets/javascripts/admin.js.coffee
deleted file mode 100644
index b2b8e1b7ffb..00000000000
--- a/app/assets/javascripts/admin.js.coffee
+++ /dev/null
@@ -1,40 +0,0 @@
-class @Admin
-  constructor: ->
-    $('input#user_force_random_password').on 'change', (elem) ->
-      elems = $('#user_password, #user_password_confirmation')
-
-      if $(@).attr 'checked'
-        elems.val('').attr 'disabled', true
-      else
-        elems.removeAttr 'disabled'
-
-    $('body').on 'click', '.js-toggle-colors-link', (e) ->
-      e.preventDefault()
-      $('.js-toggle-colors-container').toggle()
-
-    $('.log-tabs a').click (e) ->
-      e.preventDefault()
-      $(this).tab('show')
-
-    $('.log-bottom').click (e) ->
-      e.preventDefault()
-      visible_log = $(".file-content:visible")
-      visible_log.animate({ scrollTop: visible_log.find('ol').height() }, "fast")
-
-    modal = $('.change-owner-holder')
-
-    $('.change-owner-link').bind "click", (e) ->
-      e.preventDefault()
-      $(this).hide()
-      modal.show()
-
-    $('.change-owner-cancel-link').bind "click", (e) ->
-      e.preventDefault()
-      modal.hide()
-      $('.change-owner-link').show()
-
-    $('li.project_member').bind 'ajax:success', ->
-      Turbolinks.visit(location.href)
-
-    $('li.group_member').bind 'ajax:success', ->
-      Turbolinks.visit(location.href)
diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js
new file mode 100644
index 00000000000..49c2ac0dac3
--- /dev/null
+++ b/app/assets/javascripts/api.js
@@ -0,0 +1,136 @@
+(function() {
+  this.Api = {
+    groupsPath: "/api/:version/groups.json",
+    groupPath: "/api/:version/groups/:id.json",
+    namespacesPath: "/api/:version/namespaces.json",
+    groupProjectsPath: "/api/:version/groups/:id/projects.json",
+    projectsPath: "/api/:version/projects.json?simple=true",
+    labelsPath: "/api/:version/projects/:id/labels",
+    licensePath: "/api/:version/licenses/:key",
+    gitignorePath: "/api/:version/gitignores/:key",
+    gitlabCiYmlPath: "/api/:version/gitlab_ci_ymls/:key",
+    group: function(group_id, callback) {
+      var url;
+      url = Api.buildUrl(Api.groupPath);
+      url = url.replace(':id', group_id);
+      return $.ajax({
+        url: url,
+        data: {
+          private_token: gon.api_token
+        },
+        dataType: "json"
+      }).done(function(group) {
+        return callback(group);
+      });
+    },
+    groups: function(query, skip_ldap, callback) {
+      var url;
+      url = Api.buildUrl(Api.groupsPath);
+      return $.ajax({
+        url: url,
+        data: {
+          private_token: gon.api_token,
+          search: query,
+          per_page: 20
+        },
+        dataType: "json"
+      }).done(function(groups) {
+        return callback(groups);
+      });
+    },
+    namespaces: function(query, callback) {
+      var url;
+      url = Api.buildUrl(Api.namespacesPath);
+      return $.ajax({
+        url: url,
+        data: {
+          private_token: gon.api_token,
+          search: query,
+          per_page: 20
+        },
+        dataType: "json"
+      }).done(function(namespaces) {
+        return callback(namespaces);
+      });
+    },
+    projects: function(query, order, callback) {
+      var url;
+      url = Api.buildUrl(Api.projectsPath);
+      return $.ajax({
+        url: url,
+        data: {
+          private_token: gon.api_token,
+          search: query,
+          order_by: order,
+          per_page: 20
+        },
+        dataType: "json"
+      }).done(function(projects) {
+        return callback(projects);
+      });
+    },
+    newLabel: function(project_id, data, callback) {
+      var url;
+      url = Api.buildUrl(Api.labelsPath);
+      url = url.replace(':id', project_id);
+      data.private_token = gon.api_token;
+      return $.ajax({
+        url: url,
+        type: "POST",
+        data: data,
+        dataType: "json"
+      }).done(function(label) {
+        return callback(label);
+      }).error(function(message) {
+        return callback(message.responseJSON);
+      });
+    },
+    groupProjects: function(group_id, query, callback) {
+      var url;
+      url = Api.buildUrl(Api.groupProjectsPath);
+      url = url.replace(':id', group_id);
+      return $.ajax({
+        url: url,
+        data: {
+          private_token: gon.api_token,
+          search: query,
+          per_page: 20
+        },
+        dataType: "json"
+      }).done(function(projects) {
+        return callback(projects);
+      });
+    },
+    licenseText: function(key, data, callback) {
+      var url;
+      url = Api.buildUrl(Api.licensePath).replace(':key', key);
+      return $.ajax({
+        url: url,
+        data: data
+      }).done(function(license) {
+        return callback(license);
+      });
+    },
+    gitignoreText: function(key, callback) {
+      var url;
+      url = Api.buildUrl(Api.gitignorePath).replace(':key', key);
+      return $.get(url, function(gitignore) {
+        return callback(gitignore);
+      });
+    },
+    gitlabCiYml: function(key, callback) {
+      var url;
+      url = Api.buildUrl(Api.gitlabCiYmlPath).replace(':key', key);
+      return $.get(url, function(file) {
+        return callback(file);
+      });
+    },
+    buildUrl: function(url) {
+      if (gon.relative_url_root != null) {
+        url = gon.relative_url_root + url;
+      }
+      return url.replace(':version', gon.api_version);
+    }
+  };
+
+}).call(this);
diff --git a/app/assets/javascripts/api.js.coffee b/app/assets/javascripts/api.js.coffee
deleted file mode 100644
index 89b0ac697ed..00000000000
--- a/app/assets/javascripts/api.js.coffee
+++ /dev/null
@@ -1,122 +0,0 @@
-@Api =
-  groupsPath: "/api/:version/groups.json"
-  groupPath: "/api/:version/groups/:id.json"
-  namespacesPath: "/api/:version/namespaces.json"
-  groupProjectsPath: "/api/:version/groups/:id/projects.json"
-  projectsPath: "/api/:version/projects.json?simple=true"
-  labelsPath: "/api/:version/projects/:id/labels"
-  licensePath: "/api/:version/licenses/:key"
-  gitignorePath: "/api/:version/gitignores/:key"
-  gitlabCiYmlPath: "/api/:version/gitlab_ci_ymls/:key"
-
-  group: (group_id, callback) ->
-    url = Api.buildUrl(Api.groupPath)
-    url = url.replace(':id', group_id)
-
-    $.ajax(
-      url: url
-      data:
-        private_token: gon.api_token
-      dataType: "json"
-    ).done (group) ->
-      callback(group)
-
-  # Return groups list. Filtered by query
-  # Only active groups retrieved
-  groups: (query, skip_ldap, callback) ->
-    url = Api.buildUrl(Api.groupsPath)
-
-    $.ajax(
-      url: url
-      data:
-        private_token: gon.api_token
-        search: query
-        per_page: 20
-      dataType: "json"
-    ).done (groups) ->
-      callback(groups)
-
-  # Return namespaces list. Filtered by query
-  namespaces: (query, callback) ->
-    url = Api.buildUrl(Api.namespacesPath)
-
-    $.ajax(
-      url: url
-      data:
-        private_token: gon.api_token
-        search: query
-        per_page: 20
-      dataType: "json"
-    ).done (namespaces) ->
-      callback(namespaces)
-
-  # Return projects list. Filtered by query
-  projects: (query, order, callback) ->
-    url = Api.buildUrl(Api.projectsPath)
-
-    $.ajax(
-      url: url
-      data:
-        private_token: gon.api_token
-        search: query
-        order_by: order
-        per_page: 20
-      dataType: "json"
-    ).done (projects) ->
-      callback(projects)
-
-  newLabel: (project_id, data, callback) ->
-    url = Api.buildUrl(Api.labelsPath)
-    url = url.replace(':id', project_id)
-
-    data.private_token = gon.api_token
-    $.ajax(
-      url: url
-      type: "POST"
-      data: data
-      dataType: "json"
-    ).done (label) ->
-      callback(label)
-    .error (message) ->
-      callback(message.responseJSON)
-
-  # Return group projects list. Filtered by query
-  groupProjects: (group_id, query, callback) ->
-    url = Api.buildUrl(Api.groupProjectsPath)
-    url = url.replace(':id', group_id)
-
-    $.ajax(
-      url: url
-      data:
-        private_token: gon.api_token
-        search: query
-        per_page: 20
-      dataType: "json"
-    ).done (projects) ->
-      callback(projects)
-
-  # Return text for a specific license
-  licenseText: (key, data, callback) ->
-    url = Api.buildUrl(Api.licensePath).replace(':key', key)
-
-    $.ajax(
-      url: url
-      data: data
-    ).done (license) ->
-      callback(license)
-
-  gitignoreText: (key, callback) ->
-    url = Api.buildUrl(Api.gitignorePath).replace(':key', key)
-
-    $.get url, (gitignore) ->
-      callback(gitignore)
-
-  gitlabCiYml: (key, callback) ->
-    url = Api.buildUrl(Api.gitlabCiYmlPath).replace(':key', key)
-
-    $.get url, (file) ->
-      callback(file)
-
-  buildUrl: (url) ->
-    url = gon.relative_url_root + url if gon.relative_url_root?
-    return url.replace(':version', gon.api_version)
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
new file mode 100644
index 00000000000..127e568adc9
--- /dev/null
+++ b/app/assets/javascripts/application.js
@@ -0,0 +1,320 @@
+/*= require jquery2 */
+/*= require jquery-ui/autocomplete */
+/*= require jquery-ui/datepicker */
+/*= require jquery-ui/draggable */
+/*= require jquery-ui/effect-highlight */
+/*= require jquery-ui/sortable */
+/*= require jquery_ujs */
+/*= require jquery.cookie */
+/*= require jquery.endless-scroll */
+/*= require jquery.highlight */
+/*= require jquery.waitforimages */
+/*= require jquery.atwho */
+/*= require jquery.scrollTo */
+/*= require jquery.turbolinks */
+/*= require turbolinks */
+/*= require autosave */
+/*= require bootstrap/affix */
+/*= require bootstrap/alert */
+/*= require bootstrap/button */
+/*= require bootstrap/collapse */
+/*= require bootstrap/dropdown */
+/*= require bootstrap/modal */
+/*= require bootstrap/scrollspy */
+/*= require bootstrap/tab */
+/*= require bootstrap/transition */
+/*= require bootstrap/tooltip */
+/*= require bootstrap/popover */
+/*= require select2 */
+/*= require ace/ace */
+/*= require ace/ext-searchbox */
+/*= require underscore */
+/*= require dropzone */
+/*= require mousetrap */
+/*= require mousetrap/pause */
+/*= require shortcuts */
+/*= require shortcuts_navigation */
+/*= require shortcuts_dashboard_navigation */
+/*= require shortcuts_issuable */
+/*= require shortcuts_network */
+/*= require jquery.nicescroll */
+/*= require date.format */
+/*= require_directory ./behaviors */
+/*= require_directory ./blob */
+/*= require_directory ./commit */
+/*= require_directory ./extensions */
+/*= require_directory ./lib/utils */
+/*= require_directory ./u2f */
+/*= require_directory . */
+/*= require fuzzaldrin-plus */
+
+(function() {
+  window.slugify = function(text) {
+    return text.replace(/[^-a-zA-Z0-9]+/g, '_').toLowerCase();
+  };
+
+  window.ajaxGet = function(url) {
+    return $.ajax({
+      type: "GET",
+      url: url,
+      dataType: "script"
+    });
+  };
+
+  window.split = function(val) {
+    return val.split(/,\s*/);
+  };
+
+  window.extractLast = function(term) {
+    return split(term).pop();
+  };
+
+  window.rstrip = function(val) {
+    if (val) {
+      return val.replace(/\s+$/, '');
+    } else {
+      return val;
+    }
+  };
+
+  window.disableButtonIfEmptyField = function(field_selector, button_selector) {
+    var closest_submit, field;
+    field = $(field_selector);
+    closest_submit = field.closest('form').find(button_selector);
+    if (rstrip(field.val()) === "") {
+      closest_submit.disable();
+    }
+    return field.on('input', function() {
+      if (rstrip($(this).val()) === "") {
+        return closest_submit.disable();
+      } else {
+        return closest_submit.enable();
+      }
+    });
+  };
+
+  window.disableButtonIfAnyEmptyField = function(form, form_selector, button_selector) {
+    var closest_submit, updateButtons;
+    closest_submit = form.find(button_selector);
+    updateButtons = function() {
+      var filled;
+      filled = true;
+      form.find('input').filter(form_selector).each(function() {
+        return filled = rstrip($(this).val()) !== "" || !$(this).attr('required');
+      });
+      if (filled) {
+        return closest_submit.enable();
+      } else {
+        return closest_submit.disable();
+      }
+    };
+    updateButtons();
+    return form.keyup(updateButtons);
+  };
+
+  window.sanitize = function(str) {
+    return str.replace(/<(?:.|\n)*?>/gm, '');
+  };
+
+  window.unbindEvents = function() {
+    return $(document).off('scroll');
+  };
+
+  window.shiftWindow = function() {
+    return scrollBy(0, -100);
+  };
+
+  document.addEventListener("page:fetch", unbindEvents);
+
+  window.addEventListener("hashchange", shiftWindow);
+
+  window.onload = function() {
+    if (location.hash) {
+      return setTimeout(shiftWindow, 100);
+    }
+  };
+
+  $(function() {
+    var $body, $document, $sidebarGutterToggle, $window, bootstrapBreakpoint, checkInitialSidebarSize, fitSidebarForSize, flash;
+    $document = $(document);
+    $window = $(window);
+    $body = $('body');
+    gl.utils.preventDisabledButtons();
+    bootstrapBreakpoint = bp.getBreakpointSize();
+    $(".nav-sidebar").niceScroll({
+      cursoropacitymax: '0.4',
+      cursorcolor: '#FFF',
+      cursorborder: "1px solid #FFF"
+    });
+    $(".js-select-on-focus").on("focusin", function() {
+      return $(this).select().one('mouseup', function(e) {
+        return e.preventDefault();
+      });
+    });
+    $('.remove-row').bind('ajax:success', function() {
+      return $(this).closest('li').fadeOut();
+    });
+    $('.js-remove-tr').bind('ajax:before', function() {
+      return $(this).hide();
+    });
+    $('.js-remove-tr').bind('ajax:success', function() {
+      return $(this).closest('tr').fadeOut();
+    });
+    $('select.select2').select2({
+      width: 'resolve',
+      dropdownAutoWidth: true
+    });
+    $('.js-select2').bind('select2-close', function() {
+      return setTimeout((function() {
+        $('.select2-container-active').removeClass('select2-container-active');
+        return $(':focus').blur();
+      }), 1);
+    });
+    $body.tooltip({
+      selector: '.has-tooltip, [data-toggle="tooltip"]',
+      placement: function(_, el) {
+        var $el;
+        $el = $(el);
+        return $el.data('placement') || 'bottom';
+      }
+    });
+    $('.trigger-submit').on('change', function() {
+      return $(this).parents('form').submit();
+    });
+    gl.utils.localTimeAgo($('abbr.timeago, .js-timeago'), true);
+    if ((flash = $(".flash-container")).length > 0) {
+      flash.click(function() {
+        return $(this).fadeOut();
+      });
+      flash.show();
+    }
+    $body.on('ajax:complete, ajax:beforeSend, submit', 'form', function(e) {
+      var buttons;
+      buttons = $('[type="submit"]', this);
+      switch (e.type) {
+        case 'ajax:beforeSend':
+        case 'submit':
+          return buttons.disable();
+        default:
+          return buttons.enable();
+      }
+    });
+    $(document).ajaxError(function(e, xhrObj, xhrSetting, xhrErrorText) {
+      var ref;
+      if (xhrObj.status === 401) {
+        return new Flash('You need to be logged in.', 'alert');
+      } else if ((ref = xhrObj.status) === 404 || ref === 500) {
+        return new Flash('Something went wrong on our end.', 'alert');
+      }
+    });
+    $('.account-box').hover(function() {
+      return $(this).toggleClass('hover');
+    });
+    $document.on('click', '.diff-content .js-show-suppressed-diff', function() {
+      var $container;
+      $container = $(this).parent();
+      $container.next('table').show();
+      return $container.remove();
+    });
+    $('.navbar-toggle').on('click', function() {
+      $('.header-content .title').toggle();
+      $('.header-content .header-logo').toggle();
+      $('.header-content .navbar-collapse').toggle();
+      return $('.navbar-toggle').toggleClass('active');
+    });
+    $body.on("click", ".js-toggle-diff-comments", function(e) {
+      $(this).toggleClass('active');
+      $(this).closest(".diff-file").find(".notes_holder").toggle();
+      return e.preventDefault();
+    });
+    $document.off("click", '.js-confirm-danger');
+    $document.on("click", '.js-confirm-danger', function(e) {
+      var btn, form, text;
+      e.preventDefault();
+      btn = $(e.target);
+      text = btn.data("confirm-danger-message");
+      form = btn.closest("form");
+      return new ConfirmDangerModal(form, text);
+    });
+    $document.on('click', 'button', function() {
+      return $(this).blur();
+    });
+    $('input[type="search"]').each(function() {
+      var $this;
+      $this = $(this);
+      $this.attr('value', $this.val());
+    });
+    $document.off('keyup', 'input[type="search"]').on('keyup', 'input[type="search"]', function(e) {
+      var $this;
+      $this = $(this);
+      return $this.attr('value', $this.val());
+    });
+    $sidebarGutterToggle = $('.js-sidebar-toggle');
+    $document.off('breakpoint:change').on('breakpoint:change', function(e, breakpoint) {
+      var $gutterIcon;
+      if (breakpoint === 'sm' || breakpoint === 'xs') {
+        $gutterIcon = $sidebarGutterToggle.find('i');
+        if ($gutterIcon.hasClass('fa-angle-double-right')) {
+          return $sidebarGutterToggle.trigger('click');
+        }
+      }
+    });
+    fitSidebarForSize = function() {
+      var oldBootstrapBreakpoint;
+      oldBootstrapBreakpoint = bootstrapBreakpoint;
+      bootstrapBreakpoint = bp.getBreakpointSize();
+      if (bootstrapBreakpoint !== oldBootstrapBreakpoint) {
+        return $document.trigger('breakpoint:change', [bootstrapBreakpoint]);
+      }
+    };
+    checkInitialSidebarSize = function() {
+      bootstrapBreakpoint = bp.getBreakpointSize();
+      if (bootstrapBreakpoint === "xs" || "sm") {
+        return $document.trigger('breakpoint:change', [bootstrapBreakpoint]);
+      }
+    };
+    $window.off("resize.app").on("resize.app", function(e) {
+      return fitSidebarForSize();
+    });
+    gl.awardsHandler = new AwardsHandler();
+    checkInitialSidebarSize();
+    new Aside();
+    if ($window.width() < 1024 && $.cookie('pin_nav') === 'true') {
+      $.cookie('pin_nav', 'false', {
+        path: '/',
+        expires: 365 * 10
+      });
+      $('.page-with-sidebar').toggleClass('page-sidebar-collapsed page-sidebar-expanded').removeClass('page-sidebar-pinned');
+      $('.navbar-fixed-top').removeClass('header-pinned-nav');
+    }
+    return $document.off('click', '.js-nav-pin').on('click', '.js-nav-pin', function(e) {
+      var $page, $pinBtn, $tooltip, $topNav, doPinNav, tooltipText;
+      e.preventDefault();
+      $pinBtn = $(e.currentTarget);
+      $page = $('.page-with-sidebar');
+      $topNav = $('.navbar-fixed-top');
+      $tooltip = $("#" + ($pinBtn.attr('aria-describedby')));
+      doPinNav = !$page.is('.page-sidebar-pinned');
+      tooltipText = 'Pin navigation';
+      $(this).toggleClass('is-active');
+      if (doPinNav) {
+        $page.addClass('page-sidebar-pinned');
+        $topNav.addClass('header-pinned-nav');
+      } else {
+        $tooltip.remove();
+        $page.removeClass('page-sidebar-pinned').toggleClass('page-sidebar-collapsed page-sidebar-expanded');
+        $topNav.removeClass('header-pinned-nav').toggleClass('header-collapsed header-expanded');
+      }
+      $.cookie('pin_nav', doPinNav, {
+        path: '/',
+        expires: 365 * 10
+      });
+      if ($.cookie('pin_nav') === 'true' || doPinNav) {
+        tooltipText = 'Unpin navigation';
+      }
+      $tooltip.find('.tooltip-inner').text(tooltipText);
+      return $pinBtn.attr('title', tooltipText).tooltip('fixTitle');
+    });
+  });
+
+}).call(this);
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
deleted file mode 100644
index c98763d6271..00000000000
--- a/app/assets/javascripts/application.js.coffee
+++ /dev/null
@@ -1,311 +0,0 @@
-# This is a manifest file that'll be compiled into including all the files listed below.
-# Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-# be included in the compiled file accessible from http://example.com/assets/application.js
-# It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-# the compiled file.
-#
-#= require jquery2
-#= require jquery-ui/autocomplete
-#= require jquery-ui/datepicker
-#= require jquery-ui/draggable
-#= require jquery-ui/effect-highlight
-#= require jquery-ui/sortable
-#= require jquery_ujs
-#= require jquery.cookie
-#= require jquery.endless-scroll
-#= require jquery.highlight
-#= require jquery.waitforimages
-#= require jquery.atwho
-#= require jquery.scrollTo
-#= require jquery.turbolinks
-#= require turbolinks
-#= require autosave
-#= require bootstrap/affix
-#= require bootstrap/alert
-#= require bootstrap/button
-#= require bootstrap/collapse
-#= require bootstrap/dropdown
-#= require bootstrap/modal
-#= require bootstrap/scrollspy
-#= require bootstrap/tab
-#= require bootstrap/transition
-#= require bootstrap/tooltip
-#= require bootstrap/popover
-#= require select2
-#= require ace/ace
-#= require ace/ext-searchbox
-#= require underscore
-#= require dropzone
-#= require mousetrap
-#= require mousetrap/pause
-#= require shortcuts
-#= require shortcuts_navigation
-#= require shortcuts_dashboard_navigation
-#= require shortcuts_issuable
-#= require shortcuts_network
-#= require jquery.nicescroll
-#= require date.format
-#= require_directory ./behaviors
-#= require_directory ./blob
-#= require_directory ./commit
-#= require_directory ./extensions
-#= require_directory ./lib/utils
-#= require_directory ./u2f
-#= require_directory .
-#= require fuzzaldrin-plus
-#= require u2f
-
-window.slugify = (text) ->
-  text.replace(/[^-a-zA-Z0-9]+/g, '_').toLowerCase()
-
-window.ajaxGet = (url) ->
-  $.ajax({type: "GET", url: url, dataType: "script"})
-
-window.split = (val) ->
-  return val.split( /,\s*/ )
-
-window.extractLast = (term) ->
-  return split( term ).pop()
-
-window.rstrip = (val) ->
-  return if val then val.replace(/\s+$/, '') else val
-
-# Disable button if text field is empty
-window.disableButtonIfEmptyField = (field_selector, button_selector) ->
-  field = $(field_selector)
-  closest_submit = field.closest('form').find(button_selector)
-
-  closest_submit.disable() if rstrip(field.val()) is ""
-
-  field.on 'input', ->
-    if rstrip($(@).val()) is ""
-      closest_submit.disable()
-    else
-      closest_submit.enable()
-
-# Disable button if any input field with given selector is empty
-window.disableButtonIfAnyEmptyField = (form, form_selector, button_selector) ->
-  closest_submit = form.find(button_selector)
-  updateButtons = ->
-    filled = true
-    form.find('input').filter(form_selector).each ->
-      filled = rstrip($(this).val()) != "" || !$(this).attr('required')
-
-    if filled
-      closest_submit.enable()
-    else
-      closest_submit.disable()
-
-  updateButtons()
-  form.keyup(updateButtons)
-
-window.sanitize = (str) ->
-  return str.replace(/<(?:.|\n)*?>/gm, '')
-
-window.unbindEvents = ->
-  $(document).off('scroll')
-
-window.shiftWindow = ->
-  scrollBy 0, -100
-
-document.addEventListener("page:fetch", unbindEvents)
-
-window.addEventListener "hashchange", shiftWindow
-
-window.onload = ->
-  # Scroll the window to avoid the topnav bar
-  # https://github.com/twitter/bootstrap/issues/1768
-  if location.hash
-    setTimeout shiftWindow, 100
-
-$ ->
-
-  $document = $(document)
-  $window   = $(window)
-  $body     = $('body')
-
-  gl.utils.preventDisabledButtons()
-  bootstrapBreakpoint = bp.getBreakpointSize()
-
-  $(".nav-sidebar").niceScroll(cursoropacitymax: '0.4', cursorcolor: '#FFF', cursorborder: "1px solid #FFF")
-
-  # Click a .js-select-on-focus field, select the contents
-  $(".js-select-on-focus").on "focusin", ->
-    # Prevent a mouseup event from deselecting the input
-    $(this).select().one 'mouseup', (e) ->
-      e.preventDefault()
-
-  $('.remove-row').bind 'ajax:success', ->
-    $(this).closest('li').fadeOut()
-
-  $('.js-remove-tr').bind 'ajax:before', ->
-    $(this).hide()
-
-  $('.js-remove-tr').bind 'ajax:success', ->
-    $(this).closest('tr').fadeOut()
-
-  # Initialize select2 selects
-  $('select.select2').select2(width: 'resolve', dropdownAutoWidth: true)
-
-  # Close select2 on escape
-  $('.js-select2').bind 'select2-close', ->
-    setTimeout ( ->
-      $('.select2-container-active').removeClass('select2-container-active')
-      $(':focus').blur()
-    ), 1
-
-  # Initialize tooltips
-  $body.tooltip(
-    selector: '.has-tooltip, [data-toggle="tooltip"]'
-    placement: (_, el) ->
-      $el = $(el)
-      $el.data('placement') || 'bottom'
-  )
-
-  # Form submitter
-  $('.trigger-submit').on 'change', ->
-    $(@).parents('form').submit()
-
-  gl.utils.localTimeAgo($('abbr.timeago, .js-timeago'), true)
-
-  # Flash
-  if (flash = $(".flash-container")).length > 0
-    flash.click -> $(@).fadeOut()
-    flash.show()
-
-  # Disable form buttons while a form is submitting
-  $body.on 'ajax:complete, ajax:beforeSend, submit', 'form', (e) ->
-    buttons = $('[type="submit"]', @)
-
-    switch e.type
-      when 'ajax:beforeSend', 'submit'
-        buttons.disable()
-      else
-        buttons.enable()
-
-  $(document).ajaxError (e, xhrObj, xhrSetting, xhrErrorText) ->
-
-    if xhrObj.status is 401
-      new Flash 'You need to be logged in.', 'alert'
-
-    else if xhrObj.status in [ 404, 500 ]
-      new Flash 'Something went wrong on our end.', 'alert'
-
-
-  # Show/Hide the profile menu when hovering the account box
-  $('.account-box').hover -> $(@).toggleClass('hover')
-
-  # Commit show suppressed diff
-  $document.on 'click', '.diff-content .js-show-suppressed-diff', ->
-    $container = $(@).parent()
-    $container.next('table').show()
-    $container.remove()
-
-  $('.navbar-toggle').on 'click', ->
-    $('.header-content .title').toggle()
-    $('.header-content .header-logo').toggle()
-    $('.header-content .navbar-collapse').toggle()
-    $('.navbar-toggle').toggleClass('active')
-
-  # Show/hide comments on diff
-  $body.on "click", ".js-toggle-diff-comments", (e) ->
-    $(@).toggleClass('active')
-    $(@).closest(".diff-file").find(".notes_holder").toggle()
-    e.preventDefault()
-
-  $document.off "click", '.js-confirm-danger'
-  $document.on "click", '.js-confirm-danger', (e) ->
-    e.preventDefault()
-    btn = $(e.target)
-    text = btn.data("confirm-danger-message")
-    form = btn.closest("form")
-    new ConfirmDangerModal(form, text)
-
-
-  $document.on 'click', 'button', ->
-    $(this).blur()
-
-  $('input[type="search"]').each ->
-    $this = $(this)
-    $this.attr 'value', $this.val()
-    return
-
-  $document
-    .off 'keyup', 'input[type="search"]'
-    .on 'keyup', 'input[type="search"]' , (e) ->
-      $this = $(this)
-      $this.attr 'value', $this.val()
-
-  $sidebarGutterToggle = $('.js-sidebar-toggle')
-
-  $document
-    .off 'breakpoint:change'
-    .on 'breakpoint:change', (e, breakpoint) ->
-      if breakpoint is 'sm' or breakpoint is 'xs'
-        $gutterIcon = $sidebarGutterToggle.find('i')
-        if $gutterIcon.hasClass('fa-angle-double-right')
-          $sidebarGutterToggle.trigger('click')
-
-  fitSidebarForSize = ->
-    oldBootstrapBreakpoint = bootstrapBreakpoint
-    bootstrapBreakpoint = bp.getBreakpointSize()
-    if bootstrapBreakpoint != oldBootstrapBreakpoint
-      $document.trigger('breakpoint:change', [bootstrapBreakpoint])
-
-  checkInitialSidebarSize = ->
-    bootstrapBreakpoint = bp.getBreakpointSize()
-    if bootstrapBreakpoint is "xs" or "sm"
-      $document.trigger('breakpoint:change', [bootstrapBreakpoint])
-
-  $window
-    .off "resize.app"
-    .on "resize.app", (e) ->
-      fitSidebarForSize()
-
-  gl.awardsHandler = new AwardsHandler()
-  checkInitialSidebarSize()
-  new Aside()
-
-  # Sidenav pinning
-  if $window.width() < 1024 and $.cookie('pin_nav') is 'true'
-    $.cookie('pin_nav', 'false', { path: '/', expires: 365 * 10 })
-    $('.page-with-sidebar')
-      .toggleClass('page-sidebar-collapsed page-sidebar-expanded')
-      .removeClass('page-sidebar-pinned')
-    $('.navbar-fixed-top').removeClass('header-pinned-nav')
-
-  $document
-    .off 'click', '.js-nav-pin'
-    .on 'click', '.js-nav-pin', (e) ->
-      e.preventDefault()
-
-      $pinBtn = $(e.currentTarget)
-      $page = $ '.page-with-sidebar'
-      $topNav = $ '.navbar-fixed-top'
-      $tooltip = $ "##{$pinBtn.attr('aria-describedby')}"
-      doPinNav = not $page.is('.page-sidebar-pinned')
-      tooltipText = 'Pin navigation'
-
-      $(this).toggleClass 'is-active'
-
-      if doPinNav
-        $page.addClass('page-sidebar-pinned')
-        $topNav.addClass('header-pinned-nav')
-      else
-        $tooltip.remove() # Remove it immediately when collapsing the sidebar
-        $page.removeClass('page-sidebar-pinned')
-             .toggleClass('page-sidebar-collapsed page-sidebar-expanded')
-        $topNav.removeClass('header-pinned-nav')
-               .toggleClass('header-collapsed header-expanded')
-
-      # Save settings
-      $.cookie 'pin_nav', doPinNav, { path: '/', expires: 365 * 10 }
-
-      if $.cookie('pin_nav') is 'true' or doPinNav
-        tooltipText = 'Unpin navigation'
-
-      # Update tooltip text immediately
-      $tooltip.find('.tooltip-inner').text(tooltipText)
-
-      # Persist tooltip title
-      $pinBtn.attr('title', tooltipText).tooltip('fixTitle')
diff --git a/app/assets/javascripts/aside.js b/app/assets/javascripts/aside.js
new file mode 100644
index 00000000000..7b546e79ee0
--- /dev/null
+++ b/app/assets/javascripts/aside.js
@@ -0,0 +1,26 @@
+(function() {
+  this.Aside = (function() {
+    function Aside() {
+      $(document).off("click", "a.show-aside");
+      $(document).on("click", 'a.show-aside', function(e) {
+        var btn, icon;
+        e.preventDefault();
+        btn = $(e.currentTarget);
+        icon = btn.find('i');
+        if (icon.hasClass('fa-angle-left')) {
+          btn.parent().find('section').hide();
+          btn.parent().find('aside').fadeIn();
+          return icon.removeClass('fa-angle-left').addClass('fa-angle-right');
+        } else {
+          btn.parent().find('aside').hide();
+          btn.parent().find('section').fadeIn();
+          return icon.removeClass('fa-angle-right').addClass('fa-angle-left');
+        }
+      });
+    }
+
+    return Aside;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/aside.js.coffee b/app/assets/javascripts/aside.js.coffee
deleted file mode 100644
index 66ab5054326..00000000000
--- a/app/assets/javascripts/aside.js.coffee
+++ /dev/null
@@ -1,16 +0,0 @@
-class @Aside
-  constructor: ->
-    $(document).off "click", "a.show-aside"
-    $(document).on "click", 'a.show-aside', (e) ->
-      e.preventDefault()
-      btn = $(e.currentTarget)
-      icon = btn.find('i')
-
-      if icon.hasClass('fa-angle-left')
-        btn.parent().find('section').hide()
-        btn.parent().find('aside').fadeIn()
-        icon.removeClass('fa-angle-left').addClass('fa-angle-right')
-      else
-        btn.parent().find('aside').hide()
-        btn.parent().find('section').fadeIn()
-        icon.removeClass('fa-angle-right').addClass('fa-angle-left')
diff --git a/app/assets/javascripts/autosave.js b/app/assets/javascripts/autosave.js
new file mode 100644
index 00000000000..7116512d6b7
--- /dev/null
+++ b/app/assets/javascripts/autosave.js
@@ -0,0 +1,63 @@
+(function() {
+  this.Autosave = (function() {
+    function Autosave(field, key) {
+      this.field = field;
+      if (key.join != null) {
+        key = key.join("/");
+      }
+      this.key = "autosave/" + key;
+      this.field.data("autosave", this);
+      this.restore();
+      this.field.on("input", (function(_this) {
+        return function() {
+          return _this.save();
+        };
+      })(this));
+    }
+
+    Autosave.prototype.restore = function() {
+      var e, error, text;
+      if (window.localStorage == null) {
+        return;
+      }
+      try {
+        text = window.localStorage.getItem(this.key);
+      } catch (error) {
+        e = error;
+        return;
+      }
+      if ((text != null ? text.length : void 0) > 0) {
+        this.field.val(text);
+      }
+      return this.field.trigger("input");
+    };
+
+    Autosave.prototype.save = function() {
+      var text;
+      if (window.localStorage == null) {
+        return;
+      }
+      text = this.field.val();
+      if ((text != null ? text.length : void 0) > 0) {
+        try {
+          return window.localStorage.setItem(this.key, text);
+        } catch (undefined) {}
+      } else {
+        return this.reset();
+      }
+    };
+
+    Autosave.prototype.reset = function() {
+      if (window.localStorage == null) {
+        return;
+      }
+      try {
+        return window.localStorage.removeItem(this.key);
+      } catch (undefined) {}
+    };
+
+    return Autosave;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/autosave.js.coffee b/app/assets/javascripts/autosave.js.coffee
deleted file mode 100644
index 28f8e103664..00000000000
--- a/app/assets/javascripts/autosave.js.coffee
+++ /dev/null
@@ -1,39 +0,0 @@
-class @Autosave
-  constructor: (field, key) ->
-    @field = field
-
-    key = key.join("/") if key.join?
-    @key = "autosave/#{key}"
-
-    @field.data "autosave", this
-
-    @restore()
-
-    @field.on "input", => @save()
-
-  restore: ->
-    return unless window.localStorage?
-
-    try
-      text = window.localStorage.getItem @key
-    catch e
-      return
-
-    @field.val text if text?.length > 0
-    @field.trigger "input"
-
-  save: ->
-    return unless window.localStorage?
-
-    text = @field.val()
-    if text?.length > 0
-      try
-        window.localStorage.setItem @key, text
-    else
-      @reset()
-
-  reset: ->
-    return unless window.localStorage?
-
-    try
-      window.localStorage.removeItem @key
diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
deleted file mode 100644
index 37d0adaa625..00000000000
--- a/app/assets/javascripts/awards_handler.coffee
+++ /dev/null
@@ -1,372 +0,0 @@
-class @AwardsHandler
-
-  constructor: ->
-
-    @aliases = gl.emojiAliases()
-
-    $(document)
-      .off 'click', '.js-add-award'
-      .on  'click', '.js-add-award', (e) =>
-        e.stopPropagation()
-        e.preventDefault()
-
-        @showEmojiMenu $(e.currentTarget)
-
-    $('html').on 'click', (e) ->
-      $target = $ e.target
-
-      unless $target.closest('.emoji-menu-content').length
-        $('.js-awards-block.current').removeClass 'current'
-
-      unless $target.closest('.emoji-menu').length
-        if $('.emoji-menu').is(':visible')
-          $('.js-add-award.is-active').removeClass 'is-active'
-          $('.emoji-menu').removeClass 'is-visible'
-
-    $(document)
-      .off 'click', '.js-emoji-btn'
-      .on  'click', '.js-emoji-btn', (e) =>
-        e.preventDefault()
-
-        $target = $ e.currentTarget
-        emoji   = $target.find('.icon').data 'emoji'
-
-        $target.closest('.js-awards-block').addClass 'current'
-        @addAward @getVotesBlock(), @getAwardUrl(), emoji
-
-
-  showEmojiMenu: ($addBtn) ->
-
-    $menu = $ '.emoji-menu'
-
-    if $addBtn.hasClass 'js-note-emoji'
-      $addBtn.closest('.note').find('.js-awards-block').addClass 'current'
-    else
-      $addBtn.closest('.js-awards-block').addClass 'current'
-
-    if $menu.length
-      $holder = $addBtn.closest('.js-award-holder')
-
-      if $menu.is '.is-visible'
-        $addBtn.removeClass 'is-active'
-        $menu.removeClass 'is-visible'
-        $('#emoji_search').blur()
-      else
-        $addBtn.addClass 'is-active'
-        @positionMenu($menu, $addBtn)
-
-        $menu.addClass 'is-visible'
-        $('#emoji_search').focus()
-    else
-      $addBtn.addClass 'is-loading is-active'
-      url = @getAwardMenuUrl()
-
-      @createEmojiMenu url, =>
-        $addBtn.removeClass 'is-loading'
-        $menu = $('.emoji-menu')
-        @positionMenu($menu, $addBtn)
-        @renderFrequentlyUsedBlock() unless @frequentEmojiBlockRendered
-
-        setTimeout =>
-          $menu.addClass 'is-visible'
-          $('#emoji_search').focus()
-          @setupSearch()
-        , 200
-
-
-  createEmojiMenu: (awardMenuUrl, callback) ->
-
-    $.get awardMenuUrl, (response) ->
-      $('body').append response
-      callback()
-
-
-  positionMenu: ($menu, $addBtn) ->
-
-    position = $addBtn.data('position')
-
-    # The menu could potentially be off-screen or in a hidden overflow element
-    # So we position the element absolute in the body
-    css =
-      top: "#{$addBtn.offset().top + $addBtn.outerHeight()}px"
-
-    if position? and position is 'right'
-      css.left = "#{($addBtn.offset().left - $menu.outerWidth()) + 20}px"
-      $menu.addClass 'is-aligned-right'
-    else
-      css.left = "#{$addBtn.offset().left}px"
-      $menu.removeClass 'is-aligned-right'
-
-    $menu.css(css)
-
-
-  addAward: (votesBlock, awardUrl, emoji, checkMutuality = true, callback) ->
-
-    emoji = @normilizeEmojiName emoji
-
-    @postEmoji awardUrl, emoji, =>
-      @addAwardToEmojiBar votesBlock, emoji, checkMutuality
-      callback?()
-
-    $('.emoji-menu').removeClass 'is-visible'
-
-
-  addAwardToEmojiBar: (votesBlock, emoji, checkForMutuality = true) ->
-
-    @checkMutuality votesBlock, emoji  if checkForMutuality
-    @addEmojiToFrequentlyUsedList emoji
-
-    emoji        = @normilizeEmojiName emoji
-    $emojiButton = @findEmojiIcon(votesBlock, emoji).parent()
-
-    if $emojiButton.length > 0
-      if @isActive $emojiButton
-        @decrementCounter $emojiButton, emoji
-      else
-        counter = $emojiButton.find '.js-counter'
-        counter.text parseInt(counter.text()) + 1
-        $emojiButton.addClass 'active'
-        @addMeToUserList votesBlock, emoji
-        @animateEmoji $emojiButton
-    else
-      votesBlock.removeClass 'hidden'
-      @createEmoji votesBlock, emoji
-
-
-  getVotesBlock: ->
-
-    currentBlock = $ '.js-awards-block.current'
-    return if currentBlock.length then currentBlock else $('.js-awards-block').eq 0
-
-
-  getAwardUrl: -> return @getVotesBlock().data 'award-url'
-
-
-  checkMutuality: (votesBlock, emoji) ->
-
-    awardUrl = @getAwardUrl()
-
-    if emoji in [ 'thumbsup', 'thumbsdown' ]
-      mutualVote     = if emoji is 'thumbsup' then 'thumbsdown' else 'thumbsup'
-      $emojiButton   = votesBlock.find("[data-emoji=#{mutualVote}]").parent()
-      isAlreadyVoted = $emojiButton.hasClass 'active'
-
-      if isAlreadyVoted
-        @showEmojiLoader $emojiButton
-        @addAward votesBlock, awardUrl, mutualVote, false, ->
-          $emojiButton.removeClass 'is-loading'
-
-
-  showEmojiLoader: ($emojiButton) ->
-
-    $loader = $emojiButton.find '.fa-spinner'
-
-    unless $loader.length
-      $emojiButton.append '<i class="fa fa-spinner fa-spin award-control-icon award-control-icon-loading"></i>'
-
-    $emojiButton.addClass 'is-loading'
-
-
-  isActive: ($emojiButton) -> $emojiButton.hasClass 'active'
-
-
-  decrementCounter: ($emojiButton, emoji) ->
-
-    counter       = $ '.js-counter', $emojiButton
-    counterNumber = parseInt counter.text(), 10
-
-    if counterNumber > 1
-      counter.text counterNumber - 1
-      @removeMeFromUserList $emojiButton, emoji
-    else if emoji is 'thumbsup' or emoji is 'thumbsdown'
-      $emojiButton.tooltip 'destroy'
-      counter.text '0'
-      @removeMeFromUserList $emojiButton, emoji
-      @removeEmoji $emojiButton if $emojiButton.parents('.note').length
-    else
-      @removeEmoji $emojiButton
-
-    $emojiButton.removeClass 'active'
-
-
-  removeEmoji: ($emojiButton) ->
-
-    $emojiButton.tooltip('destroy')
-    $emojiButton.remove()
-
-    $votesBlock = @getVotesBlock()
-
-    if $votesBlock.find('.js-emoji-btn').length is 0
-      $votesBlock.addClass 'hidden'
-
-
-  getAwardTooltip: ($awardBlock) ->
-
-    return $awardBlock.attr('data-original-title') or $awardBlock.attr('data-title') or ''
-
-
-  removeMeFromUserList: ($emojiButton, emoji) ->
-
-    awardBlock    = $emojiButton
-    originalTitle = @getAwardTooltip awardBlock
-
-    authors = originalTitle.split ', '
-    authors.splice authors.indexOf('me'), 1
-
-    newAuthors = authors.join ', '
-
-    awardBlock
-      .closest '.js-emoji-btn'
-      .removeData 'original-title'
-      .attr 'data-original-title', newAuthors
-
-    @resetTooltip awardBlock
-
-
-  addMeToUserList: (votesBlock, emoji) ->
-
-    awardBlock = @findEmojiIcon(votesBlock, emoji).parent()
-    origTitle  = @getAwardTooltip awardBlock
-    users      = []
-
-    if origTitle
-      users = origTitle.trim().split ', '
-
-    users.push 'me'
-    awardBlock.attr 'title', users.join ', '
-
-    @resetTooltip awardBlock
-
-
-  resetTooltip: (award) ->
-
-    award.tooltip 'destroy'
-
-    # 'destroy' call is asynchronous and there is no appropriate callback on it, this is why we need to set timeout.
-    cb = -> award.tooltip()
-    setTimeout cb, 200
-
-
-  createEmoji_: (votesBlock, emoji) ->
-
-    emojiCssClass = @resolveNameToCssClass emoji
-    buttonHtml    = "<button class='btn award-control js-emoji-btn has-tooltip active' title='me' data-placement='bottom'>
-      <div class='icon emoji-icon #{emojiCssClass}' data-emoji='#{emoji}'></div>
-      <span class='award-control-text js-counter'>1</span>
-    </button>"
-
-    $emojiButton = $ buttonHtml
-    $emojiButton
-      .insertBefore votesBlock.find '.js-award-holder'
-      .find '.emoji-icon'
-      .data 'emoji', emoji
-
-    @animateEmoji $emojiButton
-    $('.award-control').tooltip()
-    votesBlock.removeClass 'current'
-
-
-  animateEmoji: ($emoji) ->
-
-    className = 'pulse animated'
-
-    $emoji.addClass className
-    setTimeout (-> $emoji.removeClass className), 321
-
-
-  createEmoji: (votesBlock, emoji) ->
-
-    if $('.emoji-menu').length
-      return @createEmoji_ votesBlock, emoji
-
-    @createEmojiMenu @getAwardMenuUrl(), => @createEmoji_ votesBlock, emoji
-
-
-  getAwardMenuUrl: -> return gon.award_menu_url
-
-
-  resolveNameToCssClass: (emoji) ->
-
-    emojiIcon = $ ".emoji-menu-content [data-emoji='#{emoji}']"
-
-    if emojiIcon.length > 0
-      unicodeName = emojiIcon.data 'unicode-name'
-    else
-      # Find by alias
-      unicodeName = $(".emoji-menu-content [data-aliases*=':#{emoji}:']").data 'unicode-name'
-
-    return "emoji-#{unicodeName}"
-
-
-  postEmoji: (awardUrl, emoji, callback) ->
-
-    $.post awardUrl, { name: emoji }, (data) ->
-      callback() if data.ok
-
-
-  findEmojiIcon: (votesBlock, emoji) ->
-
-    return votesBlock.find ".js-emoji-btn [data-emoji='#{emoji}']"
-
-
-  scrollToAwards: ->
-
-    options = scrollTop: $('.awards').offset().top - 110
-    $('body, html').animate options, 200
-
-
-  normilizeEmojiName: (emoji) -> return @aliases[emoji] or emoji
-
-
-  addEmojiToFrequentlyUsedList: (emoji) ->
-
-    frequentlyUsedEmojis = @getFrequentlyUsedEmojis()
-    frequentlyUsedEmojis.push emoji
-    $.cookie 'frequently_used_emojis', frequentlyUsedEmojis.join(','), { expires: 365 }
-
-
-  getFrequentlyUsedEmojis: ->
-
-    frequentlyUsedEmojis = ($.cookie('frequently_used_emojis') or '').split(',')
-    return _.compact _.uniq frequentlyUsedEmojis
-
-
-  renderFrequentlyUsedBlock: ->
-
-    if $.cookie 'frequently_used_emojis'
-      frequentlyUsedEmojis = @getFrequentlyUsedEmojis()
-
-      ul = $("<ul class='clearfix emoji-menu-list frequent-emojis'>")
-
-      for emoji in frequentlyUsedEmojis
-        $(".emoji-menu-content [data-emoji='#{emoji}']").closest('li').clone().appendTo(ul)
-
-      $('.emoji-menu-content')
-        .prepend(ul)
-        .prepend($('<h5>').text('Frequently used'))
-
-    @frequentEmojiBlockRendered = true
-
-
-  setupSearch: ->
-
-    $('input.emoji-search').on 'keyup', (ev) =>
-      term = $(ev.target).val()
-
-      # Clean previous search results
-      $('ul.emoji-menu-search, h5.emoji-search').remove()
-
-      if term
-        # Generate a search result block
-        h5 = $('<h5>').text('Search results')
-        found_emojis = @searchEmojis(term).show()
-        ul = $('<ul>').addClass('emoji-menu-list emoji-menu-search').append(found_emojis)
-        $('.emoji-menu-content ul, .emoji-menu-content h5').hide()
-        $('.emoji-menu-content').append(h5).append(ul)
-      else
-        $('.emoji-menu-content').children().show()
-
-
-  searchEmojis: (term) ->
-
-    $(".emoji-menu-list:not(.frequent-emojis) [data-emoji*='#{term}']").closest('li').clone()
diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js
new file mode 100644
index 00000000000..ea683b31f75
--- /dev/null
+++ b/app/assets/javascripts/awards_handler.js
@@ -0,0 +1,380 @@
+(function() {
+  this.AwardsHandler = (function() {
+    function AwardsHandler() {
+      this.aliases = gl.emojiAliases();
+      $(document).off('click', '.js-add-award').on('click', '.js-add-award', (function(_this) {
+        return function(e) {
+          e.stopPropagation();
+          e.preventDefault();
+          return _this.showEmojiMenu($(e.currentTarget));
+        };
+      })(this));
+      $('html').on('click', function(e) {
+        var $target;
+        $target = $(e.target);
+        if (!$target.closest('.emoji-menu-content').length) {
+          $('.js-awards-block.current').removeClass('current');
+        }
+        if (!$target.closest('.emoji-menu').length) {
+          if ($('.emoji-menu').is(':visible')) {
+            $('.js-add-award.is-active').removeClass('is-active');
+            return $('.emoji-menu').removeClass('is-visible');
+          }
+        }
+      });
+      $(document).off('click', '.js-emoji-btn').on('click', '.js-emoji-btn', (function(_this) {
+        return function(e) {
+          var $target, emoji;
+          e.preventDefault();
+          $target = $(e.currentTarget);
+          emoji = $target.find('.icon').data('emoji');
+          $target.closest('.js-awards-block').addClass('current');
+          return _this.addAward(_this.getVotesBlock(), _this.getAwardUrl(), emoji);
+        };
+      })(this));
+    }
+
+    AwardsHandler.prototype.showEmojiMenu = function($addBtn) {
+      var $holder, $menu, url;
+      $menu = $('.emoji-menu');
+      if ($addBtn.hasClass('js-note-emoji')) {
+        $addBtn.closest('.note').find('.js-awards-block').addClass('current');
+      } else {
+        $addBtn.closest('.js-awards-block').addClass('current');
+      }
+      if ($menu.length) {
+        $holder = $addBtn.closest('.js-award-holder');
+        if ($menu.is('.is-visible')) {
+          $addBtn.removeClass('is-active');
+          $menu.removeClass('is-visible');
+          return $('#emoji_search').blur();
+        } else {
+          $addBtn.addClass('is-active');
+          this.positionMenu($menu, $addBtn);
+          $menu.addClass('is-visible');
+          return $('#emoji_search').focus();
+        }
+      } else {
+        $addBtn.addClass('is-loading is-active');
+        url = this.getAwardMenuUrl();
+        return this.createEmojiMenu(url, (function(_this) {
+          return function() {
+            $addBtn.removeClass('is-loading');
+            $menu = $('.emoji-menu');
+            _this.positionMenu($menu, $addBtn);
+            if (!_this.frequentEmojiBlockRendered) {
+              _this.renderFrequentlyUsedBlock();
+            }
+            return setTimeout(function() {
+              $menu.addClass('is-visible');
+              $('#emoji_search').focus();
+              return _this.setupSearch();
+            }, 200);
+          };
+        })(this));
+      }
+    };
+
+    AwardsHandler.prototype.createEmojiMenu = function(awardMenuUrl, callback) {
+      return $.get(awardMenuUrl, function(response) {
+        $('body').append(response);
+        return callback();
+      });
+    };
+
+    AwardsHandler.prototype.positionMenu = function($menu, $addBtn) {
+      var css, position;
+      position = $addBtn.data('position');
+      css = {
+        top: ($addBtn.offset().top + $addBtn.outerHeight()) + "px"
+      };
+      if ((position != null) && position === 'right') {
+        css.left = (($addBtn.offset().left - $menu.outerWidth()) + 20) + "px";
+        $menu.addClass('is-aligned-right');
+      } else {
+        css.left = ($addBtn.offset().left) + "px";
+        $menu.removeClass('is-aligned-right');
+      }
+      return $menu.css(css);
+    };
+
+    AwardsHandler.prototype.addAward = function(votesBlock, awardUrl, emoji, checkMutuality, callback) {
+      if (checkMutuality == null) {
+        checkMutuality = true;
+      }
+      emoji = this.normilizeEmojiName(emoji);
+      this.postEmoji(awardUrl, emoji, (function(_this) {
+        return function() {
+          _this.addAwardToEmojiBar(votesBlock, emoji, checkMutuality);
+          return typeof callback === "function" ? callback() : void 0;
+        };
+      })(this));
+      return $('.emoji-menu').removeClass('is-visible');
+    };
+
+    AwardsHandler.prototype.addAwardToEmojiBar = function(votesBlock, emoji, checkForMutuality) {
+      var $emojiButton, counter;
+      if (checkForMutuality == null) {
+        checkForMutuality = true;
+      }
+      if (checkForMutuality) {
+        this.checkMutuality(votesBlock, emoji);
+      }
+      this.addEmojiToFrequentlyUsedList(emoji);
+      emoji = this.normilizeEmojiName(emoji);
+      $emojiButton = this.findEmojiIcon(votesBlock, emoji).parent();
+      if ($emojiButton.length > 0) {
+        if (this.isActive($emojiButton)) {
+          return this.decrementCounter($emojiButton, emoji);
+        } else {
+          counter = $emojiButton.find('.js-counter');
+          counter.text(parseInt(counter.text()) + 1);
+          $emojiButton.addClass('active');
+          this.addMeToUserList(votesBlock, emoji);
+          return this.animateEmoji($emojiButton);
+        }
+      } else {
+        votesBlock.removeClass('hidden');
+        return this.createEmoji(votesBlock, emoji);
+      }
+    };
+
+    AwardsHandler.prototype.getVotesBlock = function() {
+      var currentBlock;
+      currentBlock = $('.js-awards-block.current');
+      if (currentBlock.length) {
+        return currentBlock;
+      } else {
+        return $('.js-awards-block').eq(0);
+      }
+    };
+
+    AwardsHandler.prototype.getAwardUrl = function() {
+      return this.getVotesBlock().data('award-url');
+    };
+
+    AwardsHandler.prototype.checkMutuality = function(votesBlock, emoji) {
+      var $emojiButton, awardUrl, isAlreadyVoted, mutualVote;
+      awardUrl = this.getAwardUrl();
+      if (emoji === 'thumbsup' || emoji === 'thumbsdown') {
+        mutualVote = emoji === 'thumbsup' ? 'thumbsdown' : 'thumbsup';
+        $emojiButton = votesBlock.find("[data-emoji=" + mutualVote + "]").parent();
+        isAlreadyVoted = $emojiButton.hasClass('active');
+        if (isAlreadyVoted) {
+          this.showEmojiLoader($emojiButton);
+          return this.addAward(votesBlock, awardUrl, mutualVote, false, function() {
+            return $emojiButton.removeClass('is-loading');
+          });
+        }
+      }
+    };
+
+    AwardsHandler.prototype.showEmojiLoader = function($emojiButton) {
+      var $loader;
+      $loader = $emojiButton.find('.fa-spinner');
+      if (!$loader.length) {
+        $emojiButton.append('<i class="fa fa-spinner fa-spin award-control-icon award-control-icon-loading"></i>');
+      }
+      return $emojiButton.addClass('is-loading');
+    };
+
+    AwardsHandler.prototype.isActive = function($emojiButton) {
+      return $emojiButton.hasClass('active');
+    };
+
+    AwardsHandler.prototype.decrementCounter = function($emojiButton, emoji) {
+      var counter, counterNumber;
+      counter = $('.js-counter', $emojiButton);
+      counterNumber = parseInt(counter.text(), 10);
+      if (counterNumber > 1) {
+        counter.text(counterNumber - 1);
+        this.removeMeFromUserList($emojiButton, emoji);
+      } else if (emoji === 'thumbsup' || emoji === 'thumbsdown') {
+        $emojiButton.tooltip('destroy');
+        counter.text('0');
+        this.removeMeFromUserList($emojiButton, emoji);
+        if ($emojiButton.parents('.note').length) {
+          this.removeEmoji($emojiButton);
+        }
+      } else {
+        this.removeEmoji($emojiButton);
+      }
+      return $emojiButton.removeClass('active');
+    };
+
+    AwardsHandler.prototype.removeEmoji = function($emojiButton) {
+      var $votesBlock;
+      $emojiButton.tooltip('destroy');
+      $emojiButton.remove();
+      $votesBlock = this.getVotesBlock();
+      if ($votesBlock.find('.js-emoji-btn').length === 0) {
+        return $votesBlock.addClass('hidden');
+      }
+    };
+
+    AwardsHandler.prototype.getAwardTooltip = function($awardBlock) {
+      return $awardBlock.attr('data-original-title') || $awardBlock.attr('data-title') || '';
+    };
+
+    AwardsHandler.prototype.removeMeFromUserList = function($emojiButton, emoji) {
+      var authors, awardBlock, newAuthors, originalTitle;
+      awardBlock = $emojiButton;
+      originalTitle = this.getAwardTooltip(awardBlock);
+      authors = originalTitle.split(', ');
+      authors.splice(authors.indexOf('me'), 1);
+      newAuthors = authors.join(', ');
+      awardBlock.closest('.js-emoji-btn').removeData('original-title').attr('data-original-title', newAuthors);
+      return this.resetTooltip(awardBlock);
+    };
+
+    AwardsHandler.prototype.addMeToUserList = function(votesBlock, emoji) {
+      var awardBlock, origTitle, users;
+      awardBlock = this.findEmojiIcon(votesBlock, emoji).parent();
+      origTitle = this.getAwardTooltip(awardBlock);
+      users = [];
+      if (origTitle) {
+        users = origTitle.trim().split(', ');
+      }
+      users.push('me');
+      awardBlock.attr('title', users.join(', '));
+      return this.resetTooltip(awardBlock);
+    };
+
+    AwardsHandler.prototype.resetTooltip = function(award) {
+      var cb;
+      award.tooltip('destroy');
+      cb = function() {
+        return award.tooltip();
+      };
+      return setTimeout(cb, 200);
+    };
+
+    AwardsHandler.prototype.createEmoji_ = function(votesBlock, emoji) {
+      var $emojiButton, buttonHtml, emojiCssClass;
+      emojiCssClass = this.resolveNameToCssClass(emoji);
+      buttonHtml = "<button class='btn award-control js-emoji-btn has-tooltip active' title='me' data-placement='bottom'> <div class='icon emoji-icon " + emojiCssClass + "' data-emoji='" + emoji + "'></div> <span class='award-control-text js-counter'>1</span> </button>";
+      $emojiButton = $(buttonHtml);
+      $emojiButton.insertBefore(votesBlock.find('.js-award-holder')).find('.emoji-icon').data('emoji', emoji);
+      this.animateEmoji($emojiButton);
+      $('.award-control').tooltip();
+      return votesBlock.removeClass('current');
+    };
+
+    AwardsHandler.prototype.animateEmoji = function($emoji) {
+      var className;
+      className = 'pulse animated';
+      $emoji.addClass(className);
+      return setTimeout((function() {
+        return $emoji.removeClass(className);
+      }), 321);
+    };
+
+    AwardsHandler.prototype.createEmoji = function(votesBlock, emoji) {
+      if ($('.emoji-menu').length) {
+        return this.createEmoji_(votesBlock, emoji);
+      }
+      return this.createEmojiMenu(this.getAwardMenuUrl(), (function(_this) {
+        return function() {
+          return _this.createEmoji_(votesBlock, emoji);
+        };
+      })(this));
+    };
+
+    AwardsHandler.prototype.getAwardMenuUrl = function() {
+      return gon.award_menu_url;
+    };
+
+    AwardsHandler.prototype.resolveNameToCssClass = function(emoji) {
+      var emojiIcon, unicodeName;
+      emojiIcon = $(".emoji-menu-content [data-emoji='" + emoji + "']");
+      if (emojiIcon.length > 0) {
+        unicodeName = emojiIcon.data('unicode-name');
+      } else {
+        unicodeName = $(".emoji-menu-content [data-aliases*=':" + emoji + ":']").data('unicode-name');
+      }
+      return "emoji-" + unicodeName;
+    };
+
+    AwardsHandler.prototype.postEmoji = function(awardUrl, emoji, callback) {
+      return $.post(awardUrl, {
+        name: emoji
+      }, function(data) {
+        if (data.ok) {
+          return callback();
+        }
+      });
+    };
+
+    AwardsHandler.prototype.findEmojiIcon = function(votesBlock, emoji) {
+      return votesBlock.find(".js-emoji-btn [data-emoji='" + emoji + "']");
+    };
+
+    AwardsHandler.prototype.scrollToAwards = function() {
+      var options;
+      options = {
+        scrollTop: $('.awards').offset().top - 110
+      };
+      return $('body, html').animate(options, 200);
+    };
+
+    AwardsHandler.prototype.normilizeEmojiName = function(emoji) {
+      return this.aliases[emoji] || emoji;
+    };
+
+    AwardsHandler.prototype.addEmojiToFrequentlyUsedList = function(emoji) {
+      var frequentlyUsedEmojis;
+      frequentlyUsedEmojis = this.getFrequentlyUsedEmojis();
+      frequentlyUsedEmojis.push(emoji);
+      return $.cookie('frequently_used_emojis', frequentlyUsedEmojis.join(','), {
+        expires: 365
+      });
+    };
+
+    AwardsHandler.prototype.getFrequentlyUsedEmojis = function() {
+      var frequentlyUsedEmojis;
+      frequentlyUsedEmojis = ($.cookie('frequently_used_emojis') || '').split(',');
+      return _.compact(_.uniq(frequentlyUsedEmojis));
+    };
+
+    AwardsHandler.prototype.renderFrequentlyUsedBlock = function() {
+      var emoji, frequentlyUsedEmojis, i, len, ul;
+      if ($.cookie('frequently_used_emojis')) {
+        frequentlyUsedEmojis = this.getFrequentlyUsedEmojis();
+        ul = $("<ul class='clearfix emoji-menu-list frequent-emojis'>");
+        for (i = 0, len = frequentlyUsedEmojis.length; i < len; i++) {
+          emoji = frequentlyUsedEmojis[i];
+          $(".emoji-menu-content [data-emoji='" + emoji + "']").closest('li').clone().appendTo(ul);
+        }
+        $('.emoji-menu-content').prepend(ul).prepend($('<h5>').text('Frequently used'));
+      }
+      return this.frequentEmojiBlockRendered = true;
+    };
+
+    AwardsHandler.prototype.setupSearch = function() {
+      return $('input.emoji-search').on('keyup', (function(_this) {
+        return function(ev) {
+          var found_emojis, h5, term, ul;
+          term = $(ev.target).val();
+          $('ul.emoji-menu-search, h5.emoji-search').remove();
+          if (term) {
+            h5 = $('<h5>').text('Search results');
+            found_emojis = _this.searchEmojis(term).show();
+            ul = $('<ul>').addClass('emoji-menu-list emoji-menu-search').append(found_emojis);
+            $('.emoji-menu-content ul, .emoji-menu-content h5').hide();
+            return $('.emoji-menu-content').append(h5).append(ul);
+          } else {
+            return $('.emoji-menu-content').children().show();
+          }
+        };
+      })(this));
+    };
+
+    AwardsHandler.prototype.searchEmojis = function(term) {
+      return $(".emoji-menu-list:not(.frequent-emojis) [data-emoji*='" + term + "']").closest('li').clone();
+    };
+
+    return AwardsHandler;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/behaviors/autosize.js b/app/assets/javascripts/behaviors/autosize.js
new file mode 100644
index 00000000000..f977a1e8a7b
--- /dev/null
+++ b/app/assets/javascripts/behaviors/autosize.js
@@ -0,0 +1,30 @@
+
+/*= require jquery.ba-resize */
+
+
+/*= require autosize */
+
+(function() {
+  $(function() {
+    var $fields;
+    $fields = $('.js-autosize');
+    $fields.on('autosize:resized', function() {
+      var $field;
+      $field = $(this);
+      return $field.data('height', $field.outerHeight());
+    });
+    $fields.on('resize.autosize', function() {
+      var $field;
+      $field = $(this);
+      if ($field.data('height') !== $field.outerHeight()) {
+        $field.data('height', $field.outerHeight());
+        autosize.destroy($field);
+        return $field.css('max-height', window.outerHeight);
+      }
+    });
+    autosize($fields);
+    autosize.update($fields);
+    return $fields.css('resize', 'vertical');
+  });
+
+}).call(this);
diff --git a/app/assets/javascripts/behaviors/autosize.js.coffee b/app/assets/javascripts/behaviors/autosize.js.coffee
deleted file mode 100644
index a072fe48a98..00000000000
--- a/app/assets/javascripts/behaviors/autosize.js.coffee
+++ /dev/null
@@ -1,22 +0,0 @@
-#= require jquery.ba-resize
-#= require autosize
-
-$ ->
-  $fields = $('.js-autosize')
-
-  $fields.on 'autosize:resized', ->
-    $field = $(@)
-    $field.data('height', $field.outerHeight())
-
-  $fields.on 'resize.autosize', ->
-    $field = $(@)
-
-    if $field.data('height') != $field.outerHeight()
-      $field.data('height', $field.outerHeight())
-      autosize.destroy($field)
-      $field.css('max-height', window.outerHeight)
-
-  autosize($fields)
-  autosize.update($fields)
-
-  $fields.css('resize', 'vertical')
diff --git a/app/assets/javascripts/behaviors/details_behavior.coffee b/app/assets/javascripts/behaviors/details_behavior.coffee
deleted file mode 100644
index decab3e1bed..00000000000
--- a/app/assets/javascripts/behaviors/details_behavior.coffee
+++ /dev/null
@@ -1,15 +0,0 @@
-$ ->
-  $("body").on "click", ".js-details-target", ->
-    container = $(@).closest(".js-details-container")
-    container.toggleClass("open")
-
-  # Show details content. Hides link after click.
-  #
-  # %div
-  #   %a.js-details-expand
-  #   %div.js-details-content
-  #
-  $("body").on "click", ".js-details-expand", (e) ->
-    $(@).next('.js-details-content').removeClass("hide")
-    $(@).hide()
-    e.preventDefault()
diff --git a/app/assets/javascripts/behaviors/details_behavior.js b/app/assets/javascripts/behaviors/details_behavior.js
new file mode 100644
index 00000000000..3631d1b74ac
--- /dev/null
+++ b/app/assets/javascripts/behaviors/details_behavior.js
@@ -0,0 +1,15 @@
+(function() {
+  $(function() {
+    $("body").on("click", ".js-details-target", function() {
+      var container;
+      container = $(this).closest(".js-details-container");
+      return container.toggleClass("open");
+    });
+    return $("body").on("click", ".js-details-expand", function(e) {
+      $(this).next('.js-details-content').removeClass("hide");
+      $(this).hide();
+      return e.preventDefault();
+    });
+  });
+
+}).call(this);
diff --git a/app/assets/javascripts/behaviors/quick_submit.js b/app/assets/javascripts/behaviors/quick_submit.js
new file mode 100644
index 00000000000..3527d0a95fc
--- /dev/null
+++ b/app/assets/javascripts/behaviors/quick_submit.js
@@ -0,0 +1,58 @@
+
+/*= require extensions/jquery */
+
+(function() {
+  var isMac, keyCodeIs;
+
+  isMac = function() {
+    return navigator.userAgent.match(/Macintosh/);
+  };
+
+  keyCodeIs = function(e, keyCode) {
+    if ((e.originalEvent && e.originalEvent.repeat) || e.repeat) {
+      return false;
+    }
+    return e.keyCode === keyCode;
+  };
+
+  $(document).on('keydown.quick_submit', '.js-quick-submit', function(e) {
+    var $form, $submit_button;
+    if (!keyCodeIs(e, 13)) {
+      return;
+    }
+    if (!((e.metaKey && !e.altKey && !e.ctrlKey && !e.shiftKey) || (e.ctrlKey && !e.altKey && !e.metaKey && !e.shiftKey))) {
+      return;
+    }
+    e.preventDefault();
+    $form = $(e.target).closest('form');
+    $submit_button = $form.find('input[type=submit], button[type=submit]');
+    if ($submit_button.attr('disabled')) {
+      return;
+    }
+    $submit_button.disable();
+    return $form.submit();
+  });
+
+  $(document).on('keyup.quick_submit', '.js-quick-submit input[type=submit], .js-quick-submit button[type=submit]', function(e) {
+    var $this, title;
+    if (!keyCodeIs(e, 9)) {
+      return;
+    }
+    if (isMac()) {
+      title = "You can also press &#8984;-Enter";
+    } else {
+      title = "You can also press Ctrl-Enter";
+    }
+    $this = $(this);
+    return $this.tooltip({
+      container: 'body',
+      html: 'true',
+      placement: 'auto top',
+      title: title,
+      trigger: 'manual'
+    }).tooltip('show').one('blur', function() {
+      return $this.tooltip('hide');
+    });
+  });
+
+}).call(this);
diff --git a/app/assets/javascripts/behaviors/quick_submit.js.coffee b/app/assets/javascripts/behaviors/quick_submit.js.coffee
deleted file mode 100644
index 3cb96bacaa7..00000000000
--- a/app/assets/javascripts/behaviors/quick_submit.js.coffee
+++ /dev/null
@@ -1,56 +0,0 @@
-# Quick Submit behavior
-#
-# When a child field of a form with a `js-quick-submit` class receives a
-# "Meta+Enter" (Mac) or "Ctrl+Enter" (Linux/Windows) key combination, the form
-# is submitted.
-#
-#= require extensions/jquery
-#
-# ### Example Markup
-#
-#   <form action="/foo" class="js-quick-submit">
-#     <input type="text" />
-#     <textarea></textarea>
-#     <input type="submit" value="Submit" />
-#   </form>
-#
-isMac = ->
-  navigator.userAgent.match(/Macintosh/)
-
-keyCodeIs = (e, keyCode) ->
-  return false if (e.originalEvent && e.originalEvent.repeat) || e.repeat
-  return e.keyCode == keyCode
-
-$(document).on 'keydown.quick_submit', '.js-quick-submit', (e) ->
-  return unless keyCodeIs(e, 13) # Enter
-
-  return unless (e.metaKey && !e.altKey && !e.ctrlKey && !e.shiftKey) || (e.ctrlKey && !e.altKey && !e.metaKey && !e.shiftKey)
-
-  e.preventDefault()
-
-  $form = $(e.target).closest('form')
-  $submit_button = $form.find('input[type=submit], button[type=submit]')
-
-  return if $submit_button.attr('disabled')
-
-  $submit_button.disable()
-  $form.submit()
-
-# If the user tabs to a submit button on a `js-quick-submit` form, display a
-# tooltip to let them know they could've used the hotkey
-$(document).on 'keyup.quick_submit', '.js-quick-submit input[type=submit], .js-quick-submit button[type=submit]', (e) ->
-  return unless keyCodeIs(e, 9) # Tab
-
-  if isMac()
-    title = "You can also press &#8984;-Enter"
-  else
-    title = "You can also press Ctrl-Enter"
-
-  $this = $(@)
-  $this.tooltip(
-    container: 'body'
-    html: 'true'
-    placement: 'auto top'
-    title: title
-    trigger: 'manual'
-  ).tooltip('show').one('blur', -> $this.tooltip('hide'))
diff --git a/app/assets/javascripts/behaviors/requires_input.js b/app/assets/javascripts/behaviors/requires_input.js
new file mode 100644
index 00000000000..db0b36b24e9
--- /dev/null
+++ b/app/assets/javascripts/behaviors/requires_input.js
@@ -0,0 +1,45 @@
+
+/*= require extensions/jquery */
+
+(function() {
+  $.fn.requiresInput = function() {
+    var $button, $form, fieldSelector, requireInput, required;
+    $form = $(this);
+    $button = $('button[type=submit], input[type=submit]', $form);
+    required = '[required=required]';
+    fieldSelector = "input" + required + ", select" + required + ", textarea" + required;
+    requireInput = function() {
+      var values;
+      values = _.map($(fieldSelector, $form), function(field) {
+        return field.value;
+      });
+      if (values.length && _.any(values, _.isEmpty)) {
+        return $button.disable();
+      } else {
+        return $button.enable();
+      }
+    };
+    requireInput();
+    return $form.on('change input', fieldSelector, requireInput);
+  };
+
+  $(function() {
+    var $form, hideOrShowHelpBlock;
+    $form = $('form.js-requires-input');
+    $form.requiresInput();
+    hideOrShowHelpBlock = function(form) {
+      var selected;
+      selected = $('.js-select-namespace option:selected');
+      if (selected.length && selected.data('options-parent') === 'groups') {
+        return form.find('.help-block').hide();
+      } else if (selected.length) {
+        return form.find('.help-block').show();
+      }
+    };
+    hideOrShowHelpBlock($form);
+    return $('.select2.js-select-namespace').change(function() {
+      return hideOrShowHelpBlock($form);
+    });
+  });
+
+}).call(this);
diff --git a/app/assets/javascripts/behaviors/requires_input.js.coffee b/app/assets/javascripts/behaviors/requires_input.js.coffee
deleted file mode 100644
index 0faa570ce13..00000000000
--- a/app/assets/javascripts/behaviors/requires_input.js.coffee
+++ /dev/null
@@ -1,52 +0,0 @@
-# Requires Input behavior
-#
-# When called on a form with input fields with the `required` attribute, the
-# form's submit button will be disabled until all required fields have values.
-#
-#= require extensions/jquery
-#
-# ### Example Markup
-#
-#   <form class="js-requires-input">
-#     <input type="text" required="required">
-#     <input type="submit" value="Submit">
-#   </form>
-#
-$.fn.requiresInput = ->
-  $form   = $(this)
-  $button = $('button[type=submit], input[type=submit]', $form)
-
-  required      = '[required=required]'
-  fieldSelector = "input#{required}, select#{required}, textarea#{required}"
-
-  requireInput = ->
-    # Collect the input values of *all* required fields
-    values = _.map $(fieldSelector, $form), (field) -> field.value
-
-    # Disable the button if any required fields are empty
-    if values.length && _.any(values, _.isEmpty)
-      $button.disable()
-    else
-      $button.enable()
-
-  # Set initial button state
-  requireInput()
-
-  $form.on 'change input', fieldSelector, requireInput
-
-$ ->
-  $form = $('form.js-requires-input')
-  $form.requiresInput()
-
-  # Hide or Show the help block when creating a new project
-  # based on the option selected
-  hideOrShowHelpBlock = (form) ->
-    selected = $('.js-select-namespace option:selected')
-    if selected.length and selected.data('options-parent') is 'groups'
-      return form.find('.help-block').hide()
-    else if selected.length
-      form.find('.help-block').show()
-
-  hideOrShowHelpBlock($form)
-
-  $('.select2.js-select-namespace').change -> hideOrShowHelpBlock($form)
diff --git a/app/assets/javascripts/behaviors/toggler_behavior.coffee b/app/assets/javascripts/behaviors/toggler_behavior.coffee
deleted file mode 100644
index 177b6918270..00000000000
--- a/app/assets/javascripts/behaviors/toggler_behavior.coffee
+++ /dev/null
@@ -1,14 +0,0 @@
-$ ->
-  # Toggle button. Show/hide content inside parent container.
-  # Button does not change visibility. If button has icon - it changes chevron style.
-  #
-  # %div.js-toggle-container
-  #   %a.js-toggle-button
-  #   %div.js-toggle-content
-  #
-  $("body").on "click", ".js-toggle-button", (e) ->
-    $(@).find('i').
-      toggleClass('fa fa-chevron-down').
-      toggleClass('fa fa-chevron-up')
-    $(@).closest(".js-toggle-container").find(".js-toggle-content").toggle()
-    e.preventDefault()
diff --git a/app/assets/javascripts/behaviors/toggler_behavior.js b/app/assets/javascripts/behaviors/toggler_behavior.js
new file mode 100644
index 00000000000..1b7b63489ea
--- /dev/null
+++ b/app/assets/javascripts/behaviors/toggler_behavior.js
@@ -0,0 +1,10 @@
+(function() {
+  $(function() {
+    return $("body").on("click", ".js-toggle-button", function(e) {
+      $(this).find('i').toggleClass('fa fa-chevron-down').toggleClass('fa fa-chevron-up');
+      $(this).closest(".js-toggle-container").find(".js-toggle-content").toggle();
+      return e.preventDefault();
+    });
+  });
+
+}).call(this);
diff --git a/app/assets/javascripts/blob/blob_ci_yaml.js b/app/assets/javascripts/blob/blob_ci_yaml.js
new file mode 100644
index 00000000000..68758574967
--- /dev/null
+++ b/app/assets/javascripts/blob/blob_ci_yaml.js
@@ -0,0 +1,46 @@
+
+/*= require blob/template_selector */
+
+(function() {
+  var extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  this.BlobCiYamlSelector = (function(superClass) {
+    extend(BlobCiYamlSelector, superClass);
+
+    function BlobCiYamlSelector() {
+      return BlobCiYamlSelector.__super__.constructor.apply(this, arguments);
+    }
+
+    BlobCiYamlSelector.prototype.requestFile = function(query) {
+      return Api.gitlabCiYml(query.name, this.requestFileSuccess.bind(this));
+    };
+
+    return BlobCiYamlSelector;
+
+  })(TemplateSelector);
+
+  this.BlobCiYamlSelectors = (function() {
+    function BlobCiYamlSelectors(opts) {
+      var ref;
+      this.$dropdowns = (ref = opts.$dropdowns) != null ? ref : $('.js-gitlab-ci-yml-selector'), this.editor = opts.editor;
+      this.$dropdowns.each((function(_this) {
+        return function(i, dropdown) {
+          var $dropdown;
+          $dropdown = $(dropdown);
+          return new BlobCiYamlSelector({
+            pattern: /(.gitlab-ci.yml)/,
+            data: $dropdown.data('data'),
+            wrapper: $dropdown.closest('.js-gitlab-ci-yml-selector-wrap'),
+            dropdown: $dropdown,
+            editor: _this.editor
+          });
+        };
+      })(this));
+    }
+
+    return BlobCiYamlSelectors;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/blob/blob_ci_yaml.js.coffee b/app/assets/javascripts/blob/blob_ci_yaml.js.coffee
deleted file mode 100644
index d9a03d05529..00000000000
--- a/app/assets/javascripts/blob/blob_ci_yaml.js.coffee
+++ /dev/null
@@ -1,23 +0,0 @@
-#= require blob/template_selector
-
-class @BlobCiYamlSelector extends TemplateSelector
-  requestFile: (query) ->
-    Api.gitlabCiYml query.name, @requestFileSuccess.bind(@)
-
-class @BlobCiYamlSelectors
-  constructor: (opts) ->
-    {
-      @$dropdowns = $('.js-gitlab-ci-yml-selector')
-      @editor
-    } = opts
-
-    @$dropdowns.each (i, dropdown) =>
-      $dropdown = $(dropdown)
-
-      new BlobCiYamlSelector(
-        pattern: /(.gitlab-ci.yml)/,
-        data: $dropdown.data('data'),
-        wrapper: $dropdown.closest('.js-gitlab-ci-yml-selector-wrap'),
-        dropdown: $dropdown,
-        editor: @editor
-      )
diff --git a/app/assets/javascripts/blob/blob_file_dropzone.js b/app/assets/javascripts/blob/blob_file_dropzone.js
new file mode 100644
index 00000000000..f4044f22db2
--- /dev/null
+++ b/app/assets/javascripts/blob/blob_file_dropzone.js
@@ -0,0 +1,62 @@
+(function() {
+  this.BlobFileDropzone = (function() {
+    function BlobFileDropzone(form, method) {
+      var dropzone, form_dropzone, submitButton;
+      form_dropzone = form.find('.dropzone');
+      Dropzone.autoDiscover = false;
+      dropzone = form_dropzone.dropzone({
+        autoDiscover: false,
+        autoProcessQueue: false,
+        url: form.attr('action'),
+        method: method,
+        clickable: true,
+        uploadMultiple: false,
+        paramName: "file",
+        maxFilesize: gon.max_file_size || 10,
+        parallelUploads: 1,
+        maxFiles: 1,
+        addRemoveLinks: true,
+        previewsContainer: '.dropzone-previews',
+        headers: {
+          "X-CSRF-Token": $("meta[name=\"csrf-token\"]").attr("content")
+        },
+        init: function() {
+          this.on('addedfile', function(file) {
+            $('.dropzone-alerts').html('').hide();
+          });
+          this.on('success', function(header, response) {
+            window.location.href = response.filePath;
+          });
+          this.on('maxfilesexceeded', function(file) {
+            this.removeFile(file);
+          });
+          return this.on('sending', function(file, xhr, formData) {
+            formData.append('target_branch', form.find('.js-target-branch').val());
+            formData.append('create_merge_request', form.find('.js-create-merge-request').val());
+            formData.append('commit_message', form.find('.js-commit-message').val());
+          });
+        },
+        error: function(file, errorMessage) {
+          var stripped;
+          stripped = $("<div/>").html(errorMessage).text();
+          $('.dropzone-alerts').html('Error uploading file: \"' + stripped + '\"').show();
+          this.removeFile(file);
+        }
+      });
+      submitButton = form.find('#submit-all')[0];
+      submitButton.addEventListener('click', function(e) {
+        e.preventDefault();
+        e.stopPropagation();
+        if (dropzone[0].dropzone.getQueuedFiles().length === 0) {
+          alert("Please select a file");
+        }
+        dropzone[0].dropzone.processQueue();
+        return false;
+      });
+    }
+
+    return BlobFileDropzone;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/blob/blob_file_dropzone.js.coffee b/app/assets/javascripts/blob/blob_file_dropzone.js.coffee
deleted file mode 100644
index 9df932817f6..00000000000
--- a/app/assets/javascripts/blob/blob_file_dropzone.js.coffee
+++ /dev/null
@@ -1,57 +0,0 @@
-class @BlobFileDropzone
-  constructor: (form, method) ->
-    form_dropzone = form.find('.dropzone')
-    Dropzone.autoDiscover = false
-    dropzone = form_dropzone.dropzone(
-      autoDiscover: false
-      autoProcessQueue: false
-      url: form.attr('action')
-      # Rails uses a hidden input field for PUT
-      # http://stackoverflow.com/questions/21056482/how-to-set-method-put-in-form-tag-in-rails
-      method: method
-      clickable: true
-      uploadMultiple: false
-      paramName: "file"
-      maxFilesize: gon.max_file_size or 10
-      parallelUploads: 1
-      maxFiles: 1
-      addRemoveLinks: true
-      previewsContainer: '.dropzone-previews'
-      headers:
-        "X-CSRF-Token": $("meta[name=\"csrf-token\"]").attr("content")
-
-      init: ->
-        this.on 'addedfile', (file) ->
-          $('.dropzone-alerts').html('').hide()
-
-          return
-
-        this.on 'success', (header, response) ->
-          window.location.href = response.filePath
-          return
-
-        this.on 'maxfilesexceeded', (file) ->
-          @removeFile file
-          return
-
-        this.on 'sending', (file, xhr, formData) ->
-          formData.append('target_branch', form.find('.js-target-branch').val())
-          formData.append('create_merge_request', form.find('.js-create-merge-request').val())
-          formData.append('commit_message', form.find('.js-commit-message').val())
-          return
-
-      # Override behavior of adding error underneath preview
-      error: (file, errorMessage) ->
-        stripped = $("<div/>").html(errorMessage).text();
-        $('.dropzone-alerts').html('Error uploading file: \"' + stripped + '\"').show()
-        @removeFile file
-        return
-    )
-
-    submitButton = form.find('#submit-all')[0]
-    submitButton.addEventListener 'click', (e) ->
-      e.preventDefault()
-      e.stopPropagation()
-      alert "Please select a file" if dropzone[0].dropzone.getQueuedFiles().length == 0
-      dropzone[0].dropzone.processQueue()
-      return false
diff --git a/app/assets/javascripts/blob/blob_gitignore_selector.js b/app/assets/javascripts/blob/blob_gitignore_selector.js
new file mode 100644
index 00000000000..54a09e919f8
--- /dev/null
+++ b/app/assets/javascripts/blob/blob_gitignore_selector.js
@@ -0,0 +1,23 @@
+
+/*= require blob/template_selector */
+
+(function() {
+  var extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  this.BlobGitignoreSelector = (function(superClass) {
+    extend(BlobGitignoreSelector, superClass);
+
+    function BlobGitignoreSelector() {
+      return BlobGitignoreSelector.__super__.constructor.apply(this, arguments);
+    }
+
+    BlobGitignoreSelector.prototype.requestFile = function(query) {
+      return Api.gitignoreText(query.name, this.requestFileSuccess.bind(this));
+    };
+
+    return BlobGitignoreSelector;
+
+  })(TemplateSelector);
+
+}).call(this);
diff --git a/app/assets/javascripts/blob/blob_gitignore_selector.js.coffee b/app/assets/javascripts/blob/blob_gitignore_selector.js.coffee
deleted file mode 100644
index 8d0e3f363d1..00000000000
--- a/app/assets/javascripts/blob/blob_gitignore_selector.js.coffee
+++ /dev/null
@@ -1,5 +0,0 @@
-#= require blob/template_selector
-
-class @BlobGitignoreSelector extends TemplateSelector
-  requestFile: (query) ->
-    Api.gitignoreText query.name, @requestFileSuccess.bind(@)
diff --git a/app/assets/javascripts/blob/blob_gitignore_selectors.js b/app/assets/javascripts/blob/blob_gitignore_selectors.js
new file mode 100644
index 00000000000..4e9500428b2
--- /dev/null
+++ b/app/assets/javascripts/blob/blob_gitignore_selectors.js
@@ -0,0 +1,25 @@
+(function() {
+  this.BlobGitignoreSelectors = (function() {
+    function BlobGitignoreSelectors(opts) {
+      var ref;
+      this.$dropdowns = (ref = opts.$dropdowns) != null ? ref : $('.js-gitignore-selector'), this.editor = opts.editor;
+      this.$dropdowns.each((function(_this) {
+        return function(i, dropdown) {
+          var $dropdown;
+          $dropdown = $(dropdown);
+          return new BlobGitignoreSelector({
+            pattern: /(.gitignore)/,
+            data: $dropdown.data('data'),
+            wrapper: $dropdown.closest('.js-gitignore-selector-wrap'),
+            dropdown: $dropdown,
+            editor: _this.editor
+          });
+        };
+      })(this));
+    }
+
+    return BlobGitignoreSelectors;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/blob/blob_gitignore_selectors.js.coffee b/app/assets/javascripts/blob/blob_gitignore_selectors.js.coffee
deleted file mode 100644
index a719ba25122..00000000000
--- a/app/assets/javascripts/blob/blob_gitignore_selectors.js.coffee
+++ /dev/null
@@ -1,17 +0,0 @@
-class @BlobGitignoreSelectors
-  constructor: (opts) ->
-    {
-      @$dropdowns = $('.js-gitignore-selector')
-      @editor
-    } = opts
-
-    @$dropdowns.each (i, dropdown) =>
-      $dropdown = $(dropdown)
-
-      new BlobGitignoreSelector(
-        pattern: /(.gitignore)/,
-        data: $dropdown.data('data'),
-        wrapper: $dropdown.closest('.js-gitignore-selector-wrap'),
-        dropdown: $dropdown,
-        editor: @editor
-      )
diff --git a/app/assets/javascripts/blob/blob_license_selector.js b/app/assets/javascripts/blob/blob_license_selector.js
new file mode 100644
index 00000000000..9a8ef08f4e5
--- /dev/null
+++ b/app/assets/javascripts/blob/blob_license_selector.js
@@ -0,0 +1,28 @@
+
+/*= require blob/template_selector */
+
+(function() {
+  var extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  this.BlobLicenseSelector = (function(superClass) {
+    extend(BlobLicenseSelector, superClass);
+
+    function BlobLicenseSelector() {
+      return BlobLicenseSelector.__super__.constructor.apply(this, arguments);
+    }
+
+    BlobLicenseSelector.prototype.requestFile = function(query) {
+      var data;
+      data = {
+        project: this.dropdown.data('project'),
+        fullname: this.dropdown.data('fullname')
+      };
+      return Api.licenseText(query.id, data, this.requestFileSuccess.bind(this));
+    };
+
+    return BlobLicenseSelector;
+
+  })(TemplateSelector);
+
+}).call(this);
diff --git a/app/assets/javascripts/blob/blob_license_selector.js.coffee b/app/assets/javascripts/blob/blob_license_selector.js.coffee
deleted file mode 100644
index a3cc8dd844c..00000000000
--- a/app/assets/javascripts/blob/blob_license_selector.js.coffee
+++ /dev/null
@@ -1,9 +0,0 @@
-#= require blob/template_selector
-
-class @BlobLicenseSelector extends TemplateSelector
-  requestFile: (query) ->
-    data =
-      project: @dropdown.data('project')
-      fullname: @dropdown.data('fullname')
-
-    Api.licenseText query.id, data, @requestFileSuccess.bind(@)
diff --git a/app/assets/javascripts/blob/blob_license_selectors.js b/app/assets/javascripts/blob/blob_license_selectors.js
new file mode 100644
index 00000000000..39237705e8d
--- /dev/null
+++ b/app/assets/javascripts/blob/blob_license_selectors.js
@@ -0,0 +1,25 @@
+(function() {
+  this.BlobLicenseSelectors = (function() {
+    function BlobLicenseSelectors(opts) {
+      var ref;
+      this.$dropdowns = (ref = opts.$dropdowns) != null ? ref : $('.js-license-selector'), this.editor = opts.editor;
+      this.$dropdowns.each((function(_this) {
+        return function(i, dropdown) {
+          var $dropdown;
+          $dropdown = $(dropdown);
+          return new BlobLicenseSelector({
+            pattern: /^(.+\/)?(licen[sc]e|copying)($|\.)/i,
+            data: $dropdown.data('data'),
+            wrapper: $dropdown.closest('.js-license-selector-wrap'),
+            dropdown: $dropdown,
+            editor: _this.editor
+          });
+        };
+      })(this));
+    }
+
+    return BlobLicenseSelectors;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/blob/blob_license_selectors.js.coffee b/app/assets/javascripts/blob/blob_license_selectors.js.coffee
deleted file mode 100644
index 68438733108..00000000000
--- a/app/assets/javascripts/blob/blob_license_selectors.js.coffee
+++ /dev/null
@@ -1,17 +0,0 @@
-class @BlobLicenseSelectors
-  constructor: (opts) ->
-    {
-      @$dropdowns = $('.js-license-selector')
-      @editor
-    } = opts
-
-    @$dropdowns.each (i, dropdown) =>
-      $dropdown = $(dropdown)
-
-      new BlobLicenseSelector(
-        pattern: /^(.+\/)?(licen[sc]e|copying)($|\.)/i,
-        data: $dropdown.data('data'),
-        wrapper: $dropdown.closest('.js-license-selector-wrap'),
-        dropdown: $dropdown,
-        editor: @editor
-      )
diff --git a/app/assets/javascripts/blob/edit_blob.js b/app/assets/javascripts/blob/edit_blob.js
new file mode 100644
index 00000000000..649c79daee8
--- /dev/null
+++ b/app/assets/javascripts/blob/edit_blob.js
@@ -0,0 +1,66 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.EditBlob = (function() {
+    function EditBlob(assets_path, ace_mode) {
+      if (ace_mode == null) {
+        ace_mode = null;
+      }
+      this.editModeLinkClickHandler = bind(this.editModeLinkClickHandler, this);
+      ace.config.set("modePath", assets_path + "/ace");
+      ace.config.loadModule("ace/ext/searchbox");
+      this.editor = ace.edit("editor");
+      this.editor.focus();
+      if (ace_mode) {
+        this.editor.getSession().setMode("ace/mode/" + ace_mode);
+      }
+      $('form').submit((function(_this) {
+        return function() {
+          return $("#file-content").val(_this.editor.getValue());
+        };
+      })(this));
+      this.initModePanesAndLinks();
+      new BlobLicenseSelectors({
+        editor: this.editor
+      });
+      new BlobGitignoreSelectors({
+        editor: this.editor
+      });
+      new BlobCiYamlSelectors({
+        editor: this.editor
+      });
+    }
+
+    EditBlob.prototype.initModePanesAndLinks = function() {
+      this.$editModePanes = $(".js-edit-mode-pane");
+      this.$editModeLinks = $(".js-edit-mode a");
+      return this.$editModeLinks.click(this.editModeLinkClickHandler);
+    };
+
+    EditBlob.prototype.editModeLinkClickHandler = function(event) {
+      var currentLink, currentPane, paneId;
+      event.preventDefault();
+      currentLink = $(event.target);
+      paneId = currentLink.attr("href");
+      currentPane = this.$editModePanes.filter(paneId);
+      this.$editModeLinks.parent().removeClass("active hover");
+      currentLink.parent().addClass("active hover");
+      this.$editModePanes.hide();
+      currentPane.fadeIn(200);
+      if (paneId === "#preview") {
+        return $.post(currentLink.data("preview-url"), {
+          content: this.editor.getValue()
+        }, function(response) {
+          currentPane.empty().append(response);
+          return currentPane.syntaxHighlight();
+        });
+      } else {
+        return this.editor.focus();
+      }
+    };
+
+    return EditBlob;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/blob/edit_blob.js.coffee b/app/assets/javascripts/blob/edit_blob.js.coffee
deleted file mode 100644
index 19e584519d7..00000000000
--- a/app/assets/javascripts/blob/edit_blob.js.coffee
+++ /dev/null
@@ -1,42 +0,0 @@
-class @EditBlob
-  constructor: (assets_path, ace_mode = null) ->
-    ace.config.set "modePath", "#{assets_path}/ace"
-    ace.config.loadModule "ace/ext/searchbox"
-    @editor = ace.edit("editor")
-    @editor.focus()
-    @editor.getSession().setMode "ace/mode/#{ace_mode}" if ace_mode
-
-    # Before a form submission, move the content from the Ace editor into the
-    # submitted textarea
-    $('form').submit =>
-      $("#file-content").val(@editor.getValue())
-
-    @initModePanesAndLinks()
-
-    new BlobLicenseSelectors { @editor }
-    new BlobGitignoreSelectors { @editor }
-    new BlobCiYamlSelectors { @editor }
-
-  initModePanesAndLinks: ->
-    @$editModePanes = $(".js-edit-mode-pane")
-    @$editModeLinks = $(".js-edit-mode a")
-    @$editModeLinks.click @editModeLinkClickHandler
-
-  editModeLinkClickHandler: (event) =>
-    event.preventDefault()
-    currentLink = $(event.target)
-    paneId = currentLink.attr("href")
-    currentPane = @$editModePanes.filter(paneId)
-    @$editModeLinks.parent().removeClass "active hover"
-    currentLink.parent().addClass "active hover"
-    @$editModePanes.hide()
-    currentPane.fadeIn 200
-    if paneId is "#preview"
-      $.post currentLink.data("preview-url"),
-        content: @editor.getValue()
-      , (response) ->
-        currentPane.empty().append response
-        currentPane.syntaxHighlight()
-
-    else
-      @editor.focus()
diff --git a/app/assets/javascripts/blob/template_selector.js b/app/assets/javascripts/blob/template_selector.js
new file mode 100644
index 00000000000..2cf0a6631b8
--- /dev/null
+++ b/app/assets/javascripts/blob/template_selector.js
@@ -0,0 +1,74 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.TemplateSelector = (function() {
+    function TemplateSelector(opts) {
+      var ref;
+      if (opts == null) {
+        opts = {};
+      }
+      this.onClick = bind(this.onClick, this);
+      this.dropdown = opts.dropdown, this.data = opts.data, this.pattern = opts.pattern, this.wrapper = opts.wrapper, this.editor = opts.editor, this.fileEndpoint = opts.fileEndpoint, this.$input = (ref = opts.$input) != null ? ref : $('#file_name');
+      this.buildDropdown();
+      this.bindEvents();
+      this.onFilenameUpdate();
+    }
+
+    TemplateSelector.prototype.buildDropdown = function() {
+      return this.dropdown.glDropdown({
+        data: this.data,
+        filterable: true,
+        selectable: true,
+        toggleLabel: this.toggleLabel,
+        search: {
+          fields: ['name']
+        },
+        clicked: this.onClick,
+        text: function(item) {
+          return item.name;
+        }
+      });
+    };
+
+    TemplateSelector.prototype.bindEvents = function() {
+      return this.$input.on('keyup blur', (function(_this) {
+        return function(e) {
+          return _this.onFilenameUpdate();
+        };
+      })(this));
+    };
+
+    TemplateSelector.prototype.toggleLabel = function(item) {
+      return item.name;
+    };
+
+    TemplateSelector.prototype.onFilenameUpdate = function() {
+      var filenameMatches;
+      if (!this.$input.length) {
+        return;
+      }
+      filenameMatches = this.pattern.test(this.$input.val().trim());
+      if (!filenameMatches) {
+        this.wrapper.addClass('hidden');
+        return;
+      }
+      return this.wrapper.removeClass('hidden');
+    };
+
+    TemplateSelector.prototype.onClick = function(item, el, e) {
+      e.preventDefault();
+      return this.requestFile(item);
+    };
+
+    TemplateSelector.prototype.requestFile = function(item) {};
+
+    TemplateSelector.prototype.requestFileSuccess = function(file) {
+      this.editor.setValue(file.content, 1);
+      return this.editor.focus();
+    };
+
+    return TemplateSelector;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/blob/template_selector.js.coffee b/app/assets/javascripts/blob/template_selector.js.coffee
deleted file mode 100644
index 40c9169beac..00000000000
--- a/app/assets/javascripts/blob/template_selector.js.coffee
+++ /dev/null
@@ -1,60 +0,0 @@
-class @TemplateSelector
-  constructor: (opts = {}) ->
-    {
-      @dropdown,
-      @data,
-      @pattern,
-      @wrapper,
-      @editor,
-      @fileEndpoint,
-      @$input = $('#file_name')
-    } = opts
-
-    @buildDropdown()
-    @bindEvents()
-    @onFilenameUpdate()
-
-  buildDropdown: ->
-    @dropdown.glDropdown(
-      data: @data,
-      filterable: true,
-      selectable: true,
-      toggleLabel: @toggleLabel,
-      search:
-        fields: ['name']
-      clicked: @onClick
-      text: (item) ->
-        item.name
-    )
-
-  bindEvents: ->
-    @$input.on('keyup blur', (e) =>
-      @onFilenameUpdate()
-    )
-
-  toggleLabel: (item) ->
-    item.name
-
-  onFilenameUpdate: ->
-    return unless @$input.length
-
-    filenameMatches = @pattern.test(@$input.val().trim())
-
-    if not filenameMatches
-      @wrapper.addClass('hidden')
-      return
-
-    @wrapper.removeClass('hidden')
-
-  onClick: (item, el, e) =>
-    e.preventDefault()
-    @requestFile(item)
-
-  requestFile: (item) ->
-    # To be implemented on the extending class
-    # e.g.
-    # Api.gitignoreText item.name, @requestFileSuccess.bind(@)
-
-  requestFileSuccess: (file) ->
-    @editor.setValue(file.content, 1)
-    @editor.focus()
diff --git a/app/assets/javascripts/breakpoints.coffee b/app/assets/javascripts/breakpoints.coffee
deleted file mode 100644
index 5457430f921..00000000000
--- a/app/assets/javascripts/breakpoints.coffee
+++ /dev/null
@@ -1,37 +0,0 @@
-class @Breakpoints
-  instance = null;
-
-  class BreakpointInstance
-    BREAKPOINTS = ["xs", "sm", "md", "lg"]
-
-    constructor: ->
-      @setup()
-
-    setup: ->
-      allDeviceSelector = BREAKPOINTS.map (breakpoint) ->
-        ".device-#{breakpoint}"
-      return if $(allDeviceSelector.join(",")).length
-
-      # Create all the elements
-      els = $.map BREAKPOINTS, (breakpoint) ->
-        "<div class='device-#{breakpoint} visible-#{breakpoint}'></div>"
-      $("body").append els.join('')
-
-    visibleDevice: ->
-      allDeviceSelector = BREAKPOINTS.map (breakpoint) ->
-        ".device-#{breakpoint}"
-      $(allDeviceSelector.join(",")).filter(":visible")
-
-    getBreakpointSize: ->
-      $visibleDevice = @visibleDevice
-      # the page refreshed via turbolinks
-      if not $visibleDevice().length
-        @setup()
-      $visibleDevice = @visibleDevice()
-      return $visibleDevice.attr("class").split("visible-")[1]
-
-  @get: ->
-    return instance ?= new BreakpointInstance
-
-$ =>
-  @bp = Breakpoints.get()
diff --git a/app/assets/javascripts/breakpoints.js b/app/assets/javascripts/breakpoints.js
new file mode 100644
index 00000000000..1e0148e5798
--- /dev/null
+++ b/app/assets/javascripts/breakpoints.js
@@ -0,0 +1,68 @@
+(function() {
+  this.Breakpoints = (function() {
+    var BreakpointInstance, instance;
+
+    function Breakpoints() {}
+
+    instance = null;
+
+    BreakpointInstance = (function() {
+      var BREAKPOINTS;
+
+      BREAKPOINTS = ["xs", "sm", "md", "lg"];
+
+      function BreakpointInstance() {
+        this.setup();
+      }
+
+      BreakpointInstance.prototype.setup = function() {
+        var allDeviceSelector, els;
+        allDeviceSelector = BREAKPOINTS.map(function(breakpoint) {
+          return ".device-" + breakpoint;
+        });
+        if ($(allDeviceSelector.join(",")).length) {
+          return;
+        }
+        els = $.map(BREAKPOINTS, function(breakpoint) {
+          return "<div class='device-" + breakpoint + " visible-" + breakpoint + "'></div>";
+        });
+        return $("body").append(els.join(''));
+      };
+
+      BreakpointInstance.prototype.visibleDevice = function() {
+        var allDeviceSelector;
+        allDeviceSelector = BREAKPOINTS.map(function(breakpoint) {
+          return ".device-" + breakpoint;
+        });
+        return $(allDeviceSelector.join(",")).filter(":visible");
+      };
+
+      BreakpointInstance.prototype.getBreakpointSize = function() {
+        var $visibleDevice;
+        $visibleDevice = this.visibleDevice;
+        if (!$visibleDevice().length) {
+          this.setup();
+        }
+        $visibleDevice = this.visibleDevice();
+        return $visibleDevice.attr("class").split("visible-")[1];
+      };
+
+      return BreakpointInstance;
+
+    })();
+
+    Breakpoints.get = function() {
+      return instance != null ? instance : instance = new BreakpointInstance;
+    };
+
+    return Breakpoints;
+
+  })();
+
+  $((function(_this) {
+    return function() {
+      return _this.bp = Breakpoints.get();
+    };
+  })(this));
+
+}).call(this);
diff --git a/app/assets/javascripts/broadcast_message.js b/app/assets/javascripts/broadcast_message.js
new file mode 100644
index 00000000000..fceeff36728
--- /dev/null
+++ b/app/assets/javascripts/broadcast_message.js
@@ -0,0 +1,34 @@
+(function() {
+  $(function() {
+    var previewPath;
+    $('input#broadcast_message_color').on('input', function() {
+      var previewColor;
+      previewColor = $(this).val();
+      return $('div.broadcast-message-preview').css('background-color', previewColor);
+    });
+    $('input#broadcast_message_font').on('input', function() {
+      var previewColor;
+      previewColor = $(this).val();
+      return $('div.broadcast-message-preview').css('color', previewColor);
+    });
+    previewPath = $('textarea#broadcast_message_message').data('preview-path');
+    return $('textarea#broadcast_message_message').on('input', function() {
+      var message;
+      message = $(this).val();
+      if (message === '') {
+        return $('.js-broadcast-message-preview').text("Your message here");
+      } else {
+        return $.ajax({
+          url: previewPath,
+          type: "POST",
+          data: {
+            broadcast_message: {
+              message: message
+            }
+          }
+        });
+      }
+    });
+  });
+
+}).call(this);
diff --git a/app/assets/javascripts/broadcast_message.js.coffee b/app/assets/javascripts/broadcast_message.js.coffee
deleted file mode 100644
index a38a329c4c2..00000000000
--- a/app/assets/javascripts/broadcast_message.js.coffee
+++ /dev/null
@@ -1,22 +0,0 @@
-$ ->
-  $('input#broadcast_message_color').on 'input', ->
-    previewColor = $(@).val()
-    $('div.broadcast-message-preview').css('background-color', previewColor)
-
-  $('input#broadcast_message_font').on 'input', ->
-    previewColor = $(@).val()
-    $('div.broadcast-message-preview').css('color', previewColor)
-
-  previewPath = $('textarea#broadcast_message_message').data('preview-path')
-
-  $('textarea#broadcast_message_message').on 'input', ->
-    message = $(@).val()
-
-    if message == ''
-      $('.js-broadcast-message-preview').text("Your message here")
-    else
-      $.ajax(
-        url: previewPath
-        type: "POST"
-        data: { broadcast_message: { message: message } }
-      )
diff --git a/app/assets/javascripts/build.coffee b/app/assets/javascripts/build.coffee
deleted file mode 100644
index cf203ea43a0..00000000000
--- a/app/assets/javascripts/build.coffee
+++ /dev/null
@@ -1,114 +0,0 @@
-class @Build
-  @interval: null
-  @state: null
-
-  constructor: (@page_url, @build_url, @build_status, @state) ->
-    clearInterval(Build.interval)
-
-    # Init breakpoint checker
-    @bp = Breakpoints.get()
-    @hideSidebar()
-    $('.js-build-sidebar').niceScroll()
-    $(document)
-      .off 'click', '.js-sidebar-build-toggle'
-      .on 'click', '.js-sidebar-build-toggle', @toggleSidebar
-
-    $(window)
-      .off 'resize.build'
-      .on 'resize.build', @hideSidebar
-
-    @updateArtifactRemoveDate()
-
-    if $('#build-trace').length
-      @getInitialBuildTrace()
-      @initScrollButtonAffix()
-
-    if @build_status is "running" or @build_status is "pending"
-      #
-      # Bind autoscroll button to follow build output
-      #
-      $('#autoscroll-button').on 'click', ->
-        state = $(this).data("state")
-        if "enabled" is state
-          $(this).data "state", "disabled"
-          $(this).text "enable autoscroll"
-        else
-          $(this).data "state", "enabled"
-          $(this).text "disable autoscroll"
-
-      #
-      # Check for new build output if user still watching build page
-      # Only valid for runnig build when output changes during time
-      #
-      Build.interval = setInterval =>
-        if window.location.href.split("#").first() is @page_url
-          @getBuildTrace()
-      , 4000
-
-  getInitialBuildTrace: ->
-    $.ajax
-      url: @build_url
-      dataType: 'json'
-      success: (build_data) ->
-        $('.js-build-output').html build_data.trace_html
-
-        if build_data.status is 'success' or build_data.status is 'failed'
-          $('.js-build-refresh').remove()
-
-  getBuildTrace: ->
-    $.ajax
-      url: "#{@page_url}/trace.json?state=#{encodeURIComponent(@state)}"
-      dataType: "json"
-      success: (log) =>
-        if log.state
-          @state = log.state
-
-        if log.status is "running"
-          if log.append
-            $('.js-build-output').append log.html
-          else
-            $('.js-build-output').html log.html
-          @checkAutoscroll()
-        else if log.status isnt @build_status
-          Turbolinks.visit @page_url
-
-  checkAutoscroll: ->
-    $("html,body").scrollTop $("#build-trace").height()  if "enabled" is $("#autoscroll-button").data("state")
-
-  initScrollButtonAffix: ->
-    $buildScroll = $('#js-build-scroll')
-    $body = $('body')
-    $buildTrace = $('#build-trace')
-
-    $buildScroll.affix(
-      offset:
-        bottom: ->
-          $body.outerHeight() - ($buildTrace.outerHeight() + $buildTrace.offset().top)
-    )
-
-  shouldHideSidebar: ->
-    bootstrapBreakpoint = @bp.getBreakpointSize()
-
-    bootstrapBreakpoint is 'xs' or bootstrapBreakpoint is 'sm'
-
-  toggleSidebar: =>
-    if @shouldHideSidebar()
-      $('.js-build-sidebar')
-        .toggleClass 'right-sidebar-expanded right-sidebar-collapsed'
-
-  hideSidebar: =>
-    if @shouldHideSidebar()
-      $('.js-build-sidebar')
-        .removeClass 'right-sidebar-expanded'
-        .addClass 'right-sidebar-collapsed'
-    else
-      $('.js-build-sidebar')
-        .removeClass 'right-sidebar-collapsed'
-        .addClass 'right-sidebar-expanded'
-
-  updateArtifactRemoveDate: ->
-    $date = $('.js-artifacts-remove')
-
-    if $date.length
-      date = $date.text()
-      $date.text $.timefor(new Date(date), ' ')
diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js
new file mode 100644
index 00000000000..e135cb92a30
--- /dev/null
+++ b/app/assets/javascripts/build.js
@@ -0,0 +1,139 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.Build = (function() {
+    Build.interval = null;
+
+    Build.state = null;
+
+    function Build(page_url, build_url, build_status, state1) {
+      this.page_url = page_url;
+      this.build_url = build_url;
+      this.build_status = build_status;
+      this.state = state1;
+      this.hideSidebar = bind(this.hideSidebar, this);
+      this.toggleSidebar = bind(this.toggleSidebar, this);
+      clearInterval(Build.interval);
+      this.bp = Breakpoints.get();
+      this.hideSidebar();
+      $('.js-build-sidebar').niceScroll();
+      $(document).off('click', '.js-sidebar-build-toggle').on('click', '.js-sidebar-build-toggle', this.toggleSidebar);
+      $(window).off('resize.build').on('resize.build', this.hideSidebar);
+      this.updateArtifactRemoveDate();
+      if ($('#build-trace').length) {
+        this.getInitialBuildTrace();
+        this.initScrollButtonAffix();
+      }
+      if (this.build_status === "running" || this.build_status === "pending") {
+        $('#autoscroll-button').on('click', function() {
+          var state;
+          state = $(this).data("state");
+          if ("enabled" === state) {
+            $(this).data("state", "disabled");
+            return $(this).text("enable autoscroll");
+          } else {
+            $(this).data("state", "enabled");
+            return $(this).text("disable autoscroll");
+          }
+        });
+        Build.interval = setInterval((function(_this) {
+          return function() {
+            if (window.location.href.split("#").first() === _this.page_url) {
+              return _this.getBuildTrace();
+            }
+          };
+        })(this), 4000);
+      }
+    }
+
+    Build.prototype.getInitialBuildTrace = function() {
+      return $.ajax({
+        url: this.build_url,
+        dataType: 'json',
+        success: function(build_data) {
+          $('.js-build-output').html(build_data.trace_html);
+          if (build_data.status === 'success' || build_data.status === 'failed') {
+            return $('.js-build-refresh').remove();
+          }
+        }
+      });
+    };
+
+    Build.prototype.getBuildTrace = function() {
+      return $.ajax({
+        url: this.page_url + "/trace.json?state=" + (encodeURIComponent(this.state)),
+        dataType: "json",
+        success: (function(_this) {
+          return function(log) {
+            if (log.state) {
+              _this.state = log.state;
+            }
+            if (log.status === "running") {
+              if (log.append) {
+                $('.js-build-output').append(log.html);
+              } else {
+                $('.js-build-output').html(log.html);
+              }
+              return _this.checkAutoscroll();
+            } else if (log.status !== _this.build_status) {
+              return Turbolinks.visit(_this.page_url);
+            }
+          };
+        })(this)
+      });
+    };
+
+    Build.prototype.checkAutoscroll = function() {
+      if ("enabled" === $("#autoscroll-button").data("state")) {
+        return $("html,body").scrollTop($("#build-trace").height());
+      }
+    };
+
+    Build.prototype.initScrollButtonAffix = function() {
+      var $body, $buildScroll, $buildTrace;
+      $buildScroll = $('#js-build-scroll');
+      $body = $('body');
+      $buildTrace = $('#build-trace');
+      return $buildScroll.affix({
+        offset: {
+          bottom: function() {
+            return $body.outerHeight() - ($buildTrace.outerHeight() + $buildTrace.offset().top);
+          }
+        }
+      });
+    };
+
+    Build.prototype.shouldHideSidebar = function() {
+      var bootstrapBreakpoint;
+      bootstrapBreakpoint = this.bp.getBreakpointSize();
+      return bootstrapBreakpoint === 'xs' || bootstrapBreakpoint === 'sm';
+    };
+
+    Build.prototype.toggleSidebar = function() {
+      if (this.shouldHideSidebar()) {
+        return $('.js-build-sidebar').toggleClass('right-sidebar-expanded right-sidebar-collapsed');
+      }
+    };
+
+    Build.prototype.hideSidebar = function() {
+      if (this.shouldHideSidebar()) {
+        return $('.js-build-sidebar').removeClass('right-sidebar-expanded').addClass('right-sidebar-collapsed');
+      } else {
+        return $('.js-build-sidebar').removeClass('right-sidebar-collapsed').addClass('right-sidebar-expanded');
+      }
+    };
+
+    Build.prototype.updateArtifactRemoveDate = function() {
+      var $date, date;
+      $date = $('.js-artifacts-remove');
+      if ($date.length) {
+        date = $date.text();
+        return $date.text($.timefor(new Date(date), ' '));
+      }
+    };
+
+    return Build;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/build_artifacts.js b/app/assets/javascripts/build_artifacts.js
new file mode 100644
index 00000000000..f345ba0abe6
--- /dev/null
+++ b/app/assets/javascripts/build_artifacts.js
@@ -0,0 +1,27 @@
+(function() {
+  this.BuildArtifacts = (function() {
+    function BuildArtifacts() {
+      this.disablePropagation();
+      this.setupEntryClick();
+    }
+
+    BuildArtifacts.prototype.disablePropagation = function() {
+      $('.top-block').on('click', '.download', function(e) {
+        return e.stopPropagation();
+      });
+      return $('.tree-holder').on('click', 'tr[data-link] a', function(e) {
+        return e.stopImmediatePropagation();
+      });
+    };
+
+    BuildArtifacts.prototype.setupEntryClick = function() {
+      return $('.tree-holder').on('click', 'tr[data-link]', function(e) {
+        return window.location = this.dataset.link;
+      });
+    };
+
+    return BuildArtifacts;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/build_artifacts.js.coffee b/app/assets/javascripts/build_artifacts.js.coffee
deleted file mode 100644
index 5ae6cba56c8..00000000000
--- a/app/assets/javascripts/build_artifacts.js.coffee
+++ /dev/null
@@ -1,14 +0,0 @@
-class @BuildArtifacts
-  constructor: () ->
-    @disablePropagation()
-    @setupEntryClick()
-
-  disablePropagation: ->
-    $('.top-block').on 'click', '.download',  (e) ->
-      e.stopPropagation()
-    $('.tree-holder').on 'click', 'tr[data-link] a', (e) ->
-      e.stopImmediatePropagation()
-
-  setupEntryClick: ->
-    $('.tree-holder').on 'click', 'tr[data-link]', (e) ->
-      window.location = @dataset.link
diff --git a/app/assets/javascripts/commit.js b/app/assets/javascripts/commit.js
new file mode 100644
index 00000000000..23cf5b519f4
--- /dev/null
+++ b/app/assets/javascripts/commit.js
@@ -0,0 +1,13 @@
+(function() {
+  this.Commit = (function() {
+    function Commit() {
+      $('.files .diff-file').each(function() {
+        return new CommitFile(this);
+      });
+    }
+
+    return Commit;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/commit.js.coffee b/app/assets/javascripts/commit.js.coffee
deleted file mode 100644
index 0566e239191..00000000000
--- a/app/assets/javascripts/commit.js.coffee
+++ /dev/null
@@ -1,4 +0,0 @@
-class @Commit
-  constructor: ->
-    $('.files .diff-file').each ->
-      new CommitFile(this)
diff --git a/app/assets/javascripts/commit/file.js b/app/assets/javascripts/commit/file.js
new file mode 100644
index 00000000000..be24ee56aad
--- /dev/null
+++ b/app/assets/javascripts/commit/file.js
@@ -0,0 +1,13 @@
+(function() {
+  this.CommitFile = (function() {
+    function CommitFile(file) {
+      if ($('.image', file).length) {
+        new ImageFile(file);
+      }
+    }
+
+    return CommitFile;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/commit/file.js.coffee b/app/assets/javascripts/commit/file.js.coffee
deleted file mode 100644
index 83e793863b6..00000000000
--- a/app/assets/javascripts/commit/file.js.coffee
+++ /dev/null
@@ -1,5 +0,0 @@
-class @CommitFile
-
-  constructor: (file) ->
-    if $('.image', file).length
-      new ImageFile(file)
diff --git a/app/assets/javascripts/commit/image-file.js b/app/assets/javascripts/commit/image-file.js
new file mode 100644
index 00000000000..c0d0b2d049f
--- /dev/null
+++ b/app/assets/javascripts/commit/image-file.js
@@ -0,0 +1,175 @@
+(function() {
+  this.ImageFile = (function() {
+    var prepareFrames;
+
+    ImageFile.availWidth = 900;
+
+    ImageFile.viewModes = ['two-up', 'swipe'];
+
+    function ImageFile(file) {
+      this.file = file;
+      this.requestImageInfo($('.two-up.view .frame.deleted img', this.file), (function(_this) {
+        return function(deletedWidth, deletedHeight) {
+          return _this.requestImageInfo($('.two-up.view .frame.added img', _this.file), function(width, height) {
+            if (width === deletedWidth && height === deletedHeight) {
+              return _this.initViewModes();
+            } else {
+              return _this.initView('two-up');
+            }
+          });
+        };
+      })(this));
+    }
+
+    ImageFile.prototype.initViewModes = function() {
+      var viewMode;
+      viewMode = ImageFile.viewModes[0];
+      $('.view-modes', this.file).removeClass('hide');
+      $('.view-modes-menu', this.file).on('click', 'li', (function(_this) {
+        return function(event) {
+          if (!$(event.currentTarget).hasClass('active')) {
+            return _this.activateViewMode(event.currentTarget.className);
+          }
+        };
+      })(this));
+      return this.activateViewMode(viewMode);
+    };
+
+    ImageFile.prototype.activateViewMode = function(viewMode) {
+      $('.view-modes-menu li', this.file).removeClass('active').filter("." + viewMode).addClass('active');
+      return $(".view:visible:not(." + viewMode + ")", this.file).fadeOut(200, (function(_this) {
+        return function() {
+          $(".view." + viewMode, _this.file).fadeIn(200);
+          return _this.initView(viewMode);
+        };
+      })(this));
+    };
+
+    ImageFile.prototype.initView = function(viewMode) {
+      return this.views[viewMode].call(this);
+    };
+
+    prepareFrames = function(view) {
+      var maxHeight, maxWidth;
+      maxWidth = 0;
+      maxHeight = 0;
+      $('.frame', view).each((function(_this) {
+        return function(index, frame) {
+          var height, width;
+          width = $(frame).width();
+          height = $(frame).height();
+          maxWidth = width > maxWidth ? width : maxWidth;
+          return maxHeight = height > maxHeight ? height : maxHeight;
+        };
+      })(this)).css({
+        width: maxWidth,
+        height: maxHeight
+      });
+      return [maxWidth, maxHeight];
+    };
+
+    ImageFile.prototype.views = {
+      'two-up': function() {
+        return $('.two-up.view .wrap', this.file).each((function(_this) {
+          return function(index, wrap) {
+            $('img', wrap).each(function() {
+              var currentWidth;
+              currentWidth = $(this).width();
+              if (currentWidth > ImageFile.availWidth / 2) {
+                return $(this).width(ImageFile.availWidth / 2);
+              }
+            });
+            return _this.requestImageInfo($('img', wrap), function(width, height) {
+              $('.image-info .meta-width', wrap).text(width + "px");
+              $('.image-info .meta-height', wrap).text(height + "px");
+              return $('.image-info', wrap).removeClass('hide');
+            });
+          };
+        })(this));
+      },
+      'swipe': function() {
+        var maxHeight, maxWidth;
+        maxWidth = 0;
+        maxHeight = 0;
+        return $('.swipe.view', this.file).each((function(_this) {
+          return function(index, view) {
+            var ref;
+            ref = prepareFrames(view), maxWidth = ref[0], maxHeight = ref[1];
+            $('.swipe-frame', view).css({
+              width: maxWidth + 16,
+              height: maxHeight + 28
+            });
+            $('.swipe-wrap', view).css({
+              width: maxWidth + 1,
+              height: maxHeight + 2
+            });
+            return $('.swipe-bar', view).css({
+              left: 0
+            }).draggable({
+              axis: 'x',
+              containment: 'parent',
+              drag: function(event) {
+                return $('.swipe-wrap', view).width((maxWidth + 1) - $(this).position().left);
+              },
+              stop: function(event) {
+                return $('.swipe-wrap', view).width((maxWidth + 1) - $(this).position().left);
+              }
+            });
+          };
+        })(this));
+      },
+      'onion-skin': function() {
+        var dragTrackWidth, maxHeight, maxWidth;
+        maxWidth = 0;
+        maxHeight = 0;
+        dragTrackWidth = $('.drag-track', this.file).width() - $('.dragger', this.file).width();
+        return $('.onion-skin.view', this.file).each((function(_this) {
+          return function(index, view) {
+            var ref;
+            ref = prepareFrames(view), maxWidth = ref[0], maxHeight = ref[1];
+            $('.onion-skin-frame', view).css({
+              width: maxWidth + 16,
+              height: maxHeight + 28
+            });
+            $('.swipe-wrap', view).css({
+              width: maxWidth + 1,
+              height: maxHeight + 2
+            });
+            return $('.dragger', view).css({
+              left: dragTrackWidth
+            }).draggable({
+              axis: 'x',
+              containment: 'parent',
+              drag: function(event) {
+                return $('.frame.added', view).css('opacity', $(this).position().left / dragTrackWidth);
+              },
+              stop: function(event) {
+                return $('.frame.added', view).css('opacity', $(this).position().left / dragTrackWidth);
+              }
+            });
+          };
+        })(this));
+      }
+    };
+
+    ImageFile.prototype.requestImageInfo = function(img, callback) {
+      var domImg;
+      domImg = img.get(0);
+      if (domImg) {
+        if (domImg.complete) {
+          return callback.call(this, domImg.naturalWidth, domImg.naturalHeight);
+        } else {
+          return img.on('load', (function(_this) {
+            return function() {
+              return callback.call(_this, domImg.naturalWidth, domImg.naturalHeight);
+            };
+          })(this));
+        }
+      }
+    };
+
+    return ImageFile;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/commit/image-file.js.coffee b/app/assets/javascripts/commit/image-file.js.coffee
deleted file mode 100644
index 9c723f51e54..00000000000
--- a/app/assets/javascripts/commit/image-file.js.coffee
+++ /dev/null
@@ -1,127 +0,0 @@
-class @ImageFile
-
-  # Width where images must fits in, for 2-up this gets divided by 2
-  @availWidth = 900
-  @viewModes = ['two-up', 'swipe']
-
-  constructor: (@file) ->
-    # Determine if old and new file has same dimensions, if not show 'two-up' view
-    this.requestImageInfo $('.two-up.view .frame.deleted img', @file), (deletedWidth, deletedHeight) =>
-      this.requestImageInfo $('.two-up.view .frame.added img', @file), (width, height) =>
-        if width == deletedWidth && height == deletedHeight
-          this.initViewModes()
-        else
-          this.initView('two-up')
-
-  initViewModes: ->
-    viewMode = ImageFile.viewModes[0]
-
-    $('.view-modes', @file).removeClass 'hide'
-    $('.view-modes-menu', @file).on 'click', 'li', (event) =>
-      unless $(event.currentTarget).hasClass('active')
-        this.activateViewMode(event.currentTarget.className)
-
-    this.activateViewMode(viewMode)
-
-  activateViewMode: (viewMode) ->
-    $('.view-modes-menu li', @file)
-      .removeClass('active')
-      .filter(".#{viewMode}").addClass 'active'
-    $(".view:visible:not(.#{viewMode})", @file).fadeOut 200, =>
-      $(".view.#{viewMode}", @file).fadeIn(200)
-      this.initView viewMode
-
-  initView: (viewMode) ->
-    this.views[viewMode].call(this)
-
-  prepareFrames = (view) ->
-    maxWidth = 0
-    maxHeight = 0
-    $('.frame', view).each (index, frame) =>
-      width = $(frame).width()
-      height = $(frame).height()
-      maxWidth = if width > maxWidth then width else maxWidth
-      maxHeight = if height > maxHeight then height else maxHeight
-    .css
-      width: maxWidth
-      height: maxHeight
-    
-    [maxWidth, maxHeight]
-
-  views: 
-    'two-up': ->
-      $('.two-up.view .wrap', @file).each (index, wrap) =>
-        $('img', wrap).each ->
-          currentWidth = $(this).width()
-          if currentWidth > ImageFile.availWidth / 2
-            $(this).width ImageFile.availWidth / 2
-
-        this.requestImageInfo $('img', wrap), (width, height) ->
-          $('.image-info .meta-width', wrap).text "#{width}px"
-          $('.image-info .meta-height', wrap).text "#{height}px"
-          $('.image-info', wrap).removeClass('hide')
-
-    'swipe': ->
-      maxWidth = 0
-      maxHeight = 0
-
-      $('.swipe.view', @file).each (index, view) =>
-
-        [maxWidth, maxHeight] = prepareFrames(view)
-
-        $('.swipe-frame', view).css
-          width: maxWidth + 16
-          height: maxHeight + 28
-
-        $('.swipe-wrap', view).css
-          width: maxWidth + 1
-          height: maxHeight + 2
-
-        $('.swipe-bar', view).css
-          left: 0
-        .draggable
-          axis: 'x'
-          containment: 'parent'
-          drag: (event) ->
-            $('.swipe-wrap', view).width (maxWidth + 1) - $(this).position().left
-          stop: (event) ->
-            $('.swipe-wrap', view).width (maxWidth + 1) - $(this).position().left
-
-    'onion-skin': ->
-      maxWidth = 0
-      maxHeight = 0
-
-      dragTrackWidth = $('.drag-track', @file).width() - $('.dragger', @file).width()
-
-      $('.onion-skin.view', @file).each (index, view) =>
-
-        [maxWidth, maxHeight] = prepareFrames(view)
-
-        $('.onion-skin-frame', view).css
-          width: maxWidth + 16
-          height: maxHeight + 28
-
-        $('.swipe-wrap', view).css
-          width: maxWidth + 1
-          height: maxHeight + 2
-        
-        $('.dragger', view).css
-          left: dragTrackWidth
-        .draggable
-          axis: 'x'
-          containment: 'parent'
-          drag: (event) ->
-            $('.frame.added', view).css('opacity', $(this).position().left / dragTrackWidth)
-          stop: (event) ->
-            $('.frame.added', view).css('opacity', $(this).position().left / dragTrackWidth)
-        
-      
-
-  requestImageInfo: (img, callback) ->
-    domImg = img.get(0)
-    if domImg
-      if domImg.complete
-        callback.call(this, domImg.naturalWidth, domImg.naturalHeight)
-      else
-        img.on 'load', =>
-          callback.call(this, domImg.naturalWidth, domImg.naturalHeight)
diff --git a/app/assets/javascripts/commits.js b/app/assets/javascripts/commits.js
new file mode 100644
index 00000000000..37f168c5190
--- /dev/null
+++ b/app/assets/javascripts/commits.js
@@ -0,0 +1,58 @@
+(function() {
+  this.CommitsList = (function() {
+    function CommitsList() {}
+
+    CommitsList.timer = null;
+
+    CommitsList.init = function(limit) {
+      $("body").on("click", ".day-commits-table li.commit", function(event) {
+        if (event.target.nodeName !== "A") {
+          location.href = $(this).attr("url");
+          e.stopPropagation();
+          return false;
+        }
+      });
+      Pager.init(limit, false);
+      this.content = $("#commits-list");
+      this.searchField = $("#commits-search");
+      return this.initSearch();
+    };
+
+    CommitsList.initSearch = function() {
+      this.timer = null;
+      return this.searchField.keyup((function(_this) {
+        return function() {
+          clearTimeout(_this.timer);
+          return _this.timer = setTimeout(_this.filterResults, 500);
+        };
+      })(this));
+    };
+
+    CommitsList.filterResults = function() {
+      var commitsUrl, form, search;
+      form = $(".commits-search-form");
+      search = CommitsList.searchField.val();
+      commitsUrl = form.attr("action") + '?' + form.serialize();
+      CommitsList.content.fadeTo('fast', 0.5);
+      return $.ajax({
+        type: "GET",
+        url: form.attr("action"),
+        data: form.serialize(),
+        complete: function() {
+          return CommitsList.content.fadeTo('fast', 1.0);
+        },
+        success: function(data) {
+          CommitsList.content.html(data.html);
+          return history.replaceState({
+            page: commitsUrl
+          }, document.title, commitsUrl);
+        },
+        dataType: "json"
+      });
+    };
+
+    return CommitsList;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/commits.js.coffee b/app/assets/javascripts/commits.js.coffee
deleted file mode 100644
index 0acb4c1955e..00000000000
--- a/app/assets/javascripts/commits.js.coffee
+++ /dev/null
@@ -1,39 +0,0 @@
-class @CommitsList
-  @timer = null
-
-  @init: (limit) ->
-    $("body").on "click", ".day-commits-table li.commit", (event) ->
-      if event.target.nodeName != "A"
-        location.href = $(this).attr("url")
-        e.stopPropagation()
-        return false
-
-    Pager.init limit, false
-
-    @content = $("#commits-list")
-    @searchField = $("#commits-search")
-    @initSearch()
-
-  @initSearch: ->
-    @timer = null
-    @searchField.keyup =>
-      clearTimeout(@timer)
-      @timer = setTimeout(@filterResults, 500)
-
-  @filterResults: =>
-    form = $(".commits-search-form")
-    search = @searchField.val()
-    commitsUrl = form.attr("action") + '?' + form.serialize()
-    @content.fadeTo('fast', 0.5)
-
-    $.ajax
-      type: "GET"
-      url: form.attr("action")
-      data: form.serialize()
-      complete: =>
-        @content.fadeTo('fast', 1.0)
-      success: (data) =>
-        @content.html(data.html)
-        # Change url so if user reload a page - search results are saved
-        history.replaceState {page: commitsUrl}, document.title, commitsUrl
-      dataType: "json"
diff --git a/app/assets/javascripts/compare.js b/app/assets/javascripts/compare.js
new file mode 100644
index 00000000000..342ac0e8e69
--- /dev/null
+++ b/app/assets/javascripts/compare.js
@@ -0,0 +1,91 @@
+(function() {
+  this.Compare = (function() {
+    function Compare(opts) {
+      this.opts = opts;
+      this.source_loading = $(".js-source-loading");
+      this.target_loading = $(".js-target-loading");
+      $('.js-compare-dropdown').each((function(_this) {
+        return function(i, dropdown) {
+          var $dropdown;
+          $dropdown = $(dropdown);
+          return $dropdown.glDropdown({
+            selectable: true,
+            fieldName: $dropdown.data('field-name'),
+            filterable: true,
+            id: function(obj, $el) {
+              return $el.data('id');
+            },
+            toggleLabel: function(obj, $el) {
+              return $el.text().trim();
+            },
+            clicked: function(e, el) {
+              if ($dropdown.is('.js-target-branch')) {
+                return _this.getTargetHtml();
+              } else if ($dropdown.is('.js-source-branch')) {
+                return _this.getSourceHtml();
+              } else if ($dropdown.is('.js-target-project')) {
+                return _this.getTargetProject();
+              }
+            }
+          });
+        };
+      })(this));
+      this.initialState();
+    }
+
+    Compare.prototype.initialState = function() {
+      this.getSourceHtml();
+      return this.getTargetHtml();
+    };
+
+    Compare.prototype.getTargetProject = function() {
+      return $.ajax({
+        url: this.opts.targetProjectUrl,
+        data: {
+          target_project_id: $("input[name='merge_request[target_project_id]']").val()
+        },
+        beforeSend: function() {
+          return $('.mr_target_commit').empty();
+        },
+        success: function(html) {
+          return $('.js-target-branch-dropdown .dropdown-content').html(html);
+        }
+      });
+    };
+
+    Compare.prototype.getSourceHtml = function() {
+      return this.sendAjax(this.opts.sourceBranchUrl, this.source_loading, '.mr_source_commit', {
+        ref: $("input[name='merge_request[source_branch]']").val()
+      });
+    };
+
+    Compare.prototype.getTargetHtml = function() {
+      return this.sendAjax(this.opts.targetBranchUrl, this.target_loading, '.mr_target_commit', {
+        target_project_id: $("input[name='merge_request[target_project_id]']").val(),
+        ref: $("input[name='merge_request[target_branch]']").val()
+      });
+    };
+
+    Compare.prototype.sendAjax = function(url, loading, target, data) {
+      var $target;
+      $target = $(target);
+      return $.ajax({
+        url: url,
+        data: data,
+        beforeSend: function() {
+          loading.show();
+          return $target.empty();
+        },
+        success: function(html) {
+          loading.hide();
+          $target.html(html);
+          return $('.js-timeago', $target).timeago();
+        }
+      });
+    };
+
+    return Compare;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/compare.js.coffee b/app/assets/javascripts/compare.js.coffee
deleted file mode 100644
index f20992ead3e..00000000000
--- a/app/assets/javascripts/compare.js.coffee
+++ /dev/null
@@ -1,67 +0,0 @@
-class @Compare
-  constructor: (@opts) ->
-    @source_loading = $ ".js-source-loading"
-    @target_loading = $ ".js-target-loading"
-
-    $('.js-compare-dropdown').each (i, dropdown) =>
-      $dropdown = $(dropdown)
-
-      $dropdown.glDropdown(
-        selectable: true
-        fieldName: $dropdown.data 'field-name'
-        filterable: true
-        id: (obj, $el) ->
-          $el.data 'id'
-        toggleLabel: (obj, $el) ->
-          $el.text().trim()
-        clicked: (e, el) =>
-          if $dropdown.is '.js-target-branch'
-            @getTargetHtml()
-          else if $dropdown.is '.js-source-branch'
-            @getSourceHtml()
-          else if $dropdown.is '.js-target-project'
-            @getTargetProject()
-      )
-
-    @initialState()
-
-  initialState: ->
-    @getSourceHtml()
-    @getTargetHtml()
-
-  getTargetProject: ->
-    $.ajax(
-      url: @opts.targetProjectUrl
-      data:
-        target_project_id:  $("input[name='merge_request[target_project_id]']").val()
-      beforeSend: ->
-        $('.mr_target_commit').empty()
-      success: (html) ->
-        $('.js-target-branch-dropdown .dropdown-content').html html
-    )
-
-  getSourceHtml: ->
-    @sendAjax(@opts.sourceBranchUrl, @source_loading, '.mr_source_commit',
-      ref: $("input[name='merge_request[source_branch]']").val()
-    )
-
-  getTargetHtml: ->
-    @sendAjax(@opts.targetBranchUrl, @target_loading, '.mr_target_commit',
-      target_project_id: $("input[name='merge_request[target_project_id]']").val()
-      ref: $("input[name='merge_request[target_branch]']").val()
-    )
-
-  sendAjax: (url, loading, target, data) ->
-    $target = $(target)
-
-    $.ajax(
-      url: url
-      data: data
-      beforeSend: ->
-        loading.show()
-        $target.empty()
-      success: (html) ->
-        loading.hide()
-        $target.html html
-        $('.js-timeago', $target).timeago()
-    )
diff --git a/app/assets/javascripts/compare_autocomplete.js b/app/assets/javascripts/compare_autocomplete.js
new file mode 100644
index 00000000000..4e3a28cd163
--- /dev/null
+++ b/app/assets/javascripts/compare_autocomplete.js
@@ -0,0 +1,51 @@
+(function() {
+  this.CompareAutocomplete = (function() {
+    function CompareAutocomplete() {
+      this.initDropdown();
+    }
+
+    CompareAutocomplete.prototype.initDropdown = function() {
+      return $('.js-compare-dropdown').each(function() {
+        var $dropdown, selected;
+        $dropdown = $(this);
+        selected = $dropdown.data('selected');
+        return $dropdown.glDropdown({
+          data: function(term, callback) {
+            return $.ajax({
+              url: $dropdown.data('refs-url'),
+              data: {
+                ref: $dropdown.data('ref')
+              }
+            }).done(function(refs) {
+              return callback(refs);
+            });
+          },
+          selectable: true,
+          filterable: true,
+          filterByText: true,
+          fieldName: $dropdown.attr('name'),
+          filterInput: 'input[type="text"]',
+          renderRow: function(ref) {
+            var link;
+            if (ref.header != null) {
+              return $('<li />').addClass('dropdown-header').text(ref.header);
+            } else {
+              link = $('<a />').attr('href', '#').addClass(ref === selected ? 'is-active' : '').text(ref).attr('data-ref', escape(ref));
+              return $('<li />').append(link);
+            }
+          },
+          id: function(obj, $el) {
+            return $el.attr('data-ref');
+          },
+          toggleLabel: function(obj, $el) {
+            return $el.text().trim();
+          }
+        });
+      });
+    };
+
+    return CompareAutocomplete;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/compare_autocomplete.js.coffee b/app/assets/javascripts/compare_autocomplete.js.coffee
deleted file mode 100644
index 7ad9fd97637..00000000000
--- a/app/assets/javascripts/compare_autocomplete.js.coffee
+++ /dev/null
@@ -1,41 +0,0 @@
-class @CompareAutocomplete
-  constructor: ->
-    @initDropdown()
-
-  initDropdown: ->
-    $('.js-compare-dropdown').each ->
-      $dropdown = $(@)
-      selected = $dropdown.data('selected')
-
-      $dropdown.glDropdown(
-        data: (term, callback) ->
-          $.ajax(
-            url: $dropdown.data('refs-url')
-            data:
-              ref: $dropdown.data('ref')
-          ).done (refs) ->
-            callback(refs)
-        selectable: true
-        filterable: true
-        filterByText: true
-        fieldName: $dropdown.attr('name')
-        filterInput: 'input[type="text"]'
-        renderRow: (ref) ->
-          if ref.header?
-            $('<li />')
-              .addClass('dropdown-header')
-              .text(ref.header)
-          else
-            link = $('<a />')
-              .attr('href', '#')
-              .addClass(if ref is selected then 'is-active' else '')
-              .text(ref)
-              .attr('data-ref', escape(ref))
-
-            $('<li />')
-              .append(link)
-        id: (obj, $el) ->
-          $el.attr('data-ref')
-        toggleLabel: (obj, $el) ->
-          $el.text().trim()
-      )
diff --git a/app/assets/javascripts/confirm_danger_modal.js b/app/assets/javascripts/confirm_danger_modal.js
new file mode 100644
index 00000000000..708ab08ffac
--- /dev/null
+++ b/app/assets/javascripts/confirm_danger_modal.js
@@ -0,0 +1,32 @@
+(function() {
+  this.ConfirmDangerModal = (function() {
+    function ConfirmDangerModal(form, text) {
+      var project_path, submit;
+      this.form = form;
+      $('.js-confirm-text').text(text || '');
+      $('.js-confirm-danger-input').val('');
+      $('#modal-confirm-danger').modal('show');
+      project_path = $('.js-confirm-danger-match').text();
+      submit = $('.js-confirm-danger-submit');
+      submit.disable();
+      $('.js-confirm-danger-input').off('input');
+      $('.js-confirm-danger-input').on('input', function() {
+        if (rstrip($(this).val()) === project_path) {
+          return submit.enable();
+        } else {
+          return submit.disable();
+        }
+      });
+      $('.js-confirm-danger-submit').off('click');
+      $('.js-confirm-danger-submit').on('click', (function(_this) {
+        return function() {
+          return _this.form.submit();
+        };
+      })(this));
+    }
+
+    return ConfirmDangerModal;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/confirm_danger_modal.js.coffee b/app/assets/javascripts/confirm_danger_modal.js.coffee
deleted file mode 100644
index 66e34dd4a08..00000000000
--- a/app/assets/javascripts/confirm_danger_modal.js.coffee
+++ /dev/null
@@ -1,20 +0,0 @@
-class @ConfirmDangerModal
-  constructor: (form, text) ->
-    @form = form
-    $('.js-confirm-text').text(text || '')
-    $('.js-confirm-danger-input').val('')
-    $('#modal-confirm-danger').modal('show')
-    project_path = $('.js-confirm-danger-match').text()
-    submit = $('.js-confirm-danger-submit')
-    submit.disable()
-
-    $('.js-confirm-danger-input').off 'input'
-    $('.js-confirm-danger-input').on 'input', ->
-      if rstrip($(@).val()) is project_path
-        submit.enable()
-      else
-        submit.disable()
-
-    $('.js-confirm-danger-submit').off 'click'
-    $('.js-confirm-danger-submit').on 'click', =>
-      @form.submit()
diff --git a/app/assets/javascripts/copy_to_clipboard.js b/app/assets/javascripts/copy_to_clipboard.js
new file mode 100644
index 00000000000..c82798cc6a5
--- /dev/null
+++ b/app/assets/javascripts/copy_to_clipboard.js
@@ -0,0 +1,42 @@
+
+/*= require clipboard */
+
+(function() {
+  var genericError, genericSuccess, showTooltip;
+
+  genericSuccess = function(e) {
+    showTooltip(e.trigger, 'Copied!');
+    e.clearSelection();
+    return $(e.trigger).blur();
+  };
+
+  genericError = function(e) {
+    var key;
+    if (/Mac/i.test(navigator.userAgent)) {
+      key = '&#8984;';
+    } else {
+      key = 'Ctrl';
+    }
+    return showTooltip(e.trigger, "Press " + key + "-C to copy");
+  };
+
+  showTooltip = function(target, title) {
+    return $(target).tooltip({
+      container: 'body',
+      html: 'true',
+      placement: 'auto bottom',
+      title: title,
+      trigger: 'manual'
+    }).tooltip('show').one('mouseleave', function() {
+      return $(this).tooltip('hide');
+    });
+  };
+
+  $(function() {
+    var clipboard;
+    clipboard = new Clipboard('[data-clipboard-target], [data-clipboard-text]');
+    clipboard.on('success', genericSuccess);
+    return clipboard.on('error', genericError);
+  });
+
+}).call(this);
diff --git a/app/assets/javascripts/copy_to_clipboard.js.coffee b/app/assets/javascripts/copy_to_clipboard.js.coffee
deleted file mode 100644
index 24301e01b10..00000000000
--- a/app/assets/javascripts/copy_to_clipboard.js.coffee
+++ /dev/null
@@ -1,37 +0,0 @@
-#= require clipboard
-
-genericSuccess = (e) ->
-  showTooltip(e.trigger, 'Copied!')
-
-  # Clear the selection and blur the trigger so it loses its border
-  e.clearSelection()
-  $(e.trigger).blur()
-
-# Safari doesn't support `execCommand`, so instead we inform the user to
-# copy manually.
-#
-# See http://clipboardjs.com/#browser-support
-genericError = (e) ->
-  if /Mac/i.test(navigator.userAgent)
-    key = '&#8984;' # Command
-  else
-    key = 'Ctrl'
-
-  showTooltip(e.trigger, "Press #{key}-C to copy")
-
-showTooltip = (target, title) ->
-  $(target).
-    tooltip(
-      container: 'body'
-      html: 'true'
-      placement: 'auto bottom'
-      title: title
-      trigger: 'manual'
-    ).
-    tooltip('show').
-    one('mouseleave', -> $(this).tooltip('hide'))
-
-$ ->
-  clipboard = new Clipboard '[data-clipboard-target], [data-clipboard-text]'
-  clipboard.on 'success', genericSuccess
-  clipboard.on 'error',   genericError
diff --git a/app/assets/javascripts/diff.js b/app/assets/javascripts/diff.js
new file mode 100644
index 00000000000..298f3852085
--- /dev/null
+++ b/app/assets/javascripts/diff.js
@@ -0,0 +1,77 @@
+(function() {
+  this.Diff = (function() {
+    var UNFOLD_COUNT;
+
+    UNFOLD_COUNT = 20;
+
+    function Diff() {
+      $('.files .diff-file').singleFileDiff();
+      this.filesCommentButton = $('.files .diff-file').filesCommentButton();
+      $(document).off('click', '.js-unfold');
+      $(document).on('click', '.js-unfold', (function(_this) {
+        return function(event) {
+          var line_number, link, offset, old_line, params, prev_new_line, prev_old_line, ref, ref1, since, target, to, unfold, unfoldBottom;
+          target = $(event.target);
+          unfoldBottom = target.hasClass('js-unfold-bottom');
+          unfold = true;
+          ref = _this.lineNumbers(target.parent()), old_line = ref[0], line_number = ref[1];
+          offset = line_number - old_line;
+          if (unfoldBottom) {
+            line_number += 1;
+            since = line_number;
+            to = line_number + UNFOLD_COUNT;
+          } else {
+            ref1 = _this.lineNumbers(target.parent().prev()), prev_old_line = ref1[0], prev_new_line = ref1[1];
+            line_number -= 1;
+            to = line_number;
+            if (line_number - UNFOLD_COUNT > prev_new_line + 1) {
+              since = line_number - UNFOLD_COUNT;
+            } else {
+              since = prev_new_line + 1;
+              unfold = false;
+            }
+          }
+          link = target.parents('.diff-file').attr('data-blob-diff-path');
+          params = {
+            since: since,
+            to: to,
+            bottom: unfoldBottom,
+            offset: offset,
+            unfold: unfold,
+            indent: 1
+          };
+          return $.get(link, params, function(response) {
+            return target.parent().replaceWith(response);
+          });
+        };
+      })(this));
+    }
+
+    Diff.prototype.lineNumbers = function(line) {
+      var i, l, len, line_number, line_numbers, lines, results;
+      if (!line.children().length) {
+        return [0, 0];
+      }
+      lines = line.children().slice(0, 2);
+      line_numbers = (function() {
+        var i, len, results;
+        results = [];
+        for (i = 0, len = lines.length; i < len; i++) {
+          l = lines[i];
+          results.push($(l).attr('data-linenumber'));
+        }
+        return results;
+      })();
+      results = [];
+      for (i = 0, len = line_numbers.length; i < len; i++) {
+        line_number = line_numbers[i];
+        results.push(parseInt(line_number));
+      }
+      return results;
+    };
+
+    return Diff;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/diff.js.coffee b/app/assets/javascripts/diff.js.coffee
deleted file mode 100644
index c132cc8c542..00000000000
--- a/app/assets/javascripts/diff.js.coffee
+++ /dev/null
@@ -1,51 +0,0 @@
-class @Diff
-  UNFOLD_COUNT = 20
-  constructor: ->
-    $('.files .diff-file').singleFileDiff()
-    @filesCommentButton = $('.files .diff-file').filesCommentButton()
-
-    $(document).off('click', '.js-unfold')
-    $(document).on('click', '.js-unfold', (event) =>
-      target = $(event.target)
-      unfoldBottom = target.hasClass('js-unfold-bottom')
-      unfold = true
-
-      [old_line, line_number] = @lineNumbers(target.parent())
-      offset = line_number - old_line
-
-      if unfoldBottom
-        line_number += 1
-        since = line_number
-        to = line_number + UNFOLD_COUNT
-      else
-        [prev_old_line, prev_new_line] = @lineNumbers(target.parent().prev())
-        line_number -= 1
-        to = line_number
-        if line_number - UNFOLD_COUNT > prev_new_line + 1
-          since = line_number - UNFOLD_COUNT
-        else
-          since = prev_new_line + 1
-          unfold = false
-
-      link = target.parents('.diff-file').attr('data-blob-diff-path')
-      params =
-        since: since
-        to: to
-        bottom: unfoldBottom
-        offset: offset
-        unfold: unfold
-        # indent is used to compensate for single space indent to fit
-        # '+' and '-' prepended to diff lines,
-        # see https://gitlab.com/gitlab-org/gitlab-ce/issues/707
-        indent: 1
-
-      $.get(link, params, (response) ->
-        target.parent().replaceWith(response)
-      )
-    )
-
-  lineNumbers: (line) ->
-    return ([0, 0]) unless line.children().length
-    lines = line.children().slice(0, 2)
-    line_numbers = ($(l).attr('data-linenumber') for l in lines)
-    (parseInt(line_number) for line_number in line_numbers)
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
new file mode 100644
index 00000000000..d212d66da1b
--- /dev/null
+++ b/app/assets/javascripts/dispatcher.js
@@ -0,0 +1,255 @@
+(function() {
+  var Dispatcher;
+
+  $(function() {
+    return new Dispatcher();
+  });
+
+  Dispatcher = (function() {
+    function Dispatcher() {
+      this.initSearch();
+      this.initPageScripts();
+    }
+
+    Dispatcher.prototype.initPageScripts = function() {
+      var page, path, shortcut_handler;
+      page = $('body').attr('data-page');
+      if (!page) {
+        return false;
+      }
+      path = page.split(':');
+      shortcut_handler = null;
+      switch (page) {
+        case 'projects:issues:index':
+          Issuable.init();
+          new IssuableBulkActions();
+          shortcut_handler = new ShortcutsNavigation();
+          break;
+        case 'projects:issues:show':
+          new Issue();
+          shortcut_handler = new ShortcutsIssuable();
+          new ZenMode();
+          break;
+        case 'projects:milestones:show':
+        case 'groups:milestones:show':
+        case 'dashboard:milestones:show':
+          new Milestone();
+          break;
+        case 'dashboard:todos:index':
+          new Todos();
+          break;
+        case 'projects:milestones:new':
+        case 'projects:milestones:edit':
+          new ZenMode();
+          new DueDateSelect();
+          new GLForm($('.milestone-form'));
+          break;
+        case 'groups:milestones:new':
+          new ZenMode();
+          break;
+        case 'projects:compare:show':
+          new Diff();
+          break;
+        case 'projects:issues:new':
+        case 'projects:issues:edit':
+          shortcut_handler = new ShortcutsNavigation();
+          new GLForm($('.issue-form'));
+          new IssuableForm($('.issue-form'));
+          break;
+        case 'projects:merge_requests:new':
+        case 'projects:merge_requests:edit':
+          new Diff();
+          shortcut_handler = new ShortcutsNavigation();
+          new GLForm($('.merge-request-form'));
+          new IssuableForm($('.merge-request-form'));
+          break;
+        case 'projects:tags:new':
+          new ZenMode();
+          new GLForm($('.tag-form'));
+          break;
+        case 'projects:releases:edit':
+          new ZenMode();
+          new GLForm($('.release-form'));
+          break;
+        case 'projects:merge_requests:show':
+          new Diff();
+          shortcut_handler = new ShortcutsIssuable(true);
+          new ZenMode();
+          new MergedButtons();
+          break;
+        case 'projects:merge_requests:commits':
+        case 'projects:merge_requests:builds':
+          new MergedButtons();
+          break;
+        case "projects:merge_requests:diffs":
+          new Diff();
+          new ZenMode();
+          new MergedButtons();
+          break;
+        case 'projects:merge_requests:index':
+          shortcut_handler = new ShortcutsNavigation();
+          Issuable.init();
+          break;
+        case 'dashboard:activity':
+          new Activities();
+          break;
+        case 'dashboard:projects:starred':
+          new Activities();
+          break;
+        case 'projects:commit:show':
+          new Commit();
+          new Diff();
+          new ZenMode();
+          shortcut_handler = new ShortcutsNavigation();
+          break;
+        case 'projects:commits:show':
+        case 'projects:activity':
+          shortcut_handler = new ShortcutsNavigation();
+          break;
+        case 'projects:show':
+          shortcut_handler = new ShortcutsNavigation();
+          new NotificationsForm();
+          if ($('#tree-slider').length) {
+            new TreeView();
+          }
+          break;
+        case 'groups:activity':
+          new Activities();
+          break;
+        case 'groups:show':
+          shortcut_handler = new ShortcutsNavigation();
+          new NotificationsForm();
+          new NotificationsDropdown();
+          break;
+        case 'groups:group_members:index':
+          new GroupMembers();
+          new UsersSelect();
+          break;
+        case 'projects:project_members:index':
+          new ProjectMembers();
+          new UsersSelect();
+          break;
+        case 'groups:new':
+        case 'groups:edit':
+        case 'admin:groups:edit':
+        case 'admin:groups:new':
+          new GroupAvatar();
+          break;
+        case 'projects:tree:show':
+          shortcut_handler = new ShortcutsNavigation();
+          new TreeView();
+          break;
+        case 'projects:find_file:show':
+          shortcut_handler = true;
+          break;
+        case 'projects:blob:show':
+        case 'projects:blame:show':
+          new LineHighlighter();
+          shortcut_handler = new ShortcutsNavigation();
+          new ShortcutsBlob(true);
+          break;
+        case 'projects:labels:new':
+        case 'projects:labels:edit':
+          new Labels();
+          break;
+        case 'projects:labels:index':
+          if ($('.prioritized-labels').length) {
+            new LabelManager();
+          }
+          break;
+        case 'projects:network:show':
+          shortcut_handler = true;
+          break;
+        case 'projects:forks:new':
+          new ProjectFork();
+          break;
+        case 'projects:artifacts:browse':
+          new BuildArtifacts();
+          break;
+        case 'projects:group_links:index':
+          new GroupsSelect();
+          break;
+        case 'search:show':
+          new Search();
+      }
+      switch (path.first()) {
+        case 'admin':
+          new Admin();
+          switch (path[1]) {
+            case 'groups':
+              new UsersSelect();
+              break;
+            case 'projects':
+              new NamespaceSelects();
+          }
+          break;
+        case 'dashboard':
+        case 'root':
+          shortcut_handler = new ShortcutsDashboardNavigation();
+          break;
+        case 'profiles':
+          new NotificationsForm();
+          new NotificationsDropdown();
+          break;
+        case 'projects':
+          new Project();
+          new ProjectAvatar();
+          switch (path[1]) {
+            case 'compare':
+              new CompareAutocomplete();
+              break;
+            case 'edit':
+              shortcut_handler = new ShortcutsNavigation();
+              new ProjectNew();
+              break;
+            case 'new':
+              new ProjectNew();
+              break;
+            case 'show':
+              new ProjectNew();
+              new ProjectShow();
+              new NotificationsDropdown();
+              break;
+            case 'wikis':
+              new Wikis();
+              shortcut_handler = new ShortcutsNavigation();
+              new ZenMode();
+              new GLForm($('.wiki-form'));
+              break;
+            case 'snippets':
+              shortcut_handler = new ShortcutsNavigation();
+              if (path[2] === 'show') {
+                new ZenMode();
+              }
+              break;
+            case 'labels':
+            case 'graphs':
+            case 'compare':
+            case 'pipelines':
+            case 'forks':
+            case 'milestones':
+            case 'project_members':
+            case 'deploy_keys':
+            case 'builds':
+            case 'hooks':
+            case 'services':
+            case 'protected_branches':
+              shortcut_handler = new ShortcutsNavigation();
+          }
+      }
+      if (!shortcut_handler) {
+        return new Shortcuts();
+      }
+    };
+
+    Dispatcher.prototype.initSearch = function() {
+      if ($('.search').length) {
+        return new SearchAutocomplete();
+      }
+    };
+
+    return Dispatcher;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
deleted file mode 100644
index b5da15e9e49..00000000000
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ /dev/null
@@ -1,173 +0,0 @@
-$ ->
-  new Dispatcher()
-
-class Dispatcher
-  constructor: () ->
-    @initSearch()
-    @initPageScripts()
-
-  initPageScripts: ->
-    page = $('body').attr('data-page')
-
-    unless page
-      return false
-
-    path = page.split(':')
-    shortcut_handler = null
-    switch page
-      when 'projects:issues:index'
-        Issuable.init()
-        new IssuableBulkActions()
-        shortcut_handler = new ShortcutsNavigation()
-      when 'projects:issues:show'
-        new Issue()
-        shortcut_handler = new ShortcutsIssuable()
-        new ZenMode()
-      when 'projects:milestones:show', 'groups:milestones:show', 'dashboard:milestones:show'
-        new Milestone()
-      when 'dashboard:todos:index'
-        new Todos()
-      when 'projects:milestones:new', 'projects:milestones:edit'
-        new ZenMode()
-        new DueDateSelect()
-        new GLForm($('.milestone-form'))
-      when 'groups:milestones:new'
-        new ZenMode()
-      when 'projects:compare:show'
-        new Diff()
-      when 'projects:issues:new','projects:issues:edit'
-        shortcut_handler = new ShortcutsNavigation()
-        new GLForm($('.issue-form'))
-        new IssuableForm($('.issue-form'))
-        new LabelsSelect()
-        new MilestoneSelect()
-      when 'projects:merge_requests:new', 'projects:merge_requests:edit'
-        new Diff()
-        shortcut_handler = new ShortcutsNavigation()
-        new GLForm($('.merge-request-form'))
-        new IssuableForm($('.merge-request-form'))
-      when 'projects:tags:new'
-        new ZenMode()
-        new GLForm($('.tag-form'))
-      when 'projects:releases:edit'
-        new ZenMode()
-        new GLForm($('.release-form'))
-      when 'projects:merge_requests:show'
-        new Diff()
-        shortcut_handler = new ShortcutsIssuable(true)
-        new ZenMode()
-        new MergedButtons()
-      when 'projects:merge_requests:commits', 'projects:merge_requests:builds'
-        new MergedButtons()
-      when "projects:merge_requests:diffs"
-        new Diff()
-        new ZenMode()
-        new MergedButtons()
-      when 'projects:merge_requests:index'
-        shortcut_handler = new ShortcutsNavigation()
-        Issuable.init()
-      when 'dashboard:activity'
-        new Activities()
-      when 'dashboard:projects:starred'
-        new Activities()
-      when 'projects:commit:show'
-        new Commit()
-        new Diff()
-        new ZenMode()
-        shortcut_handler = new ShortcutsNavigation()
-      when 'projects:commits:show', 'projects:activity'
-        shortcut_handler = new ShortcutsNavigation()
-      when 'projects:show'
-        shortcut_handler = new ShortcutsNavigation()
-
-        new NotificationsForm()
-        new TreeView() if $('#tree-slider').length
-      when 'groups:activity'
-        new Activities()
-      when 'groups:show'
-        shortcut_handler = new ShortcutsNavigation()
-        new NotificationsForm()
-        new NotificationsDropdown()
-      when 'groups:group_members:index'
-        new GroupMembers()
-        new UsersSelect()
-      when 'projects:project_members:index'
-        new ProjectMembers()
-        new UsersSelect()
-      when 'groups:new', 'groups:edit', 'admin:groups:edit', 'admin:groups:new'
-        new GroupAvatar()
-      when 'projects:tree:show'
-        shortcut_handler = new ShortcutsNavigation()
-        new TreeView()
-      when 'projects:find_file:show'
-        shortcut_handler = true
-      when 'projects:blob:show', 'projects:blame:show'
-        new LineHighlighter()
-        shortcut_handler = new ShortcutsNavigation()
-        new ShortcutsBlob true
-      when 'projects:labels:new', 'projects:labels:edit'
-        new Labels()
-      when 'projects:labels:index'
-        new LabelManager() if $('.prioritized-labels').length
-      when 'projects:network:show'
-        # Ensure we don't create a particular shortcut handler here. This is
-        # already created, where the network graph is created.
-        shortcut_handler = true
-      when 'projects:forks:new'
-        new ProjectFork()
-      when 'projects:artifacts:browse'
-        new BuildArtifacts()
-      when 'projects:group_links:index'
-        new GroupsSelect()
-      when 'search:show'
-        new Search()
-
-    switch path.first()
-      when 'admin'
-        new Admin()
-        switch path[1]
-          when 'groups'
-            new UsersSelect()
-          when 'projects'
-            new NamespaceSelects()
-      when 'dashboard', 'root'
-        shortcut_handler = new ShortcutsDashboardNavigation()
-      when 'profiles'
-        new NotificationsForm()
-        new NotificationsDropdown()
-      when 'projects'
-        new Project()
-        new ProjectAvatar()
-        switch path[1]
-          when 'compare'
-            new CompareAutocomplete()
-          when 'edit'
-            shortcut_handler = new ShortcutsNavigation()
-            new ProjectNew()
-          when 'new'
-            new ProjectNew()
-          when 'show'
-            new ProjectNew()
-            new ProjectShow()
-            new NotificationsDropdown()
-          when 'wikis'
-            new Wikis()
-            shortcut_handler = new ShortcutsNavigation()
-            new ZenMode()
-            new GLForm($('.wiki-form'))
-          when 'snippets'
-            shortcut_handler = new ShortcutsNavigation()
-            new ZenMode() if path[2] == 'show'
-          when 'labels', 'graphs', 'compare', 'pipelines', 'forks', \
-          'milestones', 'project_members', 'deploy_keys', 'builds', \
-          'hooks', 'services', 'protected_branches'
-            shortcut_handler = new ShortcutsNavigation()
-
-    # If we haven't installed a custom shortcut handler, install the default one
-    if not shortcut_handler
-      new Shortcuts()
-
-  initSearch: ->
-
-    # Only when search form is present
-    new SearchAutocomplete() if $('.search').length
diff --git a/app/assets/javascripts/dropzone_input.js b/app/assets/javascripts/dropzone_input.js
new file mode 100644
index 00000000000..288cce04f87
--- /dev/null
+++ b/app/assets/javascripts/dropzone_input.js
@@ -0,0 +1,219 @@
+
+/*= require markdown_preview */
+
+(function() {
+  this.DropzoneInput = (function() {
+    function DropzoneInput(form) {
+      var $mdArea, alertAttr, alertClass, appendToTextArea, btnAlert, child, closeAlertMessage, closeSpinner, divAlert, divHover, divSpinner, dropzone, form_dropzone, form_textarea, getFilename, handlePaste, iconPaperclip, iconSpinner, insertToTextArea, isImage, max_file_size, pasteText, project_uploads_path, showError, showSpinner, uploadFile, uploadProgress;
+      Dropzone.autoDiscover = false;
+      alertClass = "alert alert-danger alert-dismissable div-dropzone-alert";
+      alertAttr = "class=\"close\" data-dismiss=\"alert\"" + "aria-hidden=\"true\"";
+      divHover = "<div class=\"div-dropzone-hover\"></div>";
+      divSpinner = "<div class=\"div-dropzone-spinner\"></div>";
+      divAlert = "<div class=\"" + alertClass + "\"></div>";
+      iconPaperclip = "<i class=\"fa fa-paperclip div-dropzone-icon\"></i>";
+      iconSpinner = "<i class=\"fa fa-spinner fa-spin div-dropzone-icon\"></i>";
+      uploadProgress = $("<div class=\"div-dropzone-progress\"></div>");
+      btnAlert = "<button type=\"button\"" + alertAttr + ">&times;</button>";
+      project_uploads_path = window.project_uploads_path || null;
+      max_file_size = gon.max_file_size || 10;
+      form_textarea = $(form).find(".js-gfm-input");
+      form_textarea.wrap("<div class=\"div-dropzone\"></div>");
+      form_textarea.on('paste', (function(_this) {
+        return function(event) {
+          return handlePaste(event);
+        };
+      })(this));
+      $mdArea = $(form_textarea).closest('.md-area');
+      $(form).setupMarkdownPreview();
+      form_dropzone = $(form).find('.div-dropzone');
+      form_dropzone.parent().addClass("div-dropzone-wrapper");
+      form_dropzone.append(divHover);
+      form_dropzone.find(".div-dropzone-hover").append(iconPaperclip);
+      form_dropzone.append(divSpinner);
+      form_dropzone.find(".div-dropzone-spinner").append(iconSpinner);
+      form_dropzone.find(".div-dropzone-spinner").append(uploadProgress);
+      form_dropzone.find(".div-dropzone-spinner").css({
+        "opacity": 0,
+        "display": "none"
+      });
+      dropzone = form_dropzone.dropzone({
+        url: project_uploads_path,
+        dictDefaultMessage: "",
+        clickable: true,
+        paramName: "file",
+        maxFilesize: max_file_size,
+        uploadMultiple: false,
+        headers: {
+          "X-CSRF-Token": $("meta[name=\"csrf-token\"]").attr("content")
+        },
+        previewContainer: false,
+        processing: function() {
+          return $(".div-dropzone-alert").alert("close");
+        },
+        dragover: function() {
+          $mdArea.addClass('is-dropzone-hover');
+          form.find(".div-dropzone-hover").css("opacity", 0.7);
+        },
+        dragleave: function() {
+          $mdArea.removeClass('is-dropzone-hover');
+          form.find(".div-dropzone-hover").css("opacity", 0);
+        },
+        drop: function() {
+          $mdArea.removeClass('is-dropzone-hover');
+          form.find(".div-dropzone-hover").css("opacity", 0);
+          form_textarea.focus();
+        },
+        success: function(header, response) {
+          pasteText(response.link.markdown);
+        },
+        error: function(temp) {
+          var checkIfMsgExists, errorAlert;
+          errorAlert = $(form).find('.error-alert');
+          checkIfMsgExists = errorAlert.children().length;
+          if (checkIfMsgExists === 0) {
+            errorAlert.append(divAlert);
+            $(".div-dropzone-alert").append(btnAlert + "Attaching the file failed.");
+          }
+        },
+        totaluploadprogress: function(totalUploadProgress) {
+          uploadProgress.text(Math.round(totalUploadProgress) + "%");
+        },
+        sending: function() {
+          form_dropzone.find(".div-dropzone-spinner").css({
+            "opacity": 0.7,
+            "display": "inherit"
+          });
+        },
+        queuecomplete: function() {
+          uploadProgress.text("");
+          $(".dz-preview").remove();
+          $(".markdown-area").trigger("input");
+          $(".div-dropzone-spinner").css({
+            "opacity": 0,
+            "display": "none"
+          });
+        }
+      });
+      child = $(dropzone[0]).children("textarea");
+      handlePaste = function(event) {
+        var filename, image, pasteEvent, text;
+        pasteEvent = event.originalEvent;
+        if (pasteEvent.clipboardData && pasteEvent.clipboardData.items) {
+          image = isImage(pasteEvent);
+          if (image) {
+            event.preventDefault();
+            filename = getFilename(pasteEvent) || "image.png";
+            text = "{{" + filename + "}}";
+            pasteText(text);
+            return uploadFile(image.getAsFile(), filename);
+          }
+        }
+      };
+      isImage = function(data) {
+        var i, item;
+        i = 0;
+        while (i < data.clipboardData.items.length) {
+          item = data.clipboardData.items[i];
+          if (item.type.indexOf("image") !== -1) {
+            return item;
+          }
+          i++;
+        }
+        return false;
+      };
+      pasteText = function(text) {
+        var afterSelection, beforeSelection, caretEnd, caretStart, textEnd;
+        caretStart = $(child)[0].selectionStart;
+        caretEnd = $(child)[0].selectionEnd;
+        textEnd = $(child).val().length;
+        beforeSelection = $(child).val().substring(0, caretStart);
+        afterSelection = $(child).val().substring(caretEnd, textEnd);
+        $(child).val(beforeSelection + text + afterSelection);
+        child.get(0).setSelectionRange(caretStart + text.length, caretEnd + text.length);
+        return form_textarea.trigger("input");
+      };
+      getFilename = function(e) {
+        var value;
+        if (window.clipboardData && window.clipboardData.getData) {
+          value = window.clipboardData.getData("Text");
+        } else if (e.clipboardData && e.clipboardData.getData) {
+          value = e.clipboardData.getData("text/plain");
+        }
+        value = value.split("\r");
+        return value.first();
+      };
+      uploadFile = function(item, filename) {
+        var formData;
+        formData = new FormData();
+        formData.append("file", item, filename);
+        return $.ajax({
+          url: project_uploads_path,
+          type: "POST",
+          data: formData,
+          dataType: "json",
+          processData: false,
+          contentType: false,
+          headers: {
+            "X-CSRF-Token": $("meta[name=\"csrf-token\"]").attr("content")
+          },
+          beforeSend: function() {
+            showSpinner();
+            return closeAlertMessage();
+          },
+          success: function(e, textStatus, response) {
+            return insertToTextArea(filename, response.responseJSON.link.markdown);
+          },
+          error: function(response) {
+            return showError(response.responseJSON.message);
+          },
+          complete: function() {
+            return closeSpinner();
+          }
+        });
+      };
+      insertToTextArea = function(filename, url) {
+        return $(child).val(function(index, val) {
+          return val.replace("{{" + filename + "}}", url + "\n");
+        });
+      };
+      appendToTextArea = function(url) {
+        return $(child).val(function(index, val) {
+          return val + url + "\n";
+        });
+      };
+      showSpinner = function(e) {
+        return form.find(".div-dropzone-spinner").css({
+          "opacity": 0.7,
+          "display": "inherit"
+        });
+      };
+      closeSpinner = function() {
+        return form.find(".div-dropzone-spinner").css({
+          "opacity": 0,
+          "display": "none"
+        });
+      };
+      showError = function(message) {
+        var checkIfMsgExists, errorAlert;
+        errorAlert = $(form).find('.error-alert');
+        checkIfMsgExists = errorAlert.children().length;
+        if (checkIfMsgExists === 0) {
+          errorAlert.append(divAlert);
+          return $(".div-dropzone-alert").append(btnAlert + message);
+        }
+      };
+      closeAlertMessage = function() {
+        return form.find(".div-dropzone-alert").alert("close");
+      };
+      form.find(".markdown-selector").click(function(e) {
+        e.preventDefault();
+        $(this).closest('.gfm-form').find('.div-dropzone').click();
+      });
+    }
+
+    return DropzoneInput;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/dropzone_input.js.coffee b/app/assets/javascripts/dropzone_input.js.coffee
deleted file mode 100644
index 665246e2a7d..00000000000
--- a/app/assets/javascripts/dropzone_input.js.coffee
+++ /dev/null
@@ -1,201 +0,0 @@
-#= require markdown_preview
-
-class @DropzoneInput
-  constructor: (form) ->
-    Dropzone.autoDiscover = false
-    alertClass = "alert alert-danger alert-dismissable div-dropzone-alert"
-    alertAttr = "class=\"close\" data-dismiss=\"alert\"" + "aria-hidden=\"true\""
-    divHover = "<div class=\"div-dropzone-hover\"></div>"
-    divSpinner = "<div class=\"div-dropzone-spinner\"></div>"
-    divAlert = "<div class=\"" + alertClass + "\"></div>"
-    iconPaperclip = "<i class=\"fa fa-paperclip div-dropzone-icon\"></i>"
-    iconSpinner = "<i class=\"fa fa-spinner fa-spin div-dropzone-icon\"></i>"
-    uploadProgress = $("<div class=\"div-dropzone-progress\"></div>")
-    btnAlert = "<button type=\"button\"" + alertAttr + ">&times;</button>"
-    project_uploads_path = window.project_uploads_path or null
-    max_file_size = gon.max_file_size or 10
-
-    form_textarea = $(form).find(".js-gfm-input")
-    form_textarea.wrap "<div class=\"div-dropzone\"></div>"
-    form_textarea.on 'paste', (event) =>
-      handlePaste(event)
-
-    $mdArea = $(form_textarea).closest('.md-area')
-
-    $(form).setupMarkdownPreview()
-
-    form_dropzone = $(form).find('.div-dropzone')
-    form_dropzone.parent().addClass "div-dropzone-wrapper"
-    form_dropzone.append divHover
-    form_dropzone.find(".div-dropzone-hover").append iconPaperclip
-    form_dropzone.append divSpinner
-    form_dropzone.find(".div-dropzone-spinner").append iconSpinner
-    form_dropzone.find(".div-dropzone-spinner").append uploadProgress
-    form_dropzone.find(".div-dropzone-spinner").css
-      "opacity": 0
-      "display": "none"
-
-    dropzone = form_dropzone.dropzone(
-      url: project_uploads_path
-      dictDefaultMessage: ""
-      clickable: true
-      paramName: "file"
-      maxFilesize: max_file_size
-      uploadMultiple: false
-      headers:
-        "X-CSRF-Token": $("meta[name=\"csrf-token\"]").attr("content")
-
-      previewContainer: false
-
-      processing: ->
-        $(".div-dropzone-alert").alert "close"
-
-      dragover: ->
-        $mdArea.addClass 'is-dropzone-hover'
-        form.find(".div-dropzone-hover").css "opacity", 0.7
-        return
-
-      dragleave: ->
-        $mdArea.removeClass 'is-dropzone-hover'
-        form.find(".div-dropzone-hover").css "opacity", 0
-        return
-
-      drop: ->
-        $mdArea.removeClass 'is-dropzone-hover'
-        form.find(".div-dropzone-hover").css "opacity", 0
-        form_textarea.focus()
-        return
-
-      success: (header, response) ->
-        pasteText response.link.markdown
-        return
-
-      error: (temp) ->
-        errorAlert = $(form).find('.error-alert')
-        checkIfMsgExists = errorAlert.children().length
-        if checkIfMsgExists is 0
-          errorAlert.append divAlert
-          $(".div-dropzone-alert").append "#{btnAlert}Attaching the file failed."
-        return
-
-      totaluploadprogress: (totalUploadProgress) ->
-        uploadProgress.text Math.round(totalUploadProgress) + "%"
-        return
-
-      sending: ->
-        form_dropzone.find(".div-dropzone-spinner").css
-          "opacity": 0.7
-          "display": "inherit"
-        return
-
-      queuecomplete: ->
-        uploadProgress.text ""
-        $(".dz-preview").remove()
-        $(".markdown-area").trigger "input"
-        $(".div-dropzone-spinner").css
-          "opacity": 0
-          "display": "none"
-        return
-    )
-
-    child = $(dropzone[0]).children("textarea")
-
-    handlePaste = (event) ->
-      pasteEvent = event.originalEvent
-      if pasteEvent.clipboardData and pasteEvent.clipboardData.items
-        image = isImage(pasteEvent)
-        if image
-          event.preventDefault()
-
-          filename = getFilename(pasteEvent) or "image.png"
-          text = "{{" + filename + "}}"
-          pasteText(text)
-          uploadFile image.getAsFile(), filename
-
-    isImage = (data) ->
-      i = 0
-      while i < data.clipboardData.items.length
-        item = data.clipboardData.items[i]
-        if item.type.indexOf("image") isnt -1
-          return item
-        i++
-      return false
-
-    pasteText = (text) ->
-      caretStart = $(child)[0].selectionStart
-      caretEnd = $(child)[0].selectionEnd
-      textEnd = $(child).val().length
-
-      beforeSelection = $(child).val().substring 0, caretStart
-      afterSelection = $(child).val().substring caretEnd, textEnd
-      $(child).val beforeSelection + text + afterSelection
-      child.get(0).setSelectionRange caretStart + text.length, caretEnd + text.length
-      form_textarea.trigger "input"
-
-    getFilename = (e) ->
-      if window.clipboardData and window.clipboardData.getData
-        value = window.clipboardData.getData("Text")
-      else if e.clipboardData and e.clipboardData.getData
-        value = e.clipboardData.getData("text/plain")
-
-      value = value.split("\r")
-      value.first()
-
-    uploadFile = (item, filename) ->
-      formData = new FormData()
-      formData.append "file", item, filename
-      $.ajax
-        url: project_uploads_path
-        type: "POST"
-        data: formData
-        dataType: "json"
-        processData: false
-        contentType: false
-        headers:
-          "X-CSRF-Token": $("meta[name=\"csrf-token\"]").attr("content")
-
-        beforeSend: ->
-          showSpinner()
-          closeAlertMessage()
-
-        success: (e, textStatus, response) ->
-          insertToTextArea(filename, response.responseJSON.link.markdown)
-
-        error: (response) ->
-          showError(response.responseJSON.message)
-
-        complete: ->
-          closeSpinner()
-
-    insertToTextArea = (filename, url) ->
-      $(child).val (index, val) ->
-        val.replace("{{" + filename + "}}", url + "\n")
-
-    appendToTextArea = (url) ->
-      $(child).val (index, val) ->
-        val + url + "\n"
-
-    showSpinner = (e) ->
-      form.find(".div-dropzone-spinner").css
-        "opacity": 0.7
-        "display": "inherit"
-
-    closeSpinner = ->
-      form.find(".div-dropzone-spinner").css
-        "opacity": 0
-        "display": "none"
-
-    showError = (message) ->
-      errorAlert = $(form).find('.error-alert')
-      checkIfMsgExists = errorAlert.children().length
-      if checkIfMsgExists is 0
-        errorAlert.append divAlert
-        $(".div-dropzone-alert").append btnAlert + message
-
-    closeAlertMessage = ->
-      form.find(".div-dropzone-alert").alert "close"
-
-    form.find(".markdown-selector").click (e) ->
-      e.preventDefault()
-      $(@).closest('.gfm-form').find('.div-dropzone').click()
-      return
diff --git a/app/assets/javascripts/due_date_select.js b/app/assets/javascripts/due_date_select.js
new file mode 100644
index 00000000000..5a725a41fd1
--- /dev/null
+++ b/app/assets/javascripts/due_date_select.js
@@ -0,0 +1,104 @@
+(function() {
+  this.DueDateSelect = (function() {
+    function DueDateSelect() {
+      var $datePicker, $dueDate, $loading;
+      $datePicker = $('.datepicker');
+      if ($datePicker.length) {
+        $dueDate = $('#milestone_due_date');
+        $datePicker.datepicker({
+          dateFormat: 'yy-mm-dd',
+          onSelect: function(dateText, inst) {
+            return $dueDate.val(dateText);
+          }
+        }).datepicker('setDate', $.datepicker.parseDate('yy-mm-dd', $dueDate.val()));
+      }
+      $('.js-clear-due-date').on('click', function(e) {
+        e.preventDefault();
+        return $.datepicker._clearDate($datePicker);
+      });
+      $loading = $('.js-issuable-update .due_date').find('.block-loading').hide();
+      $('.js-due-date-select').each(function(i, dropdown) {
+        var $block, $dropdown, $dropdownParent, $selectbox, $sidebarValue, $value, $valueContent, abilityName, addDueDate, fieldName, issueUpdateURL;
+        $dropdown = $(dropdown);
+        $dropdownParent = $dropdown.closest('.dropdown');
+        $datePicker = $dropdownParent.find('.js-due-date-calendar');
+        $block = $dropdown.closest('.block');
+        $selectbox = $dropdown.closest('.selectbox');
+        $value = $block.find('.value');
+        $valueContent = $block.find('.value-content');
+        $sidebarValue = $('.js-due-date-sidebar-value', $block);
+        fieldName = $dropdown.data('field-name');
+        abilityName = $dropdown.data('ability-name');
+        issueUpdateURL = $dropdown.data('issue-update');
+        $dropdown.glDropdown({
+          hidden: function() {
+            $selectbox.hide();
+            return $value.css('display', '');
+          }
+        });
+        addDueDate = function(isDropdown) {
+          var data, date, mediumDate, value;
+          value = $("input[name='" + fieldName + "']").val();
+          if (value !== '') {
+            date = new Date(value.replace(new RegExp('-', 'g'), ','));
+            mediumDate = $.datepicker.formatDate('M d, yy', date);
+          } else {
+            mediumDate = 'No due date';
+          }
+          data = {};
+          data[abilityName] = {};
+          data[abilityName].due_date = value;
+          return $.ajax({
+            type: 'PUT',
+            url: issueUpdateURL,
+            data: data,
+            dataType: 'json',
+            beforeSend: function() {
+              var cssClass;
+              $loading.fadeIn();
+              if (isDropdown) {
+                $dropdown.trigger('loading.gl.dropdown');
+                $selectbox.hide();
+              }
+              $value.css('display', '');
+              cssClass = Date.parse(mediumDate) ? 'bold' : 'no-value';
+              $valueContent.html("<span class='" + cssClass + "'>" + mediumDate + "</span>");
+              $sidebarValue.html(mediumDate);
+              if (value !== '') {
+                return $('.js-remove-due-date-holder').removeClass('hidden');
+              } else {
+                return $('.js-remove-due-date-holder').addClass('hidden');
+              }
+            }
+          }).done(function(data) {
+            if (isDropdown) {
+              $dropdown.trigger('loaded.gl.dropdown');
+              $dropdown.dropdown('toggle');
+            }
+            return $loading.fadeOut();
+          });
+        };
+        $block.on('click', '.js-remove-due-date', function(e) {
+          e.preventDefault();
+          $("input[name='" + fieldName + "']").val('');
+          return addDueDate(false);
+        });
+        return $datePicker.datepicker({
+          dateFormat: 'yy-mm-dd',
+          defaultDate: $("input[name='" + fieldName + "']").val(),
+          altField: "input[name='" + fieldName + "']",
+          onSelect: function() {
+            return addDueDate(true);
+          }
+        });
+      });
+      $(document).off('click', '.ui-datepicker-header a').on('click', '.ui-datepicker-header a', function(e) {
+        return e.stopImmediatePropagation();
+      });
+    }
+
+    return DueDateSelect;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/due_date_select.js.coffee b/app/assets/javascripts/due_date_select.js.coffee
deleted file mode 100644
index d65c018dad5..00000000000
--- a/app/assets/javascripts/due_date_select.js.coffee
+++ /dev/null
@@ -1,99 +0,0 @@
-class @DueDateSelect
-  constructor: ->
-    # Milestone edit/new form
-    $datePicker = $('.datepicker')
-
-    if $datePicker.length
-      $dueDate = $('#milestone_due_date')
-      $datePicker.datepicker
-        dateFormat: 'yy-mm-dd'
-        onSelect: (dateText, inst) ->
-          $dueDate.val(dateText)
-      .datepicker('setDate', $.datepicker.parseDate('yy-mm-dd', $dueDate.val()))
-
-    $('.js-clear-due-date').on 'click', (e) ->
-      e.preventDefault()
-      $.datepicker._clearDate($datePicker)
-
-    # Issuable sidebar
-    $loading = $('.js-issuable-update .due_date')
-      .find('.block-loading')
-      .hide()
-
-    $('.js-due-date-select').each (i, dropdown) ->
-      $dropdown = $(dropdown)
-      $dropdownParent = $dropdown.closest('.dropdown')
-      $datePicker = $dropdownParent.find('.js-due-date-calendar')
-      $block = $dropdown.closest('.block')
-      $selectbox = $dropdown.closest('.selectbox')
-      $value = $block.find('.value')
-      $valueContent = $block.find('.value-content')
-      $sidebarValue = $('.js-due-date-sidebar-value', $block)
-
-      fieldName = $dropdown.data('field-name')
-      abilityName = $dropdown.data('ability-name')
-      issueUpdateURL = $dropdown.data('issue-update')
-
-      $dropdown.glDropdown(
-        hidden: ->
-          $selectbox.hide()
-          $value.css('display', '')
-      )
-
-      addDueDate = (isDropdown) ->
-        # Create the post date
-        value = $("input[name='#{fieldName}']").val()
-
-        if value isnt ''
-          date = new Date value.replace(new RegExp('-', 'g'), ',')
-          mediumDate = $.datepicker.formatDate 'M d, yy', date
-        else
-          mediumDate = 'No due date'
-
-        data = {}
-        data[abilityName] = {}
-        data[abilityName].due_date = value
-
-        $.ajax(
-          type: 'PUT'
-          url: issueUpdateURL
-          data: data
-          dataType: 'json'
-          beforeSend: ->
-            $loading.fadeIn()
-            if isDropdown
-              $dropdown.trigger('loading.gl.dropdown')
-              $selectbox.hide()
-            $value.css('display', '')
-
-            cssClass = if Date.parse(mediumDate) then 'bold' else 'no-value'
-            $valueContent.html("<span class='#{cssClass}'>#{mediumDate}</span>")
-            $sidebarValue.html(mediumDate)
-
-            if value isnt ''
-              $('.js-remove-due-date-holder').removeClass 'hidden'
-            else
-              $('.js-remove-due-date-holder').addClass 'hidden'
-        ).done (data) ->
-          if isDropdown
-            $dropdown.trigger('loaded.gl.dropdown')
-            $dropdown.dropdown('toggle')
-          $loading.fadeOut()
-
-      $block.on 'click', '.js-remove-due-date', (e) ->
-        e.preventDefault()
-        $("input[name='#{fieldName}']").val ''
-        addDueDate(false)
-
-      $datePicker.datepicker(
-        dateFormat: 'yy-mm-dd',
-        defaultDate: $("input[name='#{fieldName}']").val()
-        altField: "input[name='#{fieldName}']"
-        onSelect: ->
-          addDueDate(true)
-      )
-
-    $(document)
-      .off 'click', '.ui-datepicker-header a'
-      .on 'click', '.ui-datepicker-header a', (e) ->
-        e.stopImmediatePropagation()
diff --git a/app/assets/javascripts/extensions/jquery.js b/app/assets/javascripts/extensions/jquery.js
new file mode 100644
index 00000000000..ae3dde63da3
--- /dev/null
+++ b/app/assets/javascripts/extensions/jquery.js
@@ -0,0 +1,14 @@
+(function() {
+  $.fn.extend({
+    disable: function() {
+      return $(this).attr('disabled', 'disabled').addClass('disabled');
+    }
+  });
+
+  $.fn.extend({
+    enable: function() {
+      return $(this).removeAttr('disabled').removeClass('disabled');
+    }
+  });
+
+}).call(this);
diff --git a/app/assets/javascripts/extensions/jquery.js.coffee b/app/assets/javascripts/extensions/jquery.js.coffee
deleted file mode 100644
index 0a9db8eb5ef..00000000000
--- a/app/assets/javascripts/extensions/jquery.js.coffee
+++ /dev/null
@@ -1,11 +0,0 @@
-# Disable an element and add the 'disabled' Bootstrap class
-$.fn.extend disable: ->
-  $(@)
-    .attr('disabled', 'disabled')
-    .addClass('disabled')
-
-# Enable an element and remove the 'disabled' Bootstrap class
-$.fn.extend enable: ->
-  $(@)
-    .removeAttr('disabled')
-    .removeClass('disabled')
diff --git a/app/assets/javascripts/files_comment_button.js b/app/assets/javascripts/files_comment_button.js
new file mode 100644
index 00000000000..09b5eb398d4
--- /dev/null
+++ b/app/assets/javascripts/files_comment_button.js
@@ -0,0 +1,141 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.FilesCommentButton = (function() {
+    var COMMENT_BUTTON_CLASS, COMMENT_BUTTON_TEMPLATE, DEBOUNCE_TIMEOUT_DURATION, EMPTY_CELL_CLASS, LINE_COLUMN_CLASSES, LINE_CONTENT_CLASS, LINE_HOLDER_CLASS, LINE_NUMBER_CLASS, OLD_LINE_CLASS, TEXT_FILE_SELECTOR, UNFOLDABLE_LINE_CLASS;
+
+    COMMENT_BUTTON_CLASS = '.add-diff-note';
+
+    COMMENT_BUTTON_TEMPLATE = _.template('<button name="button" type="submit" class="btn <%- COMMENT_BUTTON_CLASS %> js-add-diff-note-button" title="Add a comment to this line"><i class="fa fa-comment-o"></i></button>');
+
+    LINE_HOLDER_CLASS = '.line_holder';
+
+    LINE_NUMBER_CLASS = 'diff-line-num';
+
+    LINE_CONTENT_CLASS = 'line_content';
+
+    UNFOLDABLE_LINE_CLASS = 'js-unfold';
+
+    EMPTY_CELL_CLASS = 'empty-cell';
+
+    OLD_LINE_CLASS = 'old_line';
+
+    LINE_COLUMN_CLASSES = "." + LINE_NUMBER_CLASS + ", .line_content";
+
+    TEXT_FILE_SELECTOR = '.text-file';
+
+    DEBOUNCE_TIMEOUT_DURATION = 100;
+
+    function FilesCommentButton(filesContainerElement) {
+      var debounce;
+      this.filesContainerElement = filesContainerElement;
+      this.destroy = bind(this.destroy, this);
+      this.render = bind(this.render, this);
+      this.VIEW_TYPE = $('input#view[type=hidden]').val();
+      debounce = _.debounce(this.render, DEBOUNCE_TIMEOUT_DURATION);
+      $(document).off('mouseover', LINE_COLUMN_CLASSES).off('mouseleave', LINE_COLUMN_CLASSES).on('mouseover', LINE_COLUMN_CLASSES, debounce).on('mouseleave', LINE_COLUMN_CLASSES, this.destroy);
+    }
+
+    FilesCommentButton.prototype.render = function(e) {
+      var $currentTarget, buttonParentElement, lineContentElement, textFileElement;
+      $currentTarget = $(e.currentTarget);
+      buttonParentElement = this.getButtonParent($currentTarget);
+      if (!this.shouldRender(e, buttonParentElement)) {
+        return;
+      }
+      textFileElement = this.getTextFileElement($currentTarget);
+      lineContentElement = this.getLineContent($currentTarget);
+      buttonParentElement.append(this.buildButton({
+        noteableType: textFileElement.attr('data-noteable-type'),
+        noteableID: textFileElement.attr('data-noteable-id'),
+        commitID: textFileElement.attr('data-commit-id'),
+        noteType: lineContentElement.attr('data-note-type'),
+        position: lineContentElement.attr('data-position'),
+        lineType: lineContentElement.attr('data-line-type'),
+        discussionID: lineContentElement.attr('data-discussion-id'),
+        lineCode: lineContentElement.attr('data-line-code')
+      }));
+    };
+
+    FilesCommentButton.prototype.destroy = function(e) {
+      if (this.isMovingToSameType(e)) {
+        return;
+      }
+      $(COMMENT_BUTTON_CLASS, this.getButtonParent($(e.currentTarget))).remove();
+    };
+
+    FilesCommentButton.prototype.buildButton = function(buttonAttributes) {
+      var initializedButtonTemplate;
+      initializedButtonTemplate = COMMENT_BUTTON_TEMPLATE({
+        COMMENT_BUTTON_CLASS: COMMENT_BUTTON_CLASS.substr(1)
+      });
+      return $(initializedButtonTemplate).attr({
+        'data-noteable-type': buttonAttributes.noteableType,
+        'data-noteable-id': buttonAttributes.noteableID,
+        'data-commit-id': buttonAttributes.commitID,
+        'data-note-type': buttonAttributes.noteType,
+        'data-line-code': buttonAttributes.lineCode,
+        'data-position': buttonAttributes.position,
+        'data-discussion-id': buttonAttributes.discussionID,
+        'data-line-type': buttonAttributes.lineType
+      });
+    };
+
+    FilesCommentButton.prototype.getTextFileElement = function(hoveredElement) {
+      return $(hoveredElement.closest(TEXT_FILE_SELECTOR));
+    };
+
+    FilesCommentButton.prototype.getLineContent = function(hoveredElement) {
+      if (hoveredElement.hasClass(LINE_CONTENT_CLASS)) {
+        return hoveredElement;
+      }
+      if (this.VIEW_TYPE === 'inline') {
+        return $(hoveredElement).closest(LINE_HOLDER_CLASS).find("." + LINE_CONTENT_CLASS);
+      } else {
+        return $(hoveredElement).next("." + LINE_CONTENT_CLASS);
+      }
+    };
+
+    FilesCommentButton.prototype.getButtonParent = function(hoveredElement) {
+      if (this.VIEW_TYPE === 'inline') {
+        if (hoveredElement.hasClass(OLD_LINE_CLASS)) {
+          return hoveredElement;
+        }
+        return hoveredElement.parent().find("." + OLD_LINE_CLASS);
+      } else {
+        if (hoveredElement.hasClass(LINE_NUMBER_CLASS)) {
+          return hoveredElement;
+        }
+        return $(hoveredElement).prev("." + LINE_NUMBER_CLASS);
+      }
+    };
+
+    FilesCommentButton.prototype.isMovingToSameType = function(e) {
+      var newButtonParent;
+      newButtonParent = this.getButtonParent($(e.toElement));
+      if (!newButtonParent) {
+        return false;
+      }
+      return newButtonParent.is(this.getButtonParent($(e.currentTarget)));
+    };
+
+    FilesCommentButton.prototype.shouldRender = function(e, buttonParentElement) {
+      return !buttonParentElement.hasClass(EMPTY_CELL_CLASS) && !buttonParentElement.hasClass(UNFOLDABLE_LINE_CLASS) && $(COMMENT_BUTTON_CLASS, buttonParentElement).length === 0;
+    };
+
+    return FilesCommentButton;
+
+  })();
+
+  $.fn.filesCommentButton = function() {
+    if (!(this && (this.parent().data('can-create-note') != null))) {
+      return;
+    }
+    return this.each(function() {
+      if (!$.data(this, 'filesCommentButton')) {
+        return $.data(this, 'filesCommentButton', new FilesCommentButton($(this)));
+      }
+    });
+  };
+
+}).call(this);
diff --git a/app/assets/javascripts/files_comment_button.js.coffee b/app/assets/javascripts/files_comment_button.js.coffee
deleted file mode 100644
index db0bf7082a9..00000000000
--- a/app/assets/javascripts/files_comment_button.js.coffee
+++ /dev/null
@@ -1,97 +0,0 @@
-class @FilesCommentButton
-  COMMENT_BUTTON_CLASS = '.add-diff-note'
-  COMMENT_BUTTON_TEMPLATE = _.template '<button name="button" type="submit" class="btn <%- COMMENT_BUTTON_CLASS %> js-add-diff-note-button" title="Add a comment to this line"><i class="fa fa-comment-o"></i></button>'
-  LINE_HOLDER_CLASS = '.line_holder'
-  LINE_NUMBER_CLASS = 'diff-line-num'
-  LINE_CONTENT_CLASS = 'line_content'
-  UNFOLDABLE_LINE_CLASS = 'js-unfold'
-  EMPTY_CELL_CLASS = 'empty-cell'
-  OLD_LINE_CLASS = 'old_line'
-  NEW_CLASS = 'new'
-  LINE_COLUMN_CLASSES = ".#{LINE_NUMBER_CLASS}, .line_content"
-  TEXT_FILE_SELECTOR = '.text-file'
-  DEBOUNCE_TIMEOUT_DURATION = 100
-
-  constructor: (@filesContainerElement) ->
-    @VIEW_TYPE = $('input#view[type=hidden]').val()
-
-    debounce = _.debounce @render, DEBOUNCE_TIMEOUT_DURATION
-
-    $(document)
-      .on 'mouseover', LINE_COLUMN_CLASSES, debounce
-      .on 'mouseleave', LINE_COLUMN_CLASSES, @destroy
-
-  render: (e) =>
-    $currentTarget = $(e.currentTarget)
-    buttonParentElement = @getButtonParent $currentTarget
-    return unless @shouldRender e, buttonParentElement
-
-    textFileElement = @getTextFileElement $currentTarget
-    lineContentElement = @getLineContent $currentTarget
-
-    buttonParentElement.append @buildButton
-      noteableType: textFileElement.attr 'data-noteable-type'
-      noteableID: textFileElement.attr 'data-noteable-id'
-      commitID: textFileElement.attr 'data-commit-id'
-      noteType: lineContentElement.attr 'data-note-type'
-      position: lineContentElement.attr 'data-position'
-      lineType: lineContentElement.attr 'data-line-type'
-      discussionID: lineContentElement.attr 'data-discussion-id'
-      lineCode: lineContentElement.attr 'data-line-code'
-    return
-
-  destroy: (e) =>
-    return if @isMovingToSameType e
-    $(COMMENT_BUTTON_CLASS, @getButtonParent $(e.currentTarget)).remove()
-    return
-
-  buildButton: (buttonAttributes) ->
-    initializedButtonTemplate = COMMENT_BUTTON_TEMPLATE
-      COMMENT_BUTTON_CLASS: COMMENT_BUTTON_CLASS.substr 1
-    $(initializedButtonTemplate).attr
-      'data-noteable-type': buttonAttributes.noteableType
-      'data-noteable-id': buttonAttributes.noteableID
-      'data-commit-id': buttonAttributes.commitID
-      'data-note-type': buttonAttributes.noteType
-      'data-line-code': buttonAttributes.lineCode
-      'data-position': buttonAttributes.position
-      'data-discussion-id': buttonAttributes.discussionID
-      'data-line-type': buttonAttributes.lineType
-
-  getTextFileElement: (hoveredElement) ->
-    $(hoveredElement.closest TEXT_FILE_SELECTOR)
-
-  getLineContent: (hoveredElement) ->
-    return hoveredElement if hoveredElement.hasClass LINE_CONTENT_CLASS
-
-    $(".#{LINE_CONTENT_CLASS + @diffTypeClass hoveredElement}", hoveredElement.parent())
-
-  getButtonParent: (hoveredElement) ->
-    if @VIEW_TYPE is 'inline'
-      return hoveredElement if hoveredElement.hasClass OLD_LINE_CLASS
-
-      $(".#{OLD_LINE_CLASS}", hoveredElement.parent())
-    else
-      return hoveredElement if hoveredElement.hasClass LINE_NUMBER_CLASS
-
-      $(".#{LINE_NUMBER_CLASS + @diffTypeClass hoveredElement}", hoveredElement.parent())
-
-  diffTypeClass: (hoveredElement) ->
-    if hoveredElement.hasClass(NEW_CLASS) then '.new' else '.old'
-
-  isMovingToSameType: (e) ->
-    newButtonParent = @getButtonParent $(e.toElement)
-    return false unless newButtonParent
-    newButtonParent.is @getButtonParent $(e.currentTarget)
-
-  shouldRender: (e, buttonParentElement) ->
-    (not buttonParentElement.hasClass(EMPTY_CELL_CLASS) and \
-    not buttonParentElement.hasClass(UNFOLDABLE_LINE_CLASS) and \
-    $(COMMENT_BUTTON_CLASS, buttonParentElement).length is 0)
-
-$.fn.filesCommentButton = ->
-  return unless this and @parent().data('can-create-note')?
-
-  @each ->
-    unless $.data this, 'filesCommentButton'
-      $.data this, 'filesCommentButton', new FilesCommentButton $(this)
diff --git a/app/assets/javascripts/flash.js b/app/assets/javascripts/flash.js
new file mode 100644
index 00000000000..c8a02d6fa15
--- /dev/null
+++ b/app/assets/javascripts/flash.js
@@ -0,0 +1,43 @@
+(function() {
+  this.Flash = (function() {
+    var hideFlash;
+
+    hideFlash = function() {
+      return $(this).fadeOut();
+    };
+
+    function Flash(message, type, parent) {
+      var flash, textDiv;
+      if (type == null) {
+        type = 'alert';
+      }
+      if (parent == null) {
+        parent = null;
+      }
+      if (parent) {
+        this.flashContainer = parent.find('.flash-container');
+      } else {
+        this.flashContainer = $('.flash-container-page');
+      }
+      this.flashContainer.html('');
+      flash = $('<div/>', {
+        "class": "flash-" + type
+      });
+      flash.on('click', hideFlash);
+      textDiv = $('<div/>', {
+        "class": 'flash-text',
+        text: message
+      });
+      textDiv.appendTo(flash);
+      if (this.flashContainer.parent().hasClass('content-wrapper')) {
+        textDiv.addClass('container-fluid container-limited');
+      }
+      flash.appendTo(this.flashContainer);
+      this.flashContainer.show();
+    }
+
+    return Flash;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/flash.js.coffee b/app/assets/javascripts/flash.js.coffee
deleted file mode 100644
index 5a493041538..00000000000
--- a/app/assets/javascripts/flash.js.coffee
+++ /dev/null
@@ -1,28 +0,0 @@
-class @Flash
-  hideFlash = -> $(@).fadeOut()
-
-  constructor: (message, type = 'alert', parent = null)->
-    if parent
-      @flashContainer = parent.find('.flash-container')
-    else
-      @flashContainer = $('.flash-container-page')
-
-    @flashContainer.html('')
-
-    flash = $('<div/>',
-      class: "flash-#{type}"
-    )
-    flash.on 'click', hideFlash
-
-    textDiv = $('<div/>',
-      class: 'flash-text',
-      text: message
-    )
-    textDiv.appendTo(flash)
-
-    if @flashContainer.parent().hasClass('content-wrapper')
-      textDiv.addClass('container-fluid container-limited')
-
-    flash.appendTo(@flashContainer)
-    @flashContainer.show()
-
diff --git a/app/assets/javascripts/gfm_auto_complete.js b/app/assets/javascripts/gfm_auto_complete.js
new file mode 100644
index 00000000000..41f4c1914f2
--- /dev/null
+++ b/app/assets/javascripts/gfm_auto_complete.js
@@ -0,0 +1,272 @@
+(function() {
+  if (window.GitLab == null) {
+    window.GitLab = {};
+  }
+
+  GitLab.GfmAutoComplete = {
+    dataLoading: false,
+    dataLoaded: false,
+    cachedData: {},
+    dataSource: '',
+    Emoji: {
+      template: '<li>${name} <img alt="${name}" height="20" src="${path}" width="20" /></li>'
+    },
+    Members: {
+      template: '<li>${username} <small>${title}</small></li>'
+    },
+    Labels: {
+      template: '<li><span class="dropdown-label-box" style="background: ${color}"></span> ${title}</li>'
+    },
+    Issues: {
+      template: '<li><small>${id}</small> ${title}</li>'
+    },
+    Milestones: {
+      template: '<li>${title}</li>'
+    },
+    Loading: {
+      template: '<li><i class="fa fa-refresh fa-spin"></i> Loading...</li>'
+    },
+    DefaultOptions: {
+      sorter: function(query, items, searchKey) {
+        if ((items[0].name != null) && items[0].name === 'loading') {
+          return items;
+        }
+        return $.fn.atwho["default"].callbacks.sorter(query, items, searchKey);
+      },
+      filter: function(query, data, searchKey) {
+        if (data[0] === 'loading') {
+          return data;
+        }
+        return $.fn.atwho["default"].callbacks.filter(query, data, searchKey);
+      },
+      beforeInsert: function(value) {
+        if (!GitLab.GfmAutoComplete.dataLoaded) {
+          return this.at;
+        } else {
+          return value;
+        }
+      }
+    },
+    setup: function(wrap) {
+      this.input = $('.js-gfm-input');
+      this.destroyAtWho();
+      this.setupAtWho();
+      if (this.dataSource) {
+        if (!this.dataLoading && !this.cachedData) {
+          this.dataLoading = true;
+          setTimeout((function(_this) {
+            return function() {
+              var fetch;
+              fetch = _this.fetchData(_this.dataSource);
+              return fetch.done(function(data) {
+                _this.dataLoading = false;
+                return _this.loadData(data);
+              });
+            };
+          })(this), 1000);
+        }
+        if (this.cachedData != null) {
+          return this.loadData(this.cachedData);
+        }
+      }
+    },
+    setupAtWho: function() {
+      this.input.atwho({
+        at: ':',
+        displayTpl: (function(_this) {
+          return function(value) {
+            if (value.path != null) {
+              return _this.Emoji.template;
+            } else {
+              return _this.Loading.template;
+            }
+          };
+        })(this),
+        insertTpl: ':${name}:',
+        data: ['loading'],
+        callbacks: {
+          sorter: this.DefaultOptions.sorter,
+          filter: this.DefaultOptions.filter,
+          beforeInsert: this.DefaultOptions.beforeInsert
+        }
+      });
+      this.input.atwho({
+        at: '@',
+        displayTpl: (function(_this) {
+          return function(value) {
+            if (value.username != null) {
+              return _this.Members.template;
+            } else {
+              return _this.Loading.template;
+            }
+          };
+        })(this),
+        insertTpl: '${atwho-at}${username}',
+        searchKey: 'search',
+        data: ['loading'],
+        callbacks: {
+          sorter: this.DefaultOptions.sorter,
+          filter: this.DefaultOptions.filter,
+          beforeInsert: this.DefaultOptions.beforeInsert,
+          beforeSave: function(members) {
+            return $.map(members, function(m) {
+              var title;
+              if (m.username == null) {
+                return m;
+              }
+              title = m.name;
+              if (m.count) {
+                title += " (" + m.count + ")";
+              }
+              return {
+                username: m.username,
+                title: sanitize(title),
+                search: sanitize(m.username + " " + m.name)
+              };
+            });
+          }
+        }
+      });
+      this.input.atwho({
+        at: '#',
+        alias: 'issues',
+        searchKey: 'search',
+        displayTpl: (function(_this) {
+          return function(value) {
+            if (value.title != null) {
+              return _this.Issues.template;
+            } else {
+              return _this.Loading.template;
+            }
+          };
+        })(this),
+        data: ['loading'],
+        insertTpl: '${atwho-at}${id}',
+        callbacks: {
+          sorter: this.DefaultOptions.sorter,
+          filter: this.DefaultOptions.filter,
+          beforeInsert: this.DefaultOptions.beforeInsert,
+          beforeSave: function(issues) {
+            return $.map(issues, function(i) {
+              if (i.title == null) {
+                return i;
+              }
+              return {
+                id: i.iid,
+                title: sanitize(i.title),
+                search: i.iid + " " + i.title
+              };
+            });
+          }
+        }
+      });
+      this.input.atwho({
+        at: '%',
+        alias: 'milestones',
+        searchKey: 'search',
+        displayTpl: (function(_this) {
+          return function(value) {
+            if (value.title != null) {
+              return _this.Milestones.template;
+            } else {
+              return _this.Loading.template;
+            }
+          };
+        })(this),
+        insertTpl: '${atwho-at}"${title}"',
+        data: ['loading'],
+        callbacks: {
+          beforeSave: function(milestones) {
+            return $.map(milestones, function(m) {
+              if (m.title == null) {
+                return m;
+              }
+              return {
+                id: m.iid,
+                title: sanitize(m.title),
+                search: "" + m.title
+              };
+            });
+          }
+        }
+      });
+      this.input.atwho({
+        at: '!',
+        alias: 'mergerequests',
+        searchKey: 'search',
+        displayTpl: (function(_this) {
+          return function(value) {
+            if (value.title != null) {
+              return _this.Issues.template;
+            } else {
+              return _this.Loading.template;
+            }
+          };
+        })(this),
+        data: ['loading'],
+        insertTpl: '${atwho-at}${id}',
+        callbacks: {
+          sorter: this.DefaultOptions.sorter,
+          filter: this.DefaultOptions.filter,
+          beforeInsert: this.DefaultOptions.beforeInsert,
+          beforeSave: function(merges) {
+            return $.map(merges, function(m) {
+              if (m.title == null) {
+                return m;
+              }
+              return {
+                id: m.iid,
+                title: sanitize(m.title),
+                search: m.iid + " " + m.title
+              };
+            });
+          }
+        }
+      });
+      return this.input.atwho({
+        at: '~',
+        alias: 'labels',
+        searchKey: 'search',
+        displayTpl: this.Labels.template,
+        insertTpl: '${atwho-at}${title}',
+        callbacks: {
+          beforeSave: function(merges) {
+            var sanitizeLabelTitle;
+            sanitizeLabelTitle = function(title) {
+              if (/[\w\?&]+\s+[\w\?&]+/g.test(title)) {
+                return "\"" + (sanitize(title)) + "\"";
+              } else {
+                return sanitize(title);
+              }
+            };
+            return $.map(merges, function(m) {
+              return {
+                title: sanitizeLabelTitle(m.title),
+                color: m.color,
+                search: "" + m.title
+              };
+            });
+          }
+        }
+      });
+    },
+    destroyAtWho: function() {
+      return this.input.atwho('destroy');
+    },
+    fetchData: function(dataSource) {
+      return $.getJSON(dataSource);
+    },
+    loadData: function(data) {
+      this.cachedData = data;
+      this.dataLoaded = true;
+      this.input.atwho('load', '@', data.members);
+      this.input.atwho('load', 'issues', data.issues);
+      this.input.atwho('load', 'milestones', data.milestones);
+      this.input.atwho('load', 'mergerequests', data.mergerequests);
+      this.input.atwho('load', ':', data.emojis);
+      this.input.atwho('load', '~', data.labels);
+      return $(':focus').trigger('keyup');
+    }
+  };
+
+}).call(this);
diff --git a/app/assets/javascripts/gfm_auto_complete.js.coffee b/app/assets/javascripts/gfm_auto_complete.js.coffee
deleted file mode 100644
index 4a851d9c9fb..00000000000
--- a/app/assets/javascripts/gfm_auto_complete.js.coffee
+++ /dev/null
@@ -1,228 +0,0 @@
-# Creates the variables for setting up GFM auto-completion
-
-window.GitLab ?= {}
-GitLab.GfmAutoComplete =
-  dataLoading: false
-  dataLoaded: false
-  cachedData: {}
-  dataSource: ''
-
-  # Emoji
-  Emoji:
-    template: '<li>${name} <img alt="${name}" height="20" src="${path}" width="20" /></li>'
-
-  # Team Members
-  Members:
-    template: '<li>${username} <small>${title}</small></li>'
-
-  Labels:
-    template: '<li><span class="dropdown-label-box" style="background: ${color}"></span> ${title}</li>'
-
-  # Issues and MergeRequests
-  Issues:
-    template: '<li><small>${id}</small> ${title}</li>'
-
-  # Milestones
-  Milestones:
-    template: '<li>${title}</li>'
-
-  Loading:
-    template: '<li><i class="fa fa-refresh fa-spin"></i> Loading...</li>'
-
-  DefaultOptions:
-    sorter: (query, items, searchKey) ->
-      return items if items[0].name? and items[0].name is 'loading'
-
-      $.fn.atwho.default.callbacks.sorter(query, items, searchKey)
-    filter: (query, data, searchKey) ->
-      return data if data[0] is 'loading'
-
-      $.fn.atwho.default.callbacks.filter(query, data, searchKey)
-    beforeInsert: (value) ->
-      if not GitLab.GfmAutoComplete.dataLoaded
-        @at
-      else
-        value
-
-  # Add GFM auto-completion to all input fields, that accept GFM input.
-  setup: (wrap) ->
-    @input = $('.js-gfm-input')
-
-    # destroy previous instances
-    @destroyAtWho()
-
-    # set up instances
-    @setupAtWho()
-
-    if @dataSource
-      if not @dataLoading and not @cachedData
-        @dataLoading = true
-
-        # We should wait until initializations are done
-        # and only trigger the last .setup since
-        # The previous .dataSource belongs to the previous issuable
-        # and the last one will have the **proper** .dataSource property
-        # TODO: Make this a singleton and turn off events when moving to another page
-        setTimeout( =>
-          fetch = @fetchData(@dataSource)
-          fetch.done (data) =>
-            @dataLoading = false
-            @loadData(data)
-        , 1000)
-
-      if @cachedData?
-        @loadData(@cachedData)
-
-  setupAtWho: ->
-    # Emoji
-    @input.atwho
-      at: ':'
-      displayTpl: (value) =>
-        if value.path?
-          @Emoji.template
-        else
-          @Loading.template
-      insertTpl: ':${name}:'
-      data: ['loading']
-      callbacks:
-        sorter: @DefaultOptions.sorter
-        filter: @DefaultOptions.filter
-        beforeInsert: @DefaultOptions.beforeInsert
-
-    # Team Members
-    @input.atwho
-      at: '@'
-      displayTpl: (value) =>
-        if value.username?
-          @Members.template
-        else
-          @Loading.template
-      insertTpl: '${atwho-at}${username}'
-      searchKey: 'search'
-      data: ['loading']
-      callbacks:
-        sorter: @DefaultOptions.sorter
-        filter: @DefaultOptions.filter
-        beforeInsert: @DefaultOptions.beforeInsert
-        beforeSave: (members) ->
-          $.map members, (m) ->
-            return m if not m.username?
-
-            title = m.name
-            title += " (#{m.count})" if m.count
-
-            username: m.username
-            title:    sanitize(title)
-            search:   sanitize("#{m.username} #{m.name}")
-
-    @input.atwho
-      at: '#'
-      alias: 'issues'
-      searchKey: 'search'
-      displayTpl:  (value) =>
-        if value.title?
-          @Issues.template
-        else
-          @Loading.template
-      data: ['loading']
-      insertTpl: '${atwho-at}${id}'
-      callbacks:
-        sorter: @DefaultOptions.sorter
-        filter: @DefaultOptions.filter
-        beforeInsert: @DefaultOptions.beforeInsert
-        beforeSave: (issues) ->
-          $.map issues, (i) ->
-            return i if not i.title?
-
-            id:     i.iid
-            title:  sanitize(i.title)
-            search: "#{i.iid} #{i.title}"
-
-    @input.atwho
-      at: '%'
-      alias: 'milestones'
-      searchKey: 'search'
-      displayTpl:  (value) =>
-        if value.title?
-          @Milestones.template
-        else
-          @Loading.template
-      insertTpl: '${atwho-at}"${title}"'
-      data: ['loading']
-      callbacks:
-        beforeSave: (milestones) ->
-          $.map milestones, (m) ->
-            return m if not m.title?
-
-            id:     m.iid
-            title:  sanitize(m.title)
-            search: "#{m.title}"
-
-    @input.atwho
-      at: '!'
-      alias: 'mergerequests'
-      searchKey: 'search'
-      displayTpl:  (value) =>
-        if value.title?
-          @Issues.template
-        else
-          @Loading.template
-      data: ['loading']
-      insertTpl: '${atwho-at}${id}'
-      callbacks:
-        sorter: @DefaultOptions.sorter
-        filter: @DefaultOptions.filter
-        beforeInsert: @DefaultOptions.beforeInsert
-        beforeSave: (merges) ->
-          $.map merges, (m) ->
-            return m if not m.title?
-
-            id:     m.iid
-            title:  sanitize(m.title)
-            search: "#{m.iid} #{m.title}"
-
-    @input.atwho
-      at: '~'
-      alias: 'labels'
-      searchKey: 'search'
-      displayTpl: @Labels.template
-      insertTpl: '${atwho-at}${title}'
-      callbacks:
-        beforeSave: (merges) ->
-          sanitizeLabelTitle = (title)->
-            if /[\w\?&]+\s+[\w\?&]+/g.test(title)
-              "\"#{sanitize(title)}\""
-            else
-              sanitize(title)
-
-          $.map merges, (m) ->
-            title: sanitizeLabelTitle(m.title)
-            color: m.color
-            search: "#{m.title}"
-
-  destroyAtWho: ->
-    @input.atwho('destroy')
-
-  fetchData: (dataSource) ->
-    $.getJSON(dataSource)
-
-  loadData: (data) ->
-    @cachedData = data
-    @dataLoaded = true
-
-    # load members
-    @input.atwho 'load', '@', data.members
-    # load issues
-    @input.atwho 'load', 'issues', data.issues
-    # load milestones
-    @input.atwho 'load', 'milestones', data.milestones
-    # load merge requests
-    @input.atwho 'load', 'mergerequests', data.mergerequests
-    # load emojis
-    @input.atwho 'load', ':', data.emojis
-    # load labels
-    @input.atwho 'load', '~', data.labels
-
-    # This trigger at.js again
-    # otherwise we would be stuck with loading until the user types
-    $(':focus').trigger('keyup')
diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/gl_dropdown.js
new file mode 100644
index 00000000000..c5d92831fbe
--- /dev/null
+++ b/app/assets/javascripts/gl_dropdown.js
@@ -0,0 +1,705 @@
+(function() {
+  var GitLabDropdown, GitLabDropdownFilter, GitLabDropdownRemote,
+    bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
+    indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
+
+  GitLabDropdownFilter = (function() {
+    var ARROW_KEY_CODES, BLUR_KEYCODES, HAS_VALUE_CLASS;
+
+    BLUR_KEYCODES = [27, 40];
+
+    ARROW_KEY_CODES = [38, 40];
+
+    HAS_VALUE_CLASS = "has-value";
+
+    function GitLabDropdownFilter(input, options) {
+      var $clearButton, $inputContainer, ref, timeout;
+      this.input = input;
+      this.options = options;
+      this.filterInputBlur = (ref = this.options.filterInputBlur) != null ? ref : true;
+      $inputContainer = this.input.parent();
+      $clearButton = $inputContainer.find('.js-dropdown-input-clear');
+      this.indeterminateIds = [];
+      $clearButton.on('click', (function(_this) {
+        return function(e) {
+          e.preventDefault();
+          e.stopPropagation();
+          return _this.input.val('').trigger('keyup').focus();
+        };
+      })(this));
+      timeout = "";
+      this.input.on("keyup", (function(_this) {
+        return function(e) {
+          var keyCode;
+          keyCode = e.which;
+          if (ARROW_KEY_CODES.indexOf(keyCode) >= 0) {
+            return;
+          }
+          if (_this.input.val() !== "" && !$inputContainer.hasClass(HAS_VALUE_CLASS)) {
+            $inputContainer.addClass(HAS_VALUE_CLASS);
+          } else if (_this.input.val() === "" && $inputContainer.hasClass(HAS_VALUE_CLASS)) {
+            $inputContainer.removeClass(HAS_VALUE_CLASS);
+          }
+          if (keyCode === 13) {
+            return false;
+          }
+          if (_this.options.remote) {
+            clearTimeout(timeout);
+            return timeout = setTimeout(function() {
+              var blur_field;
+              blur_field = _this.shouldBlur(keyCode);
+              if (blur_field && _this.filterInputBlur) {
+                _this.input.blur();
+              }
+              return _this.options.query(_this.input.val(), function(data) {
+                return _this.options.callback(data);
+              });
+            }, 250);
+          } else {
+            return _this.filter(_this.input.val());
+          }
+        };
+      })(this));
+    }
+
+    GitLabDropdownFilter.prototype.shouldBlur = function(keyCode) {
+      return BLUR_KEYCODES.indexOf(keyCode) >= 0;
+    };
+
+    GitLabDropdownFilter.prototype.filter = function(search_text) {
+      var data, elements, group, key, results, tmp;
+      if (this.options.onFilter) {
+        this.options.onFilter(search_text);
+      }
+      data = this.options.data();
+      if ((data != null) && !this.options.filterByText) {
+        results = data;
+        if (search_text !== '') {
+          if (_.isArray(data)) {
+            results = fuzzaldrinPlus.filter(data, search_text, {
+              key: this.options.keys
+            });
+          } else {
+            if (gl.utils.isObject(data)) {
+              results = {};
+              for (key in data) {
+                group = data[key];
+                tmp = fuzzaldrinPlus.filter(group, search_text, {
+                  key: this.options.keys
+                });
+                if (tmp.length) {
+                  results[key] = tmp.map(function(item) {
+                    return item;
+                  });
+                }
+              }
+            }
+          }
+        }
+        return this.options.callback(results);
+      } else {
+        elements = this.options.elements();
+        if (search_text) {
+          return elements.each(function() {
+            var $el, matches;
+            $el = $(this);
+            matches = fuzzaldrinPlus.match($el.text().trim(), search_text);
+            if (!$el.is('.dropdown-header')) {
+              if (matches.length) {
+                return $el.show();
+              } else {
+                return $el.hide();
+              }
+            }
+          });
+        } else {
+          return elements.show();
+        }
+      }
+    };
+
+    return GitLabDropdownFilter;
+
+  })();
+
+  GitLabDropdownRemote = (function() {
+    function GitLabDropdownRemote(dataEndpoint, options) {
+      this.dataEndpoint = dataEndpoint;
+      this.options = options;
+    }
+
+    GitLabDropdownRemote.prototype.execute = function() {
+      if (typeof this.dataEndpoint === "string") {
+        return this.fetchData();
+      } else if (typeof this.dataEndpoint === "function") {
+        if (this.options.beforeSend) {
+          this.options.beforeSend();
+        }
+        return this.dataEndpoint("", (function(_this) {
+          return function(data) {
+            if (_this.options.success) {
+              _this.options.success(data);
+            }
+            if (_this.options.beforeSend) {
+              return _this.options.beforeSend();
+            }
+          };
+        })(this));
+      }
+    };
+
+    GitLabDropdownRemote.prototype.fetchData = function() {
+      return $.ajax({
+        url: this.dataEndpoint,
+        dataType: this.options.dataType,
+        beforeSend: (function(_this) {
+          return function() {
+            if (_this.options.beforeSend) {
+              return _this.options.beforeSend();
+            }
+          };
+        })(this),
+        success: (function(_this) {
+          return function(data) {
+            if (_this.options.success) {
+              return _this.options.success(data);
+            }
+          };
+        })(this)
+      });
+    };
+
+    return GitLabDropdownRemote;
+
+  })();
+
+  GitLabDropdown = (function() {
+    var ACTIVE_CLASS, FILTER_INPUT, INDETERMINATE_CLASS, LOADING_CLASS, PAGE_TWO_CLASS, currentIndex;
+
+    LOADING_CLASS = "is-loading";
+
+    PAGE_TWO_CLASS = "is-page-two";
+
+    ACTIVE_CLASS = "is-active";
+
+    INDETERMINATE_CLASS = "is-indeterminate";
+
+    currentIndex = -1;
+
+    FILTER_INPUT = '.dropdown-input .dropdown-input-field';
+
+    function GitLabDropdown(el1, options) {
+      var ref, ref1, ref2, ref3, searchFields, selector, self;
+      this.el = el1;
+      this.options = options;
+      this.updateLabel = bind(this.updateLabel, this);
+      this.hidden = bind(this.hidden, this);
+      this.opened = bind(this.opened, this);
+      this.shouldPropagate = bind(this.shouldPropagate, this);
+      self = this;
+      selector = $(this.el).data("target");
+      this.dropdown = selector != null ? $(selector) : $(this.el).parent();
+      ref = this.options, this.filterInput = (ref1 = ref.filterInput) != null ? ref1 : this.getElement(FILTER_INPUT), this.highlight = (ref2 = ref.highlight) != null ? ref2 : false, this.filterInputBlur = (ref3 = ref.filterInputBlur) != null ? ref3 : true;
+      self = this;
+      if (_.isString(this.filterInput)) {
+        this.filterInput = this.getElement(this.filterInput);
+      }
+      searchFields = this.options.search ? this.options.search.fields : [];
+      if (this.options.data) {
+        if (_.isObject(this.options.data) && !_.isFunction(this.options.data)) {
+          this.fullData = this.options.data;
+          this.parseData(this.options.data);
+        } else {
+          this.remote = new GitLabDropdownRemote(this.options.data, {
+            dataType: this.options.dataType,
+            beforeSend: this.toggleLoading.bind(this),
+            success: (function(_this) {
+              return function(data) {
+                _this.fullData = data;
+                _this.parseData(_this.fullData);
+                if (_this.options.filterable && _this.filter && _this.filter.input) {
+                  return _this.filter.input.trigger('keyup');
+                }
+              };
+            })(this)
+          });
+        }
+      }
+      if (this.options.filterable) {
+        this.filter = new GitLabDropdownFilter(this.filterInput, {
+          filterInputBlur: this.filterInputBlur,
+          filterByText: this.options.filterByText,
+          onFilter: this.options.onFilter,
+          remote: this.options.filterRemote,
+          query: this.options.data,
+          keys: searchFields,
+          elements: (function(_this) {
+            return function() {
+              selector = '.dropdown-content li:not(.divider)';
+              if (_this.dropdown.find('.dropdown-toggle-page').length) {
+                selector = ".dropdown-page-one " + selector;
+              }
+              return $(selector);
+            };
+          })(this),
+          data: (function(_this) {
+            return function() {
+              return _this.fullData;
+            };
+          })(this),
+          callback: (function(_this) {
+            return function(data) {
+              _this.parseData(data);
+              if (_this.filterInput.val() !== '') {
+                selector = '.dropdown-content li:not(.divider):visible';
+                if (_this.dropdown.find('.dropdown-toggle-page').length) {
+                  selector = ".dropdown-page-one " + selector;
+                }
+                $(selector, _this.dropdown).first().find('a').addClass('is-focused');
+                return currentIndex = 0;
+              }
+            };
+          })(this)
+        });
+      }
+      this.dropdown.on("shown.bs.dropdown", this.opened);
+      this.dropdown.on("hidden.bs.dropdown", this.hidden);
+      $(this.el).on("update.label", this.updateLabel);
+      this.dropdown.on("click", ".dropdown-menu, .dropdown-menu-close", this.shouldPropagate);
+      this.dropdown.on('keyup', (function(_this) {
+        return function(e) {
+          if (e.which === 27) {
+            return $('.dropdown-menu-close', _this.dropdown).trigger('click');
+          }
+        };
+      })(this));
+      this.dropdown.on('blur', 'a', (function(_this) {
+        return function(e) {
+          var $dropdownMenu, $relatedTarget;
+          if (e.relatedTarget != null) {
+            $relatedTarget = $(e.relatedTarget);
+            $dropdownMenu = $relatedTarget.closest('.dropdown-menu');
+            if ($dropdownMenu.length === 0) {
+              return _this.dropdown.removeClass('open');
+            }
+          }
+        };
+      })(this));
+      if (this.dropdown.find(".dropdown-toggle-page").length) {
+        this.dropdown.find(".dropdown-toggle-page, .dropdown-menu-back").on("click", (function(_this) {
+          return function(e) {
+            e.preventDefault();
+            e.stopPropagation();
+            return _this.togglePage();
+          };
+        })(this));
+      }
+      if (this.options.selectable) {
+        selector = ".dropdown-content a";
+        if (this.dropdown.find(".dropdown-toggle-page").length) {
+          selector = ".dropdown-page-one .dropdown-content a";
+        }
+        this.dropdown.on("click", selector, function(e) {
+          var $el, selected;
+          $el = $(this);
+          selected = self.rowClicked($el);
+          if (self.options.clicked) {
+            self.options.clicked(selected, $el, e);
+          }
+          return $el.trigger('blur');
+        });
+      }
+    }
+
+    GitLabDropdown.prototype.getElement = function(selector) {
+      return this.dropdown.find(selector);
+    };
+
+    GitLabDropdown.prototype.toggleLoading = function() {
+      return $('.dropdown-menu', this.dropdown).toggleClass(LOADING_CLASS);
+    };
+
+    GitLabDropdown.prototype.togglePage = function() {
+      var menu;
+      menu = $('.dropdown-menu', this.dropdown);
+      if (menu.hasClass(PAGE_TWO_CLASS)) {
+        if (this.remote) {
+          this.remote.execute();
+        }
+      }
+      menu.toggleClass(PAGE_TWO_CLASS);
+      return this.dropdown.find('[class^="dropdown-page-"]:visible :text:visible:first').focus();
+    };
+
+    GitLabDropdown.prototype.parseData = function(data) {
+      var full_html, groupData, html, name;
+      this.renderedData = data;
+      if (this.options.filterable && data.length === 0) {
+        html = [this.noResults()];
+      } else {
+        if (gl.utils.isObject(data)) {
+          html = [];
+          for (name in data) {
+            groupData = data[name];
+            html.push(this.renderItem({
+              header: name
+            }, name));
+            this.renderData(groupData, name).map(function(item) {
+              return html.push(item);
+            });
+          }
+        } else {
+          html = this.renderData(data);
+        }
+      }
+      full_html = this.renderMenu(html);
+      return this.appendMenu(full_html);
+    };
+
+    GitLabDropdown.prototype.renderData = function(data, group) {
+      if (group == null) {
+        group = false;
+      }
+      return data.map((function(_this) {
+        return function(obj, index) {
+          return _this.renderItem(obj, group, index);
+        };
+      })(this));
+    };
+
+    GitLabDropdown.prototype.shouldPropagate = function(e) {
+      var $target;
+      if (this.options.multiSelect) {
+        $target = $(e.target);
+        if (!$target.hasClass('dropdown-menu-close') && !$target.hasClass('dropdown-menu-close-icon') && !$target.data('is-link')) {
+          e.stopPropagation();
+          return false;
+        } else {
+          return true;
+        }
+      }
+    };
+
+    GitLabDropdown.prototype.opened = function() {
+      var contentHtml;
+      this.addArrowKeyEvent();
+      if (this.options.setIndeterminateIds) {
+        this.options.setIndeterminateIds.call(this);
+      }
+      if (this.options.setActiveIds) {
+        this.options.setActiveIds.call(this);
+      }
+      if (this.fullData && this.dropdown.find('.dropdown-menu-toggle').hasClass('js-filter-bulk-update')) {
+        this.parseData(this.fullData);
+      }
+      contentHtml = $('.dropdown-content', this.dropdown).html();
+      if (this.remote && contentHtml === "") {
+        this.remote.execute();
+      }
+      if (this.options.filterable) {
+        this.filterInput.focus();
+      }
+      return this.dropdown.trigger('shown.gl.dropdown');
+    };
+
+    GitLabDropdown.prototype.hidden = function(e) {
+      var $input;
+      this.removeArrayKeyEvent();
+      $input = this.dropdown.find(".dropdown-input-field");
+      if (this.options.filterable) {
+        $input.blur().val("");
+      }
+      if (!this.options.persistWhenHide) {
+        $input.trigger("keyup");
+      }
+      if (this.dropdown.find(".dropdown-toggle-page").length) {
+        $('.dropdown-menu', this.dropdown).removeClass(PAGE_TWO_CLASS);
+      }
+      if (this.options.hidden) {
+        this.options.hidden.call(this, e);
+      }
+      return this.dropdown.trigger('hidden.gl.dropdown');
+    };
+
+    GitLabDropdown.prototype.renderMenu = function(html) {
+      var menu_html;
+      menu_html = "";
+      if (this.options.renderMenu) {
+        menu_html = this.options.renderMenu(html);
+      } else {
+        menu_html = $('<ul />').append(html);
+      }
+      return menu_html;
+    };
+
+    GitLabDropdown.prototype.appendMenu = function(html) {
+      var selector;
+      selector = '.dropdown-content';
+      if (this.dropdown.find(".dropdown-toggle-page").length) {
+        selector = ".dropdown-page-one .dropdown-content";
+      }
+      return $(selector, this.dropdown).empty().append(html);
+    };
+
+    GitLabDropdown.prototype.renderItem = function(data, group, index) {
+      var cssClass, field, fieldName, groupAttrs, html, selected, text, url, value;
+      if (group == null) {
+        group = false;
+      }
+      if (index == null) {
+        index = false;
+      }
+      html = "";
+      if (data === "divider") {
+        return "<li class='divider'></li>";
+      }
+      if (data === "separator") {
+        return "<li class='separator'></li>";
+      }
+      if (data.header != null) {
+        return "<li class='dropdown-header'>" + data.header + "</li>";
+      }
+      if (this.options.renderRow) {
+        html = this.options.renderRow.call(this.options, data, this);
+      } else {
+        if (!selected) {
+          value = this.options.id ? this.options.id(data) : data.id;
+          fieldName = this.options.fieldName;
+          field = this.dropdown.parent().find("input[name='" + fieldName + "'][value='" + value + "']");
+          if (field.length) {
+            selected = true;
+          }
+        }
+        if (this.options.url != null) {
+          url = this.options.url(data);
+        } else {
+          url = data.url != null ? data.url : '#';
+        }
+        if (this.options.text != null) {
+          text = this.options.text(data);
+        } else {
+          text = data.text != null ? data.text : '';
+        }
+        cssClass = "";
+        if (selected) {
+          cssClass = "is-active";
+        }
+        if (this.highlight) {
+          text = this.highlightTextMatches(text, this.filterInput.val());
+        }
+        if (group) {
+          groupAttrs = "data-group='" + group + "' data-index='" + index + "'";
+        } else {
+          groupAttrs = '';
+        }
+        html = "<li> <a href='" + url + "' " + groupAttrs + " class='" + cssClass + "'> " + text + " </a> </li>";
+      }
+      return html;
+    };
+
+    GitLabDropdown.prototype.highlightTextMatches = function(text, term) {
+      var occurrences;
+      occurrences = fuzzaldrinPlus.match(text, term);
+      return text.split('').map(function(character, i) {
+        if (indexOf.call(occurrences, i) >= 0) {
+          return "<b>" + character + "</b>";
+        } else {
+          return character;
+        }
+      }).join('');
+    };
+
+    GitLabDropdown.prototype.noResults = function() {
+      var html;
+      return html = "<li class='dropdown-menu-empty-link'> <a href='#' class='is-focused'> No matching results. </a> </li>";
+    };
+
+    GitLabDropdown.prototype.highlightRow = function(index) {
+      var selector;
+      if (this.filterInput.val() !== "") {
+        selector = '.dropdown-content li:first-child a';
+        if (this.dropdown.find(".dropdown-toggle-page").length) {
+          selector = ".dropdown-page-one .dropdown-content li:first-child a";
+        }
+        return this.getElement(selector).addClass('is-focused');
+      }
+    };
+
+    GitLabDropdown.prototype.rowClicked = function(el) {
+      var field, fieldName, groupName, isInput, selectedIndex, selectedObject, value;
+      fieldName = this.options.fieldName;
+      isInput = $(this.el).is('input');
+      if (this.renderedData) {
+        groupName = el.data('group');
+        if (groupName) {
+          selectedIndex = el.data('index');
+          selectedObject = this.renderedData[groupName][selectedIndex];
+        } else {
+          selectedIndex = el.closest('li').index();
+          selectedObject = this.renderedData[selectedIndex];
+        }
+      }
+      value = this.options.id ? this.options.id(selectedObject, el) : selectedObject.id;
+      if (isInput) {
+        field = $(this.el);
+      } else {
+        field = this.dropdown.parent().find("input[name='" + fieldName + "'][value='" + value + "']");
+      }
+      if (el.hasClass(ACTIVE_CLASS)) {
+        el.removeClass(ACTIVE_CLASS);
+        if (isInput) {
+          field.val('');
+        } else {
+          field.remove();
+        }
+        if (this.options.toggleLabel) {
+          return this.updateLabel(selectedObject, el, this);
+        } else {
+          return selectedObject;
+        }
+      } else if (el.hasClass(INDETERMINATE_CLASS)) {
+        el.addClass(ACTIVE_CLASS);
+        el.removeClass(INDETERMINATE_CLASS);
+        if (value == null) {
+          field.remove();
+        }
+        if (!field.length && fieldName) {
+          this.addInput(fieldName, value);
+        }
+        return selectedObject;
+      } else {
+        if (!this.options.multiSelect || el.hasClass('dropdown-clear-active')) {
+          this.dropdown.find("." + ACTIVE_CLASS).removeClass(ACTIVE_CLASS);
+          if (!isInput) {
+            this.dropdown.parent().find("input[name='" + fieldName + "']").remove();
+          }
+        }
+        if (value == null) {
+          field.remove();
+        }
+        el.addClass(ACTIVE_CLASS);
+        if (this.options.toggleLabel) {
+          this.updateLabel(selectedObject, el, this);
+        }
+        if (value != null) {
+          if (!field.length && fieldName) {
+            this.addInput(fieldName, value);
+          } else {
+            field.val(value).trigger('change');
+          }
+        }
+        return selectedObject;
+      }
+    };
+
+    GitLabDropdown.prototype.addInput = function(fieldName, value) {
+      var $input;
+      $input = $('<input>').attr('type', 'hidden').attr('name', fieldName).val(value);
+      if (this.options.inputId != null) {
+        $input.attr('id', this.options.inputId);
+      }
+      return this.dropdown.before($input);
+    };
+
+    GitLabDropdown.prototype.selectRowAtIndex = function(e, index) {
+      var $el, selector;
+      selector = ".dropdown-content li:not(.divider,.dropdown-header,.separator):eq(" + index + ") a";
+      if (this.dropdown.find(".dropdown-toggle-page").length) {
+        selector = ".dropdown-page-one " + selector;
+      }
+      $el = $(selector, this.dropdown);
+      if ($el.length) {
+        e.preventDefault();
+        e.stopImmediatePropagation();
+        return $el.first().trigger('click');
+      }
+    };
+
+    GitLabDropdown.prototype.addArrowKeyEvent = function() {
+      var $input, ARROW_KEY_CODES, selector;
+      ARROW_KEY_CODES = [38, 40];
+      $input = this.dropdown.find(".dropdown-input-field");
+      selector = '.dropdown-content li:not(.divider,.dropdown-header,.separator)';
+      if (this.dropdown.find(".dropdown-toggle-page").length) {
+        selector = ".dropdown-page-one " + selector;
+      }
+      return $('body').on('keydown', (function(_this) {
+        return function(e) {
+          var $listItems, PREV_INDEX, currentKeyCode;
+          currentKeyCode = e.which;
+          if (ARROW_KEY_CODES.indexOf(currentKeyCode) >= 0) {
+            e.preventDefault();
+            e.stopImmediatePropagation();
+            PREV_INDEX = currentIndex;
+            $listItems = $(selector, _this.dropdown);
+            if (currentKeyCode === 40) {
+              if (currentIndex < ($listItems.length - 1)) {
+                currentIndex += 1;
+              }
+            } else if (currentKeyCode === 38) {
+              if (currentIndex > 0) {
+                currentIndex -= 1;
+              }
+            }
+            if (currentIndex !== PREV_INDEX) {
+              _this.highlightRowAtIndex($listItems, currentIndex);
+            }
+            return false;
+          }
+          if (currentKeyCode === 13 && currentIndex !== -1) {
+            return _this.selectRowAtIndex(e, currentIndex);
+          }
+        };
+      })(this));
+    };
+
+    GitLabDropdown.prototype.removeArrayKeyEvent = function() {
+      return $('body').off('keydown');
+    };
+
+    GitLabDropdown.prototype.highlightRowAtIndex = function($listItems, index) {
+      var $dropdownContent, $listItem, dropdownContentBottom, dropdownContentHeight, dropdownContentTop, dropdownScrollTop, listItemBottom, listItemHeight, listItemTop;
+      $('.is-focused', this.dropdown).removeClass('is-focused');
+      $listItem = $listItems.eq(index);
+      $listItem.find('a:first-child').addClass("is-focused");
+      $dropdownContent = $listItem.closest('.dropdown-content');
+      dropdownScrollTop = $dropdownContent.scrollTop();
+      dropdownContentHeight = $dropdownContent.outerHeight();
+      dropdownContentTop = $dropdownContent.prop('offsetTop');
+      dropdownContentBottom = dropdownContentTop + dropdownContentHeight;
+      listItemHeight = $listItem.outerHeight();
+      listItemTop = $listItem.prop('offsetTop');
+      listItemBottom = listItemTop + listItemHeight;
+      if (listItemBottom > dropdownContentBottom + dropdownScrollTop) {
+        return $dropdownContent.scrollTop(listItemBottom - dropdownContentBottom);
+      } else if (listItemTop < dropdownContentTop + dropdownScrollTop) {
+        return $dropdownContent.scrollTop(listItemTop - dropdownContentTop);
+      }
+    };
+
+    GitLabDropdown.prototype.updateLabel = function(selected, el, instance) {
+      if (selected == null) {
+        selected = null;
+      }
+      if (el == null) {
+        el = null;
+      }
+      if (instance == null) {
+        instance = null;
+      }
+      return $(this.el).find(".dropdown-toggle-text").text(this.options.toggleLabel(selected, el, instance));
+    };
+
+    return GitLabDropdown;
+
+  })();
+
+  $.fn.glDropdown = function(opts) {
+    return this.each(function() {
+      if (!$.data(this, 'glDropdown')) {
+        return $.data(this, 'glDropdown', new GitLabDropdown(this, opts));
+      }
+    });
+  };
+
+}).call(this);
diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
deleted file mode 100644
index 1b0d0db8954..00000000000
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ /dev/null
@@ -1,623 +0,0 @@
-class GitLabDropdownFilter
-  BLUR_KEYCODES = [27, 40]
-  ARROW_KEY_CODES = [38, 40]
-  HAS_VALUE_CLASS = "has-value"
-
-  constructor: (@input, @options) ->
-    {
-      @filterInputBlur = true
-    } = @options
-
-    $inputContainer = @input.parent()
-    $clearButton = $inputContainer.find('.js-dropdown-input-clear')
-
-    @indeterminateIds = []
-
-    # Clear click
-    $clearButton.on 'click', (e) =>
-      e.preventDefault()
-      e.stopPropagation()
-      @input
-        .val('')
-        .trigger('keyup')
-        .focus()
-
-    # Key events
-    timeout = ""
-    @input.on "keyup", (e) =>
-      keyCode = e.which
-
-      return if ARROW_KEY_CODES.indexOf(keyCode) >= 0
-
-      if @input.val() isnt "" and !$inputContainer.hasClass HAS_VALUE_CLASS
-        $inputContainer.addClass HAS_VALUE_CLASS
-      else if @input.val() is "" and $inputContainer.hasClass HAS_VALUE_CLASS
-        $inputContainer.removeClass HAS_VALUE_CLASS
-
-      if keyCode is 13
-        return false
-
-      # Only filter asynchronously only if option remote is set
-      if @options.remote
-        clearTimeout timeout
-        timeout = setTimeout =>
-          blur_field = @shouldBlur keyCode
-
-          if blur_field and @filterInputBlur
-            @input.blur()
-
-          @options.query @input.val(), (data) =>
-            @options.callback(data)
-        , 250
-      else
-        @filter @input.val()
-
-  shouldBlur: (keyCode) ->
-    return BLUR_KEYCODES.indexOf(keyCode) >= 0
-
-  filter: (search_text) ->
-    @options.onFilter(search_text) if @options.onFilter
-    data = @options.data()
-
-    if data? and not @options.filterByText
-      results = data
-
-      if search_text isnt ''
-        # When data is an array of objects therefore [object Array] e.g.
-        # [
-        #   { prop: 'foo' },
-        #   { prop: 'baz' }
-        # ]
-        if _.isArray(data)
-          results = fuzzaldrinPlus.filter(data, search_text,
-            key: @options.keys
-          )
-        else
-          # If data is grouped therefore an [object Object]. e.g.
-          # {
-          #   groupName1: [
-          #     { prop: 'foo' },
-          #     { prop: 'baz' }
-          #   ],
-          #   groupName2: [
-          #     { prop: 'abc' },
-          #     { prop: 'def' }
-          #   ]
-          # }
-          if gl.utils.isObject data
-            results = {}
-            for key, group of data
-              tmp = fuzzaldrinPlus.filter(group, search_text,
-                key: @options.keys
-              )
-
-              if tmp.length
-                results[key] = tmp.map (item) -> item
-
-      @options.callback results
-    else
-      elements = @options.elements()
-
-      if search_text
-        elements.each ->
-          $el = $(@)
-          matches = fuzzaldrinPlus.match($el.text().trim(), search_text)
-
-          unless $el.is('.dropdown-header')
-            if matches.length
-              $el.show()
-            else
-              $el.hide()
-      else
-        elements.show()
-
-class GitLabDropdownRemote
-  constructor: (@dataEndpoint, @options) ->
-
-  execute: ->
-    if typeof @dataEndpoint is "string"
-      @fetchData()
-    else if typeof @dataEndpoint is "function"
-      if @options.beforeSend
-        @options.beforeSend()
-
-      # Fetch the data by calling the data funcfion
-      @dataEndpoint "", (data) =>
-        if @options.success
-          @options.success(data)
-
-        if @options.beforeSend
-          @options.beforeSend()
-
-  # Fetch the data through ajax if the data is a string
-  fetchData: ->
-    $.ajax(
-      url: @dataEndpoint,
-      dataType: @options.dataType,
-      beforeSend: =>
-        if @options.beforeSend
-          @options.beforeSend()
-      success: (data) =>
-        if @options.success
-          @options.success(data)
-    )
-
-class GitLabDropdown
-  LOADING_CLASS = "is-loading"
-  PAGE_TWO_CLASS = "is-page-two"
-  ACTIVE_CLASS = "is-active"
-  INDETERMINATE_CLASS = "is-indeterminate"
-  currentIndex = -1
-
-  FILTER_INPUT = '.dropdown-input .dropdown-input-field'
-
-  constructor: (@el, @options) ->
-    self = @
-    selector = $(@el).data "target"
-    @dropdown = if selector? then $(selector) else $(@el).parent()
-
-    # Set Defaults
-    {
-      # If no input is passed create a default one
-      @filterInput = @getElement(FILTER_INPUT)
-      @highlight = false
-      @filterInputBlur = true
-    } = @options
-
-    self = @
-
-    # If selector was passed
-    if _.isString(@filterInput)
-      @filterInput = @getElement(@filterInput)
-
-    searchFields = if @options.search then @options.search.fields else [];
-
-    if @options.data
-      # If we provided data
-      # data could be an array of objects or a group of arrays
-      if _.isObject(@options.data) and not _.isFunction(@options.data)
-        @fullData = @options.data
-        @parseData @options.data
-      else
-        # Remote data
-        @remote = new GitLabDropdownRemote @options.data, {
-          dataType: @options.dataType,
-          beforeSend: @toggleLoading.bind(@)
-          success: (data) =>
-            @fullData = data
-
-            @parseData @fullData
-
-            @filter.input.trigger('keyup') if @options.filterable and @filter and @filter.input
-        }
-
-    # Init filterable
-    if @options.filterable
-      @filter = new GitLabDropdownFilter @filterInput,
-        filterInputBlur: @filterInputBlur
-        filterByText: @options.filterByText
-        onFilter: @options.onFilter
-        remote: @options.filterRemote
-        query: @options.data
-        keys: searchFields
-        elements: =>
-          selector = '.dropdown-content li:not(.divider)'
-
-          if @dropdown.find('.dropdown-toggle-page').length
-            selector = ".dropdown-page-one #{selector}"
-
-          return $(selector)
-        data: =>
-          return @fullData
-        callback: (data) =>
-          currentIndex = -1
-          @parseData data
-
-    # Event listeners
-
-    @dropdown.on "shown.bs.dropdown", @opened
-    @dropdown.on "hidden.bs.dropdown", @hidden
-    $(@el).on "update.label", @updateLabel
-    @dropdown.on "click", ".dropdown-menu, .dropdown-menu-close", @shouldPropagate
-    @dropdown.on 'keyup', (e) =>
-      if e.which is 27 # Escape key
-        $('.dropdown-menu-close', @dropdown).trigger 'click'
-    @dropdown.on 'blur', 'a', (e) =>
-      if e.relatedTarget?
-        $relatedTarget = $(e.relatedTarget)
-        $dropdownMenu = $relatedTarget.closest('.dropdown-menu')
-
-        if $dropdownMenu.length is 0
-          @dropdown.removeClass('open')
-
-    if @dropdown.find(".dropdown-toggle-page").length
-      @dropdown.find(".dropdown-toggle-page, .dropdown-menu-back").on "click", (e) =>
-        e.preventDefault()
-        e.stopPropagation()
-
-        @togglePage()
-
-    if @options.selectable
-      selector = ".dropdown-content a"
-
-      if @dropdown.find(".dropdown-toggle-page").length
-        selector = ".dropdown-page-one .dropdown-content a"
-
-      @dropdown.on "click", selector, (e) ->
-        $el = $(@)
-        selected = self.rowClicked $el
-
-        if self.options.clicked
-          self.options.clicked(selected, $el, e)
-
-  # Finds an element inside wrapper element
-  getElement: (selector) ->
-    @dropdown.find selector
-
-  toggleLoading: ->
-    $('.dropdown-menu', @dropdown).toggleClass LOADING_CLASS
-
-  togglePage: ->
-    menu = $('.dropdown-menu', @dropdown)
-
-    if menu.hasClass(PAGE_TWO_CLASS)
-      if @remote
-        @remote.execute()
-
-    menu.toggleClass PAGE_TWO_CLASS
-
-    # Focus first visible input on active page
-    @dropdown.find('[class^="dropdown-page-"]:visible :text:visible:first').focus()
-
-  parseData: (data) ->
-    @renderedData = data
-
-    if @options.filterable and data.length is 0
-      # render no matching results
-      html = [@noResults()]
-    else
-      # Handle array groups
-      if gl.utils.isObject data
-        html = []
-        for name, groupData of data
-          # Add header for each group
-          html.push(@renderItem(header: name, name))
-
-          @renderData(groupData, name)
-            .map (item) ->
-              html.push item
-      else
-        # Render each row
-        html = @renderData(data)
-
-    # Render the full menu
-    full_html = @renderMenu(html)
-
-    @appendMenu(full_html)
-
-  renderData: (data, group = false) ->
-    data.map (obj, index) =>
-      return @renderItem(obj, group, index)
-
-  shouldPropagate: (e) =>
-    if @options.multiSelect
-      $target = $(e.target)
-
-      if not $target.hasClass('dropdown-menu-close') and not $target.hasClass('dropdown-menu-close-icon') and not $target.data('is-link')
-        e.stopPropagation()
-        return false
-      else
-        return true
-
-  opened: =>
-    @addArrowKeyEvent()
-
-    if @options.setIndeterminateIds
-      @options.setIndeterminateIds.call(@)
-
-    if @options.setActiveIds
-      @options.setActiveIds.call(@)
-
-    # Makes indeterminate items effective
-    if @fullData and @dropdown.find('.dropdown-menu-toggle').hasClass('js-filter-bulk-update')
-      @parseData @fullData
-
-    contentHtml = $('.dropdown-content', @dropdown).html()
-    if @remote && contentHtml is ""
-      @remote.execute()
-
-    if @options.filterable
-      @filterInput.focus()
-
-    @dropdown.trigger('shown.gl.dropdown')
-
-  hidden: (e) =>
-    @removeArrayKeyEvent()
-
-    $input = @dropdown.find(".dropdown-input-field")
-
-    if @options.filterable
-      $input
-        .blur()
-        .val("")
-
-    # Triggering 'keyup' will re-render the dropdown which is not always required
-    # specially if we want to keep the state of the dropdown needed for bulk-assignment
-    if not @options.persistWhenHide
-      $input.trigger("keyup")
-
-    if @dropdown.find(".dropdown-toggle-page").length
-      $('.dropdown-menu', @dropdown).removeClass PAGE_TWO_CLASS
-
-    if @options.hidden
-      @options.hidden.call(@,e)
-
-    @dropdown.trigger('hidden.gl.dropdown')
-
-
-  # Render the full menu
-  renderMenu: (html) ->
-    menu_html = ""
-
-    if @options.renderMenu
-      menu_html = @options.renderMenu(html)
-    else
-      menu_html = $('<ul />')
-        .append(html)
-
-    return menu_html
-
-  # Append the menu into the dropdown
-  appendMenu: (html) ->
-    selector = '.dropdown-content'
-    if @dropdown.find(".dropdown-toggle-page").length
-      selector = ".dropdown-page-one .dropdown-content"
-    $(selector, @dropdown)
-      .empty()
-      .append(html)
-
-  # Render the row
-  renderItem: (data, group = false, index = false) ->
-    html = ""
-
-    # Divider
-    return "<li class='divider'></li>" if data is "divider"
-
-    # Separator is a full-width divider
-    return "<li class='separator'></li>" if data is "separator"
-
-    # Header
-    return "<li class='dropdown-header'>#{data.header}</li>" if data.header?
-
-    if @options.renderRow
-      # Call the render function
-      html = @options.renderRow.call(@options, data, @)
-    else
-      if not selected
-        value = if @options.id then @options.id(data) else data.id
-        fieldName = @options.fieldName
-        field = @dropdown.parent().find("input[name='#{fieldName}'][value='#{value}']")
-        if field.length
-          selected = true
-
-      # Set URL
-      if @options.url?
-        url = @options.url(data)
-      else
-        url = if data.url? then data.url else '#'
-
-      # Set Text
-      if @options.text?
-        text = @options.text(data)
-      else
-        text = if data.text? then data.text else ''
-
-      cssClass = "";
-
-      if selected
-        cssClass = "is-active"
-
-      if @highlight
-        text = @highlightTextMatches(text, @filterInput.val())
-
-      if group
-        groupAttrs = "data-group='#{group}' data-index='#{index}'"
-      else
-        groupAttrs = ''
-
-      html = "<li>
-        <a href='#{url}' #{groupAttrs} class='#{cssClass}'>
-          #{text}
-        </a>
-      </li>"
-
-    return html
-
-  highlightTextMatches: (text, term) ->
-    occurrences = fuzzaldrinPlus.match(text, term)
-    text.split('').map((character, i) ->
-      if i in occurrences then "<b>#{character}</b>" else character
-    ).join('')
-
-  noResults: ->
-    html = "<li class='dropdown-menu-empty-link'>
-      <a href='#' class='is-focused'>
-        No matching results.
-      </a>
-    </li>"
-
-  highlightRow: (index) ->
-    if @filterInput.val() isnt ""
-      selector = '.dropdown-content li:first-child a'
-      if @dropdown.find(".dropdown-toggle-page").length
-        selector = ".dropdown-page-one .dropdown-content li:first-child a"
-
-      @getElement(selector).addClass 'is-focused'
-
-  rowClicked: (el) ->
-    fieldName = @options.fieldName
-    isInput = $(@el).is('input')
-
-    if @renderedData
-      groupName = el.data('group')
-      if groupName
-        selectedIndex = el.data('index')
-        selectedObject = @renderedData[groupName][selectedIndex]
-      else
-        selectedIndex = el.closest('li').index()
-        selectedObject = @renderedData[selectedIndex]
-
-    value = if @options.id then @options.id(selectedObject, el) else selectedObject.id
-
-    if isInput
-      field = $(@el)
-    else
-      field = @dropdown.parent().find("input[name='#{fieldName}'][value='#{value}']")
-
-    if el.hasClass(ACTIVE_CLASS)
-      el.removeClass(ACTIVE_CLASS)
-
-      if isInput
-        field.val('')
-      else
-        field.remove()
-
-      # Toggle the dropdown label
-      if @options.toggleLabel
-        @updateLabel(selectedObject, el, @)
-      else
-        selectedObject
-    else if el.hasClass(INDETERMINATE_CLASS)
-      el.addClass ACTIVE_CLASS
-      el.removeClass INDETERMINATE_CLASS
-
-      if not value?
-        field.remove()
-
-      if not field.length and fieldName
-        @addInput(fieldName, value)
-
-      return selectedObject
-    else
-      if not @options.multiSelect or el.hasClass('dropdown-clear-active')
-        @dropdown.find(".#{ACTIVE_CLASS}").removeClass ACTIVE_CLASS
-
-        unless isInput
-          @dropdown.parent().find("input[name='#{fieldName}']").remove()
-
-      if !value?
-        field.remove()
-
-      # Toggle active class for the tick mark
-      el.addClass ACTIVE_CLASS
-
-      # Toggle the dropdown label
-      if @options.toggleLabel
-        @updateLabel(selectedObject, el, @)
-      if value?
-        if !field.length and fieldName
-          @addInput(fieldName, value)
-        else
-          field
-            .val value
-            .trigger 'change'
-
-      return selectedObject
-
-  addInput: (fieldName, value)->
-    # Create hidden input for form
-    $input = $('<input>').attr('type', 'hidden')
-                         .attr('name', fieldName)
-                        .val(value)
-
-    if @options.inputId?
-      $input.attr('id', @options.inputId)
-
-    @dropdown.before $input
-
-  selectRowAtIndex: (e, index) ->
-    selector = ".dropdown-content li:not(.divider,.dropdown-header,.separator):eq(#{index}) a"
-
-    if @dropdown.find(".dropdown-toggle-page").length
-      selector = ".dropdown-page-one #{selector}"
-
-    # simulate a click on the first link
-    $el = $(selector, @dropdown)
-
-    if $el.length
-      e.preventDefault()
-      e.stopImmediatePropagation()
-      $el.first().trigger('click')
-
-  addArrowKeyEvent: ->
-    ARROW_KEY_CODES = [38, 40]
-    $input = @dropdown.find(".dropdown-input-field")
-
-    selector = '.dropdown-content li:not(.divider,.dropdown-header,.separator)'
-    if @dropdown.find(".dropdown-toggle-page").length
-      selector = ".dropdown-page-one #{selector}"
-
-    $('body').on 'keydown', (e) =>
-      currentKeyCode = e.which
-
-      if ARROW_KEY_CODES.indexOf(currentKeyCode) >= 0
-        e.preventDefault()
-        e.stopImmediatePropagation()
-
-        PREV_INDEX = currentIndex
-        $listItems = $(selector, @dropdown)
-
-        # if @options.filterable
-        #   $input.blur()
-
-        if currentKeyCode is 40
-          # Move down
-          currentIndex += 1 if currentIndex < ($listItems.length - 1)
-        else if currentKeyCode is 38
-          # Move up
-          currentIndex -= 1 if currentIndex > 0
-
-        @highlightRowAtIndex($listItems, currentIndex) if currentIndex isnt PREV_INDEX
-
-        return false
-
-      if currentKeyCode is 13 and currentIndex isnt -1
-        @selectRowAtIndex e, currentIndex
-
-  removeArrayKeyEvent: ->
-    $('body').off 'keydown'
-
-  highlightRowAtIndex: ($listItems, index) ->
-    # Remove the class for the previously focused row
-    $('.is-focused', @dropdown).removeClass 'is-focused'
-
-    # Update the class for the row at the specific index
-    $listItem = $listItems.eq(index)
-    $listItem.find('a:first-child').addClass "is-focused"
-
-    # Dropdown content scroll area
-    $dropdownContent = $listItem.closest('.dropdown-content')
-    dropdownScrollTop = $dropdownContent.scrollTop()
-    dropdownContentHeight = $dropdownContent.outerHeight()
-    dropdownContentTop = $dropdownContent.prop('offsetTop')
-    dropdownContentBottom = dropdownContentTop + dropdownContentHeight
-
-    # Get the offset bottom of the list item
-    listItemHeight = $listItem.outerHeight()
-    listItemTop = $listItem.prop('offsetTop')
-    listItemBottom = listItemTop + listItemHeight
-
-    if listItemBottom > dropdownContentBottom + dropdownScrollTop
-      # Scroll the dropdown content down
-      $dropdownContent.scrollTop(listItemBottom - dropdownContentBottom)
-    else if listItemTop < dropdownContentTop + dropdownScrollTop
-      # Scroll the dropdown content up
-      $dropdownContent.scrollTop(listItemTop - dropdownContentTop)
-
-  updateLabel: (selected = null, el = null, instance = null) =>
-    $(@el).find(".dropdown-toggle-text").text @options.toggleLabel(selected, el, instance)
-
-$.fn.glDropdown = (opts) ->
-  return @.each ->
-    if (!$.data @, 'glDropdown')
-      $.data(@, 'glDropdown', new GitLabDropdown @, opts)
diff --git a/app/assets/javascripts/gl_form.js b/app/assets/javascripts/gl_form.js
new file mode 100644
index 00000000000..6ac7564a848
--- /dev/null
+++ b/app/assets/javascripts/gl_form.js
@@ -0,0 +1,53 @@
+(function() {
+  this.GLForm = (function() {
+    function GLForm(form) {
+      this.form = form;
+      this.textarea = this.form.find('textarea.js-gfm-input');
+      this.destroy();
+      this.setupForm();
+      this.form.data('gl-form', this);
+    }
+
+    GLForm.prototype.destroy = function() {
+      this.clearEventListeners();
+      return this.form.data('gl-form', null);
+    };
+
+    GLForm.prototype.setupForm = function() {
+      var isNewForm;
+      isNewForm = this.form.is(':not(.gfm-form)');
+      this.form.removeClass('js-new-note-form');
+      if (isNewForm) {
+        this.form.find('.div-dropzone').remove();
+        this.form.addClass('gfm-form');
+        disableButtonIfEmptyField(this.form.find('.js-note-text'), this.form.find('.js-comment-button'));
+        GitLab.GfmAutoComplete.setup();
+        new DropzoneInput(this.form);
+        autosize(this.textarea);
+        this.addEventListeners();
+        gl.text.init(this.form);
+      }
+      this.form.find('.js-note-discard').hide();
+      return this.form.show();
+    };
+
+    GLForm.prototype.clearEventListeners = function() {
+      this.textarea.off('focus');
+      this.textarea.off('blur');
+      return gl.text.removeListeners(this.form);
+    };
+
+    GLForm.prototype.addEventListeners = function() {
+      this.textarea.on('focus', function() {
+        return $(this).closest('.md-area').addClass('is-focused');
+      });
+      return this.textarea.on('blur', function() {
+        return $(this).closest('.md-area').removeClass('is-focused');
+      });
+    };
+
+    return GLForm;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/gl_form.js.coffee b/app/assets/javascripts/gl_form.js.coffee
deleted file mode 100644
index 77512d187c9..00000000000
--- a/app/assets/javascripts/gl_form.js.coffee
+++ /dev/null
@@ -1,54 +0,0 @@
-class @GLForm
-  constructor: (@form) ->
-    @textarea = @form.find('textarea.js-gfm-input')
-
-    # Before we start, we should clean up any previous data for this form
-    @destroy()
-
-    # Setup the form
-    @setupForm()
-
-    @form.data 'gl-form', @
-
-  destroy: ->
-    # Clean form listeners
-    @clearEventListeners()
-    @form.data 'gl-form', null
-
-  setupForm: ->
-    isNewForm = @form.is(':not(.gfm-form)')
-
-    @form.removeClass 'js-new-note-form'
-
-    if isNewForm
-      @form.find('.div-dropzone').remove()
-      @form.addClass('gfm-form')
-      disableButtonIfEmptyField @form.find('.js-note-text'), @form.find('.js-comment-button')
-
-      # remove notify commit author checkbox for non-commit notes
-      GitLab.GfmAutoComplete.setup()
-      new DropzoneInput(@form)
-
-      autosize(@textarea)
-
-      # form and textarea event listeners
-      @addEventListeners()
-
-      gl.text.init(@form)
-
-    # hide discard button
-    @form.find('.js-note-discard').hide()
-
-    @form.show()
-
-  clearEventListeners: ->
-    @textarea.off 'focus'
-    @textarea.off 'blur'
-    gl.text.removeListeners(@form)
-
-  addEventListeners: ->
-    @textarea.on 'focus', ->
-      $(@).closest('.md-area').addClass 'is-focused'
-
-    @textarea.on 'blur', ->
-      $(@).closest('.md-area').removeClass 'is-focused'
diff --git a/app/assets/javascripts/graphs/application.js.coffee b/app/assets/javascripts/graphs/application.js.coffee
deleted file mode 100644
index e0f681acf0b..00000000000
--- a/app/assets/javascripts/graphs/application.js.coffee
+++ /dev/null
@@ -1,7 +0,0 @@
-# This is a manifest file that'll be compiled into including all the files listed below.
-# Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-# be included in the compiled file accessible from http://example.com/assets/application.js
-# It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-# the compiled file.
-#
-#= require_tree .
diff --git a/app/assets/javascripts/graphs/graphs_bundle.js b/app/assets/javascripts/graphs/graphs_bundle.js
new file mode 100644
index 00000000000..b95faadc8e7
--- /dev/null
+++ b/app/assets/javascripts/graphs/graphs_bundle.js
@@ -0,0 +1,7 @@
+
+/*= require_tree . */
+
+(function() {
+
+
+}).call(this);
diff --git a/app/assets/javascripts/graphs/stat_graph.js b/app/assets/javascripts/graphs/stat_graph.js
new file mode 100644
index 00000000000..f041980bc19
--- /dev/null
+++ b/app/assets/javascripts/graphs/stat_graph.js
@@ -0,0 +1,19 @@
+(function() {
+  this.StatGraph = (function() {
+    function StatGraph() {}
+
+    StatGraph.log = {};
+
+    StatGraph.get_log = function() {
+      return this.log;
+    };
+
+    StatGraph.set_log = function(data) {
+      return this.log = data;
+    };
+
+    return StatGraph;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/graphs/stat_graph.js.coffee b/app/assets/javascripts/graphs/stat_graph.js.coffee
deleted file mode 100644
index f36c71fd25e..00000000000
--- a/app/assets/javascripts/graphs/stat_graph.js.coffee
+++ /dev/null
@@ -1,6 +0,0 @@
-class @StatGraph  
-  @log: {}
-  @get_log: ->
-    @log
-  @set_log: (data) ->
-    @log = data
diff --git a/app/assets/javascripts/graphs/stat_graph_contributors.js b/app/assets/javascripts/graphs/stat_graph_contributors.js
new file mode 100644
index 00000000000..927d241b357
--- /dev/null
+++ b/app/assets/javascripts/graphs/stat_graph_contributors.js
@@ -0,0 +1,112 @@
+
+/*= require d3 */
+
+(function() {
+  this.ContributorsStatGraph = (function() {
+    function ContributorsStatGraph() {}
+
+    ContributorsStatGraph.prototype.init = function(log) {
+      var author_commits, total_commits;
+      this.parsed_log = ContributorsStatGraphUtil.parse_log(log);
+      this.set_current_field("commits");
+      total_commits = ContributorsStatGraphUtil.get_total_data(this.parsed_log, this.field);
+      author_commits = ContributorsStatGraphUtil.get_author_data(this.parsed_log, this.field);
+      this.add_master_graph(total_commits);
+      this.add_authors_graph(author_commits);
+      return this.change_date_header();
+    };
+
+    ContributorsStatGraph.prototype.add_master_graph = function(total_data) {
+      this.master_graph = new ContributorsMasterGraph(total_data);
+      return this.master_graph.draw();
+    };
+
+    ContributorsStatGraph.prototype.add_authors_graph = function(author_data) {
+      var limited_author_data;
+      this.authors = [];
+      limited_author_data = author_data.slice(0, 100);
+      return _.each(limited_author_data, (function(_this) {
+        return function(d) {
+          var author_graph, author_header;
+          author_header = _this.create_author_header(d);
+          $(".contributors-list").append(author_header);
+          _this.authors[d.author_name] = author_graph = new ContributorsAuthorGraph(d.dates);
+          return author_graph.draw();
+        };
+      })(this));
+    };
+
+    ContributorsStatGraph.prototype.format_author_commit_info = function(author) {
+      var commits;
+      commits = $('<span/>', {
+        "class": 'graph-author-commits-count'
+      });
+      commits.text(author.commits + " commits");
+      return $('<span/>').append(commits);
+    };
+
+    ContributorsStatGraph.prototype.create_author_header = function(author) {
+      var author_commit_info, author_commit_info_span, author_email, author_name, list_item;
+      list_item = $('<li/>', {
+        "class": 'person',
+        style: 'display: block;'
+      });
+      author_name = $('<h4>' + author.author_name + '</h4>');
+      author_email = $('<p class="graph-author-email">' + author.author_email + '</p>');
+      author_commit_info_span = $('<span/>', {
+        "class": 'commits'
+      });
+      author_commit_info = this.format_author_commit_info(author);
+      author_commit_info_span.html(author_commit_info);
+      list_item.append(author_name);
+      list_item.append(author_email);
+      list_item.append(author_commit_info_span);
+      return list_item;
+    };
+
+    ContributorsStatGraph.prototype.redraw_master = function() {
+      var total_data;
+      total_data = ContributorsStatGraphUtil.get_total_data(this.parsed_log, this.field);
+      this.master_graph.set_data(total_data);
+      return this.master_graph.redraw();
+    };
+
+    ContributorsStatGraph.prototype.redraw_authors = function() {
+      var author_commits, x_domain;
+      $("ol").html("");
+      x_domain = ContributorsGraph.prototype.x_domain;
+      author_commits = ContributorsStatGraphUtil.get_author_data(this.parsed_log, this.field, x_domain);
+      return _.each(author_commits, (function(_this) {
+        return function(d) {
+          _this.redraw_author_commit_info(d);
+          $(_this.authors[d.author_name].list_item).appendTo("ol");
+          _this.authors[d.author_name].set_data(d.dates);
+          return _this.authors[d.author_name].redraw();
+        };
+      })(this));
+    };
+
+    ContributorsStatGraph.prototype.set_current_field = function(field) {
+      return this.field = field;
+    };
+
+    ContributorsStatGraph.prototype.change_date_header = function() {
+      var print, print_date_format, x_domain;
+      x_domain = ContributorsGraph.prototype.x_domain;
+      print_date_format = d3.time.format("%B %e %Y");
+      print = print_date_format(x_domain[0]) + " - " + print_date_format(x_domain[1]);
+      return $("#date_header").text(print);
+    };
+
+    ContributorsStatGraph.prototype.redraw_author_commit_info = function(author) {
+      var author_commit_info, author_list_item;
+      author_list_item = $(this.authors[author.author_name].list_item);
+      author_commit_info = this.format_author_commit_info(author);
+      return author_list_item.find("span").html(author_commit_info);
+    };
+
+    return ContributorsStatGraph;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/graphs/stat_graph_contributors.js.coffee b/app/assets/javascripts/graphs/stat_graph_contributors.js.coffee
deleted file mode 100644
index 1d9fae7cf79..00000000000
--- a/app/assets/javascripts/graphs/stat_graph_contributors.js.coffee
+++ /dev/null
@@ -1,71 +0,0 @@
-#= require d3
-
-class @ContributorsStatGraph
-  init: (log) ->
-    @parsed_log = ContributorsStatGraphUtil.parse_log(log)
-    @set_current_field("commits")
-    total_commits = ContributorsStatGraphUtil.get_total_data(@parsed_log, @field)
-    author_commits = ContributorsStatGraphUtil.get_author_data(@parsed_log, @field)
-    @add_master_graph(total_commits)
-    @add_authors_graph(author_commits)
-    @change_date_header()
-  add_master_graph: (total_data) ->
-    @master_graph = new ContributorsMasterGraph(total_data)
-    @master_graph.draw()
-  add_authors_graph: (author_data) ->
-    @authors = []
-    limited_author_data = author_data.slice(0, 100)
-    _.each(limited_author_data, (d) =>
-      author_header = @create_author_header(d)
-      $(".contributors-list").append(author_header)
-      @authors[d.author_name] = author_graph = new ContributorsAuthorGraph(d.dates)
-      author_graph.draw()
-    )
-  format_author_commit_info: (author) ->
-    commits = $('<span/>', {
-      class: 'graph-author-commits-count'
-    })
-    commits.text(author.commits + " commits")
-    $('<span/>').append(commits)
-
-  create_author_header: (author) ->
-    list_item = $('<li/>', {
-      class: 'person'
-      style: 'display: block;'
-    })
-    author_name = $('<h4>' + author.author_name + '</h4>')
-    author_email = $('<p class="graph-author-email">' + author.author_email + '</p>')
-    author_commit_info_span = $('<span/>', {
-      class: 'commits'
-    })
-    author_commit_info = @format_author_commit_info(author)
-    author_commit_info_span.html(author_commit_info)
-    list_item.append(author_name)
-    list_item.append(author_email)
-    list_item.append(author_commit_info_span)
-    list_item
-  redraw_master: ->
-    total_data = ContributorsStatGraphUtil.get_total_data(@parsed_log, @field)
-    @master_graph.set_data(total_data)
-    @master_graph.redraw()
-  redraw_authors: ->
-    $("ol").html("")
-    x_domain = ContributorsGraph.prototype.x_domain
-    author_commits = ContributorsStatGraphUtil.get_author_data(@parsed_log, @field, x_domain)
-    _.each(author_commits, (d) =>
-      @redraw_author_commit_info(d)
-      $(@authors[d.author_name].list_item).appendTo("ol")
-      @authors[d.author_name].set_data(d.dates)
-      @authors[d.author_name].redraw()
-    )
-  set_current_field: (field) ->
-    @field = field
-  change_date_header: ->
-    x_domain = ContributorsGraph.prototype.x_domain
-    print_date_format = d3.time.format("%B %e %Y")
-    print = print_date_format(x_domain[0]) + " - " + print_date_format(x_domain[1])
-    $("#date_header").text(print)
-  redraw_author_commit_info: (author) ->
-    author_list_item = $(@authors[author.author_name].list_item)
-    author_commit_info = @format_author_commit_info(author)
-    author_list_item.find("span").html(author_commit_info)
diff --git a/app/assets/javascripts/graphs/stat_graph_contributors_graph.js b/app/assets/javascripts/graphs/stat_graph_contributors_graph.js
new file mode 100644
index 00000000000..a646ca1d84f
--- /dev/null
+++ b/app/assets/javascripts/graphs/stat_graph_contributors_graph.js
@@ -0,0 +1,279 @@
+
+/*= require d3 */
+
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
+    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  this.ContributorsGraph = (function() {
+    function ContributorsGraph() {}
+
+    ContributorsGraph.prototype.MARGIN = {
+      top: 20,
+      right: 20,
+      bottom: 30,
+      left: 50
+    };
+
+    ContributorsGraph.prototype.x_domain = null;
+
+    ContributorsGraph.prototype.y_domain = null;
+
+    ContributorsGraph.prototype.dates = [];
+
+    ContributorsGraph.set_x_domain = function(data) {
+      return ContributorsGraph.prototype.x_domain = data;
+    };
+
+    ContributorsGraph.set_y_domain = function(data) {
+      return ContributorsGraph.prototype.y_domain = [
+        0, d3.max(data, function(d) {
+          var ref, ref1;
+          return d.commits = (ref = (ref1 = d.commits) != null ? ref1 : d.additions) != null ? ref : d.deletions;
+        })
+      ];
+    };
+
+    ContributorsGraph.init_x_domain = function(data) {
+      return ContributorsGraph.prototype.x_domain = d3.extent(data, function(d) {
+        return d.date;
+      });
+    };
+
+    ContributorsGraph.init_y_domain = function(data) {
+      return ContributorsGraph.prototype.y_domain = [
+        0, d3.max(data, function(d) {
+          var ref, ref1;
+          return d.commits = (ref = (ref1 = d.commits) != null ? ref1 : d.additions) != null ? ref : d.deletions;
+        })
+      ];
+    };
+
+    ContributorsGraph.init_domain = function(data) {
+      ContributorsGraph.init_x_domain(data);
+      return ContributorsGraph.init_y_domain(data);
+    };
+
+    ContributorsGraph.set_dates = function(data) {
+      return ContributorsGraph.prototype.dates = data;
+    };
+
+    ContributorsGraph.prototype.set_x_domain = function() {
+      return this.x.domain(this.x_domain);
+    };
+
+    ContributorsGraph.prototype.set_y_domain = function() {
+      return this.y.domain(this.y_domain);
+    };
+
+    ContributorsGraph.prototype.set_domain = function() {
+      this.set_x_domain();
+      return this.set_y_domain();
+    };
+
+    ContributorsGraph.prototype.create_scale = function(width, height) {
+      this.x = d3.time.scale().range([0, width]).clamp(true);
+      return this.y = d3.scale.linear().range([height, 0]).nice();
+    };
+
+    ContributorsGraph.prototype.draw_x_axis = function() {
+      return this.svg.append("g").attr("class", "x axis").attr("transform", "translate(0, " + this.height + ")").call(this.x_axis);
+    };
+
+    ContributorsGraph.prototype.draw_y_axis = function() {
+      return this.svg.append("g").attr("class", "y axis").call(this.y_axis);
+    };
+
+    ContributorsGraph.prototype.set_data = function(data) {
+      return this.data = data;
+    };
+
+    return ContributorsGraph;
+
+  })();
+
+  this.ContributorsMasterGraph = (function(superClass) {
+    extend(ContributorsMasterGraph, superClass);
+
+    function ContributorsMasterGraph(data1) {
+      this.data = data1;
+      this.update_content = bind(this.update_content, this);
+      this.width = $('.content').width() - 70;
+      this.height = 200;
+      this.x = null;
+      this.y = null;
+      this.x_axis = null;
+      this.y_axis = null;
+      this.area = null;
+      this.svg = null;
+      this.brush = null;
+      this.x_max_domain = null;
+    }
+
+    ContributorsMasterGraph.prototype.process_dates = function(data) {
+      var dates;
+      dates = this.get_dates(data);
+      this.parse_dates(data);
+      return ContributorsGraph.set_dates(dates);
+    };
+
+    ContributorsMasterGraph.prototype.get_dates = function(data) {
+      return _.pluck(data, 'date');
+    };
+
+    ContributorsMasterGraph.prototype.parse_dates = function(data) {
+      var parseDate;
+      parseDate = d3.time.format("%Y-%m-%d").parse;
+      return data.forEach(function(d) {
+        return d.date = parseDate(d.date);
+      });
+    };
+
+    ContributorsMasterGraph.prototype.create_scale = function() {
+      return ContributorsMasterGraph.__super__.create_scale.call(this, this.width, this.height);
+    };
+
+    ContributorsMasterGraph.prototype.create_axes = function() {
+      this.x_axis = d3.svg.axis().scale(this.x).orient("bottom");
+      return this.y_axis = d3.svg.axis().scale(this.y).orient("left").ticks(5);
+    };
+
+    ContributorsMasterGraph.prototype.create_svg = function() {
+      return this.svg = d3.select("#contributors-master").append("svg").attr("width", this.width + this.MARGIN.left + this.MARGIN.right).attr("height", this.height + this.MARGIN.top + this.MARGIN.bottom).attr("class", "tint-box").append("g").attr("transform", "translate(" + this.MARGIN.left + "," + this.MARGIN.top + ")");
+    };
+
+    ContributorsMasterGraph.prototype.create_area = function(x, y) {
+      return this.area = d3.svg.area().x(function(d) {
+        return x(d.date);
+      }).y0(this.height).y1(function(d) {
+        var ref, ref1, xa;
+        xa = d.commits = (ref = (ref1 = d.commits) != null ? ref1 : d.additions) != null ? ref : d.deletions;
+        return y(xa);
+      }).interpolate("basis");
+    };
+
+    ContributorsMasterGraph.prototype.create_brush = function() {
+      return this.brush = d3.svg.brush().x(this.x).on("brushend", this.update_content);
+    };
+
+    ContributorsMasterGraph.prototype.draw_path = function(data) {
+      return this.svg.append("path").datum(data).attr("class", "area").attr("d", this.area);
+    };
+
+    ContributorsMasterGraph.prototype.add_brush = function() {
+      return this.svg.append("g").attr("class", "selection").call(this.brush).selectAll("rect").attr("height", this.height);
+    };
+
+    ContributorsMasterGraph.prototype.update_content = function() {
+      ContributorsGraph.set_x_domain(this.brush.empty() ? this.x_max_domain : this.brush.extent());
+      return $("#brush_change").trigger('change');
+    };
+
+    ContributorsMasterGraph.prototype.draw = function() {
+      this.process_dates(this.data);
+      this.create_scale();
+      this.create_axes();
+      ContributorsGraph.init_domain(this.data);
+      this.x_max_domain = this.x_domain;
+      this.set_domain();
+      this.create_area(this.x, this.y);
+      this.create_svg();
+      this.create_brush();
+      this.draw_path(this.data);
+      this.draw_x_axis();
+      this.draw_y_axis();
+      return this.add_brush();
+    };
+
+    ContributorsMasterGraph.prototype.redraw = function() {
+      this.process_dates(this.data);
+      ContributorsGraph.set_y_domain(this.data);
+      this.set_y_domain();
+      this.svg.select("path").datum(this.data);
+      this.svg.select("path").attr("d", this.area);
+      return this.svg.select(".y.axis").call(this.y_axis);
+    };
+
+    return ContributorsMasterGraph;
+
+  })(ContributorsGraph);
+
+  this.ContributorsAuthorGraph = (function(superClass) {
+    extend(ContributorsAuthorGraph, superClass);
+
+    function ContributorsAuthorGraph(data1) {
+      this.data = data1;
+      if ($(window).width() < 768) {
+        this.width = $('.content').width() - 80;
+      } else {
+        this.width = ($('.content').width() / 2) - 100;
+      }
+      this.height = 200;
+      this.x = null;
+      this.y = null;
+      this.x_axis = null;
+      this.y_axis = null;
+      this.area = null;
+      this.svg = null;
+      this.list_item = null;
+    }
+
+    ContributorsAuthorGraph.prototype.create_scale = function() {
+      return ContributorsAuthorGraph.__super__.create_scale.call(this, this.width, this.height);
+    };
+
+    ContributorsAuthorGraph.prototype.create_axes = function() {
+      this.x_axis = d3.svg.axis().scale(this.x).orient("bottom").ticks(8);
+      return this.y_axis = d3.svg.axis().scale(this.y).orient("left").ticks(5);
+    };
+
+    ContributorsAuthorGraph.prototype.create_area = function(x, y) {
+      return this.area = d3.svg.area().x(function(d) {
+        var parseDate;
+        parseDate = d3.time.format("%Y-%m-%d").parse;
+        return x(parseDate(d));
+      }).y0(this.height).y1((function(_this) {
+        return function(d) {
+          if (_this.data[d] != null) {
+            return y(_this.data[d]);
+          } else {
+            return y(0);
+          }
+        };
+      })(this)).interpolate("basis");
+    };
+
+    ContributorsAuthorGraph.prototype.create_svg = function() {
+      this.list_item = d3.selectAll(".person")[0].pop();
+      return this.svg = d3.select(this.list_item).append("svg").attr("width", this.width + this.MARGIN.left + this.MARGIN.right).attr("height", this.height + this.MARGIN.top + this.MARGIN.bottom).attr("class", "spark").append("g").attr("transform", "translate(" + this.MARGIN.left + "," + this.MARGIN.top + ")");
+    };
+
+    ContributorsAuthorGraph.prototype.draw_path = function(data) {
+      return this.svg.append("path").datum(data).attr("class", "area-contributor").attr("d", this.area);
+    };
+
+    ContributorsAuthorGraph.prototype.draw = function() {
+      this.create_scale();
+      this.create_axes();
+      this.set_domain();
+      this.create_area(this.x, this.y);
+      this.create_svg();
+      this.draw_path(this.dates);
+      this.draw_x_axis();
+      return this.draw_y_axis();
+    };
+
+    ContributorsAuthorGraph.prototype.redraw = function() {
+      this.set_domain();
+      this.svg.select("path").datum(this.dates);
+      this.svg.select("path").attr("d", this.area);
+      this.svg.select(".x.axis").call(this.x_axis);
+      return this.svg.select(".y.axis").call(this.y_axis);
+    };
+
+    return ContributorsAuthorGraph;
+
+  })(ContributorsGraph);
+
+}).call(this);
diff --git a/app/assets/javascripts/graphs/stat_graph_contributors_graph.js.coffee b/app/assets/javascripts/graphs/stat_graph_contributors_graph.js.coffee
deleted file mode 100644
index 834a81af459..00000000000
--- a/app/assets/javascripts/graphs/stat_graph_contributors_graph.js.coffee
+++ /dev/null
@@ -1,173 +0,0 @@
-#= require d3
-
-class @ContributorsGraph
-  MARGIN:
-    top: 20
-    right: 20
-    bottom: 30
-    left: 50
-  x_domain: null
-  y_domain: null
-  dates: []
-  @set_x_domain: (data) =>
-    @prototype.x_domain = data
-  @set_y_domain: (data) =>
-    @prototype.y_domain = [0, d3.max(data, (d) ->
-      d.commits = d.commits ? d.additions ? d.deletions
-    )]
-  @init_x_domain: (data) =>
-    @prototype.x_domain = d3.extent(data, (d) ->
-     d.date
-    )
-  @init_y_domain: (data) =>
-    @prototype.y_domain = [0, d3.max(data, (d) ->
-      d.commits = d.commits ? d.additions ? d.deletions
-    )]
-  @init_domain: (data) =>
-    @init_x_domain(data)
-    @init_y_domain(data)
-  @set_dates: (data) =>
-    @prototype.dates = data
-  set_x_domain: ->
-    @x.domain(@x_domain)
-  set_y_domain: ->
-    @y.domain(@y_domain)
-  set_domain: ->
-    @set_x_domain()
-    @set_y_domain()
-  create_scale: (width, height) ->
-    @x = d3.time.scale().range([0, width]).clamp(true)
-    @y = d3.scale.linear().range([height, 0]).nice()
-  draw_x_axis: ->
-    @svg.append("g").attr("class", "x axis").attr("transform", "translate(0, #{@height})")
-    .call(@x_axis)
-  draw_y_axis: ->
-    @svg.append("g").attr("class", "y axis").call(@y_axis)
-  set_data: (data) ->
-    @data = data
-
-class @ContributorsMasterGraph extends ContributorsGraph
-  constructor: (@data) ->
-    @width = $('.content').width() - 70
-    @height = 200
-    @x = null
-    @y = null
-    @x_axis = null
-    @y_axis = null
-    @area = null
-    @svg = null
-    @brush = null
-    @x_max_domain = null
-  process_dates: (data) ->
-    dates = @get_dates(data)
-    @parse_dates(data)
-    ContributorsGraph.set_dates(dates)
-  get_dates: (data) ->
-    _.pluck(data, 'date')
-  parse_dates: (data) ->
-    parseDate = d3.time.format("%Y-%m-%d").parse
-    data.forEach((d) ->
-      d.date = parseDate(d.date)
-    )
-  create_scale: ->
-    super @width, @height
-  create_axes: ->
-    @x_axis = d3.svg.axis().scale(@x).orient("bottom")
-    @y_axis = d3.svg.axis().scale(@y).orient("left").ticks(5)
-  create_svg: ->
-    @svg = d3.select("#contributors-master").append("svg")
-    .attr("width", @width + @MARGIN.left + @MARGIN.right)
-    .attr("height", @height + @MARGIN.top + @MARGIN.bottom)
-    .attr("class", "tint-box")
-    .append("g")
-    .attr("transform", "translate(" + @MARGIN.left + "," + @MARGIN.top + ")")
-  create_area: (x, y) ->
-    @area = d3.svg.area().x((d) ->
-      x(d.date)
-    ).y0(@height).y1((d) ->
-      xa = d.commits = d.commits ? d.additions ? d.deletions
-      y(xa)
-    ).interpolate("basis")
-  create_brush: ->
-    @brush = d3.svg.brush().x(@x).on("brushend", @update_content)
-  draw_path: (data) ->
-    @svg.append("path").datum(data).attr("class", "area").attr("d", @area)
-  add_brush: ->
-    @svg.append("g").attr("class", "selection").call(@brush).selectAll("rect").attr("height", @height)
-  update_content: =>
-    ContributorsGraph.set_x_domain(if @brush.empty() then @x_max_domain else @brush.extent())
-    $("#brush_change").trigger('change')
-  draw: ->
-    @process_dates(@data)
-    @create_scale()
-    @create_axes()
-    ContributorsGraph.init_domain(@data)
-    @x_max_domain = @x_domain
-    @set_domain()
-    @create_area(@x, @y)
-    @create_svg()
-    @create_brush()
-    @draw_path(@data)
-    @draw_x_axis()
-    @draw_y_axis()
-    @add_brush()
-  redraw: ->
-    @process_dates(@data)
-    ContributorsGraph.set_y_domain(@data)
-    @set_y_domain()
-    @svg.select("path").datum(@data)
-    @svg.select("path").attr("d", @area)
-    @svg.select(".y.axis").call(@y_axis)
-
-class @ContributorsAuthorGraph extends ContributorsGraph
-  constructor: (@data) ->
-    # Don't split graph size in half for mobile devices.
-    if $(window).width() < 768
-      @width = $('.content').width() - 80
-    else
-      @width = ($('.content').width() / 2) - 100
-    @height = 200
-    @x = null
-    @y = null
-    @x_axis = null
-    @y_axis = null
-    @area = null
-    @svg = null
-    @list_item = null
-  create_scale: ->
-    super @width, @height
-  create_axes: ->
-    @x_axis = d3.svg.axis().scale(@x).orient("bottom").ticks(8)
-    @y_axis = d3.svg.axis().scale(@y).orient("left").ticks(5)
-  create_area: (x, y) ->
-    @area = d3.svg.area().x((d) ->
-      parseDate = d3.time.format("%Y-%m-%d").parse
-      x(parseDate(d))
-    ).y0(@height).y1((d) =>
-      if @data[d]? then y(@data[d]) else y(0)
-    ).interpolate("basis")
-  create_svg: ->
-    @list_item = d3.selectAll(".person")[0].pop()
-    @svg = d3.select(@list_item).append("svg")
-    .attr("width", @width + @MARGIN.left + @MARGIN.right)
-    .attr("height", @height + @MARGIN.top + @MARGIN.bottom)
-    .attr("class", "spark")
-    .append("g")
-    .attr("transform", "translate(" + @MARGIN.left + "," + @MARGIN.top + ")")
-  draw_path: (data) ->
-    @svg.append("path").datum(data).attr("class", "area-contributor").attr("d", @area)
-  draw: ->
-    @create_scale()
-    @create_axes()
-    @set_domain()
-    @create_area(@x, @y)
-    @create_svg()
-    @draw_path(@dates)
-    @draw_x_axis()
-    @draw_y_axis()
-  redraw: ->
-    @set_domain()
-    @svg.select("path").datum(@dates)
-    @svg.select("path").attr("d", @area)
-    @svg.select(".x.axis").call(@x_axis)
-    @svg.select(".y.axis").call(@y_axis)
diff --git a/app/assets/javascripts/graphs/stat_graph_contributors_util.js b/app/assets/javascripts/graphs/stat_graph_contributors_util.js
new file mode 100644
index 00000000000..0d240bed8b6
--- /dev/null
+++ b/app/assets/javascripts/graphs/stat_graph_contributors_util.js
@@ -0,0 +1,135 @@
+(function() {
+  window.ContributorsStatGraphUtil = {
+    parse_log: function(log) {
+      var by_author, by_email, data, entry, i, len, total;
+      total = {};
+      by_author = {};
+      by_email = {};
+      for (i = 0, len = log.length; i < len; i++) {
+        entry = log[i];
+        if (total[entry.date] == null) {
+          this.add_date(entry.date, total);
+        }
+        data = by_author[entry.author_name] || by_email[entry.author_email];
+        if (data == null) {
+          data = this.add_author(entry, by_author, by_email);
+        }
+        if (!data[entry.date]) {
+          this.add_date(entry.date, data);
+        }
+        this.store_data(entry, total[entry.date], data[entry.date]);
+      }
+      total = _.toArray(total);
+      by_author = _.toArray(by_author);
+      return {
+        total: total,
+        by_author: by_author
+      };
+    },
+    add_date: function(date, collection) {
+      collection[date] = {};
+      return collection[date].date = date;
+    },
+    add_author: function(author, by_author, by_email) {
+      var data;
+      data = {};
+      data.author_name = author.author_name;
+      data.author_email = author.author_email;
+      by_author[author.author_name] = data;
+      return by_email[author.author_email] = data;
+    },
+    store_data: function(entry, total, by_author) {
+      this.store_commits(total, by_author);
+      this.store_additions(entry, total, by_author);
+      return this.store_deletions(entry, total, by_author);
+    },
+    store_commits: function(total, by_author) {
+      this.add(total, "commits", 1);
+      return this.add(by_author, "commits", 1);
+    },
+    add: function(collection, field, value) {
+      if (collection[field] == null) {
+        collection[field] = 0;
+      }
+      return collection[field] += value;
+    },
+    store_additions: function(entry, total, by_author) {
+      if (entry.additions == null) {
+        entry.additions = 0;
+      }
+      this.add(total, "additions", entry.additions);
+      return this.add(by_author, "additions", entry.additions);
+    },
+    store_deletions: function(entry, total, by_author) {
+      if (entry.deletions == null) {
+        entry.deletions = 0;
+      }
+      this.add(total, "deletions", entry.deletions);
+      return this.add(by_author, "deletions", entry.deletions);
+    },
+    get_total_data: function(parsed_log, field) {
+      var log, total_data;
+      log = parsed_log.total;
+      total_data = this.pick_field(log, field);
+      return _.sortBy(total_data, function(d) {
+        return d.date;
+      });
+    },
+    pick_field: function(log, field) {
+      var total_data;
+      total_data = [];
+      _.each(log, function(d) {
+        return total_data.push(_.pick(d, [field, 'date']));
+      });
+      return total_data;
+    },
+    get_author_data: function(parsed_log, field, date_range) {
+      var author_data, log;
+      if (date_range == null) {
+        date_range = null;
+      }
+      log = parsed_log.by_author;
+      author_data = [];
+      _.each(log, (function(_this) {
+        return function(log_entry) {
+          var parsed_log_entry;
+          parsed_log_entry = _this.parse_log_entry(log_entry, field, date_range);
+          if (!_.isEmpty(parsed_log_entry.dates)) {
+            return author_data.push(parsed_log_entry);
+          }
+        };
+      })(this));
+      return _.sortBy(author_data, function(d) {
+        return d[field];
+      }).reverse();
+    },
+    parse_log_entry: function(log_entry, field, date_range) {
+      var parsed_entry;
+      parsed_entry = {};
+      parsed_entry.author_name = log_entry.author_name;
+      parsed_entry.author_email = log_entry.author_email;
+      parsed_entry.dates = {};
+      parsed_entry.commits = parsed_entry.additions = parsed_entry.deletions = 0;
+      _.each(_.omit(log_entry, 'author_name', 'author_email'), (function(_this) {
+        return function(value, key) {
+          if (_this.in_range(value.date, date_range)) {
+            parsed_entry.dates[value.date] = value[field];
+            parsed_entry.commits += value.commits;
+            parsed_entry.additions += value.additions;
+            return parsed_entry.deletions += value.deletions;
+          }
+        };
+      })(this));
+      return parsed_entry;
+    },
+    in_range: function(date, date_range) {
+      var ref;
+      if (date_range === null || (date_range[0] <= (ref = new Date(date)) && ref <= date_range[1])) {
+        return true;
+      } else {
+        return false;
+      }
+    }
+  };
+
+}).call(this);
diff --git a/app/assets/javascripts/graphs/stat_graph_contributors_util.js.coffee b/app/assets/javascripts/graphs/stat_graph_contributors_util.js.coffee
deleted file mode 100644
index 31617c88b4a..00000000000
--- a/app/assets/javascripts/graphs/stat_graph_contributors_util.js.coffee
+++ /dev/null
@@ -1,98 +0,0 @@
-window.ContributorsStatGraphUtil =
-  parse_log: (log) ->
-    total = {}
-    by_author = {}
-    by_email = {}
-    for entry in log
-      @add_date(entry.date, total) unless total[entry.date]?
-
-      data = by_author[entry.author_name] || by_email[entry.author_email]      
-      data ?= @add_author(entry, by_author, by_email)
-
-      @add_date(entry.date, data) unless data[entry.date]
-      @store_data(entry, total[entry.date], data[entry.date])
-    total = _.toArray(total)
-    by_author = _.toArray(by_author)
-    total: total, by_author: by_author
-
-  add_date: (date, collection) ->
-    collection[date] = {}
-    collection[date].date = date
-
-  add_author: (author, by_author, by_email) ->
-    data = {}
-    data.author_name = author.author_name
-    data.author_email = author.author_email
-    by_author[author.author_name] = data
-    by_email[author.author_email] = data
-
-  store_data: (entry, total, by_author) ->
-    @store_commits(total, by_author)
-    @store_additions(entry, total, by_author)
-    @store_deletions(entry, total, by_author)
-
-  store_commits: (total, by_author) ->
-    @add(total, "commits", 1)
-    @add(by_author, "commits", 1)
-
-  add: (collection, field, value) ->
-    collection[field] ?= 0
-    collection[field] += value
-
-  store_additions: (entry, total, by_author) ->
-    entry.additions ?= 0
-    @add(total, "additions", entry.additions)
-    @add(by_author, "additions", entry.additions)
-
-  store_deletions: (entry, total, by_author) ->
-    entry.deletions ?= 0
-    @add(total, "deletions", entry.deletions)
-    @add(by_author, "deletions", entry.deletions)
-
-  get_total_data: (parsed_log, field) ->
-    log = parsed_log.total
-    total_data = @pick_field(log, field)
-    _.sortBy(total_data, (d) ->
-      d.date
-    )
-  pick_field: (log, field) ->
-    total_data = []
-    _.each(log, (d) ->
-      total_data.push(_.pick(d, [field, 'date']))
-    )
-    total_data
-
-  get_author_data: (parsed_log, field, date_range = null) ->
-    log = parsed_log.by_author
-    author_data = []
-
-    _.each(log, (log_entry) =>
-      parsed_log_entry = @parse_log_entry(log_entry, field, date_range)
-      if not _.isEmpty(parsed_log_entry.dates)
-        author_data.push(parsed_log_entry)
-    )
-
-    _.sortBy(author_data, (d) ->
-      d[field]
-    ).reverse()
-
-  parse_log_entry: (log_entry, field, date_range) ->
-    parsed_entry = {}
-    parsed_entry.author_name = log_entry.author_name
-    parsed_entry.author_email = log_entry.author_email
-    parsed_entry.dates = {}
-    parsed_entry.commits = parsed_entry.additions = parsed_entry.deletions = 0
-    _.each(_.omit(log_entry, 'author_name', 'author_email'), (value, key) =>
-      if @in_range(value.date, date_range)
-        parsed_entry.dates[value.date] = value[field]
-        parsed_entry.commits += value.commits
-        parsed_entry.additions += value.additions
-        parsed_entry.deletions += value.deletions
-    )
-    return parsed_entry
-
-  in_range: (date, date_range) ->
-    if date_range is null || date_range[0] <= new Date(date) <= date_range[1]
-      true
-    else
-      false
diff --git a/app/assets/javascripts/group_avatar.js b/app/assets/javascripts/group_avatar.js
new file mode 100644
index 00000000000..c28ce86d7af
--- /dev/null
+++ b/app/assets/javascripts/group_avatar.js
@@ -0,0 +1,21 @@
+(function() {
+  this.GroupAvatar = (function() {
+    function GroupAvatar() {
+      $('.js-choose-group-avatar-button').bind("click", function() {
+        var form;
+        form = $(this).closest("form");
+        return form.find(".js-group-avatar-input").click();
+      });
+      $('.js-group-avatar-input').bind("change", function() {
+        var filename, form;
+        form = $(this).closest("form");
+        filename = $(this).val().replace(/^.*[\\\/]/, '');
+        return form.find(".js-avatar-filename").text(filename);
+      });
+    }
+
+    return GroupAvatar;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/group_avatar.js.coffee b/app/assets/javascripts/group_avatar.js.coffee
deleted file mode 100644
index 0825fd3ce52..00000000000
--- a/app/assets/javascripts/group_avatar.js.coffee
+++ /dev/null
@@ -1,9 +0,0 @@
-class @GroupAvatar
-  constructor: ->
-    $('.js-choose-group-avatar-button').bind "click", ->
-      form = $(this).closest("form")
-      form.find(".js-group-avatar-input").click()
-    $('.js-group-avatar-input').bind "change", ->
-      form = $(this).closest("form")
-      filename = $(this).val().replace(/^.*[\\\/]/, '')
-      form.find(".js-avatar-filename").text(filename)
diff --git a/app/assets/javascripts/groups.js b/app/assets/javascripts/groups.js
new file mode 100644
index 00000000000..4382dd6860f
--- /dev/null
+++ b/app/assets/javascripts/groups.js
@@ -0,0 +1,13 @@
+(function() {
+  this.GroupMembers = (function() {
+    function GroupMembers() {
+      $('li.group_member').bind('ajax:success', function() {
+        return $(this).fadeOut();
+      });
+    }
+
+    return GroupMembers;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/groups.js.coffee b/app/assets/javascripts/groups.js.coffee
deleted file mode 100644
index cc905e91ea2..00000000000
--- a/app/assets/javascripts/groups.js.coffee
+++ /dev/null
@@ -1,4 +0,0 @@
-class @GroupMembers
-  constructor: ->
-    $('li.group_member').bind 'ajax:success', ->
-      $(this).fadeOut()
diff --git a/app/assets/javascripts/groups_select.js b/app/assets/javascripts/groups_select.js
new file mode 100644
index 00000000000..fd5b6dc0ddd
--- /dev/null
+++ b/app/assets/javascripts/groups_select.js
@@ -0,0 +1,67 @@
+(function() {
+  var slice = [].slice;
+
+  this.GroupsSelect = (function() {
+    function GroupsSelect() {
+      $('.ajax-groups-select').each((function(_this) {
+        return function(i, select) {
+          var skip_ldap;
+          skip_ldap = $(select).hasClass('skip_ldap');
+          return $(select).select2({
+            placeholder: "Search for a group",
+            multiple: $(select).hasClass('multiselect'),
+            minimumInputLength: 0,
+            query: function(query) {
+              return Api.groups(query.term, skip_ldap, function(groups) {
+                var data;
+                data = {
+                  results: groups
+                };
+                return query.callback(data);
+              });
+            },
+            initSelection: function(element, callback) {
+              var id;
+              id = $(element).val();
+              if (id !== "") {
+                return Api.group(id, callback);
+              }
+            },
+            formatResult: function() {
+              var args;
+              args = 1 <= arguments.length ? slice.call(arguments, 0) : [];
+              return _this.formatResult.apply(_this, args);
+            },
+            formatSelection: function() {
+              var args;
+              args = 1 <= arguments.length ? slice.call(arguments, 0) : [];
+              return _this.formatSelection.apply(_this, args);
+            },
+            dropdownCssClass: "ajax-groups-dropdown",
+            escapeMarkup: function(m) {
+              return m;
+            }
+          });
+        };
+      })(this));
+    }
+
+    GroupsSelect.prototype.formatResult = function(group) {
+      var avatar;
+      if (group.avatar_url) {
+        avatar = group.avatar_url;
+      } else {
+        avatar = gon.default_avatar_url;
+      }
+      return "<div class='group-result'> <div class='group-name'>" + group.name + "</div> <div class='group-path'>" + group.path + "</div> </div>";
+    };
+
+    GroupsSelect.prototype.formatSelection = function(group) {
+      return group.name;
+    };
+
+    return GroupsSelect;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/groups_select.js.coffee b/app/assets/javascripts/groups_select.js.coffee
deleted file mode 100644
index 1084e2a17d1..00000000000
--- a/app/assets/javascripts/groups_select.js.coffee
+++ /dev/null
@@ -1,41 +0,0 @@
-class @GroupsSelect
-  constructor: ->
-    $('.ajax-groups-select').each (i, select) =>
-      skip_ldap = $(select).hasClass('skip_ldap')
-
-      $(select).select2
-        placeholder: "Search for a group"
-        multiple: $(select).hasClass('multiselect')
-        minimumInputLength: 0
-        query: (query) ->
-          Api.groups query.term, skip_ldap, (groups) ->
-            data = { results: groups }
-            query.callback(data)
-
-        initSelection: (element, callback) ->
-          id = $(element).val()
-          if id isnt ""
-            Api.group(id, callback)
-
-
-        formatResult: (args...) =>
-          @formatResult(args...)
-        formatSelection: (args...) =>
-          @formatSelection(args...)
-        dropdownCssClass: "ajax-groups-dropdown"
-        escapeMarkup: (m) -> # we do not want to escape markup since we are displaying html in results
-          m
-
-  formatResult: (group) ->
-    if group.avatar_url
-      avatar = group.avatar_url
-    else
-      avatar = gon.default_avatar_url
-
-    "<div class='group-result'>
-       <div class='group-name'>#{group.name}</div>
-       <div class='group-path'>#{group.path}</div>
-     </div>"
-
-  formatSelection: (group) ->
-    group.name
diff --git a/app/assets/javascripts/importer_status.js b/app/assets/javascripts/importer_status.js
new file mode 100644
index 00000000000..55b6f132bab
--- /dev/null
+++ b/app/assets/javascripts/importer_status.js
@@ -0,0 +1,69 @@
+(function() {
+  this.ImporterStatus = (function() {
+    function ImporterStatus(jobs_url, import_url) {
+      this.jobs_url = jobs_url;
+      this.import_url = import_url;
+      this.initStatusPage();
+      this.setAutoUpdate();
+    }
+
+    ImporterStatus.prototype.initStatusPage = function() {
+      $('.js-add-to-import').off('click').on('click', (function(_this) {
+        return function(e) {
+          var $btn, $namespace_input, $target_field, $tr, id, new_namespace;
+          $btn = $(e.currentTarget);
+          $tr = $btn.closest('tr');
+          $target_field = $tr.find('.import-target');
+          $namespace_input = $target_field.find('input');
+          id = $tr.attr('id').replace('repo_', '');
+          new_namespace = null;
+          if ($namespace_input.length > 0) {
+            new_namespace = $namespace_input.prop('value');
+            $target_field.empty().append(new_namespace + "/" + ($target_field.data('project_name')));
+          }
+          $btn.disable().addClass('is-loading');
+          return $.post(_this.import_url, {
+            repo_id: id,
+            new_namespace: new_namespace
+          }, {
+            dataType: 'script'
+          });
+        };
+      })(this));
+      return $('.js-import-all').off('click').on('click', function(e) {
+        var $btn;
+        $btn = $(this);
+        $btn.disable().addClass('is-loading');
+        return $('.js-add-to-import').each(function() {
+          return $(this).trigger('click');
+        });
+      });
+    };
+
+    ImporterStatus.prototype.setAutoUpdate = function() {
+      return setInterval(((function(_this) {
+        return function() {
+          return $.get(_this.jobs_url, function(data) {
+            return $.each(data, function(i, job) {
+              var job_item, status_field;
+              job_item = $("#project_" + job.id);
+              status_field = job_item.find(".job-status");
+              if (job.import_status === 'finished') {
+                job_item.removeClass("active").addClass("success");
+                return status_field.html('<span><i class="fa fa-check"></i> done</span>');
+              } else if (job.import_status === 'started') {
+                return status_field.html("<i class='fa fa-spinner fa-spin'></i> started");
+              } else {
+                return status_field.html(job.import_status);
+              }
+            });
+          });
+        };
+      })(this)), 4000);
+    };
+
+    return ImporterStatus;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/importer_status.js.coffee b/app/assets/javascripts/importer_status.js.coffee
deleted file mode 100644
index eb046eb2eff..00000000000
--- a/app/assets/javascripts/importer_status.js.coffee
+++ /dev/null
@@ -1,53 +0,0 @@
-class @ImporterStatus
-  constructor: (@jobs_url, @import_url) ->
-    this.initStatusPage()
-    this.setAutoUpdate()
-
-  initStatusPage: ->
-    $('.js-add-to-import')
-      .off 'click'
-      .on 'click', (e) =>
-        $btn = $(e.currentTarget)
-        $tr = $btn.closest('tr')
-        $target_field = $tr.find('.import-target')
-        $namespace_input = $target_field.find('input')
-        id = $tr.attr('id').replace('repo_', '')
-        new_namespace = null
-
-        if $namespace_input.length > 0
-          new_namespace = $namespace_input.prop('value')
-          $target_field.empty().append("#{new_namespace}/#{$target_field.data('project_name')}")
-
-        $btn
-          .disable()
-          .addClass 'is-loading'
-
-        $.post @import_url, {repo_id: id, new_namespace: new_namespace}, dataType: 'script'
-
-    $('.js-import-all')
-      .off 'click'
-      .on 'click', (e) ->
-        $btn = $(@)
-        $btn
-          .disable()
-          .addClass 'is-loading'
-
-        $('.js-add-to-import').each ->
-          $(this).trigger('click')
-
-  setAutoUpdate: ->
-    setInterval (=>
-      $.get @jobs_url, (data) =>
-        $.each data, (i, job) =>
-          job_item = $("#project_" + job.id)
-          status_field = job_item.find(".job-status")
-
-          if job.import_status == 'finished'
-            job_item.removeClass("active").addClass("success")
-            status_field.html('<span><i class="fa fa-check"></i> done</span>')
-          else if job.import_status == 'started'
-            status_field.html("<i class='fa fa-spinner fa-spin'></i> started")
-          else
-            status_field.html(job.import_status)
-
-    ), 4000
diff --git a/app/assets/javascripts/issuable.js b/app/assets/javascripts/issuable.js
new file mode 100644
index 00000000000..f27f1bad1f7
--- /dev/null
+++ b/app/assets/javascripts/issuable.js
@@ -0,0 +1,89 @@
+(function() {
+  var issuable_created;
+
+  issuable_created = false;
+
+  this.Issuable = {
+    init: function() {
+      if (!issuable_created) {
+        issuable_created = true;
+        Issuable.initTemplates();
+        Issuable.initSearch();
+        Issuable.initChecks();
+        return Issuable.initLabelFilterRemove();
+      }
+    },
+    initTemplates: function() {
+      return Issuable.labelRow = _.template('<% _.each(labels, function(label){ %> <span class="label-row btn-group" role="group" aria-label="<%- label.title %>" style="color: <%- label.text_color %>;"> <a href="#" class="btn btn-transparent has-tooltip" style="background-color: <%- label.color %>;" title="<%- label.description %>" data-container="body"> <%- label.title %> </a> <button type="button" class="btn btn-transparent label-remove js-label-filter-remove" style="background-color: <%- label.color %>;" data-label="<%- label.title %>"> <i class="fa fa-times"></i> </button> </span> <% }); %>');
+    },
+    initSearch: function() {
+      this.timer = null;
+      return $('#issue_search').off('keyup').on('keyup', function() {
+        clearTimeout(this.timer);
+        return this.timer = setTimeout(function() {
+          var $form, $input, $search;
+          $search = $('#issue_search');
+          $form = $('.js-filter-form');
+          $input = $("input[name='" + ($search.attr('name')) + "']", $form);
+          if ($input.length === 0) {
+            $form.append("<input type='hidden' name='" + ($search.attr('name')) + "' value='" + (_.escape($search.val())) + "'/>");
+          } else {
+            $input.val($search.val());
+          }
+          if ($search.val() !== '') {
+            return Issuable.filterResults($form);
+          }
+        }, 500);
+      });
+    },
+    initLabelFilterRemove: function() {
+      return $(document).off('click', '.js-label-filter-remove').on('click', '.js-label-filter-remove', function(e) {
+        var $button;
+        $button = $(this);
+        $('input[name="label_name[]"]').filter(function() {
+          return this.value === $button.data('label');
+        }).remove();
+        Issuable.filterResults($('.filter-form'));
+        return $('.js-label-select').trigger('update.label');
+      });
+    },
+    filterResults: (function(_this) {
+      return function(form) {
+        var formAction, formData, issuesUrl;
+        formData = form.serialize();
+        formAction = form.attr('action');
+        issuesUrl = formAction;
+        issuesUrl += "" + (formAction.indexOf('?') < 0 ? '?' : '&');
+        issuesUrl += formData;
+        return Turbolinks.visit(issuesUrl);
+      };
+    })(this),
+    initChecks: function() {
+      this.issuableBulkActions = $('.bulk-update').data('bulkActions');
+      $('.check_all_issues').off('click').on('click', function() {
+        $('.selected_issue').prop('checked', this.checked);
+        return Issuable.checkChanged();
+      });
+      return $('.selected_issue').off('change').on('change', Issuable.checkChanged.bind(this));
+    },
+    checkChanged: function() {
+      var checked_issues, ids;
+      checked_issues = $('.selected_issue:checked');
+      if (checked_issues.length > 0) {
+        ids = $.map(checked_issues, function(value) {
+          return $(value).data('id');
+        });
+        $('#update_issues_ids').val(ids);
+        $('.issues-other-filters').hide();
+        $('.issues_bulk_update').show();
+      } else {
+        $('#update_issues_ids').val([]);
+        $('.issues_bulk_update').hide();
+        $('.issues-other-filters').show();
+        this.issuableBulkActions.willUpdateLabels = false;
+      }
+      return true;
+    }
+  };
+
+}).call(this);
diff --git a/app/assets/javascripts/issuable.js.coffee b/app/assets/javascripts/issuable.js.coffee
deleted file mode 100644
index 7f795f8096b..00000000000
--- a/app/assets/javascripts/issuable.js.coffee
+++ /dev/null
@@ -1,93 +0,0 @@
-issuable_created = false
-@Issuable =
-  init: ->
-    unless issuable_created
-      issuable_created = true
-      Issuable.initTemplates()
-      Issuable.initSearch()
-      Issuable.initChecks()
-      Issuable.initLabelFilterRemove()
-
-  initTemplates: ->
-    Issuable.labelRow = _.template(
-      '<% _.each(labels, function(label){ %>
-        <span class="label-row btn-group" role="group" aria-label="<%- label.title %>" style="color: <%- label.text_color %>;">
-          <a href="#" class="btn btn-transparent has-tooltip" style="background-color: <%- label.color %>;" title="<%- label.description %>" data-container="body">
-            <%- label.title %>
-          </a>
-          <button type="button" class="btn btn-transparent label-remove js-label-filter-remove" style="background-color: <%- label.color %>;" data-label="<%- label.title %>">
-            <i class="fa fa-times"></i>
-          </button>
-        </span>
-      <% }); %>'
-    )
-
-  initSearch: ->
-    @timer = null
-    $('#issue_search')
-      .off 'keyup'
-      .on 'keyup', ->
-        clearTimeout(@timer)
-        @timer = setTimeout( ->
-          $search = $('#issue_search')
-          $form = $('.js-filter-form')
-          $input = $("input[name='#{$search.attr('name')}']", $form)
-          if $input.length is 0
-            $form.append "<input type='hidden' name='#{$search.attr('name')}' value='#{_.escape($search.val())}'/>"
-          else
-            $input.val $search.val()
-          Issuable.filterResults $form if $search.val() isnt ''
-        , 500)
-
-  initLabelFilterRemove: ->
-    $(document)
-      .off 'click', '.js-label-filter-remove'
-      .on 'click', '.js-label-filter-remove', (e) ->
-        $button = $(@)
-
-        # Remove the label input box
-        $('input[name="label_name[]"]')
-          .filter -> @value is $button.data('label')
-          .remove()
-
-        # Submit the form to get new data
-        Issuable.filterResults $('.filter-form')
-        $('.js-label-select').trigger('update.label')
-
-  filterResults: (form) =>
-    formData = form.serialize()
-
-    formAction = form.attr('action')
-    issuesUrl = formAction
-    issuesUrl += ("#{if formAction.indexOf('?') < 0 then '?' else '&'}")
-    issuesUrl += formData
-
-    Turbolinks.visit(issuesUrl)
-
-  initChecks: ->
-    @issuableBulkActions = $('.bulk-update').data('bulkActions')
-
-    $('.check_all_issues').off('click').on('click', ->
-      $('.selected_issue').prop('checked', @checked)
-      Issuable.checkChanged()
-    )
-
-    $('.selected_issue').off('change').on('change', Issuable.checkChanged.bind(@))
-
-
-  checkChanged: ->
-    checked_issues = $('.selected_issue:checked')
-    if checked_issues.length > 0
-      ids = $.map checked_issues, (value) ->
-        $(value).data('id')
-
-      $('#update_issues_ids').val ids
-      $('.issues-other-filters').hide()
-      $('.issues_bulk_update').show()
-    else
-      $('#update_issues_ids').val []
-      $('.issues_bulk_update').hide()
-      $('.issues-other-filters').show()
-      @issuableBulkActions.willUpdateLabels = false
-
-    return true
diff --git a/app/assets/javascripts/issuable_context.js b/app/assets/javascripts/issuable_context.js
new file mode 100644
index 00000000000..8147e83ffe8
--- /dev/null
+++ b/app/assets/javascripts/issuable_context.js
@@ -0,0 +1,69 @@
+(function() {
+  this.IssuableContext = (function() {
+    function IssuableContext(currentUser) {
+      this.initParticipants();
+      new UsersSelect(currentUser);
+      $('select.select2').select2({
+        width: 'resolve',
+        dropdownAutoWidth: true
+      });
+      $(".issuable-sidebar .inline-update").on("change", "select", function() {
+        return $(this).submit();
+      });
+      $(".issuable-sidebar .inline-update").on("change", ".js-assignee", function() {
+        return $(this).submit();
+      });
+      $(document).off('click', '.issuable-sidebar .dropdown-content a').on('click', '.issuable-sidebar .dropdown-content a', function(e) {
+        return e.preventDefault();
+      });
+      $(document).off('click', '.edit-link').on('click', '.edit-link', function(e) {
+        var $block, $selectbox;
+        e.preventDefault();
+        $block = $(this).parents('.block');
+        $selectbox = $block.find('.selectbox');
+        if ($selectbox.is(':visible')) {
+          $selectbox.hide();
+          $block.find('.value').show();
+        } else {
+          $selectbox.show();
+          $block.find('.value').hide();
+        }
+        if ($selectbox.is(':visible')) {
+          return setTimeout(function() {
+            return $block.find('.dropdown-menu-toggle').trigger('click');
+          }, 0);
+        }
+      });
+      $(".right-sidebar").niceScroll();
+    }
+
+    IssuableContext.prototype.initParticipants = function() {
+      var _this;
+      _this = this;
+      $(document).on("click", ".js-participants-more", this.toggleHiddenParticipants);
+      return $(".js-participants-author").each(function(i) {
+        if (i >= _this.PARTICIPANTS_ROW_COUNT) {
+          return $(this).addClass("js-participants-hidden").hide();
+        }
+      });
+    };
+
+    IssuableContext.prototype.toggleHiddenParticipants = function(e) {
+      var currentText, lessText, originalText;
+      e.preventDefault();
+      currentText = $(this).text().trim();
+      lessText = $(this).data("less-text");
+      originalText = $(this).data("original-text");
+      if (currentText === originalText) {
+        $(this).text(lessText);
+      } else {
+        $(this).text(originalText);
+      }
+      return $(".js-participants-hidden").toggle();
+    };
+
+    return IssuableContext;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/issuable_context.js.coffee b/app/assets/javascripts/issuable_context.js.coffee
deleted file mode 100644
index 3c491ebfc4c..00000000000
--- a/app/assets/javascripts/issuable_context.js.coffee
+++ /dev/null
@@ -1,60 +0,0 @@
-class @IssuableContext
-  constructor: (currentUser) ->
-    @initParticipants()
-    new UsersSelect(currentUser)
-    $('select.select2').select2({width: 'resolve', dropdownAutoWidth: true})
-
-    $(".issuable-sidebar .inline-update").on "change", "select", ->
-      $(this).submit()
-    $(".issuable-sidebar .inline-update").on "change", ".js-assignee", ->
-      $(this).submit()
-
-    $(document)
-      .off 'click', '.issuable-sidebar .dropdown-content a'
-      .on 'click', '.issuable-sidebar .dropdown-content a', (e) ->
-        e.preventDefault()
-
-    $(document)
-      .off 'click', '.edit-link'
-      .on 'click', '.edit-link', (e) ->
-        e.preventDefault()
-
-        $block = $(@).parents('.block')
-        $selectbox = $block.find('.selectbox')
-        if $selectbox.is(':visible')
-          $selectbox.hide()
-          $block.find('.value').show()
-        else
-          $selectbox.show()
-          $block.find('.value').hide()
-
-        if $selectbox.is(':visible')
-          setTimeout ->
-            $block.find('.dropdown-menu-toggle').trigger 'click'
-          , 0
-
-    $(".right-sidebar").niceScroll()
-
-  initParticipants: ->
-    _this = @
-    $(document).on "click", ".js-participants-more", @toggleHiddenParticipants
-
-    $(".js-participants-author").each (i) ->
-      if i >= _this.PARTICIPANTS_ROW_COUNT
-        $(@)
-          .addClass "js-participants-hidden"
-          .hide()
-
-  toggleHiddenParticipants: (e) ->
-    e.preventDefault()
-
-    currentText = $(this).text().trim()
-    lessText = $(this).data("less-text")
-    originalText = $(this).data("original-text")
-
-    if currentText is originalText
-      $(this).text(lessText)
-    else
-      $(this).text(originalText)
-
-    $(".js-participants-hidden").toggle()
diff --git a/app/assets/javascripts/issuable_form.js b/app/assets/javascripts/issuable_form.js
new file mode 100644
index 00000000000..297d4f029f0
--- /dev/null
+++ b/app/assets/javascripts/issuable_form.js
@@ -0,0 +1,136 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.IssuableForm = (function() {
+    IssuableForm.prototype.issueMoveConfirmMsg = 'Are you sure you want to move this issue to another project?';
+
+    IssuableForm.prototype.wipRegex = /^\s*(\[WIP\]\s*|WIP:\s*|WIP\s+)+\s*/i;
+
+    function IssuableForm(form) {
+      var $issuableDueDate;
+      this.form = form;
+      this.toggleWip = bind(this.toggleWip, this);
+      this.renderWipExplanation = bind(this.renderWipExplanation, this);
+      this.resetAutosave = bind(this.resetAutosave, this);
+      this.handleSubmit = bind(this.handleSubmit, this);
+      GitLab.GfmAutoComplete.setup();
+      new UsersSelect();
+      new ZenMode();
+      this.titleField = this.form.find("input[name*='[title]']");
+      this.descriptionField = this.form.find("textarea[name*='[description]']");
+      this.issueMoveField = this.form.find("#move_to_project_id");
+      if (!(this.titleField.length && this.descriptionField.length)) {
+        return;
+      }
+      this.initAutosave();
+      this.form.on("submit", this.handleSubmit);
+      this.form.on("click", ".btn-cancel", this.resetAutosave);
+      this.initWip();
+      this.initMoveDropdown();
+      $issuableDueDate = $('#issuable-due-date');
+      if ($issuableDueDate.length) {
+        $('.datepicker').datepicker({
+          dateFormat: 'yy-mm-dd',
+          onSelect: function(dateText, inst) {
+            return $issuableDueDate.val(dateText);
+          }
+        }).datepicker('setDate', $.datepicker.parseDate('yy-mm-dd', $issuableDueDate.val()));
+      }
+    }
+
+    IssuableForm.prototype.initAutosave = function() {
+      new Autosave(this.titleField, [document.location.pathname, document.location.search, "title"]);
+      return new Autosave(this.descriptionField, [document.location.pathname, document.location.search, "description"]);
+    };
+
+    IssuableForm.prototype.handleSubmit = function() {
+      var ref, ref1;
+      if (((ref = parseInt((ref1 = this.issueMoveField) != null ? ref1.val() : void 0)) != null ? ref : 0) > 0) {
+        if (!confirm(this.issueMoveConfirmMsg)) {
+          return false;
+        }
+      }
+      return this.resetAutosave();
+    };
+
+    IssuableForm.prototype.resetAutosave = function() {
+      this.titleField.data("autosave").reset();
+      return this.descriptionField.data("autosave").reset();
+    };
+
+    IssuableForm.prototype.initWip = function() {
+      this.$wipExplanation = this.form.find(".js-wip-explanation");
+      this.$noWipExplanation = this.form.find(".js-no-wip-explanation");
+      if (!(this.$wipExplanation.length && this.$noWipExplanation.length)) {
+        return;
+      }
+      this.form.on("click", ".js-toggle-wip", this.toggleWip);
+      this.titleField.on("keyup blur", this.renderWipExplanation);
+      return this.renderWipExplanation();
+    };
+
+    IssuableForm.prototype.workInProgress = function() {
+      return this.wipRegex.test(this.titleField.val());
+    };
+
+    IssuableForm.prototype.renderWipExplanation = function() {
+      if (this.workInProgress()) {
+        this.$wipExplanation.show();
+        return this.$noWipExplanation.hide();
+      } else {
+        this.$wipExplanation.hide();
+        return this.$noWipExplanation.show();
+      }
+    };
+
+    IssuableForm.prototype.toggleWip = function(event) {
+      event.preventDefault();
+      if (this.workInProgress()) {
+        this.removeWip();
+      } else {
+        this.addWip();
+      }
+      return this.renderWipExplanation();
+    };
+
+    IssuableForm.prototype.removeWip = function() {
+      return this.titleField.val(this.titleField.val().replace(this.wipRegex, ""));
+    };
+
+    IssuableForm.prototype.addWip = function() {
+      return this.titleField.val("WIP: " + (this.titleField.val()));
+    };
+
+    IssuableForm.prototype.initMoveDropdown = function() {
+      var $moveDropdown;
+      $moveDropdown = $('.js-move-dropdown');
+      if ($moveDropdown.length) {
+        return $('.js-move-dropdown').select2({
+          ajax: {
+            url: $moveDropdown.data('projects-url'),
+            results: function(data) {
+              return {
+                results: data
+              };
+            },
+            data: function(query) {
+              return {
+                search: query
+              };
+            }
+          },
+          formatResult: function(project) {
+            return project.name_with_namespace;
+          },
+          formatSelection: function(project) {
+            return project.name_with_namespace;
+          }
+        });
+      }
+    };
+
+    return IssuableForm;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/issuable_form.js.coffee b/app/assets/javascripts/issuable_form.js.coffee
deleted file mode 100644
index 5b7a4831dfc..00000000000
--- a/app/assets/javascripts/issuable_form.js.coffee
+++ /dev/null
@@ -1,112 +0,0 @@
-class @IssuableForm
-  issueMoveConfirmMsg: 'Are you sure you want to move this issue to another project?'
-  wipRegex: /^\s*(\[WIP\]\s*|WIP:\s*|WIP\s+)+\s*/i
-
-  constructor: (@form) ->
-    GitLab.GfmAutoComplete.setup()
-    new UsersSelect()
-    new ZenMode()
-
-    @titleField       = @form.find("input[name*='[title]']")
-    @descriptionField = @form.find("textarea[name*='[description]']")
-    @issueMoveField   = @form.find("#move_to_project_id")
-
-    return unless @titleField.length && @descriptionField.length
-
-    @initAutosave()
-
-    @form.on "submit", @handleSubmit
-    @form.on "click", ".btn-cancel", @resetAutosave
-
-    @initWip()
-    @initMoveDropdown()
-
-    $issuableDueDate = $('#issuable-due-date')
-
-    if $issuableDueDate.length
-      $('.datepicker').datepicker(
-        dateFormat: 'yy-mm-dd',
-        onSelect: (dateText, inst) ->
-          $issuableDueDate.val dateText
-      ).datepicker 'setDate', $.datepicker.parseDate('yy-mm-dd', $issuableDueDate.val())
-
-  initAutosave: ->
-    new Autosave @titleField, [
-      document.location.pathname,
-      document.location.search,
-      "title"
-    ]
-
-    new Autosave @descriptionField, [
-      document.location.pathname,
-      document.location.search,
-      "description"
-    ]
-
-  handleSubmit: =>
-    if (parseInt(@issueMoveField?.val()) ? 0) > 0
-      return false unless confirm(@issueMoveConfirmMsg)
-
-    @resetAutosave()
-
-  resetAutosave: =>
-    @titleField.data("autosave").reset()
-    @descriptionField.data("autosave").reset()
-
-  initWip: ->
-    @$wipExplanation = @form.find(".js-wip-explanation")
-    @$noWipExplanation = @form.find(".js-no-wip-explanation")
-    return unless @$wipExplanation.length and @$noWipExplanation.length
-
-    @form.on "click", ".js-toggle-wip", @toggleWip
-
-    @titleField.on "keyup blur", @renderWipExplanation
-
-    @renderWipExplanation()
-
-  workInProgress: ->
-    @wipRegex.test @titleField.val()
-
-  renderWipExplanation: =>
-    if @workInProgress()
-      @$wipExplanation.show()
-      @$noWipExplanation.hide()
-    else
-      @$wipExplanation.hide()
-      @$noWipExplanation.show()
-
-  toggleWip: (event) =>
-    event.preventDefault()
-
-    if @workInProgress()
-      @removeWip()
-    else
-      @addWip()
-
-    @renderWipExplanation()
-
-  removeWip: ->
-    @titleField.val @titleField.val().replace(@wipRegex, "")
-
-  addWip: ->
-    @titleField.val "WIP: #{@titleField.val()}"
-
-  initMoveDropdown: ->
-    $moveDropdown = $('.js-move-dropdown')
-
-    if $moveDropdown.length
-      $('.js-move-dropdown').select2
-        ajax:
-          url: $moveDropdown.data('projects-url')
-          results: (data) ->
-            return {
-              results: data
-            }
-          data: (query) ->
-            {
-              search: query
-            }
-        formatResult: (project) ->
-          project.name_with_namespace
-        formatSelection: (project) ->
-          project.name_with_namespace
diff --git a/app/assets/javascripts/issue.js b/app/assets/javascripts/issue.js
new file mode 100644
index 00000000000..6838d9d8da1
--- /dev/null
+++ b/app/assets/javascripts/issue.js
@@ -0,0 +1,154 @@
+
+/*= require flash */
+
+
+/*= require jquery.waitforimages */
+
+
+/*= require task_list */
+
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.Issue = (function() {
+    function Issue() {
+      this.submitNoteForm = bind(this.submitNoteForm, this);
+      this.disableTaskList();
+      if ($('a.btn-close').length) {
+        this.initTaskList();
+        this.initIssueBtnEventListeners();
+      }
+      this.initMergeRequests();
+      this.initRelatedBranches();
+      this.initCanCreateBranch();
+    }
+
+    Issue.prototype.initTaskList = function() {
+      $('.detail-page-description .js-task-list-container').taskList('enable');
+      return $(document).on('tasklist:changed', '.detail-page-description .js-task-list-container', this.updateTaskList);
+    };
+
+    Issue.prototype.initIssueBtnEventListeners = function() {
+      var _this, issueFailMessage;
+      _this = this;
+      issueFailMessage = 'Unable to update this issue at this time.';
+      return $('a.btn-close, a.btn-reopen').on('click', function(e) {
+        var $this, isClose, shouldSubmit, url;
+        e.preventDefault();
+        e.stopImmediatePropagation();
+        $this = $(this);
+        isClose = $this.hasClass('btn-close');
+        shouldSubmit = $this.hasClass('btn-comment');
+        if (shouldSubmit) {
+          _this.submitNoteForm($this.closest('form'));
+        }
+        $this.prop('disabled', true);
+        url = $this.attr('href');
+        return $.ajax({
+          type: 'PUT',
+          url: url,
+          error: function(jqXHR, textStatus, errorThrown) {
+            var issueStatus;
+            issueStatus = isClose ? 'close' : 'open';
+            return new Flash(issueFailMessage, 'alert');
+          },
+          success: function(data, textStatus, jqXHR) {
+            if ('id' in data) {
+              $(document).trigger('issuable:change');
+              if (isClose) {
+                $('a.btn-close').addClass('hidden');
+                $('a.btn-reopen').removeClass('hidden');
+                $('div.status-box-closed').removeClass('hidden');
+                $('div.status-box-open').addClass('hidden');
+              } else {
+                $('a.btn-reopen').addClass('hidden');
+                $('a.btn-close').removeClass('hidden');
+                $('div.status-box-closed').addClass('hidden');
+                $('div.status-box-open').removeClass('hidden');
+              }
+            } else {
+              new Flash(issueFailMessage, 'alert');
+            }
+            return $this.prop('disabled', false);
+          }
+        });
+      });
+    };
+
+    Issue.prototype.submitNoteForm = function(form) {
+      var noteText;
+      noteText = form.find("textarea.js-note-text").val();
+      if (noteText.trim().length > 0) {
+        return form.submit();
+      }
+    };
+
+    Issue.prototype.disableTaskList = function() {
+      $('.detail-page-description .js-task-list-container').taskList('disable');
+      return $(document).off('tasklist:changed', '.detail-page-description .js-task-list-container');
+    };
+
+    Issue.prototype.updateTaskList = function() {
+      var patchData;
+      patchData = {};
+      patchData['issue'] = {
+        'description': $('.js-task-list-field', this).val()
+      };
+      return $.ajax({
+        type: 'PATCH',
+        url: $('form.js-issuable-update').attr('action'),
+        data: patchData
+      });
+    };
+
+    Issue.prototype.initMergeRequests = function() {
+      var $container;
+      $container = $('#merge-requests');
+      return $.getJSON($container.data('url')).error(function() {
+        return new Flash('Failed to load referenced merge requests', 'alert');
+      }).success(function(data) {
+        if ('html' in data) {
+          return $container.html(data.html);
+        }
+      });
+    };
+
+    Issue.prototype.initRelatedBranches = function() {
+      var $container;
+      $container = $('#related-branches');
+      return $.getJSON($container.data('url')).error(function() {
+        return new Flash('Failed to load related branches', 'alert');
+      }).success(function(data) {
+        if ('html' in data) {
+          return $container.html(data.html);
+        }
+      });
+    };
+
+    Issue.prototype.initCanCreateBranch = function() {
+      var $container;
+      $container = $('div#new-branch');
+      if ($container.length === 0) {
+        return;
+      }
+      return $.getJSON($container.data('path')).error(function() {
+        $container.find('.checking').hide();
+        $container.find('.unavailable').show();
+        return new Flash('Failed to check if a new branch can be created.', 'alert');
+      }).success(function(data) {
+        if (data.can_create_branch) {
+          $container.find('.checking').hide();
+          $container.find('.available').show();
+          return $container.find('a').attr('disabled', false);
+        } else {
+          $container.find('.checking').hide();
+          return $container.find('.unavailable').show();
+        }
+      });
+    };
+
+    return Issue;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/issue.js.coffee b/app/assets/javascripts/issue.js.coffee
deleted file mode 100644
index f446aa49cde..00000000000
--- a/app/assets/javascripts/issue.js.coffee
+++ /dev/null
@@ -1,117 +0,0 @@
-#= require flash
-#= require jquery.waitforimages
-#= require task_list
-
-class @Issue
-  constructor: ->
-    # Prevent duplicate event bindings
-    @disableTaskList()
-    if $('a.btn-close').length
-      @initTaskList()
-      @initIssueBtnEventListeners()
-
-    @initMergeRequests()
-    @initRelatedBranches()
-    @initCanCreateBranch()
-
-  initTaskList: ->
-    $('.detail-page-description .js-task-list-container').taskList('enable')
-    $(document).on 'tasklist:changed', '.detail-page-description .js-task-list-container', @updateTaskList
-
-  initIssueBtnEventListeners: ->
-    _this = @
-    issueFailMessage = 'Unable to update this issue at this time.'
-    $('a.btn-close, a.btn-reopen').on 'click', (e) ->
-      e.preventDefault()
-      e.stopImmediatePropagation()
-      $this = $(this)
-      isClose = $this.hasClass('btn-close')
-      shouldSubmit = $this.hasClass('btn-comment')
-      if shouldSubmit
-        _this.submitNoteForm($this.closest('form'))
-      $this.prop('disabled', true)
-      url = $this.attr('href')
-      $.ajax
-        type: 'PUT'
-        url: url,
-        error: (jqXHR, textStatus, errorThrown) ->
-          issueStatus = if isClose then 'close' else 'open'
-          new Flash(issueFailMessage, 'alert')
-        success: (data, textStatus, jqXHR) ->
-          if 'id' of data
-            $(document).trigger('issuable:change');
-            if isClose
-              $('a.btn-close').addClass('hidden')
-              $('a.btn-reopen').removeClass('hidden')
-              $('div.status-box-closed').removeClass('hidden')
-              $('div.status-box-open').addClass('hidden')
-            else
-              $('a.btn-reopen').addClass('hidden')
-              $('a.btn-close').removeClass('hidden')
-              $('div.status-box-closed').addClass('hidden')
-              $('div.status-box-open').removeClass('hidden')
-          else
-            new Flash(issueFailMessage, 'alert')
-          $this.prop('disabled', false)
-
-  submitNoteForm: (form) =>
-    noteText = form.find("textarea.js-note-text").val()
-    if noteText.trim().length > 0
-      form.submit()
-
-  disableTaskList: ->
-    $('.detail-page-description .js-task-list-container').taskList('disable')
-    $(document).off 'tasklist:changed', '.detail-page-description .js-task-list-container'
-
-  # TODO (rspeicher): Make the issue description inline-editable like a note so
-  # that we can re-use its form here
-  updateTaskList: ->
-    patchData = {}
-    patchData['issue'] = {'description': $('.js-task-list-field', this).val()}
-
-    $.ajax
-      type: 'PATCH'
-      url: $('form.js-issuable-update').attr('action')
-      data: patchData
-
-  initMergeRequests: ->
-    $container = $('#merge-requests')
-
-    $.getJSON($container.data('url'))
-      .error ->
-        new Flash('Failed to load referenced merge requests', 'alert')
-      .success (data) ->
-        if 'html' of data
-          $container.html(data.html)
-
-  initRelatedBranches: ->
-    $container = $('#related-branches')
-
-    $.getJSON($container.data('url'))
-      .error ->
-        new Flash('Failed to load related branches', 'alert')
-      .success (data) ->
-        if 'html' of data
-          $container.html(data.html)
-
-  initCanCreateBranch: ->
-    $container = $('div#new-branch')
-
-    # If the user doesn't have the required permissions the container isn't
-    # rendered at all.
-    return if $container.length is 0
-
-    $.getJSON($container.data('path'))
-      .error ->
-        $container.find('.checking').hide()
-        $container.find('.unavailable').show()
-
-        new Flash('Failed to check if a new branch can be created.', 'alert')
-      .success (data) ->
-        if data.can_create_branch
-          $container.find('.checking').hide()
-          $container.find('.available').show()
-          $container.find('a').attr('disabled', false)
-        else
-          $container.find('.checking').hide()
-          $container.find('.unavailable').show()
diff --git a/app/assets/javascripts/issue_status_select.js b/app/assets/javascripts/issue_status_select.js
new file mode 100644
index 00000000000..076e3972944
--- /dev/null
+++ b/app/assets/javascripts/issue_status_select.js
@@ -0,0 +1,35 @@
+(function() {
+  this.IssueStatusSelect = (function() {
+    function IssueStatusSelect() {
+      $('.js-issue-status').each(function(i, el) {
+        var fieldName;
+        fieldName = $(el).data("field-name");
+        return $(el).glDropdown({
+          selectable: true,
+          fieldName: fieldName,
+          toggleLabel: (function(_this) {
+            return function(selected, el, instance) {
+              var $item, label;
+              label = 'Author';
+              $item = instance.dropdown.find('.is-active');
+              if ($item.length) {
+                label = $item.text();
+              }
+              return label;
+            };
+          })(this),
+          clicked: function(item, $el, e) {
+            return e.preventDefault();
+          },
+          id: function(obj, el) {
+            return $(el).data("id");
+          }
+        });
+      });
+    }
+
+    return IssueStatusSelect;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/issue_status_select.js.coffee b/app/assets/javascripts/issue_status_select.js.coffee
deleted file mode 100644
index ed50e2e698f..00000000000
--- a/app/assets/javascripts/issue_status_select.js.coffee
+++ /dev/null
@@ -1,18 +0,0 @@
-class @IssueStatusSelect
-  constructor: ->
-    $('.js-issue-status').each (i, el) ->
-      fieldName = $(el).data("field-name")
-
-      $(el).glDropdown(
-        selectable: true
-        fieldName: fieldName
-        toggleLabel: (selected, el, instance) =>
-          label = 'Author'
-          $item = instance.dropdown.find('.is-active')
-          label = $item.text() if $item.length
-          label
-        clicked: (item, $el, e)->
-          e.preventDefault()
-        id: (obj, el) ->
-          $(el).data("id")
-      )
diff --git a/app/assets/javascripts/issues-bulk-assignment.js b/app/assets/javascripts/issues-bulk-assignment.js
new file mode 100644
index 00000000000..98d3358ba92
--- /dev/null
+++ b/app/assets/javascripts/issues-bulk-assignment.js
@@ -0,0 +1,161 @@
+(function() {
+  this.IssuableBulkActions = (function() {
+    function IssuableBulkActions(opts) {
+      var ref, ref1, ref2;
+      if (opts == null) {
+        opts = {};
+      }
+      this.container = (ref = opts.container) != null ? ref : $('.content'), this.form = (ref1 = opts.form) != null ? ref1 : this.getElement('.bulk-update'), this.issues = (ref2 = opts.issues) != null ? ref2 : this.getElement('.issues-list .issue');
+      this.form.data('bulkActions', this);
+      this.willUpdateLabels = false;
+      this.bindEvents();
+      Issuable.initChecks();
+    }
+
+    IssuableBulkActions.prototype.getElement = function(selector) {
+      return this.container.find(selector);
+    };
+
+    IssuableBulkActions.prototype.bindEvents = function() {
+      return this.form.off('submit').on('submit', this.onFormSubmit.bind(this));
+    };
+
+    IssuableBulkActions.prototype.onFormSubmit = function(e) {
+      e.preventDefault();
+      return this.submit();
+    };
+
+    IssuableBulkActions.prototype.submit = function() {
+      var _this, xhr;
+      _this = this;
+      xhr = $.ajax({
+        url: this.form.attr('action'),
+        method: this.form.attr('method'),
+        dataType: 'JSON',
+        data: this.getFormDataAsObject()
+      });
+      xhr.done(function(response, status, xhr) {
+        return location.reload();
+      });
+      xhr.fail(function() {
+        return new Flash("Issue update failed");
+      });
+      return xhr.always(this.onFormSubmitAlways.bind(this));
+    };
+
+    IssuableBulkActions.prototype.onFormSubmitAlways = function() {
+      return this.form.find('[type="submit"]').enable();
+    };
+
+    IssuableBulkActions.prototype.getSelectedIssues = function() {
+      return this.issues.has('.selected_issue:checked');
+    };
+
+    IssuableBulkActions.prototype.getLabelsFromSelection = function() {
+      var labels;
+      labels = [];
+      this.getSelectedIssues().map(function() {
+        var _labels;
+        _labels = $(this).data('labels');
+        if (_labels) {
+          return _labels.map(function(labelId) {
+            if (labels.indexOf(labelId) === -1) {
+              return labels.push(labelId);
+            }
+          });
+        }
+      });
+      return labels;
+    };
+
+
+    /**
+     * Will return only labels that were marked previously and the user has unmarked
+     * @return {Array} Label IDs
+     */
+
+    IssuableBulkActions.prototype.getUnmarkedIndeterminedLabels = function() {
+      var el, i, id, j, labelsToKeep, len, len1, ref, ref1, result;
+      result = [];
+      labelsToKeep = [];
+      ref = this.getElement('.labels-filter .is-indeterminate');
+      for (i = 0, len = ref.length; i < len; i++) {
+        el = ref[i];
+        labelsToKeep.push($(el).data('labelId'));
+      }
+      ref1 = this.getLabelsFromSelection();
+      for (j = 0, len1 = ref1.length; j < len1; j++) {
+        id = ref1[j];
+        if (labelsToKeep.indexOf(id) === -1) {
+          result.push(id);
+        }
+      }
+      return result;
+    };
+
+
+    /**
+     * Simple form serialization, it will return just what we need
+     * Returns key/value pairs from form data
+     */
+
+    IssuableBulkActions.prototype.getFormDataAsObject = function() {
+      var formData;
+      formData = {
+        update: {
+          state_event: this.form.find('input[name="update[state_event]"]').val(),
+          assignee_id: this.form.find('input[name="update[assignee_id]"]').val(),
+          milestone_id: this.form.find('input[name="update[milestone_id]"]').val(),
+          issues_ids: this.form.find('input[name="update[issues_ids]"]').val(),
+          subscription_event: this.form.find('input[name="update[subscription_event]"]').val(),
+          add_label_ids: [],
+          remove_label_ids: []
+        }
+      };
+      if (this.willUpdateLabels) {
+        this.getLabelsToApply().map(function(id) {
+          return formData.update.add_label_ids.push(id);
+        });
+        this.getLabelsToRemove().map(function(id) {
+          return formData.update.remove_label_ids.push(id);
+        });
+      }
+      return formData;
+    };
+
+    IssuableBulkActions.prototype.getLabelsToApply = function() {
+      var $labels, labelIds;
+      labelIds = [];
+      $labels = this.form.find('.labels-filter input[name="update[label_ids][]"]');
+      $labels.each(function(k, label) {
+        if (label) {
+          return labelIds.push(parseInt($(label).val()));
+        }
+      });
+      return labelIds;
+    };
+
+
+    /**
+     * Returns Label IDs that will be removed from issue selection
+     * @return {Array} Array of labels IDs
+     */
+
+    IssuableBulkActions.prototype.getLabelsToRemove = function() {
+      var indeterminatedLabels, labelsToApply, result;
+      result = [];
+      indeterminatedLabels = this.getUnmarkedIndeterminedLabels();
+      labelsToApply = this.getLabelsToApply();
+      indeterminatedLabels.map(function(id) {
+        if (labelsToApply.indexOf(id) === -1) {
+          return result.push(id);
+        }
+      });
+      return result;
+    };
+
+    return IssuableBulkActions;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/issues-bulk-assignment.js.coffee b/app/assets/javascripts/issues-bulk-assignment.js.coffee
deleted file mode 100644
index 6b0e69dbae7..00000000000
--- a/app/assets/javascripts/issues-bulk-assignment.js.coffee
+++ /dev/null
@@ -1,127 +0,0 @@
-class @IssuableBulkActions
-  constructor: (opts = {}) ->
-    # Set defaults
-    {
-      @container = $('.content')
-      @form = @getElement('.bulk-update')
-      @issues = @getElement('.issues-list .issue')
-    } = opts
-
-    # Save instance
-    @form.data 'bulkActions', @
-
-    @willUpdateLabels = false
-
-    @bindEvents()
-
-    # Fixes bulk-assign not working when navigating through pages
-    Issuable.initChecks();
-
-  getElement: (selector) ->
-    @container.find selector
-
-  bindEvents: ->
-    @form.off('submit').on('submit', @onFormSubmit.bind(@))
-
-  onFormSubmit: (e) ->
-    e.preventDefault()
-    @submit()
-
-  submit: ->
-    _this = @
-
-    xhr = $.ajax
-            url: @form.attr 'action'
-            method: @form.attr 'method'
-            dataType: 'JSON',
-            data: @getFormDataAsObject()
-
-    xhr.done (response, status, xhr) ->
-      location.reload()
-
-    xhr.fail ->
-      new Flash("Issue update failed")
-
-    xhr.always @onFormSubmitAlways.bind(@)
-
-  onFormSubmitAlways: ->
-    @form.find('[type="submit"]').enable()
-
-  getSelectedIssues: ->
-    @issues.has('.selected_issue:checked')
-
-  getLabelsFromSelection: ->
-    labels = []
-
-    @getSelectedIssues().map ->
-      _labels = $(@).data('labels')
-      if _labels
-        _labels.map (labelId) ->
-          labels.push(labelId) if labels.indexOf(labelId) is -1
-
-    labels
-
-  ###*
-   * Will return only labels that were marked previously and the user has unmarked
-   * @return {Array} Label IDs
-  ###
-  getUnmarkedIndeterminedLabels: ->
-    result = []
-    labelsToKeep = []
-
-    for el in @getElement('.labels-filter .is-indeterminate')
-      labelsToKeep.push $(el).data('labelId')
-
-    for id in @getLabelsFromSelection()
-      # Only the ones that we are not going to keep
-      result.push(id) if labelsToKeep.indexOf(id) is -1
-
-    result
-
-  ###*
-   * Simple form serialization, it will return just what we need
-   * Returns key/value pairs from form data
-  ###
-  getFormDataAsObject: ->
-    formData =
-      update:
-        state_event       : @form.find('input[name="update[state_event]"]').val()
-        assignee_id       : @form.find('input[name="update[assignee_id]"]').val()
-        milestone_id      : @form.find('input[name="update[milestone_id]"]').val()
-        issues_ids        : @form.find('input[name="update[issues_ids]"]').val()
-        add_label_ids     : []
-        remove_label_ids  : []
-
-    if @willUpdateLabels
-      @getLabelsToApply().map (id) ->
-        formData.update.add_label_ids.push id
-
-      @getLabelsToRemove().map (id) ->
-        formData.update.remove_label_ids.push id
-
-    formData
-
-  getLabelsToApply: ->
-    labelIds = []
-    $labels = @form.find('.labels-filter input[name="update[label_ids][]"]')
-
-    $labels.each (k, label) ->
-      labelIds.push parseInt($(label).val()) if label
-
-    labelIds
-
-  ###*
-   * Returns Label IDs that will be removed from issue selection
-   * @return {Array} Array of labels IDs
-  ###
-  getLabelsToRemove: ->
-    result = []
-    indeterminatedLabels = @getUnmarkedIndeterminedLabels()
-    labelsToApply = @getLabelsToApply()
-
-    indeterminatedLabels.map (id) ->
-      # We need to exclude label IDs that will be applied
-      # By not doing this will cause issues from selection to not add labels at all
-      result.push(id) if labelsToApply.indexOf(id) is -1
-
-    result
diff --git a/app/assets/javascripts/labels.js b/app/assets/javascripts/labels.js
new file mode 100644
index 00000000000..fe071fca67c
--- /dev/null
+++ b/app/assets/javascripts/labels.js
@@ -0,0 +1,44 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.Labels = (function() {
+    function Labels() {
+      this.setSuggestedColor = bind(this.setSuggestedColor, this);
+      this.updateColorPreview = bind(this.updateColorPreview, this);
+      var form;
+      form = $('.label-form');
+      this.cleanBinding();
+      this.addBinding();
+      this.updateColorPreview();
+    }
+
+    Labels.prototype.addBinding = function() {
+      $(document).on('click', '.suggest-colors a', this.setSuggestedColor);
+      return $(document).on('input', 'input#label_color', this.updateColorPreview);
+    };
+
+    Labels.prototype.cleanBinding = function() {
+      $(document).off('click', '.suggest-colors a');
+      return $(document).off('input', 'input#label_color');
+    };
+
+    Labels.prototype.updateColorPreview = function() {
+      var previewColor;
+      previewColor = $('input#label_color').val();
+      return $('div.label-color-preview').css('background-color', previewColor);
+    };
+
+    Labels.prototype.setSuggestedColor = function(e) {
+      var color;
+      color = $(e.currentTarget).data('color');
+      $('input#label_color').val(color);
+      this.updateColorPreview();
+      $('.label-form').trigger('keyup');
+      return e.preventDefault();
+    };
+
+    return Labels;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/labels.js.coffee b/app/assets/javascripts/labels.js.coffee
deleted file mode 100644
index d05bacd7494..00000000000
--- a/app/assets/javascripts/labels.js.coffee
+++ /dev/null
@@ -1,28 +0,0 @@
-class @Labels
-  constructor: ->
-    form = $('.label-form')
-    @cleanBinding()
-    @addBinding()
-    @updateColorPreview()
-
-  addBinding: ->
-    $(document).on 'click', '.suggest-colors a', @setSuggestedColor
-    $(document).on 'input', 'input#label_color', @updateColorPreview
-
-  cleanBinding: ->
-    $(document).off 'click', '.suggest-colors a'
-    $(document).off 'input', 'input#label_color'
-
-  # Updates the the preview color with the hex-color input
-  updateColorPreview: =>
-    previewColor = $('input#label_color').val()
-    $('div.label-color-preview').css('background-color', previewColor)
-
-  # Updates the preview color with a click on a suggested color
-  setSuggestedColor: (e) =>
-    color = $(e.currentTarget).data('color')
-    $('input#label_color').val(color)
-    @updateColorPreview()
-    # Notify the form, that color has changed
-    $('.label-form').trigger('keyup')
-    e.preventDefault()
diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js
new file mode 100644
index 00000000000..675dd5b7cea
--- /dev/null
+++ b/app/assets/javascripts/labels_select.js
@@ -0,0 +1,377 @@
+(function() {
+  this.LabelsSelect = (function() {
+    function LabelsSelect() {
+      var _this;
+      _this = this;
+      $('.js-label-select').each(function(i, dropdown) {
+        var $block, $colorPreview, $dropdown, $form, $loading, $newLabelCreateButton, $newLabelError, $selectbox, $sidebarCollapsedValue, $value, abilityName, defaultLabel, enableLabelCreateButton, issueURLSplit, issueUpdateURL, labelHTMLTemplate, labelNoneHTMLTemplate, labelUrl, newColorField, newLabelField, projectId, resetForm, saveLabel, saveLabelData, selectedLabel, showAny, showNo;
+        $dropdown = $(dropdown);
+        projectId = $dropdown.data('project-id');
+        labelUrl = $dropdown.data('labels');
+        issueUpdateURL = $dropdown.data('issueUpdate');
+        selectedLabel = $dropdown.data('selected');
+        if ((selectedLabel != null) && !$dropdown.hasClass('js-multiselect')) {
+          selectedLabel = selectedLabel.split(',');
+        }
+        newLabelField = $('#new_label_name');
+        newColorField = $('#new_label_color');
+        showNo = $dropdown.data('show-no');
+        showAny = $dropdown.data('show-any');
+        defaultLabel = $dropdown.data('default-label');
+        abilityName = $dropdown.data('ability-name');
+        $selectbox = $dropdown.closest('.selectbox');
+        $block = $selectbox.closest('.block');
+        $form = $dropdown.closest('form');
+        $sidebarCollapsedValue = $block.find('.sidebar-collapsed-icon span');
+        $value = $block.find('.value');
+        $newLabelError = $('.js-label-error');
+        $colorPreview = $('.js-dropdown-label-color-preview');
+        $newLabelCreateButton = $('.js-new-label-btn');
+        $newLabelError.hide();
+        $loading = $block.find('.block-loading').fadeOut();
+        if (issueUpdateURL != null) {
+          issueURLSplit = issueUpdateURL.split('/');
+        }
+        if (issueUpdateURL) {
+          labelHTMLTemplate = _.template('<% _.each(labels, function(label){ %> <a href="<%- ["",issueURLSplit[1], issueURLSplit[2],""].join("/") %>issues?label_name[]=<%- encodeURIComponent(label.title) %>"> <span class="label has-tooltip color-label" title="<%- label.description %>" style="background-color: <%- label.color %>; color: <%- label.text_color %>;"> <%- label.title %> </span> </a> <% }); %>');
+          labelNoneHTMLTemplate = '<span class="no-value">None</span>';
+        }
+        if (newLabelField.length) {
+          $('.suggest-colors-dropdown a').on("click", function(e) {
+            e.preventDefault();
+            e.stopPropagation();
+            newColorField.val($(this).data('color')).trigger('change');
+            return $colorPreview.css('background-color', $(this).data('color')).parent().addClass('is-active');
+          });
+          resetForm = function() {
+            newLabelField.val('').trigger('change');
+            newColorField.val('').trigger('change');
+            return $colorPreview.css('background-color', '').parent().removeClass('is-active');
+          };
+          $('.dropdown-menu-back').on('click', function() {
+            return resetForm();
+          });
+          $('.js-cancel-label-btn').on('click', function(e) {
+            e.preventDefault();
+            e.stopPropagation();
+            resetForm();
+            return $('.dropdown-menu-back', $dropdown.parent()).trigger('click');
+          });
+          enableLabelCreateButton = function() {
+            if (newLabelField.val() !== '' && newColorField.val() !== '') {
+              $newLabelError.hide();
+              return $newLabelCreateButton.enable();
+            } else {
+              return $newLabelCreateButton.disable();
+            }
+          };
+          saveLabel = function() {
+            return Api.newLabel(projectId, {
+              name: newLabelField.val(),
+              color: newColorField.val()
+            }, function(label) {
+              var errors;
+              $newLabelCreateButton.enable();
+              if (label.message != null) {
+                errors = _.map(label.message, function(value, key) {
+                  return key + " " + value[0];
+                });
+                return $newLabelError.html(errors.join("<br/>")).show();
+              } else {
+                return $('.dropdown-menu-back', $dropdown.parent()).trigger('click');
+              }
+            });
+          };
+          newLabelField.on('keyup change', enableLabelCreateButton);
+          newColorField.on('keyup change', enableLabelCreateButton);
+          $newLabelCreateButton.disable().on('click', function(e) {
+            e.preventDefault();
+            e.stopPropagation();
+            return saveLabel();
+          });
+        }
+        saveLabelData = function() {
+          var data, selected;
+          selected = $dropdown.closest('.selectbox').find("input[name='" + ($dropdown.data('field-name')) + "']").map(function() {
+            return this.value;
+          }).get();
+          data = {};
+          data[abilityName] = {};
+          data[abilityName].label_ids = selected;
+          if (!selected.length) {
+            data[abilityName].label_ids = [''];
+          }
+          $loading.fadeIn();
+          $dropdown.trigger('loading.gl.dropdown');
+          return $.ajax({
+            type: 'PUT',
+            url: issueUpdateURL,
+            dataType: 'JSON',
+            data: data
+          }).done(function(data) {
+            var labelCount, template;
+            $loading.fadeOut();
+            $dropdown.trigger('loaded.gl.dropdown');
+            $selectbox.hide();
+            data.issueURLSplit = issueURLSplit;
+            labelCount = 0;
+            if (data.labels.length) {
+              template = labelHTMLTemplate(data);
+              labelCount = data.labels.length;
+            } else {
+              template = labelNoneHTMLTemplate;
+            }
+            $value.removeAttr('style').html(template);
+            $sidebarCollapsedValue.text(labelCount);
+            $('.has-tooltip', $value).tooltip({
+              container: 'body'
+            });
+            return $value.find('a').each(function(i) {
+              return setTimeout((function(_this) {
+                return function() {
+                  return gl.animate.animate($(_this), 'pulse');
+                };
+              })(this), 200 * i);
+            });
+          });
+        };
+        return $dropdown.glDropdown({
+          data: function(term, callback) {
+            return $.ajax({
+              url: labelUrl
+            }).done(function(data) {
+              data = _.chain(data).groupBy(function(label) {
+                return label.title;
+              }).map(function(label) {
+                var color;
+                color = _.map(label, function(dup) {
+                  return dup.color;
+                });
+                return {
+                  id: label[0].id,
+                  title: label[0].title,
+                  color: color,
+                  duplicate: color.length > 1
+                };
+              }).value();
+              if ($dropdown.hasClass('js-extra-options')) {
+                if (showNo) {
+                  data.unshift({
+                    id: 0,
+                    title: 'No Label'
+                  });
+                }
+                if (showAny) {
+                  data.unshift({
+                    isAny: true,
+                    title: 'Any Label'
+                  });
+                }
+                if (data.length > 2) {
+                  data.splice(2, 0, 'divider');
+                }
+              }
+              return callback(data);
+            });
+          },
+          renderRow: function(label, instance) {
+            var $a, $li, active, color, colorEl, indeterminate, removesAll, selectedClass, spacing;
+            $li = $('<li>');
+            $a = $('<a href="#">');
+            selectedClass = [];
+            removesAll = label.id === 0 || (label.id == null);
+            if ($dropdown.hasClass('js-filter-bulk-update')) {
+              indeterminate = instance.indeterminateIds;
+              active = instance.activeIds;
+              if (indeterminate.indexOf(label.id) !== -1) {
+                selectedClass.push('is-indeterminate');
+              }
+              if (active.indexOf(label.id) !== -1) {
+                i = selectedClass.indexOf('is-indeterminate');
+                if (i !== -1) {
+                  selectedClass.splice(i, 1);
+                }
+                selectedClass.push('is-active');
+                instance.addInput(this.fieldName, label.id);
+              }
+            }
+            if ($form.find("input[type='hidden'][name='" + ($dropdown.data('fieldName')) + "'][value='" + (this.id(label)) + "']").length) {
+              selectedClass.push('is-active');
+            }
+            if ($dropdown.hasClass('js-multiselect') && removesAll) {
+              selectedClass.push('dropdown-clear-active');
+            }
+            if (label.duplicate) {
+              spacing = 100 / label.color.length;
+              label.color = label.color.filter(function(color, i) {
+                return i < 4;
+              });
+              color = _.map(label.color, function(color, i) {
+                var percentFirst, percentSecond;
+                percentFirst = Math.floor(spacing * i);
+                percentSecond = Math.floor(spacing * (i + 1));
+                return color + " " + percentFirst + "%," + color + " " + percentSecond + "% ";
+              }).join(',');
+              color = "linear-gradient(" + color + ")";
+            } else {
+              if (label.color != null) {
+                color = label.color[0];
+              }
+            }
+            if (color) {
+              colorEl = "<span class='dropdown-label-box' style='background: " + color + "'></span>";
+            } else {
+              colorEl = '';
+            }
+            if (label.id) {
+              selectedClass.push('label-item');
+              $a.attr('data-label-id', label.id);
+            }
+            $a.addClass(selectedClass.join(' ')).html(colorEl + " " + label.title);
+            return $li.html($a).prop('outerHTML');
+          },
+          persistWhenHide: $dropdown.data('persistWhenHide'),
+          search: {
+            fields: ['title']
+          },
+          selectable: true,
+          filterable: true,
+          toggleLabel: function(selected, el) {
+            var selected_labels;
+            selected_labels = $('.js-label-select').siblings('.dropdown-menu-labels').find('.is-active');
+            if (selected && (selected.title != null)) {
+              if (selected_labels.length > 1) {
+                return selected.title + " +" + (selected_labels.length - 1) + " more";
+              } else {
+                return selected.title;
+              }
+            } else if (!selected && selected_labels.length !== 0) {
+              if (selected_labels.length > 1) {
+                return ($(selected_labels[0]).text()) + " +" + (selected_labels.length - 1) + " more";
+              } else if (selected_labels.length === 1) {
+                return $(selected_labels).text();
+              }
+            } else {
+              return defaultLabel;
+            }
+          },
+          fieldName: $dropdown.data('field-name'),
+          id: function(label) {
+            if ($dropdown.hasClass("js-filter-submit") && (label.isAny == null)) {
+              return label.title;
+            } else {
+              return label.id;
+            }
+          },
+          hidden: function() {
+            var isIssueIndex, isMRIndex, page, selectedLabels;
+            page = $('body').data('page');
+            isIssueIndex = page === 'projects:issues:index';
+            isMRIndex = page === 'projects:merge_requests:index';
+            $selectbox.hide();
+            $value.removeAttr('style');
+            if ($dropdown.hasClass('js-multiselect')) {
+              if ($dropdown.hasClass('js-filter-submit') && (isIssueIndex || isMRIndex)) {
+                selectedLabels = $dropdown.closest('form').find("input:hidden[name='" + ($dropdown.data('fieldName')) + "']");
+                Issuable.filterResults($dropdown.closest('form'));
+              } else if ($dropdown.hasClass('js-filter-submit')) {
+                $dropdown.closest('form').submit();
+              } else {
+                if (!$dropdown.hasClass('js-filter-bulk-update')) {
+                  saveLabelData();
+                }
+              }
+            }
+            if ($dropdown.hasClass('js-filter-bulk-update')) {
+              if (!this.options.persistWhenHide) {
+                return $dropdown.parent().find('.is-active, .is-indeterminate').removeClass();
+              }
+            }
+          },
+          multiSelect: $dropdown.hasClass('js-multiselect'),
+          clicked: function(label) {
+            var isIssueIndex, isMRIndex, page;
+            _this.enableBulkLabelDropdown();
+            if ($dropdown.hasClass('js-filter-bulk-update')) {
+              return;
+            }
+            page = $('body').data('page');
+            isIssueIndex = page === 'projects:issues:index';
+            isMRIndex = page === 'projects:merge_requests:index';
+            if ($dropdown.hasClass('js-filter-submit') && (isIssueIndex || isMRIndex)) {
+              if (!$dropdown.hasClass('js-multiselect')) {
+                selectedLabel = label.title;
+                return Issuable.filterResults($dropdown.closest('form'));
+              }
+            } else if ($dropdown.hasClass('js-filter-submit')) {
+              return $dropdown.closest('form').submit();
+            } else {
+              if ($dropdown.hasClass('js-multiselect')) {
+
+              } else {
+                return saveLabelData();
+              }
+            }
+          },
+          setIndeterminateIds: function() {
+            if (this.dropdown.find('.dropdown-menu-toggle').hasClass('js-filter-bulk-update')) {
+              return this.indeterminateIds = _this.getIndeterminateIds();
+            }
+          },
+          setActiveIds: function() {
+            if (this.dropdown.find('.dropdown-menu-toggle').hasClass('js-filter-bulk-update')) {
+              return this.activeIds = _this.getActiveIds();
+            }
+          }
+        });
+      });
+      this.bindEvents();
+    }
+
+    LabelsSelect.prototype.bindEvents = function() {
+      return $('body').on('change', '.selected_issue', this.onSelectCheckboxIssue);
+    };
+
+    LabelsSelect.prototype.onSelectCheckboxIssue = function() {
+      if ($('.selected_issue:checked').length) {
+        return;
+      }
+      $('.issues_bulk_update .labels-filter input[type="hidden"]').remove();
+      return $('.issues_bulk_update .labels-filter .dropdown-toggle-text').text('Label');
+    };
+
+    LabelsSelect.prototype.getIndeterminateIds = function() {
+      var label_ids;
+      label_ids = [];
+      $('.selected_issue:checked').each(function(i, el) {
+        var issue_id;
+        issue_id = $(el).data('id');
+        return label_ids.push($("#issue_" + issue_id).data('labels'));
+      });
+      return _.flatten(label_ids);
+    };
+
+    LabelsSelect.prototype.getActiveIds = function() {
+      var label_ids;
+      label_ids = [];
+      $('.selected_issue:checked').each(function(i, el) {
+        var issue_id;
+        issue_id = $(el).data('id');
+        return label_ids.push($("#issue_" + issue_id).data('labels'));
+      });
+      return _.intersection.apply(_, label_ids);
+    };
+
+    LabelsSelect.prototype.enableBulkLabelDropdown = function() {
+      var issuableBulkActions;
+      if ($('.selected_issue:checked').length) {
+        issuableBulkActions = $('.bulk-update').data('bulkActions');
+        return issuableBulkActions.willUpdateLabels = true;
+      }
+    };
+
+    return LabelsSelect;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
deleted file mode 100644
index 1a802b81452..00000000000
--- a/app/assets/javascripts/labels_select.js.coffee
+++ /dev/null
@@ -1,397 +0,0 @@
-class @LabelsSelect
-  constructor: ->
-    _this = @
-
-    $('.js-label-select').each (i, dropdown) ->
-      $dropdown = $(dropdown)
-      projectId = $dropdown.data('project-id')
-      labelUrl = $dropdown.data('labels')
-      issueUpdateURL = $dropdown.data('issueUpdate')
-      selectedLabel = $dropdown.data('selected')
-      if selectedLabel? and not $dropdown.hasClass 'js-multiselect'
-        selectedLabel = selectedLabel.split(',')
-      newLabelField = $('#new_label_name')
-      newColorField = $('#new_label_color')
-      showNo = $dropdown.data('show-no')
-      showAny = $dropdown.data('show-any')
-      defaultLabel = $dropdown.data('default-label')
-      abilityName = $dropdown.data('ability-name')
-      $selectbox = $dropdown.closest('.selectbox')
-      $block = $selectbox.closest('.block')
-      $form = $dropdown.closest('form')
-      $sidebarCollapsedValue = $block.find('.sidebar-collapsed-icon span')
-      $value = $block.find('.value')
-      $newLabelError = $('.js-label-error')
-      $colorPreview = $('.js-dropdown-label-color-preview')
-      $newLabelCreateButton = $('.js-new-label-btn')
-
-      $newLabelError.hide()
-      $loading = $block.find('.block-loading').fadeOut()
-
-      issueURLSplit = issueUpdateURL.split('/') if issueUpdateURL?
-      if issueUpdateURL
-        labelHTMLTemplate = _.template(
-            '<% _.each(labels, function(label){ %>
-            <a href="<%- ["",issueURLSplit[1], issueURLSplit[2],""].join("/") %>issues?label_name[]=<%- encodeURIComponent(label.title) %>">
-            <span class="label has-tooltip color-label" title="<%- label.description %>" style="background-color: <%- label.color %>; color: <%- label.text_color %>;">
-            <%- label.title %>
-            </span>
-            </a>
-            <% }); %>'
-        )
-        labelNoneHTMLTemplate = '<span class="no-value">None</span>'
-
-      if newLabelField.length
-
-        # Suggested colors in the dropdown to chose from pre-chosen colors
-        $('.suggest-colors-dropdown a').on "click", (e) ->
-          e.preventDefault()
-          e.stopPropagation()
-          newColorField
-            .val($(this).data('color'))
-            .trigger('change')
-          $colorPreview
-            .css 'background-color', $(this).data('color')
-            .parent()
-            .addClass 'is-active'
-
-        # Cancel button takes back to first page
-        resetForm = ->
-          newLabelField
-            .val ''
-            .trigger 'change'
-          newColorField
-            .val ''
-            .trigger 'change'
-          $colorPreview
-            .css 'background-color', ''
-            .parent()
-            .removeClass 'is-active'
-
-        $('.dropdown-menu-back').on 'click', ->
-          resetForm()
-
-        $('.js-cancel-label-btn').on 'click', (e) ->
-          e.preventDefault()
-          e.stopPropagation()
-          resetForm()
-          $('.dropdown-menu-back', $dropdown.parent()).trigger 'click'
-
-        # Listen for change and keyup events on label and color field
-        # This allows us to enable the button when ready
-        enableLabelCreateButton = ->
-          if newLabelField.val() isnt '' and newColorField.val() isnt ''
-            $newLabelError.hide()
-            $newLabelCreateButton.enable()
-          else
-            $newLabelCreateButton.disable()
-
-        saveLabel = ->
-          # Create new label with API
-          Api.newLabel projectId, {
-            name: newLabelField.val()
-            color: newColorField.val()
-          }, (label) ->
-            $newLabelCreateButton.enable()
-
-            if label.message?
-              errors = _.map label.message, (value, key) ->
-                "#{key} #{value[0]}"
-
-              $newLabelError
-                .html errors.join("<br/>")
-                .show()
-            else
-              $('.dropdown-menu-back', $dropdown.parent()).trigger 'click'
-
-        newLabelField.on 'keyup change', enableLabelCreateButton
-
-        newColorField.on 'keyup change', enableLabelCreateButton
-
-        # Send the API call to create the label
-        $newLabelCreateButton
-          .disable()
-          .on 'click', (e) ->
-            e.preventDefault()
-            e.stopPropagation()
-            saveLabel()
-
-      saveLabelData = ->
-        selected = $dropdown
-          .closest('.selectbox')
-          .find("input[name='#{$dropdown.data('field-name')}']")
-          .map(->
-            @value
-          ).get()
-        data = {}
-        data[abilityName] = {}
-        data[abilityName].label_ids = selected
-        if not selected.length
-          data[abilityName].label_ids = ['']
-        $loading.fadeIn()
-        $dropdown.trigger('loading.gl.dropdown')
-        $.ajax(
-          type: 'PUT'
-          url: issueUpdateURL
-          dataType: 'JSON'
-          data: data
-        ).done (data) ->
-          $loading.fadeOut()
-          $dropdown.trigger('loaded.gl.dropdown')
-          $selectbox.hide()
-          data.issueURLSplit = issueURLSplit
-          labelCount = 0
-          if data.labels.length
-            template = labelHTMLTemplate(data)
-            labelCount = data.labels.length
-          else
-            template = labelNoneHTMLTemplate
-          $value
-            .removeAttr('style')
-            .html(template)
-          $sidebarCollapsedValue.text(labelCount)
-
-          $('.has-tooltip', $value).tooltip(container: 'body')
-
-          $value
-            .find('a')
-            .each((i) ->
-              setTimeout(=>
-                gl.animate.animate($(@), 'pulse')
-              ,200 * i
-              )
-            )
-
-
-      $dropdown.glDropdown(
-        data: (term, callback) ->
-          $.ajax(
-            url: labelUrl
-          ).done (data) ->
-            data = _.chain data
-              .groupBy (label) ->
-                label.title
-              .map (label) ->
-                color = _.map label, (dup) ->
-                  dup.color
-
-                return {
-                  id: label[0].id
-                  title: label[0].title
-                  color: color
-                  duplicate: color.length > 1
-                }
-              .value()
-
-            if $dropdown.hasClass 'js-extra-options'
-              extraData = []
-              if showAny
-                extraData.push(
-                  isAny: true
-                  title: 'Any Label'
-                )
-
-              if showNo
-                extraData.push(
-                  id: 0
-                  title: 'No Label'
-                )
-
-              if extraData.length
-                extraData.push 'divider'
-                data = extraData.concat(data)
-
-            callback data
-
-        renderRow: (label, instance) ->
-          $li = $('<li>')
-          $a  = $('<a href="#">')
-
-          selectedClass = []
-          removesAll = label.id is 0 or not label.id?
-
-          if $dropdown.hasClass('js-filter-bulk-update')
-            indeterminate = instance.indeterminateIds
-            active = instance.activeIds
-
-            if indeterminate.indexOf(label.id) isnt -1
-              selectedClass.push 'is-indeterminate'
-
-            if active.indexOf(label.id) isnt -1
-              # Remove is-indeterminate class if the item will be marked as active
-              i = selectedClass.indexOf 'is-indeterminate'
-              selectedClass.splice i, 1 unless i is -1
-
-              selectedClass.push 'is-active'
-
-              # Add input manually
-              instance.addInput @fieldName, label.id
-
-          if $form.find("input[type='hidden']\
-            [name='#{$dropdown.data('fieldName')}']\
-            [value='#{this.id(label)}']").length
-            selectedClass.push 'is-active'
-
-          if $dropdown.hasClass('js-multiselect') and removesAll
-            selectedClass.push 'dropdown-clear-active'
-
-          if label.duplicate
-            spacing = 100 / label.color.length
-
-            # Reduce the colors to 4
-            label.color = label.color.filter (color, i) ->
-              i < 4
-
-            color = _.map(label.color, (color, i) ->
-              percentFirst = Math.floor(spacing * i)
-              percentSecond = Math.floor(spacing * (i + 1))
-              "#{color} #{percentFirst}%,#{color} #{percentSecond}% "
-            ).join(',')
-            color = "linear-gradient(#{color})"
-          else
-            if label.color?
-              color = label.color[0]
-
-          if color
-            colorEl = "<span class='dropdown-label-box' style='background: #{color}'></span>"
-          else
-            colorEl = ''
-
-          # We need to identify which items are actually labels
-          if label.id
-            selectedClass.push('label-item')
-            $a.attr('data-label-id', label.id)
-
-          $a.addClass(selectedClass.join(' '))
-            .html("#{colorEl} #{label.title}")
-
-          # Return generated html
-          $li.html($a).prop('outerHTML')
-        persistWhenHide: $dropdown.data('persistWhenHide')
-        search:
-          fields: ['title']
-        selectable: true
-        filterable: true
-        toggleLabel: (selected, el) ->
-          selected_labels = $('.js-label-select').siblings('.dropdown-menu-labels').find('.is-active')
-
-          if selected and selected.title?
-            if selected_labels.length > 1
-              "#{selected.title} +#{selected_labels.length - 1} more"
-            else
-              selected.title
-          else if not selected and selected_labels.length isnt 0
-            if selected_labels.length > 1
-              "#{$(selected_labels[0]).text()} +#{selected_labels.length - 1} more"
-            else if selected_labels.length is 1
-              $(selected_labels).text()
-          else
-            defaultLabel
-        fieldName: $dropdown.data('field-name')
-        id: (label) ->
-          if $dropdown.hasClass('js-issuable-form-dropdown')
-            if label.id is 0
-              return
-            else
-              return label.id
-
-          if $dropdown.hasClass("js-filter-submit") and not label.isAny?
-            label.title
-          else
-            label.id
-
-        hidden: ->
-          page = $('body').data 'page'
-          isIssueIndex = page is 'projects:issues:index'
-          isMRIndex = page is 'projects:merge_requests:index'
-
-          $selectbox.hide()
-          # display:block overrides the hide-collapse rule
-          $value.removeAttr('style')
-
-          return if $dropdown.hasClass('js-issuable-form-dropdown')
-
-          if $dropdown.hasClass 'js-multiselect'
-            if $dropdown.hasClass('js-filter-submit') and (isIssueIndex or isMRIndex)
-              selectedLabels = $dropdown
-                .closest('form')
-                .find("input:hidden[name='#{$dropdown.data('fieldName')}']")
-              Issuable.filterResults $dropdown.closest('form')
-            else if $dropdown.hasClass('js-filter-submit')
-              $dropdown.closest('form').submit()
-            else
-              if not $dropdown.hasClass 'js-filter-bulk-update'
-                saveLabelData()
-
-          if $dropdown.hasClass('js-filter-bulk-update')
-            # If we are persisting state we need the classes
-            if not @options.persistWhenHide
-              $dropdown.parent().find('.is-active, .is-indeterminate').removeClass()
-
-        multiSelect: $dropdown.hasClass 'js-multiselect'
-        clicked: (label) ->
-          _this.enableBulkLabelDropdown()
-
-          if $dropdown.hasClass('js-filter-bulk-update') or $dropdown.hasClass('js-issuable-form-dropdown')
-            return
-
-          page = $('body').data 'page'
-          isIssueIndex = page is 'projects:issues:index'
-          isMRIndex = page is 'projects:merge_requests:index'
-          if $dropdown.hasClass('js-filter-submit') and (isIssueIndex or isMRIndex)
-            if not $dropdown.hasClass 'js-multiselect'
-              selectedLabel = label.title
-              Issuable.filterResults $dropdown.closest('form')
-          else if $dropdown.hasClass 'js-filter-submit'
-            $dropdown.closest('form').submit()
-          else
-            if $dropdown.hasClass 'js-multiselect'
-              return
-            else
-              saveLabelData()
-
-        setIndeterminateIds: ->
-          if @dropdown.find('.dropdown-menu-toggle').hasClass('js-filter-bulk-update')
-            @indeterminateIds = _this.getIndeterminateIds()
-
-        setActiveIds: ->
-          if @dropdown.find('.dropdown-menu-toggle').hasClass('js-filter-bulk-update')
-            @activeIds = _this.getActiveIds()
-      )
-
-    @bindEvents()
-
-  bindEvents: ->
-    $('body').on 'change', '.selected_issue', @onSelectCheckboxIssue
-
-  onSelectCheckboxIssue: ->
-    return if $('.selected_issue:checked').length
-
-    # Remove inputs
-    $('.issues_bulk_update .labels-filter input[type="hidden"]').remove()
-
-    # Also restore button text
-    $('.issues_bulk_update .labels-filter .dropdown-toggle-text').text('Label')
-
-  getIndeterminateIds: ->
-    label_ids = []
-
-    $('.selected_issue:checked').each (i, el) ->
-      issue_id = $(el).data('id')
-      label_ids.push $("#issue_#{issue_id}").data('labels')
-
-    _.flatten(label_ids)
-
-  getActiveIds: ->
-    label_ids = []
-
-    $('.selected_issue:checked').each (i, el) ->
-      issue_id = $(el).data('id')
-      label_ids.push $("#issue_#{issue_id}").data('labels')
-
-    _.intersection.apply _, label_ids
-
-  enableBulkLabelDropdown: ->
-    if $('.selected_issue:checked').length
-      issuableBulkActions = $('.bulk-update').data('bulkActions')
-      issuableBulkActions.willUpdateLabels = true
diff --git a/app/assets/javascripts/layout_nav.js b/app/assets/javascripts/layout_nav.js
new file mode 100644
index 00000000000..ce472f3bcd0
--- /dev/null
+++ b/app/assets/javascripts/layout_nav.js
@@ -0,0 +1,27 @@
+(function() {
+  var hideEndFade;
+
+  hideEndFade = function($scrollingTabs) {
+    return $scrollingTabs.each(function() {
+      var $this;
+      $this = $(this);
+      return $this.siblings('.fade-right').toggleClass('scrolling', $this.width() < $this.prop('scrollWidth'));
+    });
+  };
+
+  $(function() {
+    hideEndFade($('.scrolling-tabs'));
+    $(window).off('resize.nav').on('resize.nav', function() {
+      return hideEndFade($('.scrolling-tabs'));
+    });
+    return $('.scrolling-tabs').on('scroll', function(event) {
+      var $this, currentPosition, maxPosition;
+      $this = $(this);
+      currentPosition = $this.scrollLeft();
+      maxPosition = $this.prop('scrollWidth') - $this.outerWidth();
+      $this.siblings('.fade-left').toggleClass('scrolling', currentPosition > 0);
+      return $this.siblings('.fade-right').toggleClass('scrolling', currentPosition < maxPosition - 1);
+    });
+  });
+
+}).call(this);
diff --git a/app/assets/javascripts/layout_nav.js.coffee b/app/assets/javascripts/layout_nav.js.coffee
deleted file mode 100644
index f639f7f5892..00000000000
--- a/app/assets/javascripts/layout_nav.js.coffee
+++ /dev/null
@@ -1,24 +0,0 @@
-hideEndFade = ($scrollingTabs) ->
-  $scrollingTabs.each ->
-    $this = $(@)
-
-    $this
-      .siblings('.fade-right')
-      .toggleClass('scrolling', $this.width() < $this.prop('scrollWidth'))
-
-$ ->
-
-  hideEndFade($('.scrolling-tabs'))
-
-  $(window)
-    .off 'resize.nav'
-    .on 'resize.nav', ->
-      hideEndFade($('.scrolling-tabs'))
-
-  $('.scrolling-tabs').on 'scroll', (event) ->
-    $this = $(this)
-    currentPosition = $this.scrollLeft()
-    maxPosition = $this.prop('scrollWidth') - $this.outerWidth()
-
-    $this.siblings('.fade-left').toggleClass('scrolling', currentPosition > 0)
-    $this.siblings('.fade-right').toggleClass('scrolling', currentPosition < maxPosition - 1)
diff --git a/app/assets/javascripts/lib/chart.js b/app/assets/javascripts/lib/chart.js
new file mode 100644
index 00000000000..8d5e52286b7
--- /dev/null
+++ b/app/assets/javascripts/lib/chart.js
@@ -0,0 +1,7 @@
+
+/*= require Chart */
+
+(function() {
+
+
+}).call(this);
diff --git a/app/assets/javascripts/lib/chart.js.coffee b/app/assets/javascripts/lib/chart.js.coffee
deleted file mode 100644
index 82217fc5107..00000000000
--- a/app/assets/javascripts/lib/chart.js.coffee
+++ /dev/null
@@ -1 +0,0 @@
-#= require Chart
diff --git a/app/assets/javascripts/lib/cropper.js b/app/assets/javascripts/lib/cropper.js
new file mode 100644
index 00000000000..8ee81804513
--- /dev/null
+++ b/app/assets/javascripts/lib/cropper.js
@@ -0,0 +1,7 @@
+
+/*= require cropper */
+
+(function() {
+
+
+}).call(this);
diff --git a/app/assets/javascripts/lib/cropper.js.coffee b/app/assets/javascripts/lib/cropper.js.coffee
deleted file mode 100644
index 32536d23fe3..00000000000
--- a/app/assets/javascripts/lib/cropper.js.coffee
+++ /dev/null
@@ -1 +0,0 @@
-#= require cropper
diff --git a/app/assets/javascripts/lib/d3.js b/app/assets/javascripts/lib/d3.js
new file mode 100644
index 00000000000..31e6033e756
--- /dev/null
+++ b/app/assets/javascripts/lib/d3.js
@@ -0,0 +1,7 @@
+
+/*= require d3 */
+
+(function() {
+
+
+}).call(this);
diff --git a/app/assets/javascripts/lib/d3.js.coffee b/app/assets/javascripts/lib/d3.js.coffee
deleted file mode 100644
index 74f0a0bb06a..00000000000
--- a/app/assets/javascripts/lib/d3.js.coffee
+++ /dev/null
@@ -1 +0,0 @@
-#= require d3
diff --git a/app/assets/javascripts/lib/raphael.js b/app/assets/javascripts/lib/raphael.js
new file mode 100644
index 00000000000..923c575dcfe
--- /dev/null
+++ b/app/assets/javascripts/lib/raphael.js
@@ -0,0 +1,13 @@
+
+/*= require raphael */
+
+
+/*= require g.raphael */
+
+
+/*= require g.bar */
+
+(function() {
+
+
+}).call(this);
diff --git a/app/assets/javascripts/lib/raphael.js.coffee b/app/assets/javascripts/lib/raphael.js.coffee
deleted file mode 100644
index ab8e5979b87..00000000000
--- a/app/assets/javascripts/lib/raphael.js.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-#= require raphael
-#= require g.raphael
-#= require g.bar
diff --git a/app/assets/javascripts/lib/utils/animate.js b/app/assets/javascripts/lib/utils/animate.js
new file mode 100644
index 00000000000..d36efdabc93
--- /dev/null
+++ b/app/assets/javascripts/lib/utils/animate.js
@@ -0,0 +1,49 @@
+(function() {
+  (function(w) {
+    if (w.gl == null) {
+      w.gl = {};
+    }
+    if (gl.animate == null) {
+      gl.animate = {};
+    }
+    gl.animate.animate = function($el, animation, options, done) {
+      if ((options != null ? options.cssStart : void 0) != null) {
+        $el.css(options.cssStart);
+      }
+      $el.removeClass(animation + ' animated').addClass(animation + ' animated').one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', function() {
+        $(this).removeClass(animation + ' animated');
+        if (done != null) {
+          done();
+        }
+        if ((options != null ? options.cssEnd : void 0) != null) {
+          $el.css(options.cssEnd);
+        }
+      });
+    };
+    gl.animate.animateEach = function($els, animation, time, options, done) {
+      var dfd;
+      dfd = $.Deferred();
+      if (!$els.length) {
+        dfd.resolve();
+      }
+      $els.each(function(i) {
+        setTimeout((function(_this) {
+          return function() {
+            var $this;
+            $this = $(_this);
+            return gl.animate.animate($this, animation, options, function() {
+              if (i === $els.length - 1) {
+                dfd.resolve();
+                if (done != null) {
+                  return done();
+                }
+              }
+            });
+          };
+        })(this), time * i);
+      });
+      return dfd.promise();
+    };
+  })(window);
+
+}).call(this);
diff --git a/app/assets/javascripts/lib/utils/animate.js.coffee b/app/assets/javascripts/lib/utils/animate.js.coffee
deleted file mode 100644
index ec3b44d6126..00000000000
--- a/app/assets/javascripts/lib/utils/animate.js.coffee
+++ /dev/null
@@ -1,39 +0,0 @@
-((w) -> 
-  if not w.gl? then w.gl = {}
-  if not gl.animate? then gl.animate = {}
-
-  gl.animate.animate = ($el, animation, options, done) ->
-    if options?.cssStart?
-      $el.css(options.cssStart)
-    $el
-      .removeClass(animation + ' animated')
-      .addClass(animation + ' animated')
-      .one 'webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', ->
-        $(this).removeClass(animation + ' animated')
-        if done?
-          done()
-        if options?.cssEnd?
-          $el.css(options.cssEnd)
-        return
-    return
-
-  gl.animate.animateEach = ($els, animation, time, options, done) ->
-    dfd = $.Deferred()
-    if not $els.length
-      dfd.resolve()
-    $els.each((i) ->
-      setTimeout(=>
-        $this = $(@)
-        gl.animate.animate($this, animation, options, =>
-          if i is $els.length - 1
-            dfd.resolve()
-            if done?
-              done()
-        )
-      ,time * i
-      )
-      return
-    )
-    return dfd.promise()
-  return 
-) window
\ No newline at end of file
diff --git a/app/assets/javascripts/lib/utils/common_utils.js b/app/assets/javascripts/lib/utils/common_utils.js
new file mode 100644
index 00000000000..9299d0eabd2
--- /dev/null
+++ b/app/assets/javascripts/lib/utils/common_utils.js
@@ -0,0 +1,60 @@
+(function() {
+  (function(w) {
+    var base;
+    w.gl || (w.gl = {});
+    (base = w.gl).utils || (base.utils = {});
+    w.gl.utils.isInGroupsPage = function() {
+      return gl.utils.getPagePath() === 'groups';
+    };
+    w.gl.utils.isInProjectPage = function() {
+      return gl.utils.getPagePath() === 'projects';
+    };
+    w.gl.utils.getProjectSlug = function() {
+      if (this.isInProjectPage()) {
+        return $('body').data('project');
+      } else {
+        return null;
+      }
+    };
+    w.gl.utils.getGroupSlug = function() {
+      if (this.isInGroupsPage()) {
+        return $('body').data('group');
+      } else {
+        return null;
+      }
+    };
+    gl.utils.updateTooltipTitle = function($tooltipEl, newTitle) {
+      return $tooltipEl.tooltip('destroy').attr('title', newTitle).tooltip('fixTitle');
+    };
+    gl.utils.preventDisabledButtons = function() {
+      return $('.btn').click(function(e) {
+        if ($(this).hasClass('disabled')) {
+          e.preventDefault();
+          e.stopImmediatePropagation();
+          return false;
+        }
+      });
+    };
+    gl.utils.getPagePath = function() {
+      return $('body').data('page').split(':')[0];
+    };
+    return jQuery.timefor = function(time, suffix, expiredLabel) {
+      var suffixFromNow, timefor;
+      if (!time) {
+        return '';
+      }
+      suffix || (suffix = 'remaining');
+      expiredLabel || (expiredLabel = 'Past due');
+      jQuery.timeago.settings.allowFuture = true;
+      suffixFromNow = jQuery.timeago.settings.strings.suffixFromNow;
+      jQuery.timeago.settings.strings.suffixFromNow = suffix;
+      timefor = $.timeago(time);
+      if (timefor.indexOf('ago') > -1) {
+        timefor = expiredLabel;
+      }
+      jQuery.timeago.settings.strings.suffixFromNow = suffixFromNow;
+      return timefor;
+    };
+  })(window);
+
+}).call(this);
diff --git a/app/assets/javascripts/lib/utils/common_utils.js.coffee b/app/assets/javascripts/lib/utils/common_utils.js.coffee
deleted file mode 100644
index d4dd3dc329a..00000000000
--- a/app/assets/javascripts/lib/utils/common_utils.js.coffee
+++ /dev/null
@@ -1,68 +0,0 @@
-((w) ->
-
-  w.gl       or= {}
-  w.gl.utils or= {}
-
-  w.gl.utils.isInGroupsPage = ->
-
-    return gl.utils.getPagePath() is 'groups'
-
-
-  w.gl.utils.isInProjectPage = ->
-
-    return gl.utils.getPagePath() is 'projects'
-
-
-  w.gl.utils.getProjectSlug = ->
-
-    return if @isInProjectPage() then $('body').data 'project' else null
-
-
-  w.gl.utils.getGroupSlug = ->
-
-    return if @isInGroupsPage() then $('body').data 'group' else null
-
-
-
-  gl.utils.updateTooltipTitle = ($tooltipEl, newTitle) ->
-
-    $tooltipEl
-      .tooltip 'destroy'
-      .attr    'title', newTitle
-      .tooltip 'fixTitle'
-
-
-  gl.utils.preventDisabledButtons = ->
-
-    $('.btn').click (e) ->
-      if $(this).hasClass 'disabled'
-        e.preventDefault()
-        e.stopImmediatePropagation()
-        return false
-
-  gl.utils.getPagePath = ->
-    return $('body').data('page').split(':')[0]
-
-
-  jQuery.timefor = (time, suffix, expiredLabel) ->
-
-    return '' unless time
-
-    suffix       or= 'remaining'
-    expiredLabel or= 'Past due'
-
-    jQuery.timeago.settings.allowFuture = yes
-
-    { suffixFromNow } = jQuery.timeago.settings.strings
-    jQuery.timeago.settings.strings.suffixFromNow = suffix
-
-    timefor = $.timeago time
-
-    if timefor.indexOf('ago') > -1
-      timefor = expiredLabel
-
-    jQuery.timeago.settings.strings.suffixFromNow = suffixFromNow
-
-    return timefor
-
-) window
diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js b/app/assets/javascripts/lib/utils/datetime_utility.js
new file mode 100644
index 00000000000..e817261f210
--- /dev/null
+++ b/app/assets/javascripts/lib/utils/datetime_utility.js
@@ -0,0 +1,36 @@
+(function() {
+  (function(w) {
+    var base;
+    if (w.gl == null) {
+      w.gl = {};
+    }
+    if ((base = w.gl).utils == null) {
+      base.utils = {};
+    }
+    w.gl.utils.days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
+    w.gl.utils.formatDate = function(datetime) {
+      return dateFormat(datetime, 'mmm d, yyyy h:MMtt Z');
+    };
+    w.gl.utils.getDayName = function(date) {
+      return this.days[date.getDay()];
+    };
+    return w.gl.utils.localTimeAgo = function($timeagoEls, setTimeago) {
+      if (setTimeago == null) {
+        setTimeago = true;
+      }
+      $timeagoEls.each(function() {
+        var $el;
+        $el = $(this);
+        return $el.attr('title', gl.utils.formatDate($el.attr('datetime')));
+      });
+      if (setTimeago) {
+        $timeagoEls.timeago();
+        $timeagoEls.tooltip('destroy');
+        return $timeagoEls.tooltip({
+          template: '<div class="tooltip local-timeago" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
+        });
+      }
+    };
+  })(window);
+
+}).call(this);
diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js.coffee b/app/assets/javascripts/lib/utils/datetime_utility.js.coffee
deleted file mode 100644
index 178963fe0aa..00000000000
--- a/app/assets/javascripts/lib/utils/datetime_utility.js.coffee
+++ /dev/null
@@ -1,28 +0,0 @@
-((w) ->
-
-  w.gl ?= {}
-  w.gl.utils ?= {}
-  w.gl.utils.days = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']
-
-  w.gl.utils.formatDate = (datetime) ->
-    dateFormat(datetime, 'mmm d, yyyy h:MMtt Z')
-
-  w.gl.utils.getDayName = (date) ->
-    this.days[date.getDay()]
-
-  w.gl.utils.localTimeAgo = ($timeagoEls, setTimeago = true) ->
-    $timeagoEls.each( ->
-          $el = $(@)
-          $el.attr('title', gl.utils.formatDate($el.attr('datetime')))
-    )
-
-    if setTimeago
-      $timeagoEls.timeago()
-      $timeagoEls.tooltip('destroy')
-
-      # Recreate with custom template
-      $timeagoEls.tooltip(
-        template: '<div class="tooltip local-timeago" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
-      )
-
-) window
diff --git a/app/assets/javascripts/lib/utils/notify.js b/app/assets/javascripts/lib/utils/notify.js
new file mode 100644
index 00000000000..42b6ac0589e
--- /dev/null
+++ b/app/assets/javascripts/lib/utils/notify.js
@@ -0,0 +1,41 @@
+(function() {
+  (function(w) {
+    var notificationGranted, notifyMe, notifyPermissions;
+    notificationGranted = function(message, opts, onclick) {
+      var notification;
+      notification = new Notification(message, opts);
+      setTimeout(function() {
+        return notification.close();
+      }, 8000);
+      if (onclick) {
+        return notification.onclick = onclick;
+      }
+    };
+    notifyPermissions = function() {
+      if ('Notification' in window) {
+        return Notification.requestPermission();
+      }
+    };
+    notifyMe = function(message, body, icon, onclick) {
+      var opts;
+      opts = {
+        body: body,
+        icon: icon
+      };
+      if (!('Notification' in window)) {
+
+      } else if (Notification.permission === 'granted') {
+        return notificationGranted(message, opts, onclick);
+      } else if (Notification.permission !== 'denied') {
+        return Notification.requestPermission(function(permission) {
+          if (permission === 'granted') {
+            return notificationGranted(message, opts, onclick);
+          }
+        });
+      }
+    };
+    w.notify = notifyMe;
+    return w.notifyPermissions = notifyPermissions;
+  })(window);
+
+}).call(this);
diff --git a/app/assets/javascripts/lib/utils/notify.js.coffee b/app/assets/javascripts/lib/utils/notify.js.coffee
deleted file mode 100644
index 9e28353ac34..00000000000
--- a/app/assets/javascripts/lib/utils/notify.js.coffee
+++ /dev/null
@@ -1,35 +0,0 @@
-((w) ->
-  notificationGranted = (message, opts, onclick) ->
-    notification = new Notification(message, opts)
-
-    # Hide the notification after X amount of seconds
-    setTimeout ->
-      notification.close()
-    , 8000
-
-    if onclick
-      notification.onclick = onclick
-
-  notifyPermissions = ->
-    if 'Notification' of window
-      Notification.requestPermission()
-
-  notifyMe = (message, body, icon, onclick) ->
-    opts =
-      body: body
-      icon: icon
-    # Let's check if the browser supports notifications
-    if !('Notification' of window)
-      # do nothing
-    else if Notification.permission == 'granted'
-      # If it's okay let's create a notification
-      notificationGranted message, opts, onclick
-    else if Notification.permission != 'denied'
-      Notification.requestPermission (permission) ->
-        # If the user accepts, let's create a notification
-        if permission == 'granted'
-          notificationGranted message, opts, onclick
-
-  w.notify = notifyMe
-  w.notifyPermissions = notifyPermissions
-) window
diff --git a/app/assets/javascripts/lib/utils/text_utility.js b/app/assets/javascripts/lib/utils/text_utility.js
new file mode 100644
index 00000000000..130479642f3
--- /dev/null
+++ b/app/assets/javascripts/lib/utils/text_utility.js
@@ -0,0 +1,112 @@
+(function() {
+  (function(w) {
+    var base;
+    if (w.gl == null) {
+      w.gl = {};
+    }
+    if ((base = w.gl).text == null) {
+      base.text = {};
+    }
+    gl.text.randomString = function() {
+      return Math.random().toString(36).substring(7);
+    };
+    gl.text.replaceRange = function(s, start, end, substitute) {
+      return s.substring(0, start) + substitute + s.substring(end);
+    };
+    gl.text.selectedText = function(text, textarea) {
+      return text.substring(textarea.selectionStart, textarea.selectionEnd);
+    };
+    gl.text.lineBefore = function(text, textarea) {
+      var split;
+      split = text.substring(0, textarea.selectionStart).trim().split('\n');
+      return split[split.length - 1];
+    };
+    gl.text.lineAfter = function(text, textarea) {
+      return text.substring(textarea.selectionEnd).trim().split('\n')[0];
+    };
+    gl.text.blockTagText = function(text, textArea, blockTag, selected) {
+      var lineAfter, lineBefore;
+      lineBefore = this.lineBefore(text, textArea);
+      lineAfter = this.lineAfter(text, textArea);
+      if (lineBefore === blockTag && lineAfter === blockTag) {
+        if (blockTag != null) {
+          textArea.selectionStart = textArea.selectionStart - (blockTag.length + 1);
+          textArea.selectionEnd = textArea.selectionEnd + (blockTag.length + 1);
+        }
+        return selected;
+      } else {
+        return blockTag + "\n" + selected + "\n" + blockTag;
+      }
+    };
+    gl.text.insertText = function(textArea, text, tag, blockTag, selected, wrap) {
+      var insertText, inserted, selectedSplit, startChar;
+      selectedSplit = selected.split('\n');
+      startChar = !wrap && textArea.selectionStart > 0 ? '\n' : '';
+      if (selectedSplit.length > 1 && (!wrap || (blockTag != null))) {
+        if (blockTag != null) {
+          insertText = this.blockTagText(text, textArea, blockTag, selected);
+        } else {
+          insertText = selectedSplit.map(function(val) {
+            if (val.indexOf(tag) === 0) {
+              return "" + (val.replace(tag, ''));
+            } else {
+              return "" + tag + val;
+            }
+          }).join('\n');
+        }
+      } else {
+        insertText = "" + startChar + tag + selected + (wrap ? tag : ' ');
+      }
+      if (document.queryCommandSupported('insertText')) {
+        inserted = document.execCommand('insertText', false, insertText);
+      }
+      if (!inserted) {
+        try {
+          document.execCommand("ms-beginUndoUnit");
+        } catch (undefined) {}
+        textArea.value = this.replaceRange(text, textArea.selectionStart, textArea.selectionEnd, insertText);
+        try {
+          document.execCommand("ms-endUndoUnit");
+        } catch (undefined) {}
+      }
+      return this.moveCursor(textArea, tag, wrap);
+    };
+    gl.text.moveCursor = function(textArea, tag, wrapped) {
+      var pos;
+      if (!textArea.setSelectionRange) {
+        return;
+      }
+      if (textArea.selectionStart === textArea.selectionEnd) {
+        if (wrapped) {
+          pos = textArea.selectionStart - tag.length;
+        } else {
+          pos = textArea.selectionStart;
+        }
+        return textArea.setSelectionRange(pos, pos);
+      }
+    };
+    gl.text.updateText = function(textArea, tag, blockTag, wrap) {
+      var $textArea, oldVal, selected, text;
+      $textArea = $(textArea);
+      oldVal = $textArea.val();
+      textArea = $textArea.get(0);
+      text = $textArea.val();
+      selected = this.selectedText(text, textArea);
+      $textArea.focus();
+      return this.insertText(textArea, text, tag, blockTag, selected, wrap);
+    };
+    gl.text.init = function(form) {
+      var self;
+      self = this;
+      return $('.js-md', form).off('click').on('click', function() {
+        var $this;
+        $this = $(this);
+        return self.updateText($this.closest('.md-area').find('textarea'), $this.data('md-tag'), $this.data('md-block'), !$this.data('md-prepend'));
+      });
+    };
+    return gl.text.removeListeners = function(form) {
+      return $('.js-md', form).off();
+    };
+  })(window);
+
+}).call(this);
diff --git a/app/assets/javascripts/lib/utils/text_utility.js.coffee b/app/assets/javascripts/lib/utils/text_utility.js.coffee
deleted file mode 100644
index 2e1407f8738..00000000000
--- a/app/assets/javascripts/lib/utils/text_utility.js.coffee
+++ /dev/null
@@ -1,105 +0,0 @@
-((w) ->
-  w.gl ?= {}
-  w.gl.text ?= {}
-
-  gl.text.randomString = -> Math.random().toString(36).substring(7)
-
-  gl.text.replaceRange = (s, start, end, substitute) ->
-    s.substring(0, start) + substitute + s.substring(end);
-
-  gl.text.selectedText = (text, textarea) ->
-    text.substring(textarea.selectionStart, textarea.selectionEnd)
-
-  gl.text.lineBefore = (text, textarea) ->
-    split = text.substring(0, textarea.selectionStart).trim().split('\n')
-    split[split.length - 1]
-
-  gl.text.lineAfter = (text, textarea) ->
-    text.substring(textarea.selectionEnd).trim().split('\n')[0]
-
-  gl.text.blockTagText = (text, textArea, blockTag, selected) ->
-    lineBefore = @lineBefore(text, textArea)
-    lineAfter = @lineAfter(text, textArea)
-
-    if lineBefore is blockTag and lineAfter is blockTag
-      # To remove the block tag we have to select the line before & after
-      if blockTag?
-        textArea.selectionStart = textArea.selectionStart - (blockTag.length + 1)
-        textArea.selectionEnd = textArea.selectionEnd + (blockTag.length + 1)
-
-      selected
-    else
-      "#{blockTag}\n#{selected}\n#{blockTag}"
-
-  gl.text.insertText = (textArea, text, tag, blockTag, selected, wrap) ->
-    selectedSplit = selected.split('\n')
-    startChar = if not wrap and textArea.selectionStart > 0 then '\n' else ''
-
-    if selectedSplit.length > 1 and (not wrap or blockTag?)
-      if blockTag?
-        insertText = @blockTagText(text, textArea, blockTag, selected)
-      else
-        insertText = selectedSplit.map((val) ->
-          if val.indexOf(tag) is 0
-            "#{val.replace(tag, '')}"
-          else
-            "#{tag}#{val}"
-        ).join('\n')
-    else
-      insertText = "#{startChar}#{tag}#{selected}#{if wrap then tag else ' '}"
-
-    if document.queryCommandSupported('insertText')
-      inserted = document.execCommand 'insertText', false, insertText
-
-    unless inserted
-      try
-        document.execCommand("ms-beginUndoUnit")
-
-      textArea.value = @replaceRange(
-          text,
-          textArea.selectionStart,
-          textArea.selectionEnd,
-          insertText)
-      try
-        document.execCommand("ms-endUndoUnit")
-
-    @moveCursor(textArea, tag, wrap)
-
-  gl.text.moveCursor = (textArea, tag, wrapped) ->
-    return unless textArea.setSelectionRange
-
-    if textArea.selectionStart is textArea.selectionEnd
-      if wrapped
-        pos = textArea.selectionStart - tag.length
-      else
-        pos = textArea.selectionStart
-
-      textArea.setSelectionRange pos, pos
-
-  gl.text.updateText = (textArea, tag, blockTag, wrap) ->
-    $textArea = $(textArea)
-    oldVal = $textArea.val()
-    textArea = $textArea.get(0)
-    text = $textArea.val()
-    selected = @selectedText(text, textArea)
-    $textArea.focus()
-
-    @insertText(textArea, text, tag, blockTag, selected, wrap)
-
-  gl.text.init = (form) ->
-    self = @
-    $('.js-md', form)
-      .off 'click'
-      .on 'click', ->
-        $this = $(@)
-        self.updateText(
-          $this.closest('.md-area').find('textarea'),
-          $this.data('md-tag'),
-          $this.data('md-block'),
-          not $this.data('md-prepend')
-        )
-
-  gl.text.removeListeners = (form) ->
-    $('.js-md', form).off()
-
-) window
diff --git a/app/assets/javascripts/lib/utils/type_utility.js b/app/assets/javascripts/lib/utils/type_utility.js
new file mode 100644
index 00000000000..dc30babd645
--- /dev/null
+++ b/app/assets/javascripts/lib/utils/type_utility.js
@@ -0,0 +1,15 @@
+(function() {
+  (function(w) {
+    var base;
+    if (w.gl == null) {
+      w.gl = {};
+    }
+    if ((base = w.gl).utils == null) {
+      base.utils = {};
+    }
+    return w.gl.utils.isObject = function(obj) {
+      return (obj != null) && (obj.constructor === Object);
+    };
+  })(window);
+
+}).call(this);
diff --git a/app/assets/javascripts/lib/utils/type_utility.js.coffee b/app/assets/javascripts/lib/utils/type_utility.js.coffee
deleted file mode 100644
index 957f0d86b36..00000000000
--- a/app/assets/javascripts/lib/utils/type_utility.js.coffee
+++ /dev/null
@@ -1,9 +0,0 @@
-((w) ->
-
-  w.gl ?= {}
-  w.gl.utils ?= {}
-
-  w.gl.utils.isObject = (obj) ->
-    obj? and (obj.constructor is Object)
-
-) window
diff --git a/app/assets/javascripts/lib/utils/url_utility.js b/app/assets/javascripts/lib/utils/url_utility.js
new file mode 100644
index 00000000000..fffbfd19745
--- /dev/null
+++ b/app/assets/javascripts/lib/utils/url_utility.js
@@ -0,0 +1,64 @@
+(function() {
+  (function(w) {
+    var base;
+    if (w.gl == null) {
+      w.gl = {};
+    }
+    if ((base = w.gl).utils == null) {
+      base.utils = {};
+    }
+    w.gl.utils.getParameterValues = function(sParam) {
+      var i, sPageURL, sParameterName, sURLVariables, values;
+      sPageURL = decodeURIComponent(window.location.search.substring(1));
+      sURLVariables = sPageURL.split('&');
+      sParameterName = void 0;
+      values = [];
+      i = 0;
+      while (i < sURLVariables.length) {
+        sParameterName = sURLVariables[i].split('=');
+        if (sParameterName[0] === sParam) {
+          values.push(sParameterName[1]);
+        }
+        i++;
+      }
+      return values;
+    };
+    w.gl.utils.mergeUrlParams = function(params, url) {
+      var lastChar, newUrl, paramName, paramValue, pattern;
+      newUrl = decodeURIComponent(url);
+      for (paramName in params) {
+        paramValue = params[paramName];
+        pattern = new RegExp("\\b(" + paramName + "=).*?(&|$)");
+        if (paramValue == null) {
+          newUrl = newUrl.replace(pattern, '');
+        } else if (url.search(pattern) !== -1) {
+          newUrl = newUrl.replace(pattern, "$1" + paramValue + "$2");
+        } else {
+          newUrl = "" + newUrl + (newUrl.indexOf('?') > 0 ? '&' : '?') + paramName + "=" + paramValue;
+        }
+      }
+      lastChar = newUrl[newUrl.length - 1];
+      if (lastChar === '&') {
+        newUrl = newUrl.slice(0, -1);
+      }
+      return newUrl;
+    };
+    return w.gl.utils.removeParamQueryString = function(url, param) {
+      var urlVariables, variables;
+      url = decodeURIComponent(url);
+      urlVariables = url.split('&');
+      return ((function() {
+        var j, len, results;
+        results = [];
+        for (j = 0, len = urlVariables.length; j < len; j++) {
+          variables = urlVariables[j];
+          if (variables.indexOf(param) === -1) {
+            results.push(variables);
+          }
+        }
+        return results;
+      })()).join('&');
+    };
+  })(window);
+
+}).call(this);
diff --git a/app/assets/javascripts/lib/utils/url_utility.js.coffee b/app/assets/javascripts/lib/utils/url_utility.js.coffee
deleted file mode 100644
index e8085e1c2e4..00000000000
--- a/app/assets/javascripts/lib/utils/url_utility.js.coffee
+++ /dev/null
@@ -1,52 +0,0 @@
-((w) ->
-
-  w.gl ?= {}
-  w.gl.utils ?= {}
-
-  # Returns an array containing the value(s) of the
-  # of the key passed as an argument
-  w.gl.utils.getParameterValues = (sParam) ->
-    sPageURL = decodeURIComponent(window.location.search.substring(1))
-    sURLVariables = sPageURL.split('&')
-    sParameterName = undefined
-    values = []
-    i = 0
-    while i < sURLVariables.length
-      sParameterName = sURLVariables[i].split('=')
-      if sParameterName[0] is sParam
-        values.push(sParameterName[1])
-      i++
-    values
-
-  # #
-  #  @param {Object} params - url keys and value to merge
-  #  @param {String} url
-  # #
-  w.gl.utils.mergeUrlParams = (params, url) ->
-    newUrl = decodeURIComponent(url)
-    for paramName, paramValue of params
-      pattern = new RegExp "\\b(#{paramName}=).*?(&|$)"
-      if not paramValue?
-        newUrl = newUrl.replace pattern, ''
-      else if url.search(pattern) isnt -1
-        newUrl = newUrl.replace pattern, "$1#{paramValue}$2"
-      else
-        newUrl = "#{newUrl}#{(if newUrl.indexOf('?') > 0 then '&' else '?')}#{paramName}=#{paramValue}"
-
-    # Remove a trailing ampersand
-    lastChar = newUrl[newUrl.length - 1]
-
-    if lastChar is '&'
-        newUrl = newUrl.slice 0, -1
-
-    newUrl
-
-  # removes parameter query string from url. returns the modified url
-  w.gl.utils.removeParamQueryString = (url, param) ->
-    url = decodeURIComponent(url)
-    urlVariables = url.split('&')
-    (
-      variables for variables in urlVariables when variables.indexOf(param) is -1
-    ).join('&')
-
-) window
diff --git a/app/assets/javascripts/line_highlighter.js b/app/assets/javascripts/line_highlighter.js
new file mode 100644
index 00000000000..f145bd3ad74
--- /dev/null
+++ b/app/assets/javascripts/line_highlighter.js
@@ -0,0 +1,115 @@
+
+/*= require jquery.scrollTo */
+
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.LineHighlighter = (function() {
+    LineHighlighter.prototype.highlightClass = 'hll';
+
+    LineHighlighter.prototype._hash = '';
+
+    function LineHighlighter(hash) {
+      var range;
+      if (hash == null) {
+        hash = location.hash;
+      }
+      this.setHash = bind(this.setHash, this);
+      this.highlightLine = bind(this.highlightLine, this);
+      this.clickHandler = bind(this.clickHandler, this);
+      this._hash = hash;
+      this.bindEvents();
+      if (hash !== '') {
+        range = this.hashToRange(hash);
+        if (range[0]) {
+          this.highlightRange(range);
+          $.scrollTo("#L" + range[0], {
+            offset: -150
+          });
+        }
+      }
+    }
+
+    LineHighlighter.prototype.bindEvents = function() {
+      $('#blob-content-holder').on('mousedown', 'a[data-line-number]', this.clickHandler);
+      return $('#blob-content-holder').on('click', 'a[data-line-number]', function(event) {
+        return event.preventDefault();
+      });
+    };
+
+    LineHighlighter.prototype.clickHandler = function(event) {
+      var current, lineNumber, range;
+      event.preventDefault();
+      this.clearHighlight();
+      lineNumber = $(event.target).closest('a').data('line-number');
+      current = this.hashToRange(this._hash);
+      if (!(current[0] && event.shiftKey)) {
+        this.setHash(lineNumber);
+        return this.highlightLine(lineNumber);
+      } else if (event.shiftKey) {
+        if (lineNumber < current[0]) {
+          range = [lineNumber, current[0]];
+        } else {
+          range = [current[0], lineNumber];
+        }
+        this.setHash(range[0], range[1]);
+        return this.highlightRange(range);
+      }
+    };
+
+    LineHighlighter.prototype.clearHighlight = function() {
+      return $("." + this.highlightClass).removeClass(this.highlightClass);
+    };
+
+    LineHighlighter.prototype.hashToRange = function(hash) {
+      var first, last, matches;
+      matches = hash.match(/^#?L(\d+)(?:-(\d+))?$/);
+      if (matches && matches.length) {
+        first = parseInt(matches[1]);
+        last = matches[2] ? parseInt(matches[2]) : null;
+        return [first, last];
+      } else {
+        return [null, null];
+      }
+    };
+
+    LineHighlighter.prototype.highlightLine = function(lineNumber) {
+      return $("#LC" + lineNumber).addClass(this.highlightClass);
+    };
+
+    LineHighlighter.prototype.highlightRange = function(range) {
+      var i, lineNumber, ref, ref1, results;
+      if (range[1]) {
+        results = [];
+        for (lineNumber = i = ref = range[0], ref1 = range[1]; ref <= ref1 ? i <= ref1 : i >= ref1; lineNumber = ref <= ref1 ? ++i : --i) {
+          results.push(this.highlightLine(lineNumber));
+        }
+        return results;
+      } else {
+        return this.highlightLine(range[0]);
+      }
+    };
+
+    LineHighlighter.prototype.setHash = function(firstLineNumber, lastLineNumber) {
+      var hash;
+      if (lastLineNumber) {
+        hash = "#L" + firstLineNumber + "-" + lastLineNumber;
+      } else {
+        hash = "#L" + firstLineNumber;
+      }
+      this._hash = hash;
+      return this.__setLocationHash__(hash);
+    };
+
+    LineHighlighter.prototype.__setLocationHash__ = function(value) {
+      return history.pushState({
+        turbolinks: false,
+        url: value
+      }, document.title, value);
+    };
+
+    return LineHighlighter;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/line_highlighter.js.coffee b/app/assets/javascripts/line_highlighter.js.coffee
deleted file mode 100644
index 2254a3f91ae..00000000000
--- a/app/assets/javascripts/line_highlighter.js.coffee
+++ /dev/null
@@ -1,148 +0,0 @@
-# LineHighlighter
-#
-# Handles single- and multi-line selection and highlight for blob views.
-#
-#= require jquery.scrollTo
-#
-# ### Example Markup
-#
-#   <div id="blob-content-holder">
-#     <div class="file-content">
-#       <div class="line-numbers">
-#         <a href="#L1" id="L1" data-line-number="1">1</a>
-#         <a href="#L2" id="L2" data-line-number="2">2</a>
-#         <a href="#L3" id="L3" data-line-number="3">3</a>
-#         <a href="#L4" id="L4" data-line-number="4">4</a>
-#         <a href="#L5" id="L5" data-line-number="5">5</a>
-#       </div>
-#       <pre class="code highlight">
-#         <code>
-#           <span id="LC1" class="line">...</span>
-#           <span id="LC2" class="line">...</span>
-#           <span id="LC3" class="line">...</span>
-#           <span id="LC4" class="line">...</span>
-#           <span id="LC5" class="line">...</span>
-#         </code>
-#       </pre>
-#     </div>
-#   </div>
-#
-class @LineHighlighter
-  # CSS class applied to highlighted lines
-  highlightClass: 'hll'
-
-  # Internal copy of location.hash so we're not dependent on `location` in tests
-  _hash: ''
-
-  # Initialize a LineHighlighter object
-  #
-  # hash - String URL hash for dependency injection in tests
-  constructor: (hash = location.hash) ->
-    @_hash = hash
-
-    @bindEvents()
-
-    unless hash == ''
-      range = @hashToRange(hash)
-
-      if range[0]
-        @highlightRange(range)
-
-        # Scroll to the first highlighted line on initial load
-        # Offset -50 for the sticky top bar, and another -100 for some context
-        $.scrollTo("#L#{range[0]}", offset: -150)
-
-  bindEvents: ->
-    $('#blob-content-holder').on 'mousedown', 'a[data-line-number]', @clickHandler
-
-    # While it may seem odd to bind to the mousedown event and then throw away
-    # the click event, there is a method to our madness.
-    #
-    # If not done this way, the line number anchor will sometimes keep its
-    # active state even when the event is cancelled, resulting in an ugly border
-    # around the link and/or a persisted underline text decoration.
-
-    $('#blob-content-holder').on 'click', 'a[data-line-number]', (event) ->
-      event.preventDefault()
-
-  clickHandler: (event) =>
-    event.preventDefault()
-
-    @clearHighlight()
-
-    lineNumber = $(event.target).closest('a').data('line-number')
-    current = @hashToRange(@_hash)
-
-    unless current[0] && event.shiftKey
-      # If there's no current selection, or there is but Shift wasn't held,
-      # treat this like a single-line selection.
-      @setHash(lineNumber)
-      @highlightLine(lineNumber)
-    else if event.shiftKey
-      if lineNumber < current[0]
-        range = [lineNumber, current[0]]
-      else
-        range = [current[0], lineNumber]
-
-      @setHash(range[0], range[1])
-      @highlightRange(range)
-
-  # Unhighlight previously highlighted lines
-  clearHighlight: ->
-    $(".#{@highlightClass}").removeClass(@highlightClass)
-
-  # Convert a URL hash String into line numbers
-  #
-  # hash - Hash String
-  #
-  # Examples:
-  #
-  #   hashToRange('#L5')    # => [5, null]
-  #   hashToRange('#L5-15') # => [5, 15]
-  #   hashToRange('#foo')   # => [null, null]
-  #
-  # Returns an Array
-  hashToRange: (hash) ->
-    matches = hash.match(/^#?L(\d+)(?:-(\d+))?$/)
-
-    if matches && matches.length
-      first = parseInt(matches[1])
-      last  = if matches[2] then parseInt(matches[2]) else null
-
-      [first, last]
-    else
-      [null, null]
-
-  # Highlight a single line
-  #
-  # lineNumber - Line number to highlight
-  highlightLine: (lineNumber) =>
-    $("#LC#{lineNumber}").addClass(@highlightClass)
-
-  # Highlight all lines within a range
-  #
-  # range - Array containing the starting and ending line numbers
-  highlightRange: (range) ->
-    if range[1]
-      for lineNumber in [range[0]..range[1]]
-        @highlightLine(lineNumber)
-    else
-      @highlightLine(range[0])
-
-  # Set the URL hash string
-  setHash: (firstLineNumber, lastLineNumber) =>
-    if lastLineNumber
-      hash = "#L#{firstLineNumber}-#{lastLineNumber}"
-    else
-      hash = "#L#{firstLineNumber}"
-
-    @_hash = hash
-    @__setLocationHash__(hash)
-
-  # Make the actual hash change in the browser
-  #
-  # This method is stubbed in tests.
-  __setLocationHash__: (value) ->
-    # We're using pushState instead of assigning location.hash directly to
-    # prevent the page from scrolling on the hashchange event
-    history.pushState({turbolinks: false, url: value}, document.title, value)
diff --git a/app/assets/javascripts/logo.js b/app/assets/javascripts/logo.js
new file mode 100644
index 00000000000..218f24fe908
--- /dev/null
+++ b/app/assets/javascripts/logo.js
@@ -0,0 +1,54 @@
+(function() {
+  var clearHighlights, currentTimer, defaultClass, delay, firstPiece, pieceIndex, pieces, start, stop, work;
+
+  Turbolinks.enableProgressBar();
+
+  defaultClass = 'tanuki-shape';
+
+  pieces = ['path#tanuki-right-cheek', 'path#tanuki-right-eye, path#tanuki-right-ear', 'path#tanuki-nose', 'path#tanuki-left-eye, path#tanuki-left-ear', 'path#tanuki-left-cheek'];
+
+  pieceIndex = 0;
+
+  firstPiece = pieces[0];
+
+  currentTimer = null;
+
+  delay = 150;
+
+  clearHighlights = function() {
+    return $("." + defaultClass + ".highlight").attr('class', defaultClass);
+  };
+
+  start = function() {
+    clearHighlights();
+    pieceIndex = 0;
+    if (pieces[0] !== firstPiece) {
+      pieces.reverse();
+    }
+    if (currentTimer) {
+      clearInterval(currentTimer);
+    }
+    return currentTimer = setInterval(work, delay);
+  };
+
+  stop = function() {
+    clearInterval(currentTimer);
+    return clearHighlights();
+  };
+
+  work = function() {
+    clearHighlights();
+    $(pieces[pieceIndex]).attr('class', defaultClass + " highlight");
+    if (pieceIndex === pieces.length - 1) {
+      pieceIndex = 0;
+      return pieces.reverse();
+    } else {
+      return pieceIndex++;
+    }
+  };
+
+  $(document).on('page:fetch', start);
+
+  $(document).on('page:change', stop);
+
+}).call(this);
diff --git a/app/assets/javascripts/logo.js.coffee b/app/assets/javascripts/logo.js.coffee
deleted file mode 100644
index dc2590a0355..00000000000
--- a/app/assets/javascripts/logo.js.coffee
+++ /dev/null
@@ -1,44 +0,0 @@
-Turbolinks.enableProgressBar();
-
-defaultClass = 'tanuki-shape'
-pieces = [
-  'path#tanuki-right-cheek',
-  'path#tanuki-right-eye, path#tanuki-right-ear',
-  'path#tanuki-nose',
-  'path#tanuki-left-eye, path#tanuki-left-ear',
-  'path#tanuki-left-cheek',
-]
-pieceIndex = 0
-firstPiece = pieces[0]
-
-currentTimer = null
-delay        = 150
-
-clearHighlights = ->
-  $(".#{defaultClass}.highlight").attr('class', defaultClass)
-
-start = ->
-  clearHighlights()
-  pieceIndex = 0
-  pieces.reverse() unless pieces[0] == firstPiece
-  clearInterval(currentTimer) if currentTimer
-  currentTimer = setInterval(work, delay)
-
-stop = ->
-  clearInterval(currentTimer)
-  clearHighlights()
-
-work = ->
-  clearHighlights()
-  $(pieces[pieceIndex]).attr('class', "#{defaultClass} highlight")
-
-  # If we hit the last piece, reset the index and then reverse the array to
-  # get a nice back-and-forth sweeping look
-  if pieceIndex == pieces.length - 1
-    pieceIndex = 0
-    pieces.reverse()
-  else
-    pieceIndex++
-
-$(document).on('page:fetch',  start)
-$(document).on('page:change', stop)
diff --git a/app/assets/javascripts/markdown_preview.js b/app/assets/javascripts/markdown_preview.js
new file mode 100644
index 00000000000..18fc7bae09a
--- /dev/null
+++ b/app/assets/javascripts/markdown_preview.js
@@ -0,0 +1,150 @@
+(function() {
+  var lastTextareaPreviewed, markdownPreview, previewButtonSelector, writeButtonSelector;
+
+  this.MarkdownPreview = (function() {
+    function MarkdownPreview() {}
+
+    MarkdownPreview.prototype.referenceThreshold = 10;
+
+    MarkdownPreview.prototype.ajaxCache = {};
+
+    MarkdownPreview.prototype.showPreview = function(form) {
+      var mdText, preview;
+      preview = form.find('.js-md-preview');
+      mdText = form.find('textarea.markdown-area').val();
+      if (mdText.trim().length === 0) {
+        preview.text('Nothing to preview.');
+        return this.hideReferencedUsers(form);
+      } else {
+        preview.text('Loading...');
+        return this.renderMarkdown(mdText, (function(_this) {
+          return function(response) {
+            preview.html(response.body);
+            preview.syntaxHighlight();
+            return _this.renderReferencedUsers(response.references.users, form);
+          };
+        })(this));
+      }
+    };
+
+    MarkdownPreview.prototype.renderMarkdown = function(text, success) {
+      if (!window.markdown_preview_path) {
+        return;
+      }
+      if (text === this.ajaxCache.text) {
+        return success(this.ajaxCache.response);
+      }
+      return $.ajax({
+        type: 'POST',
+        url: window.markdown_preview_path,
+        data: {
+          text: text
+        },
+        dataType: 'json',
+        success: (function(_this) {
+          return function(response) {
+            _this.ajaxCache = {
+              text: text,
+              response: response
+            };
+            return success(response);
+          };
+        })(this)
+      });
+    };
+
+    MarkdownPreview.prototype.hideReferencedUsers = function(form) {
+      var referencedUsers;
+      referencedUsers = form.find('.referenced-users');
+      return referencedUsers.hide();
+    };
+
+    MarkdownPreview.prototype.renderReferencedUsers = function(users, form) {
+      var referencedUsers;
+      referencedUsers = form.find('.referenced-users');
+      if (referencedUsers.length) {
+        if (users.length >= this.referenceThreshold) {
+          referencedUsers.show();
+          return referencedUsers.find('.js-referenced-users-count').text(users.length);
+        } else {
+          return referencedUsers.hide();
+        }
+      }
+    };
+
+    return MarkdownPreview;
+
+  })();
+
+  markdownPreview = new MarkdownPreview();
+
+  previewButtonSelector = '.js-md-preview-button';
+
+  writeButtonSelector = '.js-md-write-button';
+
+  lastTextareaPreviewed = null;
+
+  $.fn.setupMarkdownPreview = function() {
+    var $form, form_textarea;
+    $form = $(this);
+    form_textarea = $form.find('textarea.markdown-area');
+    form_textarea.on('input', function() {
+      return markdownPreview.hideReferencedUsers($form);
+    });
+    return form_textarea.on('blur', function() {
+      return markdownPreview.showPreview($form);
+    });
+  };
+
+  $(document).on('markdown-preview:show', function(e, $form) {
+    if (!$form) {
+      return;
+    }
+    lastTextareaPreviewed = $form.find('textarea.markdown-area');
+    $form.find(writeButtonSelector).parent().removeClass('active');
+    $form.find(previewButtonSelector).parent().addClass('active');
+    $form.find('.md-write-holder').hide();
+    $form.find('.md-preview-holder').show();
+    return markdownPreview.showPreview($form);
+  });
+
+  $(document).on('markdown-preview:hide', function(e, $form) {
+    if (!$form) {
+      return;
+    }
+    lastTextareaPreviewed = null;
+    $form.find(writeButtonSelector).parent().addClass('active');
+    $form.find(previewButtonSelector).parent().removeClass('active');
+    $form.find('.md-write-holder').show();
+    $form.find('textarea.markdown-area').focus();
+    return $form.find('.md-preview-holder').hide();
+  });
+
+  $(document).on('markdown-preview:toggle', function(e, keyboardEvent) {
+    var $target;
+    $target = $(keyboardEvent.target);
+    if ($target.is('textarea.markdown-area')) {
+      $(document).triggerHandler('markdown-preview:show', [$target.closest('form')]);
+      return keyboardEvent.preventDefault();
+    } else if (lastTextareaPreviewed) {
+      $target = lastTextareaPreviewed;
+      $(document).triggerHandler('markdown-preview:hide', [$target.closest('form')]);
+      return keyboardEvent.preventDefault();
+    }
+  });
+
+  $(document).on('click', previewButtonSelector, function(e) {
+    var $form;
+    e.preventDefault();
+    $form = $(this).closest('form');
+    return $(document).triggerHandler('markdown-preview:show', [$form]);
+  });
+
+  $(document).on('click', writeButtonSelector, function(e) {
+    var $form;
+    e.preventDefault();
+    $form = $(this).closest('form');
+    return $(document).triggerHandler('markdown-preview:hide', [$form]);
+  });
+
+}).call(this);
diff --git a/app/assets/javascripts/markdown_preview.js.coffee b/app/assets/javascripts/markdown_preview.js.coffee
deleted file mode 100644
index 2a0b9479445..00000000000
--- a/app/assets/javascripts/markdown_preview.js.coffee
+++ /dev/null
@@ -1,119 +0,0 @@
-# MarkdownPreview
-#
-# Handles toggling the "Write" and "Preview" tab clicks, rendering the preview,
-# and showing a warning when more than `x` users are referenced.
-#
-class @MarkdownPreview
-  # Minimum number of users referenced before triggering a warning
-  referenceThreshold: 10
-  ajaxCache: {}
-
-  showPreview: (form) ->
-    preview = form.find('.js-md-preview')
-    mdText  = form.find('textarea.markdown-area').val()
-
-    if mdText.trim().length == 0
-      preview.text('Nothing to preview.')
-      @hideReferencedUsers(form)
-    else
-      preview.text('Loading...')
-      @renderMarkdown mdText, (response) =>
-        preview.html(response.body)
-        preview.syntaxHighlight()
-        @renderReferencedUsers(response.references.users, form)
-
-  renderMarkdown: (text, success) ->
-    return unless window.markdown_preview_path
-
-    return success(@ajaxCache.response) if text == @ajaxCache.text
-
-    $.ajax
-      type: 'POST'
-      url: window.markdown_preview_path
-      data: { text: text }
-      dataType: 'json'
-      success: (response) =>
-        @ajaxCache = text: text, response: response
-        success(response)
-
-  hideReferencedUsers: (form) ->
-    referencedUsers = form.find('.referenced-users')
-    referencedUsers.hide()
-
-  renderReferencedUsers: (users, form) ->
-    referencedUsers = form.find('.referenced-users')
-
-    if referencedUsers.length
-      if users.length >= @referenceThreshold
-        referencedUsers.show()
-        referencedUsers.find('.js-referenced-users-count').text(users.length)
-      else
-        referencedUsers.hide()
-
-markdownPreview = new MarkdownPreview()
-
-previewButtonSelector = '.js-md-preview-button'
-writeButtonSelector   = '.js-md-write-button'
-lastTextareaPreviewed = null
-
-$.fn.setupMarkdownPreview = ->
-  $form = $(this)
-
-  form_textarea = $form.find('textarea.markdown-area')
-
-  form_textarea.on 'input', -> markdownPreview.hideReferencedUsers($form)
-  form_textarea.on 'blur',  -> markdownPreview.showPreview($form)
-
-$(document).on 'markdown-preview:show', (e, $form) ->
-  return unless $form
-
-  lastTextareaPreviewed = $form.find('textarea.markdown-area')
-
-  # toggle tabs
-  $form.find(writeButtonSelector).parent().removeClass('active')
-  $form.find(previewButtonSelector).parent().addClass('active')
-
-  # toggle content
-  $form.find('.md-write-holder').hide()
-  $form.find('.md-preview-holder').show()
-
-  markdownPreview.showPreview($form)
-
-$(document).on 'markdown-preview:hide', (e, $form) ->
-  return unless $form
-
-  lastTextareaPreviewed = null
-
-  # toggle tabs
-  $form.find(writeButtonSelector).parent().addClass('active')
-  $form.find(previewButtonSelector).parent().removeClass('active')
-
-  # toggle content
-  $form.find('.md-write-holder').show()
-  $form.find('textarea.markdown-area').focus()
-  $form.find('.md-preview-holder').hide()
-
-$(document).on 'markdown-preview:toggle', (e, keyboardEvent) ->
-  $target = $(keyboardEvent.target)
-
-  if $target.is('textarea.markdown-area')
-    $(document).triggerHandler('markdown-preview:show', [$target.closest('form')])
-    keyboardEvent.preventDefault()
-  else if lastTextareaPreviewed
-    $target = lastTextareaPreviewed
-    $(document).triggerHandler('markdown-preview:hide', [$target.closest('form')])
-    keyboardEvent.preventDefault()
-
-$(document).on 'click', previewButtonSelector, (e) ->
-  e.preventDefault()
-
-  $form = $(this).closest('form')
-
-  $(document).triggerHandler('markdown-preview:show', [$form])
-
-$(document).on 'click', writeButtonSelector, (e) ->
-  e.preventDefault()
-
-  $form = $(this).closest('form')
-
-  $(document).triggerHandler('markdown-preview:hide', [$form])
diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js
new file mode 100644
index 00000000000..47e6dd1084d
--- /dev/null
+++ b/app/assets/javascripts/merge_request.js
@@ -0,0 +1,105 @@
+
+/*= require jquery.waitforimages */
+
+
+/*= require task_list */
+
+
+/*= require merge_request_tabs */
+
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.MergeRequest = (function() {
+    function MergeRequest(opts) {
+      this.opts = opts != null ? opts : {};
+      this.submitNoteForm = bind(this.submitNoteForm, this);
+      this.$el = $('.merge-request');
+      this.$('.show-all-commits').on('click', (function(_this) {
+        return function() {
+          return _this.showAllCommits();
+        };
+      })(this));
+      this.initTabs();
+      this.disableTaskList();
+      this.initMRBtnListeners();
+      if ($("a.btn-close").length) {
+        this.initTaskList();
+      }
+    }
+
+    MergeRequest.prototype.$ = function(selector) {
+      return this.$el.find(selector);
+    };
+
+    MergeRequest.prototype.initTabs = function() {
+      if (this.opts.action !== 'new') {
+        return new MergeRequestTabs(this.opts);
+      } else {
+        return $('.merge-request-tabs a[data-toggle="tab"]:first').tab('show');
+      }
+    };
+
+    MergeRequest.prototype.showAllCommits = function() {
+      this.$('.first-commits').remove();
+      return this.$('.all-commits').removeClass('hide');
+    };
+
+    MergeRequest.prototype.initTaskList = function() {
+      $('.detail-page-description .js-task-list-container').taskList('enable');
+      return $(document).on('tasklist:changed', '.detail-page-description .js-task-list-container', this.updateTaskList);
+    };
+
+    MergeRequest.prototype.initMRBtnListeners = function() {
+      var _this;
+      _this = this;
+      return $('a.btn-close, a.btn-reopen').on('click', function(e) {
+        var $this, shouldSubmit;
+        $this = $(this);
+        shouldSubmit = $this.hasClass('btn-comment');
+        if (shouldSubmit && $this.data('submitted')) {
+          return;
+        }
+        if (shouldSubmit) {
+          if ($this.hasClass('btn-comment-and-close') || $this.hasClass('btn-comment-and-reopen')) {
+            e.preventDefault();
+            e.stopImmediatePropagation();
+            return _this.submitNoteForm($this.closest('form'), $this);
+          }
+        }
+      });
+    };
+
+    MergeRequest.prototype.submitNoteForm = function(form, $button) {
+      var noteText;
+      noteText = form.find("textarea.js-note-text").val();
+      if (noteText.trim().length > 0) {
+        form.submit();
+        $button.data('submitted', true);
+        return $button.trigger('click');
+      }
+    };
+
+    MergeRequest.prototype.disableTaskList = function() {
+      $('.detail-page-description .js-task-list-container').taskList('disable');
+      return $(document).off('tasklist:changed', '.detail-page-description .js-task-list-container');
+    };
+
+    MergeRequest.prototype.updateTaskList = function() {
+      var patchData;
+      patchData = {};
+      patchData['merge_request'] = {
+        'description': $('.js-task-list-field', this).val()
+      };
+      return $.ajax({
+        type: 'PATCH',
+        url: $('form.js-issuable-update').attr('action'),
+        data: patchData
+      });
+    };
+
+    return MergeRequest;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/merge_request.js.coffee b/app/assets/javascripts/merge_request.js.coffee
deleted file mode 100644
index dabfd91cf14..00000000000
--- a/app/assets/javascripts/merge_request.js.coffee
+++ /dev/null
@@ -1,82 +0,0 @@
-#= require jquery.waitforimages
-#= require task_list
-
-#= require merge_request_tabs
-
-class @MergeRequest
-  # Initialize MergeRequest behavior
-  #
-  # Options:
-  #   action - String, current controller action
-  #
-  constructor: (@opts = {}) ->
-    this.$el = $('.merge-request')
-
-    this.$('.show-all-commits').on 'click', =>
-      this.showAllCommits()
-
-    @initTabs()
-
-    # Prevent duplicate event bindings
-    @disableTaskList()
-    @initMRBtnListeners()
-
-    if $("a.btn-close").length
-      @initTaskList()
-
-  # Local jQuery finder
-  $: (selector) ->
-    this.$el.find(selector)
-
-  initTabs: ->
-    if @opts.action != 'new'
-      # `MergeRequests#new` has no tab-persisting or lazy-loading behavior
-      new MergeRequestTabs(@opts)
-    else
-      # Show the first tab (Commits)
-      $('.merge-request-tabs a[data-toggle="tab"]:first').tab('show')
-
-  showAllCommits: ->
-    this.$('.first-commits').remove()
-    this.$('.all-commits').removeClass 'hide'
-
-  initTaskList: ->
-    $('.detail-page-description .js-task-list-container').taskList('enable')
-    $(document).on 'tasklist:changed', '.detail-page-description .js-task-list-container', @updateTaskList
-
-  initMRBtnListeners: ->
-    _this = @
-    $('a.btn-close, a.btn-reopen').on 'click', (e) ->
-      $this = $(this)
-      shouldSubmit = $this.hasClass('btn-comment')
-      if shouldSubmit && $this.data('submitted')
-        return
-      if shouldSubmit
-        if $this.hasClass('btn-comment-and-close') || $this.hasClass('btn-comment-and-reopen')
-          e.preventDefault()
-          e.stopImmediatePropagation()
-          _this.submitNoteForm($this.closest('form'),$this)
-
-
-  submitNoteForm: (form, $button) =>
-    noteText = form.find("textarea.js-note-text").val()
-    if noteText.trim().length > 0
-      form.submit()
-      $button.data('submitted',true)
-      $button.trigger('click')
-
-
-  disableTaskList: ->
-    $('.detail-page-description .js-task-list-container').taskList('disable')
-    $(document).off 'tasklist:changed', '.detail-page-description .js-task-list-container'
-
-  # TODO (rspeicher): Make the merge request description inline-editable like a
-  # note so that we can re-use its form here
-  updateTaskList: ->
-    patchData = {}
-    patchData['merge_request'] = {'description': $('.js-task-list-field', this).val()}
-
-    $.ajax
-      type: 'PATCH'
-      url: $('form.js-issuable-update').attr('action')
-      data: patchData
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js
new file mode 100644
index 00000000000..52c2ed61012
--- /dev/null
+++ b/app/assets/javascripts/merge_request_tabs.js
@@ -0,0 +1,239 @@
+
+/*= require jquery.cookie */
+
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.MergeRequestTabs = (function() {
+    MergeRequestTabs.prototype.diffsLoaded = false;
+
+    MergeRequestTabs.prototype.buildsLoaded = false;
+
+    MergeRequestTabs.prototype.commitsLoaded = false;
+
+    function MergeRequestTabs(opts) {
+      this.opts = opts != null ? opts : {};
+      this.setCurrentAction = bind(this.setCurrentAction, this);
+      this.tabShown = bind(this.tabShown, this);
+      this.showTab = bind(this.showTab, this);
+      this._location = location;
+      this.bindEvents();
+      this.activateTab(this.opts.action);
+    }
+
+    MergeRequestTabs.prototype.bindEvents = function() {
+      $(document).on('shown.bs.tab', '.merge-request-tabs a[data-toggle="tab"]', this.tabShown);
+      return $(document).on('click', '.js-show-tab', this.showTab);
+    };
+
+    MergeRequestTabs.prototype.showTab = function(event) {
+      event.preventDefault();
+      return this.activateTab($(event.target).data('action'));
+    };
+
+    MergeRequestTabs.prototype.tabShown = function(event) {
+      var $target, action, navBarHeight;
+      $target = $(event.target);
+      action = $target.data('action');
+      if (action === 'commits') {
+        this.loadCommits($target.attr('href'));
+        this.expandView();
+      } else if (action === 'diffs') {
+        this.loadDiff($target.attr('href'));
+        if ((typeof bp !== "undefined" && bp !== null) && bp.getBreakpointSize() !== 'lg') {
+          this.shrinkView();
+        }
+        navBarHeight = $('.navbar-gitlab').outerHeight();
+        $.scrollTo(".merge-request-details .merge-request-tabs", {
+          offset: -navBarHeight
+        });
+      } else if (action === 'builds') {
+        this.loadBuilds($target.attr('href'));
+        this.expandView();
+      } else {
+        this.expandView();
+      }
+      return this.setCurrentAction(action);
+    };
+
+    MergeRequestTabs.prototype.scrollToElement = function(container) {
+      var $el, navBarHeight;
+      if (window.location.hash) {
+        navBarHeight = $('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight();
+        $el = $(container + " " + window.location.hash + ":not(.match)");
+        if ($el.length) {
+          return $.scrollTo(container + " " + window.location.hash + ":not(.match)", {
+            offset: -navBarHeight
+          });
+        }
+      }
+    };
+
+    MergeRequestTabs.prototype.activateTab = function(action) {
+      if (action === 'show') {
+        action = 'notes';
+      }
+      return $(".merge-request-tabs a[data-action='" + action + "']").tab('show');
+    };
+
+    MergeRequestTabs.prototype.setCurrentAction = function(action) {
+      var new_state;
+      if (action === 'show') {
+        action = 'notes';
+      }
+      new_state = this._location.pathname.replace(/\/(commits|diffs|builds)(\.html)?\/?$/, '');
+      if (action !== 'notes') {
+        new_state += "/" + action;
+      }
+      new_state += this._location.search + this._location.hash;
+      history.replaceState({
+        turbolinks: true,
+        url: new_state
+      }, document.title, new_state);
+      return new_state;
+    };
+
+    MergeRequestTabs.prototype.loadCommits = function(source) {
+      if (this.commitsLoaded) {
+        return;
+      }
+      return this._get({
+        url: source + ".json",
+        success: (function(_this) {
+          return function(data) {
+            document.querySelector("div#commits").innerHTML = data.html;
+            gl.utils.localTimeAgo($('.js-timeago', 'div#commits'));
+            _this.commitsLoaded = true;
+            return _this.scrollToElement("#commits");
+          };
+        })(this)
+      });
+    };
+
+    MergeRequestTabs.prototype.loadDiff = function(source) {
+      if (this.diffsLoaded) {
+        return;
+      }
+      return this._get({
+        url: (source + ".json") + this._location.search,
+        success: (function(_this) {
+          return function(data) {
+            $('#diffs').html(data.html);
+            gl.utils.localTimeAgo($('.js-timeago', 'div#diffs'));
+            $('#diffs .js-syntax-highlight').syntaxHighlight();
+            $('#diffs .diff-file').singleFileDiff();
+            if (_this.diffViewType() === 'parallel') {
+              _this.expandViewContainer();
+            }
+            _this.diffsLoaded = true;
+            _this.scrollToElement("#diffs");
+            _this.highlighSelectedLine();
+            _this.filesCommentButton = $('.files .diff-file').filesCommentButton();
+            return $(document).off('click', '.diff-line-num a').on('click', '.diff-line-num a', function(e) {
+              e.preventDefault();
+              window.location.hash = $(e.currentTarget).attr('href');
+              _this.highlighSelectedLine();
+              return _this.scrollToElement("#diffs");
+            });
+          };
+        })(this)
+      });
+    };
+
+    MergeRequestTabs.prototype.highlighSelectedLine = function() {
+      var $diffLine, diffLineTop, hashClassString, locationHash, navBarHeight;
+      $('.hll').removeClass('hll');
+      locationHash = window.location.hash;
+      if (locationHash !== '') {
+        hashClassString = "." + (locationHash.replace('#', ''));
+        $diffLine = $(locationHash + ":not(.match)", $('#diffs'));
+        if (!$diffLine.is('tr')) {
+          $diffLine = $('#diffs').find("td" + locationHash + ", td" + hashClassString);
+        } else {
+          $diffLine = $diffLine.find('td');
+        }
+        if ($diffLine.length) {
+          $diffLine.addClass('hll');
+          diffLineTop = $diffLine.offset().top;
+          return navBarHeight = $('.navbar-gitlab').outerHeight();
+        }
+      }
+    };
+
+    MergeRequestTabs.prototype.loadBuilds = function(source) {
+      if (this.buildsLoaded) {
+        return;
+      }
+      return this._get({
+        url: source + ".json",
+        success: (function(_this) {
+          return function(data) {
+            document.querySelector("div#builds").innerHTML = data.html;
+            gl.utils.localTimeAgo($('.js-timeago', 'div#builds'));
+            _this.buildsLoaded = true;
+            return _this.scrollToElement("#builds");
+          };
+        })(this)
+      });
+    };
+
+    MergeRequestTabs.prototype.toggleLoading = function(status) {
+      return $('.mr-loading-status .loading').toggle(status);
+    };
+
+    MergeRequestTabs.prototype._get = function(options) {
+      var defaults;
+      defaults = {
+        beforeSend: (function(_this) {
+          return function() {
+            return _this.toggleLoading(true);
+          };
+        })(this),
+        complete: (function(_this) {
+          return function() {
+            return _this.toggleLoading(false);
+          };
+        })(this),
+        dataType: 'json',
+        type: 'GET'
+      };
+      options = $.extend({}, defaults, options);
+      return $.ajax(options);
+    };
+
+    MergeRequestTabs.prototype.diffViewType = function() {
+      return $('.inline-parallel-buttons a.active').data('view-type');
+    };
+
+    MergeRequestTabs.prototype.expandViewContainer = function() {
+      return $('.container-fluid').removeClass('container-limited');
+    };
+
+    MergeRequestTabs.prototype.shrinkView = function() {
+      var $gutterIcon;
+      $gutterIcon = $('.js-sidebar-toggle i:visible');
+      return setTimeout(function() {
+        if ($gutterIcon.is('.fa-angle-double-right')) {
+          return $gutterIcon.closest('a').trigger('click', [true]);
+        }
+      }, 0);
+    };
+
+    MergeRequestTabs.prototype.expandView = function() {
+      var $gutterIcon;
+      if ($.cookie('collapsed_gutter') === 'true') {
+        return;
+      }
+      $gutterIcon = $('.js-sidebar-toggle i:visible');
+      return setTimeout(function() {
+        if ($gutterIcon.is('.fa-angle-double-left')) {
+          return $gutterIcon.closest('a').trigger('click', [true]);
+        }
+      }, 0);
+    };
+
+    return MergeRequestTabs;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee
deleted file mode 100644
index 86539e0d725..00000000000
--- a/app/assets/javascripts/merge_request_tabs.js.coffee
+++ /dev/null
@@ -1,252 +0,0 @@
-# MergeRequestTabs
-#
-# Handles persisting and restoring the current tab selection and lazily-loading
-# content on the MergeRequests#show page.
-#
-#= require jquery.cookie
-#
-# ### Example Markup
-#
-#   <ul class="nav-links merge-request-tabs">
-#     <li class="notes-tab active">
-#       <a data-action="notes" data-target="#notes" data-toggle="tab" href="/foo/bar/merge_requests/1">
-#         Discussion
-#       </a>
-#     </li>
-#     <li class="commits-tab">
-#       <a data-action="commits" data-target="#commits" data-toggle="tab" href="/foo/bar/merge_requests/1/commits">
-#         Commits
-#       </a>
-#     </li>
-#     <li class="diffs-tab">
-#       <a data-action="diffs" data-target="#diffs" data-toggle="tab" href="/foo/bar/merge_requests/1/diffs">
-#         Diffs
-#       </a>
-#     </li>
-#   </ul>
-#
-#   <div class="tab-content">
-#     <div class="notes tab-pane active" id="notes">
-#       Notes Content
-#     </div>
-#     <div class="commits tab-pane" id="commits">
-#       Commits Content
-#     </div>
-#     <div class="diffs tab-pane" id="diffs">
-#       Diffs Content
-#     </div>
-#   </div>
-#
-#   <div class="mr-loading-status">
-#     <div class="loading">
-#       Loading Animation
-#     </div>
-#   </div>
-#
-class @MergeRequestTabs
-  diffsLoaded: false
-  buildsLoaded: false
-  commitsLoaded: false
-
-  constructor: (@opts = {}) ->
-    # Store the `location` object, allowing for easier stubbing in tests
-    @_location = location
-
-    @bindEvents()
-    @activateTab(@opts.action)
-
-  bindEvents: ->
-    $(document).on 'shown.bs.tab', '.merge-request-tabs a[data-toggle="tab"]', @tabShown
-    $(document).on 'click', '.js-show-tab', @showTab
-
-  showTab: (event) =>
-    event.preventDefault()
-
-    @activateTab $(event.target).data('action')
-
-  tabShown: (event) =>
-    $target = $(event.target)
-    action = $target.data('action')
-
-    if action == 'commits'
-      @loadCommits($target.attr('href'))
-      @expandView()
-    else if action == 'diffs'
-      @loadDiff($target.attr('href'))
-      if bp? and bp.getBreakpointSize() isnt 'lg'
-        @shrinkView()
-
-      navBarHeight = $('.navbar-gitlab').outerHeight()
-      $.scrollTo(".merge-request-details .merge-request-tabs", offset: -navBarHeight)
-    else if action == 'builds'
-      @loadBuilds($target.attr('href'))
-      @expandView()
-    else
-      @expandView()
-
-    @setCurrentAction(action)
-
-  scrollToElement: (container) ->
-    if window.location.hash
-      navBarHeight = $('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight()
-
-      $el = $("#{container} #{window.location.hash}:not(.match)")
-      $.scrollTo("#{container} #{window.location.hash}:not(.match)", offset: -navBarHeight) if $el.length
-
-  # Activate a tab based on the current action
-  activateTab: (action) ->
-    action = 'notes' if action == 'show'
-    $(".merge-request-tabs a[data-action='#{action}']").tab('show')
-
-  # Replaces the current Merge Request-specific action in the URL with a new one
-  #
-  # If the action is "notes", the URL is reset to the standard
-  # `MergeRequests#show` route.
-  #
-  # Examples:
-  #
-  #   location.pathname # => "/namespace/project/merge_requests/1"
-  #   setCurrentAction('diffs')
-  #   location.pathname # => "/namespace/project/merge_requests/1/diffs"
-  #
-  #   location.pathname # => "/namespace/project/merge_requests/1/diffs"
-  #   setCurrentAction('notes')
-  #   location.pathname # => "/namespace/project/merge_requests/1"
-  #
-  #   location.pathname # => "/namespace/project/merge_requests/1/diffs"
-  #   setCurrentAction('commits')
-  #   location.pathname # => "/namespace/project/merge_requests/1/commits"
-  #
-  # Returns the new URL String
-  setCurrentAction: (action) =>
-    # Normalize action, just to be safe
-    action = 'notes' if action == 'show'
-
-    # Remove a trailing '/commits' or '/diffs'
-    new_state = @_location.pathname.replace(/\/(commits|diffs|builds)(\.html)?\/?$/, '')
-
-    # Append the new action if we're on a tab other than 'notes'
-    unless action == 'notes'
-      new_state += "/#{action}"
-
-    # Ensure parameters and hash come along for the ride
-    new_state += @_location.search + @_location.hash
-
-    # Replace the current history state with the new one without breaking
-    # Turbolinks' history.
-    #
-    # See https://github.com/rails/turbolinks/issues/363
-    history.replaceState {turbolinks: true, url: new_state}, document.title, new_state
-
-    new_state
-
-  loadCommits: (source) ->
-    return if @commitsLoaded
-
-    @_get
-      url: "#{source}.json"
-      success: (data) =>
-        document.querySelector("div#commits").innerHTML = data.html
-        gl.utils.localTimeAgo($('.js-timeago', 'div#commits'))
-        @commitsLoaded = true
-        @scrollToElement("#commits")
-
-  loadDiff: (source) ->
-    return if @diffsLoaded
-    @_get
-      url: "#{source}.json" + @_location.search
-      success: (data) =>
-        $('#diffs').html data.html
-        gl.utils.localTimeAgo($('.js-timeago', 'div#diffs'))
-        $('#diffs .js-syntax-highlight').syntaxHighlight()
-        $('#diffs .diff-file').singleFileDiff()
-        @expandViewContainer() if @diffViewType() is 'parallel'
-        @diffsLoaded = true
-        @scrollToElement("#diffs")
-        @highlighSelectedLine()
-        @filesCommentButton = $('.files .diff-file').filesCommentButton()
-
-        $(document)
-          .off 'click', '.diff-line-num a'
-          .on 'click', '.diff-line-num a', (e) =>
-            e.preventDefault()
-            window.location.hash = $(e.currentTarget).attr 'href'
-            @highlighSelectedLine()
-            @scrollToElement("#diffs")
-
-  highlighSelectedLine: ->
-    $('.hll').removeClass 'hll'
-    locationHash = window.location.hash
-
-    if locationHash isnt ''
-      hashClassString = ".#{locationHash.replace('#', '')}"
-      $diffLine = $("#{locationHash}:not(.match)", $('#diffs'))
-
-      if not $diffLine.is 'tr'
-        $diffLine = $('#diffs').find("td#{locationHash}, td#{hashClassString}")
-      else
-        $diffLine = $diffLine.find('td')
-
-      if $diffLine.length
-        $diffLine.addClass 'hll'
-        diffLineTop = $diffLine.offset().top
-        navBarHeight = $('.navbar-gitlab').outerHeight()
-
-  loadBuilds: (source) ->
-    return if @buildsLoaded
-
-    @_get
-      url: "#{source}.json"
-      success: (data) =>
-        document.querySelector("div#builds").innerHTML = data.html
-        gl.utils.localTimeAgo($('.js-timeago', 'div#builds'))
-        @buildsLoaded = true
-        @scrollToElement("#builds")
-
-  # Show or hide the loading spinner
-  #
-  # status - Boolean, true to show, false to hide
-  toggleLoading: (status) ->
-    $('.mr-loading-status .loading').toggle(status)
-
-  _get: (options) ->
-    defaults = {
-      beforeSend: => @toggleLoading(true)
-      complete:   => @toggleLoading(false)
-      dataType: 'json'
-      type: 'GET'
-    }
-
-    options = $.extend({}, defaults, options)
-
-    $.ajax(options)
-
-  # Returns diff view type
-  diffViewType: ->
-    $('.inline-parallel-buttons a.active').data('view-type')
-
-  expandViewContainer: ->
-    $('.container-fluid').removeClass('container-limited')
-
-  shrinkView: ->
-    $gutterIcon = $('.js-sidebar-toggle i:visible')
-
-    # Wait until listeners are set
-    setTimeout( ->
-      # Only when sidebar is expanded
-      if $gutterIcon.is('.fa-angle-double-right')
-        $gutterIcon.closest('a').trigger('click', [true])
-    , 0)
-
-  # Expand the issuable sidebar unless the user explicitly collapsed it
-  expandView: ->
-    return if $.cookie('collapsed_gutter') == 'true'
-
-    $gutterIcon = $('.js-sidebar-toggle i:visible')
-
-    # Wait until listeners are set
-    setTimeout( ->
-      # Only when sidebar is collapsed
-      if $gutterIcon.is('.fa-angle-double-left')
-        $gutterIcon.closest('a').trigger('click', [true])
-    , 0)
diff --git a/app/assets/javascripts/merge_request_widget.js b/app/assets/javascripts/merge_request_widget.js
new file mode 100644
index 00000000000..362aaa906d0
--- /dev/null
+++ b/app/assets/javascripts/merge_request_widget.js
@@ -0,0 +1,185 @@
+(function() {
+  var indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
+
+  this.MergeRequestWidget = (function() {
+    function MergeRequestWidget(opts) {
+      this.opts = opts;
+      $('#modal_merge_info').modal({
+        show: false
+      });
+      this.firstCICheck = true;
+      this.readyForCICheck = false;
+      this.cancel = false;
+      clearInterval(this.fetchBuildStatusInterval);
+      this.clearEventListeners();
+      this.addEventListeners();
+      this.getCIStatus(false);
+      this.pollCIStatus();
+      notifyPermissions();
+    }
+
+    MergeRequestWidget.prototype.clearEventListeners = function() {
+      return $(document).off('page:change.merge_request');
+    };
+
+    MergeRequestWidget.prototype.cancelPolling = function() {
+      return this.cancel = true;
+    };
+
+    MergeRequestWidget.prototype.addEventListeners = function() {
+      var allowedPages;
+      allowedPages = ['show', 'commits', 'builds', 'changes'];
+      return $(document).on('page:change.merge_request', (function(_this) {
+        return function() {
+          var page;
+          page = $('body').data('page').split(':').last();
+          if (allowedPages.indexOf(page) < 0) {
+            clearInterval(_this.fetchBuildStatusInterval);
+            _this.cancelPolling();
+            return _this.clearEventListeners();
+          }
+        };
+      })(this));
+    };
+
+    MergeRequestWidget.prototype.mergeInProgress = function(deleteSourceBranch) {
+      if (deleteSourceBranch == null) {
+        deleteSourceBranch = false;
+      }
+      return $.ajax({
+        type: 'GET',
+        url: $('.merge-request').data('url'),
+        success: (function(_this) {
+          return function(data) {
+            var callback, urlSuffix;
+            if (data.state === "merged") {
+              urlSuffix = deleteSourceBranch ? '?delete_source=true' : '';
+              return window.location.href = window.location.pathname + urlSuffix;
+            } else if (data.merge_error) {
+              return $('.mr-widget-body').html("<h4>" + data.merge_error + "</h4>");
+            } else {
+              callback = function() {
+                return merge_request_widget.mergeInProgress(deleteSourceBranch);
+              };
+              return setTimeout(callback, 2000);
+            }
+          };
+        })(this),
+        dataType: 'json'
+      });
+    };
+
+    MergeRequestWidget.prototype.getMergeStatus = function() {
+      return $.get(this.opts.merge_check_url, function(data) {
+        return $('.mr-state-widget').replaceWith(data);
+      });
+    };
+
+    MergeRequestWidget.prototype.ciLabelForStatus = function(status) {
+      switch (status) {
+        case 'success':
+          return 'passed';
+        case 'success_with_warnings':
+          return 'passed with warnings';
+        default:
+          return status;
+      }
+    };
+
+    MergeRequestWidget.prototype.pollCIStatus = function() {
+      return this.fetchBuildStatusInterval = setInterval(((function(_this) {
+        return function() {
+          if (!_this.readyForCICheck) {
+            return;
+          }
+          _this.getCIStatus(true);
+          return _this.readyForCICheck = false;
+        };
+      })(this)), 10000);
+    };
+
+    MergeRequestWidget.prototype.getCIStatus = function(showNotification) {
+      var _this;
+      _this = this;
+      $('.ci-widget-fetching').show();
+      return $.getJSON(this.opts.ci_status_url, (function(_this) {
+        return function(data) {
+          var message, status, title;
+          if (_this.cancel) {
+            return;
+          }
+          _this.readyForCICheck = true;
+          if (data.status === '') {
+            return;
+          }
+          if (_this.firstCICheck || data.status !== _this.opts.ci_status && (data.status != null)) {
+            _this.opts.ci_status = data.status;
+            _this.showCIStatus(data.status);
+            if (data.coverage) {
+              _this.showCICoverage(data.coverage);
+            }
+            if (showNotification && !_this.firstCICheck) {
+              status = _this.ciLabelForStatus(data.status);
+              if (status === "preparing") {
+                title = _this.opts.ci_title.preparing;
+                status = status.charAt(0).toUpperCase() + status.slice(1);
+                message = _this.opts.ci_message.preparing.replace('{{status}}', status);
+              } else {
+                title = _this.opts.ci_title.normal;
+                message = _this.opts.ci_message.normal.replace('{{status}}', status);
+              }
+              title = title.replace('{{status}}', status);
+              message = message.replace('{{sha}}', data.sha);
+              message = message.replace('{{title}}', data.title);
+              notify(title, message, _this.opts.gitlab_icon, function() {
+                this.close();
+                return Turbolinks.visit(_this.opts.builds_path);
+              });
+            }
+            return _this.firstCICheck = false;
+          }
+        };
+      })(this));
+    };
+
+    MergeRequestWidget.prototype.showCIStatus = function(state) {
+      var allowed_states;
+      if (state == null) {
+        return;
+      }
+      $('.ci_widget').hide();
+      allowed_states = ["failed", "canceled", "running", "pending", "success", "success_with_warnings", "skipped", "not_found"];
+      if (indexOf.call(allowed_states, state) >= 0) {
+        $('.ci_widget.ci-' + state).show();
+        switch (state) {
+          case "failed":
+          case "canceled":
+          case "not_found":
+            return this.setMergeButtonClass('btn-danger');
+          case "running":
+            return this.setMergeButtonClass('btn-warning');
+          case "success":
+          case "success_with_warnings":
+            return this.setMergeButtonClass('btn-create');
+        }
+      } else {
+        $('.ci_widget.ci-error').show();
+        return this.setMergeButtonClass('btn-danger');
+      }
+    };
+
+    MergeRequestWidget.prototype.showCICoverage = function(coverage) {
+      var text;
+      text = 'Coverage ' + coverage + '%';
+      return $('.ci_widget:visible .ci-coverage').text(text);
+    };
+
+    MergeRequestWidget.prototype.setMergeButtonClass = function(css_class) {
+      return $('.js-merge-button,.accept-action .dropdown-toggle').removeClass('btn-danger btn-warning btn-create').addClass(css_class);
+    };
+
+    return MergeRequestWidget;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee
deleted file mode 100644
index 779f536d9f0..00000000000
--- a/app/assets/javascripts/merge_request_widget.js.coffee
+++ /dev/null
@@ -1,140 +0,0 @@
-class @MergeRequestWidget
-  # Initialize MergeRequestWidget behavior
-  #
-  #   check_enable           - Boolean, whether to check automerge status
-  #   merge_check_url - String, URL to use to check automerge status
-  #   ci_status_url        - String, URL to use to check CI status
-  #
-
-  constructor: (@opts) ->
-    $('#modal_merge_info').modal(show: false)
-    @firstCICheck = true
-    @readyForCICheck = false
-    @cancel = false
-    clearInterval @fetchBuildStatusInterval
-
-    @clearEventListeners()
-    @addEventListeners()
-    @getCIStatus(false)
-    @pollCIStatus()
-    notifyPermissions()
-
-  clearEventListeners: ->
-    $(document).off 'page:change.merge_request'
-
-  cancelPolling: ->
-    @cancel = true
-
-  addEventListeners: ->
-    allowedPages = ['show', 'commits', 'builds', 'changes']
-    $(document).on 'page:change.merge_request', =>
-      page = $('body').data('page').split(':').last()
-      if allowedPages.indexOf(page) < 0
-        clearInterval @fetchBuildStatusInterval
-        @cancelPolling()
-        @clearEventListeners()
-
-  mergeInProgress: (deleteSourceBranch = false)->
-    $.ajax
-      type: 'GET'
-      url: $('.merge-request').data('url')
-      success: (data) =>
-        if data.state == "merged"
-          urlSuffix = if deleteSourceBranch then '?delete_source=true' else ''
-
-          window.location.href = window.location.pathname + urlSuffix
-        else if data.merge_error
-          $('.mr-widget-body').html("<h4>" + data.merge_error + "</h4>")
-        else
-          callback = -> merge_request_widget.mergeInProgress(deleteSourceBranch)
-          setTimeout(callback, 2000)
-      dataType: 'json'
-
-  getMergeStatus: ->
-    $.get @opts.merge_check_url, (data) ->
-      $('.mr-state-widget').replaceWith(data)
-
-  ciLabelForStatus: (status) ->
-    if status is 'success'
-      'passed'
-    else
-      status
-
-  pollCIStatus: ->
-    @fetchBuildStatusInterval = setInterval ( =>
-      return if not @readyForCICheck
-
-      @getCIStatus(true)
-
-      @readyForCICheck = false
-    ), 10000
-
-  getCIStatus: (showNotification) ->
-    _this = @
-    $('.ci-widget-fetching').show()
-
-    $.getJSON @opts.ci_status_url, (data) =>
-      return if @cancel
-      @readyForCICheck = true
-
-      if data.status is ''
-        return
-
-      if @firstCICheck || data.status isnt @opts.ci_status and data.status?
-        @opts.ci_status = data.status
-        @showCIStatus data.status
-        if data.coverage
-          @showCICoverage data.coverage
-
-        # The first check should only update the UI, a notification
-        # should only be displayed on status changes
-        if showNotification and not @firstCICheck
-          status = @ciLabelForStatus(data.status)
-
-          if status is "preparing"
-            title = @opts.ci_title.preparing
-            status = status.charAt(0).toUpperCase() + status.slice(1);
-            message = @opts.ci_message.preparing.replace('{{status}}', status)
-          else
-            title = @opts.ci_title.normal
-            message = @opts.ci_message.normal.replace('{{status}}', status)
-
-          title = title.replace('{{status}}', status)
-          message = message.replace('{{sha}}', data.sha)
-          message = message.replace('{{title}}', data.title)
-
-          notify(
-            title,
-            message,
-            @opts.gitlab_icon,
-            ->
-              @close()
-              Turbolinks.visit _this.opts.builds_path
-          )
-        @firstCICheck = false
-
-  showCIStatus: (state) ->
-    return if not state?
-    $('.ci_widget').hide()
-    allowed_states = ["failed", "canceled", "running", "pending", "success", "skipped", "not_found"]
-    if state in allowed_states
-      $('.ci_widget.ci-' + state).show()
-      switch state
-        when "failed", "canceled", "not_found"
-          @setMergeButtonClass('btn-danger')
-        when "running"
-          @setMergeButtonClass('btn-warning')
-        when "success"
-          @setMergeButtonClass('btn-create')
-    else
-      $('.ci_widget.ci-error').show()
-      @setMergeButtonClass('btn-danger')
-
-  showCICoverage: (coverage) ->
-    text = 'Coverage ' + coverage + '%'
-    $('.ci_widget:visible .ci-coverage').text(text)
-
-  setMergeButtonClass: (css_class) ->
-    $('.js-merge-button,.accept-action .dropdown-toggle')
-      .removeClass('btn-danger btn-warning btn-create')
-      .addClass(css_class)
diff --git a/app/assets/javascripts/merged_buttons.js b/app/assets/javascripts/merged_buttons.js
new file mode 100644
index 00000000000..1fed38661a2
--- /dev/null
+++ b/app/assets/javascripts/merged_buttons.js
@@ -0,0 +1,45 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.MergedButtons = (function() {
+    function MergedButtons() {
+      this.removeSourceBranch = bind(this.removeSourceBranch, this);
+      this.$removeBranchWidget = $('.remove_source_branch_widget');
+      this.$removeBranchProgress = $('.remove_source_branch_in_progress');
+      this.$removeBranchFailed = $('.remove_source_branch_widget.failed');
+      this.cleanEventListeners();
+      this.initEventListeners();
+    }
+
+    MergedButtons.prototype.cleanEventListeners = function() {
+      $(document).off('click', '.remove_source_branch');
+      $(document).off('ajax:success', '.remove_source_branch');
+      return $(document).off('ajax:error', '.remove_source_branch');
+    };
+
+    MergedButtons.prototype.initEventListeners = function() {
+      $(document).on('click', '.remove_source_branch', this.removeSourceBranch);
+      $(document).on('ajax:success', '.remove_source_branch', this.removeBranchSuccess);
+      return $(document).on('ajax:error', '.remove_source_branch', this.removeBranchError);
+    };
+
+    MergedButtons.prototype.removeSourceBranch = function() {
+      this.$removeBranchWidget.hide();
+      return this.$removeBranchProgress.show();
+    };
+
+    MergedButtons.prototype.removeBranchSuccess = function() {
+      return location.reload();
+    };
+
+    MergedButtons.prototype.removeBranchError = function() {
+      this.$removeBranchWidget.hide();
+      this.$removeBranchProgress.hide();
+      return this.$removeBranchFailed.show();
+    };
+
+    return MergedButtons;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/merged_buttons.js.coffee b/app/assets/javascripts/merged_buttons.js.coffee
deleted file mode 100644
index 4929295c10b..00000000000
--- a/app/assets/javascripts/merged_buttons.js.coffee
+++ /dev/null
@@ -1,30 +0,0 @@
-class @MergedButtons
-  constructor: ->
-    @$removeBranchWidget = $('.remove_source_branch_widget')
-    @$removeBranchProgress = $('.remove_source_branch_in_progress')
-    @$removeBranchFailed = $('.remove_source_branch_widget.failed')
-
-    @cleanEventListeners()
-    @initEventListeners()
-
-  cleanEventListeners: ->
-    $(document).off 'click', '.remove_source_branch'
-    $(document).off 'ajax:success', '.remove_source_branch'
-    $(document).off 'ajax:error', '.remove_source_branch'
-
-  initEventListeners: ->
-    $(document).on 'click', '.remove_source_branch', @removeSourceBranch
-    $(document).on 'ajax:success', '.remove_source_branch', @removeBranchSuccess
-    $(document).on 'ajax:error', '.remove_source_branch', @removeBranchError
-
-  removeSourceBranch: =>
-    @$removeBranchWidget.hide()
-    @$removeBranchProgress.show()
-
-  removeBranchSuccess: ->
-    location.reload()
-
-  removeBranchError: ->
-    @$removeBranchWidget.hide()
-    @$removeBranchProgress.hide()
-    @$removeBranchFailed.show()
diff --git a/app/assets/javascripts/milestone.js b/app/assets/javascripts/milestone.js
new file mode 100644
index 00000000000..e8d51da7d58
--- /dev/null
+++ b/app/assets/javascripts/milestone.js
@@ -0,0 +1,195 @@
+(function() {
+  this.Milestone = (function() {
+    Milestone.updateIssue = function(li, issue_url, data) {
+      return $.ajax({
+        type: "PUT",
+        url: issue_url,
+        data: data,
+        success: (function(_this) {
+          return function(_data) {
+            return _this.successCallback(_data, li);
+          };
+        })(this),
+        error: function(data) {
+          return new Flash("Issue update failed", 'alert');
+        },
+        dataType: "json"
+      });
+    };
+
+    Milestone.sortIssues = function(data) {
+      var sort_issues_url;
+      sort_issues_url = location.href + "/sort_issues";
+      return $.ajax({
+        type: "PUT",
+        url: sort_issues_url,
+        data: data,
+        success: (function(_this) {
+          return function(_data) {
+            return _this.successCallback(_data);
+          };
+        })(this),
+        error: function() {
+          return new Flash("Issues update failed", 'alert');
+        },
+        dataType: "json"
+      });
+    };
+
+    Milestone.sortMergeRequests = function(data) {
+      var sort_mr_url;
+      sort_mr_url = location.href + "/sort_merge_requests";
+      return $.ajax({
+        type: "PUT",
+        url: sort_mr_url,
+        data: data,
+        success: (function(_this) {
+          return function(_data) {
+            return _this.successCallback(_data);
+          };
+        })(this),
+        error: function(data) {
+          return new Flash("Issue update failed", 'alert');
+        },
+        dataType: "json"
+      });
+    };
+
+    Milestone.updateMergeRequest = function(li, merge_request_url, data) {
+      return $.ajax({
+        type: "PUT",
+        url: merge_request_url,
+        data: data,
+        success: (function(_this) {
+          return function(_data) {
+            return _this.successCallback(_data, li);
+          };
+        })(this),
+        error: function(data) {
+          return new Flash("Issue update failed", 'alert');
+        },
+        dataType: "json"
+      });
+    };
+
+    Milestone.successCallback = function(data, element) {
+      var img_tag;
+      if (data.assignee) {
+        img_tag = $('<img/>');
+        img_tag.attr('src', data.assignee.avatar_url);
+        img_tag.addClass('avatar s16');
+        $(element).find('.assignee-icon').html(img_tag);
+      } else {
+        $(element).find('.assignee-icon').html('');
+      }
+      return $(element).effect('highlight');
+    };
+
+    function Milestone() {
+      var oldMouseStart;
+      oldMouseStart = $.ui.sortable.prototype._mouseStart;
+      $.ui.sortable.prototype._mouseStart = function(event, overrideHandle, noActivation) {
+        this._trigger("beforeStart", event, this._uiHash());
+        return oldMouseStart.apply(this, [event, overrideHandle, noActivation]);
+      };
+      this.bindIssuesSorting();
+      this.bindMergeRequestSorting();
+      this.bindTabsSwitching();
+    }
+
+    Milestone.prototype.bindIssuesSorting = function() {
+      return $("#issues-list-unassigned, #issues-list-ongoing, #issues-list-closed").sortable({
+        connectWith: ".issues-sortable-list",
+        dropOnEmpty: true,
+        items: "li:not(.ui-sort-disabled)",
+        beforeStart: function(event, ui) {
+          return $(".issues-sortable-list").css("min-height", ui.item.outerHeight());
+        },
+        stop: function(event, ui) {
+          return $(".issues-sortable-list").css("min-height", "0px");
+        },
+        update: function(event, ui) {
+          var data;
+          if ($(this).find(ui.item).length > 0) {
+            data = $(this).sortable("serialize");
+            return Milestone.sortIssues(data);
+          }
+        },
+        receive: function(event, ui) {
+          var data, issue_id, issue_url, new_state;
+          new_state = $(this).data('state');
+          issue_id = ui.item.data('iid');
+          issue_url = ui.item.data('url');
+          data = (function() {
+            switch (new_state) {
+              case 'ongoing':
+                return "issue[assignee_id]=" + gon.current_user_id;
+              case 'unassigned':
+                return "issue[assignee_id]=";
+              case 'closed':
+                return "issue[state_event]=close";
+            }
+          })();
+          if ($(ui.sender).data('state') === "closed") {
+            data += "&issue[state_event]=reopen";
+          }
+          return Milestone.updateIssue(ui.item, issue_url, data);
+        }
+      }).disableSelection();
+    };
+
+    Milestone.prototype.bindTabsSwitching = function() {
+      return $('a[data-toggle="tab"]').on('show.bs.tab', function(e) {
+        var currentTabClass, previousTabClass;
+        currentTabClass = $(e.target).data('show');
+        previousTabClass = $(e.relatedTarget).data('show');
+        $(previousTabClass).hide();
+        $(currentTabClass).removeClass('hidden');
+        return $(currentTabClass).show();
+      });
+    };
+
+    Milestone.prototype.bindMergeRequestSorting = function() {
+      return $("#merge_requests-list-unassigned, #merge_requests-list-ongoing, #merge_requests-list-closed").sortable({
+        connectWith: ".merge_requests-sortable-list",
+        dropOnEmpty: true,
+        items: "li:not(.ui-sort-disabled)",
+        beforeStart: function(event, ui) {
+          return $(".merge_requests-sortable-list").css("min-height", ui.item.outerHeight());
+        },
+        stop: function(event, ui) {
+          return $(".merge_requests-sortable-list").css("min-height", "0px");
+        },
+        update: function(event, ui) {
+          var data;
+          data = $(this).sortable("serialize");
+          return Milestone.sortMergeRequests(data);
+        },
+        receive: function(event, ui) {
+          var data, merge_request_id, merge_request_url, new_state;
+          new_state = $(this).data('state');
+          merge_request_id = ui.item.data('iid');
+          merge_request_url = ui.item.data('url');
+          data = (function() {
+            switch (new_state) {
+              case 'ongoing':
+                return "merge_request[assignee_id]=" + gon.current_user_id;
+              case 'unassigned':
+                return "merge_request[assignee_id]=";
+              case 'closed':
+                return "merge_request[state_event]=close";
+            }
+          })();
+          if ($(ui.sender).data('state') === "closed") {
+            data += "&merge_request[state_event]=reopen";
+          }
+          return Milestone.updateMergeRequest(ui.item, merge_request_url, data);
+        }
+      }).disableSelection();
+    };
+
+    return Milestone;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/milestone.js.coffee b/app/assets/javascripts/milestone.js.coffee
deleted file mode 100644
index a19e68b39e2..00000000000
--- a/app/assets/javascripts/milestone.js.coffee
+++ /dev/null
@@ -1,146 +0,0 @@
-class @Milestone
-  @updateIssue: (li, issue_url, data) ->
-    $.ajax
-      type: "PUT"
-      url: issue_url
-      data: data
-      success: (_data) =>
-        @successCallback(_data, li)
-      error: (data) ->
-        new Flash("Issue update failed", 'alert')
-      dataType: "json"
-
-  @sortIssues: (data) ->
-    sort_issues_url = location.href + "/sort_issues"
-
-    $.ajax
-      type: "PUT"
-      url: sort_issues_url
-      data: data
-      success: (_data) =>
-        @successCallback(_data)
-      error: ->
-        new Flash("Issues update failed", 'alert')
-      dataType: "json"
-
-  @sortMergeRequests: (data) ->
-    sort_mr_url = location.href + "/sort_merge_requests"
-
-    $.ajax
-      type: "PUT"
-      url: sort_mr_url
-      data: data
-      success: (_data) =>
-        @successCallback(_data)
-      error: (data) ->
-        new Flash("Issue update failed", 'alert')
-      dataType: "json"
-
-  @updateMergeRequest: (li, merge_request_url, data) ->
-    $.ajax
-      type: "PUT"
-      url: merge_request_url
-      data: data
-      success: (_data) =>
-        @successCallback(_data, li)
-      error: (data) ->
-        new Flash("Issue update failed", 'alert')
-      dataType: "json"
-
-  @successCallback: (data, element) =>
-    if data.assignee
-      img_tag = $('<img/>')
-      img_tag.attr('src', data.assignee.avatar_url)
-      img_tag.addClass('avatar s16')
-      $(element).find('.assignee-icon').html(img_tag)
-    else
-      $(element).find('.assignee-icon').html('')
-
-    $(element).effect 'highlight'
-
-  constructor: ->
-    oldMouseStart = $.ui.sortable.prototype._mouseStart
-    $.ui.sortable.prototype._mouseStart = (event, overrideHandle, noActivation) ->
-      this._trigger "beforeStart", event, this._uiHash()
-      oldMouseStart.apply this, [event, overrideHandle, noActivation]
-
-    @bindIssuesSorting()
-    @bindMergeRequestSorting()
-    @bindTabsSwitching()
-
-  bindIssuesSorting: ->
-    $("#issues-list-unassigned, #issues-list-ongoing, #issues-list-closed").sortable(
-      connectWith: ".issues-sortable-list",
-      dropOnEmpty: true,
-      items: "li:not(.ui-sort-disabled)",
-      beforeStart: (event, ui) ->
-        $(".issues-sortable-list").css "min-height", ui.item.outerHeight()
-      stop: (event, ui) ->
-        $(".issues-sortable-list").css "min-height", "0px"
-      update: (event, ui) ->
-        # Prevents sorting from container which element has been removed.
-        if $(this).find(ui.item).length > 0
-          data = $(this).sortable("serialize")
-          Milestone.sortIssues(data)
-
-      receive: (event, ui) ->
-        new_state = $(this).data('state')
-        issue_id = ui.item.data('iid')
-        issue_url = ui.item.data('url')
-
-        data = switch new_state
-          when 'ongoing'
-            "issue[assignee_id]=" + gon.current_user_id
-          when 'unassigned'
-            "issue[assignee_id]="
-          when 'closed'
-            "issue[state_event]=close"
-
-        if $(ui.sender).data('state') == "closed"
-          data += "&issue[state_event]=reopen"
-
-        Milestone.updateIssue(ui.item, issue_url, data)
-
-    ).disableSelection()
-
-  bindTabsSwitching: ->
-    $('a[data-toggle="tab"]').on 'show.bs.tab', (e) ->
-      currentTabClass  = $(e.target).data('show')
-      previousTabClass =  $(e.relatedTarget).data('show')
-
-      $(previousTabClass).hide()
-      $(currentTabClass).removeClass('hidden')
-      $(currentTabClass).show()
-
-  bindMergeRequestSorting: ->
-    $("#merge_requests-list-unassigned, #merge_requests-list-ongoing, #merge_requests-list-closed").sortable(
-      connectWith: ".merge_requests-sortable-list",
-      dropOnEmpty: true,
-      items: "li:not(.ui-sort-disabled)",
-      beforeStart: (event, ui) ->
-        $(".merge_requests-sortable-list").css "min-height", ui.item.outerHeight()
-      stop: (event, ui) ->
-        $(".merge_requests-sortable-list").css "min-height", "0px"
-      update: (event, ui) ->
-        data = $(this).sortable("serialize")
-        Milestone.sortMergeRequests(data)
-
-      receive: (event, ui) ->
-        new_state = $(this).data('state')
-        merge_request_id = ui.item.data('iid')
-        merge_request_url = ui.item.data('url')
-
-        data = switch new_state
-          when 'ongoing'
-            "merge_request[assignee_id]=" + gon.current_user_id
-          when 'unassigned'
-            "merge_request[assignee_id]="
-          when 'closed'
-            "merge_request[state_event]=close"
-
-        if $(ui.sender).data('state') == "closed"
-          data += "&merge_request[state_event]=reopen"
-
-        Milestone.updateMergeRequest(ui.item, merge_request_url, data)
-
-    ).disableSelection()
diff --git a/app/assets/javascripts/milestone_select.js b/app/assets/javascripts/milestone_select.js
new file mode 100644
index 00000000000..a0b65d20c03
--- /dev/null
+++ b/app/assets/javascripts/milestone_select.js
@@ -0,0 +1,151 @@
+(function() {
+  this.MilestoneSelect = (function() {
+    function MilestoneSelect(currentProject) {
+      var _this;
+      if (currentProject != null) {
+        _this = this;
+        this.currentProject = JSON.parse(currentProject);
+      }
+      $('.js-milestone-select').each(function(i, dropdown) {
+        var $block, $dropdown, $loading, $selectbox, $sidebarCollapsedValue, $value, abilityName, collapsedSidebarLabelTemplate, defaultLabel, issuableId, issueUpdateURL, milestoneLinkNoneTemplate, milestoneLinkTemplate, milestonesUrl, projectId, selectedMilestone, showAny, showNo, showUpcoming, useId;
+        $dropdown = $(dropdown);
+        projectId = $dropdown.data('project-id');
+        milestonesUrl = $dropdown.data('milestones');
+        issueUpdateURL = $dropdown.data('issueUpdate');
+        selectedMilestone = $dropdown.data('selected');
+        showNo = $dropdown.data('show-no');
+        showAny = $dropdown.data('show-any');
+        showUpcoming = $dropdown.data('show-upcoming');
+        useId = $dropdown.data('use-id');
+        defaultLabel = $dropdown.data('default-label');
+        issuableId = $dropdown.data('issuable-id');
+        abilityName = $dropdown.data('ability-name');
+        $selectbox = $dropdown.closest('.selectbox');
+        $block = $selectbox.closest('.block');
+        $sidebarCollapsedValue = $block.find('.sidebar-collapsed-icon');
+        $value = $block.find('.value');
+        $loading = $block.find('.block-loading').fadeOut();
+        if (issueUpdateURL) {
+          milestoneLinkTemplate = _.template('<a href="/<%- namespace %>/<%- path %>/milestones/<%- iid %>" class="bold has-tooltip" data-container="body" title="<%- remaining %>"><%- title %></a>');
+          milestoneLinkNoneTemplate = '<span class="no-value">None</span>';
+          collapsedSidebarLabelTemplate = _.template('<span class="has-tooltip" data-container="body" title="<%- remaining %>" data-placement="left"> <%- title %> </span>');
+        }
+        return $dropdown.glDropdown({
+          data: function(term, callback) {
+            return $.ajax({
+              url: milestonesUrl
+            }).done(function(data) {
+              var extraOptions;
+              extraOptions = [];
+              if (showAny) {
+                extraOptions.push({
+                  id: 0,
+                  name: '',
+                  title: 'Any Milestone'
+                });
+              }
+              if (showNo) {
+                extraOptions.push({
+                  id: -1,
+                  name: 'No Milestone',
+                  title: 'No Milestone'
+                });
+              }
+              if (showUpcoming) {
+                extraOptions.push({
+                  id: -2,
+                  name: '#upcoming',
+                  title: 'Upcoming'
+                });
+              }
+              if (extraOptions.length > 2) {
+                extraOptions.push('divider');
+              }
+              return callback(extraOptions.concat(data));
+            });
+          },
+          filterable: true,
+          search: {
+            fields: ['title']
+          },
+          selectable: true,
+          toggleLabel: function(selected) {
+            if (selected && 'id' in selected) {
+              return selected.title;
+            } else {
+              return defaultLabel;
+            }
+          },
+          fieldName: $dropdown.data('field-name'),
+          text: function(milestone) {
+            return _.escape(milestone.title);
+          },
+          id: function(milestone) {
+            if (!useId) {
+              return milestone.name;
+            } else {
+              return milestone.id;
+            }
+          },
+          isSelected: function(milestone) {
+            return milestone.name === selectedMilestone;
+          },
+          hidden: function() {
+            $selectbox.hide();
+            return $value.css('display', '');
+          },
+          clicked: function(selected) {
+            var data, isIssueIndex, isMRIndex, page;
+            page = $('body').data('page');
+            isIssueIndex = page === 'projects:issues:index';
+            isMRIndex = (page === page && page === 'projects:merge_requests:index');
+            if ($dropdown.hasClass('js-filter-bulk-update')) {
+              return;
+            }
+            if ($dropdown.hasClass('js-filter-submit') && (isIssueIndex || isMRIndex)) {
+              if (selected.name != null) {
+                selectedMilestone = selected.name;
+              } else {
+                selectedMilestone = '';
+              }
+              return Issuable.filterResults($dropdown.closest('form'));
+            } else if ($dropdown.hasClass('js-filter-submit')) {
+              return $dropdown.closest('form').submit();
+            } else {
+              selected = $selectbox.find('input[type="hidden"]').val();
+              data = {};
+              data[abilityName] = {};
+              data[abilityName].milestone_id = selected != null ? selected : null;
+              $loading.fadeIn();
+              $dropdown.trigger('loading.gl.dropdown');
+              return $.ajax({
+                type: 'PUT',
+                url: issueUpdateURL,
+                data: data
+              }).done(function(data) {
+                $dropdown.trigger('loaded.gl.dropdown');
+                $loading.fadeOut();
+                $selectbox.hide();
+                $value.css('display', '');
+                if (data.milestone != null) {
+                  data.milestone.namespace = _this.currentProject.namespace;
+                  data.milestone.path = _this.currentProject.path;
+                  data.milestone.remaining = $.timefor(data.milestone.due_date);
+                  $value.html(milestoneLinkTemplate(data.milestone));
+                  return $sidebarCollapsedValue.find('span').html(collapsedSidebarLabelTemplate(data.milestone));
+                } else {
+                  $value.html(milestoneLinkNoneTemplate);
+                  return $sidebarCollapsedValue.find('span').text('No');
+                }
+              });
+            }
+          }
+        });
+      });
+    }
+
+    return MilestoneSelect;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/milestone_select.js.coffee b/app/assets/javascripts/milestone_select.js.coffee
deleted file mode 100644
index 3a036569317..00000000000
--- a/app/assets/javascripts/milestone_select.js.coffee
+++ /dev/null
@@ -1,137 +0,0 @@
-class @MilestoneSelect
-  constructor: (currentProject) ->
-    if currentProject?
-      _this = @
-      @currentProject = JSON.parse(currentProject)
-    $('.js-milestone-select').each (i, dropdown) ->
-      $dropdown = $(dropdown)
-      projectId = $dropdown.data('project-id')
-      milestonesUrl = $dropdown.data('milestones')
-      issueUpdateURL = $dropdown.data('issueUpdate')
-      selectedMilestone = $dropdown.data('selected')
-      showNo = $dropdown.data('show-no')
-      showAny = $dropdown.data('show-any')
-      showUpcoming = $dropdown.data('show-upcoming')
-      useId = $dropdown.data('use-id')
-      defaultLabel = $dropdown.data('default-label')
-      issuableId = $dropdown.data('issuable-id')
-      abilityName = $dropdown.data('ability-name')
-      $selectbox = $dropdown.closest('.selectbox')
-      $block = $selectbox.closest('.block')
-      $sidebarCollapsedValue = $block.find('.sidebar-collapsed-icon')
-      $value = $block.find('.value')
-      $loading = $block.find('.block-loading').fadeOut()
-
-      if issueUpdateURL
-        milestoneLinkTemplate = _.template(
-          '<a href="/<%- namespace %>/<%- path %>/milestones/<%- iid %>" class="bold has-tooltip" data-container="body" title="<%- remaining %>"><%- title %></a>'
-        )
-
-        milestoneLinkNoneTemplate = '<span class="no-value">None</span>'
-
-        collapsedSidebarLabelTemplate = _.template(
-          '<span class="has-tooltip" data-container="body" title="<%- remaining %>" data-placement="left">
-            <%- title %>
-          </span>'
-        )
-
-      $dropdown.glDropdown(
-        data: (term, callback) ->
-          $.ajax(
-            url: milestonesUrl
-          ).done (data) ->
-            extraOptions = []
-            if showAny
-              extraOptions.push(
-                id: 0
-                name: ''
-                title: 'Any Milestone'
-              )
-
-            if showNo
-              extraOptions.push(
-                id: -1
-                name: 'No Milestone'
-                title: 'No Milestone'
-              )
-
-            if showUpcoming
-              extraOptions.push(
-                id: -2
-                name: '#upcoming'
-                title: 'Upcoming'
-              )
-
-            if extraOptions.length > 0
-              extraOptions.push 'divider'
-
-            callback(extraOptions.concat(data))
-        filterable: true
-        search:
-          fields: ['title']
-        selectable: true
-        toggleLabel: (selected) ->
-          if selected && 'id' of selected
-            selected.title
-          else
-            defaultLabel
-        fieldName: $dropdown.data('field-name')
-        text: (milestone) ->
-          _.escape(milestone.title)
-        id: (milestone) ->
-          if !useId
-            milestone.name
-          else
-            milestone.id
-        isSelected: (milestone) ->
-          milestone.name is selectedMilestone
-        hidden: ->
-          $selectbox.hide()
-
-          # display:block overrides the hide-collapse rule
-          $value.css('display', '')
-        clicked: (selected) ->
-          page = $('body').data 'page'
-          isIssueIndex = page is 'projects:issues:index'
-          isMRIndex = page is page is 'projects:merge_requests:index'
-
-          if $dropdown.hasClass 'js-filter-bulk-update'
-            return
-
-          if $dropdown.hasClass('js-filter-submit') and (isIssueIndex or isMRIndex)
-            if selected.name?
-              selectedMilestone = selected.name
-            else
-              selectedMilestone = ''
-            Issuable.filterResults $dropdown.closest('form')
-          else if $dropdown.hasClass('js-filter-submit')
-            $dropdown.closest('form').submit()
-          else
-            selected = $selectbox
-              .find('input[type="hidden"]')
-              .val()
-            data = {}
-            data[abilityName] = {}
-            data[abilityName].milestone_id = if selected? then selected else null
-            $loading
-              .fadeIn()
-            $dropdown.trigger('loading.gl.dropdown')
-            $.ajax(
-              type: 'PUT'
-              url: issueUpdateURL
-              data: data
-            ).done (data) ->
-              $dropdown.trigger('loaded.gl.dropdown')
-              $loading.fadeOut()
-              $selectbox.hide()
-              $value.css('display', '')
-              if data.milestone?
-                data.milestone.namespace = _this.currentProject.namespace
-                data.milestone.path = _this.currentProject.path
-                data.milestone.remaining = $.timefor data.milestone.due_date
-                $value.html(milestoneLinkTemplate(data.milestone))
-                $sidebarCollapsedValue.find('span').html(collapsedSidebarLabelTemplate(data.milestone))
-              else
-                $value.html(milestoneLinkNoneTemplate)
-                $sidebarCollapsedValue.find('span').text('No')
-      )
diff --git a/app/assets/javascripts/namespace_select.js b/app/assets/javascripts/namespace_select.js
new file mode 100644
index 00000000000..10f4fd106d8
--- /dev/null
+++ b/app/assets/javascripts/namespace_select.js
@@ -0,0 +1,86 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.NamespaceSelect = (function() {
+    function NamespaceSelect(opts) {
+      this.onSelectItem = bind(this.onSelectItem, this);
+      var fieldName, showAny;
+      this.dropdown = opts.dropdown;
+      showAny = true;
+      fieldName = 'namespace_id';
+      if (this.dropdown.attr('data-field-name')) {
+        fieldName = this.dropdown.data('fieldName');
+      }
+      if (this.dropdown.attr('data-show-any')) {
+        showAny = this.dropdown.data('showAny');
+      }
+      this.dropdown.glDropdown({
+        filterable: true,
+        selectable: true,
+        filterRemote: true,
+        search: {
+          fields: ['path']
+        },
+        fieldName: fieldName,
+        toggleLabel: function(selected) {
+          if (selected.id == null) {
+            return selected.text;
+          } else {
+            return selected.kind + ": " + selected.path;
+          }
+        },
+        data: function(term, dataCallback) {
+          return Api.namespaces(term, function(namespaces) {
+            var anyNamespace;
+            if (showAny) {
+              anyNamespace = {
+                text: 'Any namespace',
+                id: null
+              };
+              namespaces.unshift(anyNamespace);
+              namespaces.splice(1, 0, 'divider');
+            }
+            return dataCallback(namespaces);
+          });
+        },
+        text: function(namespace) {
+          if (namespace.id == null) {
+            return namespace.text;
+          } else {
+            return namespace.kind + ": " + namespace.path;
+          }
+        },
+        renderRow: this.renderRow,
+        clicked: this.onSelectItem
+      });
+    }
+
+    NamespaceSelect.prototype.onSelectItem = function(item, el, e) {
+      return e.preventDefault();
+    };
+
+    return NamespaceSelect;
+
+  })();
+
+  this.NamespaceSelects = (function() {
+    function NamespaceSelects(opts) {
+      var ref;
+      if (opts == null) {
+        opts = {};
+      }
+      this.$dropdowns = (ref = opts.$dropdowns) != null ? ref : $('.js-namespace-select');
+      this.$dropdowns.each(function(i, dropdown) {
+        var $dropdown;
+        $dropdown = $(dropdown);
+        return new NamespaceSelect({
+          dropdown: $dropdown
+        });
+      });
+    }
+
+    return NamespaceSelects;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/namespace_select.js.coffee b/app/assets/javascripts/namespace_select.js.coffee
deleted file mode 100644
index 3b419dff105..00000000000
--- a/app/assets/javascripts/namespace_select.js.coffee
+++ /dev/null
@@ -1,56 +0,0 @@
-class @NamespaceSelect
-  constructor: (opts) ->
-    {
-      @dropdown
-    } = opts
-
-    showAny = true
-    fieldName = 'namespace_id'
-
-    if @dropdown.attr 'data-field-name'
-     fieldName = @dropdown.data 'fieldName'
-
-    if @dropdown.attr 'data-show-any'
-      showAny = @dropdown.data 'showAny'
-
-    @dropdown.glDropdown(
-      filterable: true
-      selectable: true
-      filterRemote: true
-      search:
-        fields: ['path']
-      fieldName: fieldName
-      toggleLabel: (selected) ->
-        return if not selected.id? then selected.text else "#{selected.kind}: #{selected.path}"
-      data: (term, dataCallback) ->
-        Api.namespaces term, (namespaces) ->
-          if showAny
-            anyNamespace =
-              text: 'Any namespace'
-              id: null
-
-            namespaces.unshift(anyNamespace)
-            namespaces.splice 1, 0, 'divider'
-
-          dataCallback(namespaces)
-      text: (namespace) ->
-        return if not namespace.id? then namespace.text else "#{namespace.kind}: #{namespace.path}"
-      renderRow: @renderRow
-      clicked: @onSelectItem
-    )
-
-  onSelectItem: (item, el, e) =>
-    e.preventDefault()
-
-class @NamespaceSelects
-  constructor: (opts = {}) ->
-    {
-      @$dropdowns = $('.js-namespace-select')
-    } = opts
-
-    @$dropdowns.each (i, dropdown) ->
-      $dropdown = $(dropdown)
-
-      new NamespaceSelect(
-        dropdown: $dropdown
-      )
diff --git a/app/assets/javascripts/network/application.js.coffee b/app/assets/javascripts/network/application.js.coffee
deleted file mode 100644
index f75f63869c5..00000000000
--- a/app/assets/javascripts/network/application.js.coffee
+++ /dev/null
@@ -1,17 +0,0 @@
-# This is a manifest file that'll be compiled into including all the files listed below.
-# Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-# be included in the compiled file accessible from http://example.com/assets/application.js
-# It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-# the compiled file.
-#
-#= require_tree .
-
-$ ->
-  network_graph = new Network({
-    url: $(".network-graph").attr('data-url'),
-    commit_url: $(".network-graph").attr('data-commit-url'),
-    ref: $(".network-graph").attr('data-ref'),
-    commit_id: $(".network-graph").attr('data-commit-id')
-  })
-
-  new ShortcutsNetwork(network_graph.branch_graph)
diff --git a/app/assets/javascripts/network/branch-graph.js b/app/assets/javascripts/network/branch-graph.js
new file mode 100644
index 00000000000..c0fec1f8607
--- /dev/null
+++ b/app/assets/javascripts/network/branch-graph.js
@@ -0,0 +1,404 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.BranchGraph = (function() {
+    function BranchGraph(element1, options1) {
+      this.element = element1;
+      this.options = options1;
+      this.scrollTop = bind(this.scrollTop, this);
+      this.scrollBottom = bind(this.scrollBottom, this);
+      this.scrollRight = bind(this.scrollRight, this);
+      this.scrollLeft = bind(this.scrollLeft, this);
+      this.scrollUp = bind(this.scrollUp, this);
+      this.scrollDown = bind(this.scrollDown, this);
+      this.preparedCommits = {};
+      this.mtime = 0;
+      this.mspace = 0;
+      this.parents = {};
+      this.colors = ["#000"];
+      this.offsetX = 150;
+      this.offsetY = 20;
+      this.unitTime = 30;
+      this.unitSpace = 10;
+      this.prev_start = -1;
+      this.load();
+    }
+
+    BranchGraph.prototype.load = function() {
+      return $.ajax({
+        url: this.options.url,
+        method: "get",
+        dataType: "json",
+        success: $.proxy(function(data) {
+          $(".loading", this.element).hide();
+          this.prepareData(data.days, data.commits);
+          return this.buildGraph();
+        }, this)
+      });
+    };
+
+    BranchGraph.prototype.prepareData = function(days, commits) {
+      var c, ch, cw, j, len, ref;
+      this.days = days;
+      this.commits = commits;
+      this.collectParents();
+      this.graphHeight = $(this.element).height();
+      this.graphWidth = $(this.element).width();
+      ch = Math.max(this.graphHeight, this.offsetY + this.unitTime * this.mtime + 150);
+      cw = Math.max(this.graphWidth, this.offsetX + this.unitSpace * this.mspace + 300);
+      this.r = Raphael(this.element.get(0), cw, ch);
+      this.top = this.r.set();
+      this.barHeight = Math.max(this.graphHeight, this.unitTime * this.days.length + 320);
+      ref = this.commits;
+      for (j = 0, len = ref.length; j < len; j++) {
+        c = ref[j];
+        if (c.id in this.parents) {
+          c.isParent = true;
+        }
+        this.preparedCommits[c.id] = c;
+        this.markCommit(c);
+      }
+      return this.collectColors();
+    };
+
+    BranchGraph.prototype.collectParents = function() {
+      var c, j, len, p, ref, results;
+      ref = this.commits;
+      results = [];
+      for (j = 0, len = ref.length; j < len; j++) {
+        c = ref[j];
+        this.mtime = Math.max(this.mtime, c.time);
+        this.mspace = Math.max(this.mspace, c.space);
+        results.push((function() {
+          var l, len1, ref1, results1;
+          ref1 = c.parents;
+          results1 = [];
+          for (l = 0, len1 = ref1.length; l < len1; l++) {
+            p = ref1[l];
+            this.parents[p[0]] = true;
+            results1.push(this.mspace = Math.max(this.mspace, p[1]));
+          }
+          return results1;
+        }).call(this));
+      }
+      return results;
+    };
+
+    BranchGraph.prototype.collectColors = function() {
+      var k, results;
+      k = 0;
+      results = [];
+      while (k < this.mspace) {
+        this.colors.push(Raphael.getColor(.8));
+        Raphael.getColor();
+        Raphael.getColor();
+        results.push(k++);
+      }
+      return results;
+    };
+
+    BranchGraph.prototype.buildGraph = function() {
+      var cuday, cumonth, day, j, len, mm, r, ref;
+      r = this.r;
+      cuday = 0;
+      cumonth = "";
+      r.rect(0, 0, 40, this.barHeight).attr({
+        fill: "#222"
+      });
+      r.rect(40, 0, 30, this.barHeight).attr({
+        fill: "#444"
+      });
+      ref = this.days;
+      for (mm = j = 0, len = ref.length; j < len; mm = ++j) {
+        day = ref[mm];
+        if (cuday !== day[0] || cumonth !== day[1]) {
+          r.text(55, this.offsetY + this.unitTime * mm, day[0]).attr({
+            font: "12px Monaco, monospace",
+            fill: "#BBB"
+          });
+          cuday = day[0];
+        }
+        if (cumonth !== day[1]) {
+          r.text(20, this.offsetY + this.unitTime * mm, day[1]).attr({
+            font: "12px Monaco, monospace",
+            fill: "#EEE"
+          });
+          cumonth = day[1];
+        }
+      }
+      this.renderPartialGraph();
+      return this.bindEvents();
+    };
+
+    BranchGraph.prototype.renderPartialGraph = function() {
+      var commit, end, i, isGraphEdge, start, x, y;
+      start = Math.floor((this.element.scrollTop() - this.offsetY) / this.unitTime) - 10;
+      if (start < 0) {
+        isGraphEdge = true;
+        start = 0;
+      }
+      end = start + 40;
+      if (this.commits.length < end) {
+        isGraphEdge = true;
+        end = this.commits.length;
+      }
+      if (this.prev_start === -1 || Math.abs(this.prev_start - start) > 10 || isGraphEdge) {
+        i = start;
+        this.prev_start = start;
+        while (i < end) {
+          commit = this.commits[i];
+          i += 1;
+          if (commit.hasDrawn !== true) {
+            x = this.offsetX + this.unitSpace * (this.mspace - commit.space);
+            y = this.offsetY + this.unitTime * commit.time;
+            this.drawDot(x, y, commit);
+            this.drawLines(x, y, commit);
+            this.appendLabel(x, y, commit);
+            this.appendAnchor(x, y, commit);
+            commit.hasDrawn = true;
+          }
+        }
+        return this.top.toFront();
+      }
+    };
+
+    BranchGraph.prototype.bindEvents = function() {
+      var element;
+      element = this.element;
+      return $(element).scroll((function(_this) {
+        return function(event) {
+          return _this.renderPartialGraph();
+        };
+      })(this));
+    };
+
+    BranchGraph.prototype.scrollDown = function() {
+      this.element.scrollTop(this.element.scrollTop() + 50);
+      return this.renderPartialGraph();
+    };
+
+    BranchGraph.prototype.scrollUp = function() {
+      this.element.scrollTop(this.element.scrollTop() - 50);
+      return this.renderPartialGraph();
+    };
+
+    BranchGraph.prototype.scrollLeft = function() {
+      this.element.scrollLeft(this.element.scrollLeft() - 50);
+      return this.renderPartialGraph();
+    };
+
+    BranchGraph.prototype.scrollRight = function() {
+      this.element.scrollLeft(this.element.scrollLeft() + 50);
+      return this.renderPartialGraph();
+    };
+
+    BranchGraph.prototype.scrollBottom = function() {
+      return this.element.scrollTop(this.element.find('svg').height());
+    };
+
+    BranchGraph.prototype.scrollTop = function() {
+      return this.element.scrollTop(0);
+    };
+
+    BranchGraph.prototype.appendLabel = function(x, y, commit) {
+      var label, r, rect, shortrefs, text, textbox, triangle;
+      if (!commit.refs) {
+        return;
+      }
+      r = this.r;
+      shortrefs = commit.refs;
+      if (shortrefs.length > 17) {
+        shortrefs = shortrefs.substr(0, 15) + "…";
+      }
+      text = r.text(x + 4, y, shortrefs).attr({
+        "text-anchor": "start",
+        font: "10px Monaco, monospace",
+        fill: "#FFF",
+        title: commit.refs
+      });
+      textbox = text.getBBox();
+      rect = r.rect(x, y - 7, textbox.width + 5, textbox.height + 5, 4).attr({
+        fill: "#000",
+        "fill-opacity": .5,
+        stroke: "none"
+      });
+      triangle = r.path(["M", x - 5, y, "L", x - 15, y - 4, "L", x - 15, y + 4, "Z"]).attr({
+        fill: "#000",
+        "fill-opacity": .5,
+        stroke: "none"
+      });
+      label = r.set(rect, text);
+      label.transform(["t", -rect.getBBox().width - 15, 0]);
+      return text.toFront();
+    };
+
+    BranchGraph.prototype.appendAnchor = function(x, y, commit) {
+      var anchor, options, r, top;
+      r = this.r;
+      top = this.top;
+      options = this.options;
+      anchor = r.circle(x, y, 10).attr({
+        fill: "#000",
+        opacity: 0,
+        cursor: "pointer"
+      }).click(function() {
+        return window.open(options.commit_url.replace("%s", commit.id), "_blank");
+      }).hover(function() {
+        this.tooltip = r.commitTooltip(x + 5, y, commit);
+        return top.push(this.tooltip.insertBefore(this));
+      }, function() {
+        return this.tooltip && this.tooltip.remove() && delete this.tooltip;
+      });
+      return top.push(anchor);
+    };
+
+    BranchGraph.prototype.drawDot = function(x, y, commit) {
+      var avatar_box_x, avatar_box_y, r;
+      r = this.r;
+      r.circle(x, y, 3).attr({
+        fill: this.colors[commit.space],
+        stroke: "none"
+      });
+      avatar_box_x = this.offsetX + this.unitSpace * this.mspace + 10;
+      avatar_box_y = y - 10;
+      r.rect(avatar_box_x, avatar_box_y, 20, 20).attr({
+        stroke: this.colors[commit.space],
+        "stroke-width": 2
+      });
+      r.image(commit.author.icon, avatar_box_x, avatar_box_y, 20, 20);
+      return r.text(this.offsetX + this.unitSpace * this.mspace + 35, y, commit.message.split("\n")[0]).attr({
+        "text-anchor": "start",
+        font: "14px Monaco, monospace"
+      });
+    };
+
+    BranchGraph.prototype.drawLines = function(x, y, commit) {
+      var arrow, color, i, j, len, offset, parent, parentCommit, parentX1, parentX2, parentY, r, ref, results, route;
+      r = this.r;
+      ref = commit.parents;
+      results = [];
+      for (i = j = 0, len = ref.length; j < len; i = ++j) {
+        parent = ref[i];
+        parentCommit = this.preparedCommits[parent[0]];
+        parentY = this.offsetY + this.unitTime * parentCommit.time;
+        parentX1 = this.offsetX + this.unitSpace * (this.mspace - parentCommit.space);
+        parentX2 = this.offsetX + this.unitSpace * (this.mspace - parent[1]);
+        if (parentCommit.space <= commit.space) {
+          color = this.colors[commit.space];
+        } else {
+          color = this.colors[parentCommit.space];
+        }
+        if (parent[1] === commit.space) {
+          offset = [0, 5];
+          arrow = "l-2,5,4,0,-2,-5,0,5";
+        } else if (parent[1] < commit.space) {
+          offset = [3, 3];
+          arrow = "l5,0,-2,4,-3,-4,4,2";
+        } else {
+          offset = [-3, 3];
+          arrow = "l-5,0,2,4,3,-4,-4,2";
+        }
+        route = ["M", x + offset[0], y + offset[1]];
+        if (i > 0) {
+          route.push(arrow);
+        }
+        if (commit.space !== parentCommit.space || commit.space !== parent[1]) {
+          route.push("L", parentX2, y + 10, "L", parentX2, parentY - 5);
+        }
+        route.push("L", parentX1, parentY);
+        results.push(r.path(route).attr({
+          stroke: color,
+          "stroke-width": 2
+        }));
+      }
+      return results;
+    };
+
+    BranchGraph.prototype.markCommit = function(commit) {
+      var r, x, y;
+      if (commit.id === this.options.commit_id) {
+        r = this.r;
+        x = this.offsetX + this.unitSpace * (this.mspace - commit.space);
+        y = this.offsetY + this.unitTime * commit.time;
+        r.path(["M", x + 5, y, "L", x + 15, y + 4, "L", x + 15, y - 4, "Z"]).attr({
+          fill: "#000",
+          "fill-opacity": .5,
+          stroke: "none"
+        });
+        return this.element.scrollTop(y - this.graphHeight / 2);
+      }
+    };
+
+    return BranchGraph;
+
+  })();
+
+  Raphael.prototype.commitTooltip = function(x, y, commit) {
+    var boxHeight, boxWidth, icon, idText, messageText, nameText, rect, textSet, tooltip;
+    boxWidth = 300;
+    boxHeight = 200;
+    icon = this.image(gon.relative_url_root + commit.author.icon, x, y, 20, 20);
+    nameText = this.text(x + 25, y + 10, commit.author.name);
+    idText = this.text(x, y + 35, commit.id);
+    messageText = this.text(x, y + 50, commit.message);
+    textSet = this.set(icon, nameText, idText, messageText).attr({
+      "text-anchor": "start",
+      font: "12px Monaco, monospace"
+    });
+    nameText.attr({
+      font: "14px Arial",
+      "font-weight": "bold"
+    });
+    idText.attr({
+      fill: "#AAA"
+    });
+    this.textWrap(messageText, boxWidth - 50);
+    rect = this.rect(x - 10, y - 10, boxWidth, 100, 4).attr({
+      fill: "#FFF",
+      stroke: "#000",
+      "stroke-linecap": "round",
+      "stroke-width": 2
+    });
+    tooltip = this.set(rect, textSet);
+    rect.attr({
+      height: tooltip.getBBox().height + 10,
+      width: tooltip.getBBox().width + 10
+    });
+    tooltip.transform(["t", 20, 20]);
+    return tooltip;
+  };
+
+  Raphael.prototype.textWrap = function(t, width) {
+    var abc, b, content, h, j, len, letterWidth, s, word, words, x;
+    content = t.attr("text");
+    abc = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    t.attr({
+      text: abc
+    });
+    letterWidth = t.getBBox().width / abc.length;
+    t.attr({
+      text: content
+    });
+    words = content.split(" ");
+    x = 0;
+    s = [];
+    for (j = 0, len = words.length; j < len; j++) {
+      word = words[j];
+      if (x + (word.length * letterWidth) > width) {
+        s.push("\n");
+        x = 0;
+      }
+      x += word.length * letterWidth;
+      s.push(word + " ");
+    }
+    t.attr({
+      text: s.join("")
+    });
+    b = t.getBBox();
+    h = Math.abs(b.y2) - Math.abs(b.y) + 1;
+    return t.attr({
+      y: b.y + h
+    });
+  };
+
+}).call(this);
diff --git a/app/assets/javascripts/network/branch-graph.js.coffee b/app/assets/javascripts/network/branch-graph.js.coffee
deleted file mode 100644
index f2fd2a775a4..00000000000
--- a/app/assets/javascripts/network/branch-graph.js.coffee
+++ /dev/null
@@ -1,340 +0,0 @@
-class @BranchGraph
-  constructor: (@element, @options) ->
-    @preparedCommits = {}
-    @mtime = 0
-    @mspace = 0
-    @parents = {}
-    @colors = ["#000"]
-    @offsetX = 150
-    @offsetY = 20
-    @unitTime = 30
-    @unitSpace = 10
-    @prev_start = -1
-    @load()
-
-  load: ->
-    $.ajax
-      url: @options.url
-      method: "get"
-      dataType: "json"
-      success: $.proxy((data) ->
-        $(".loading", @element).hide()
-        @prepareData data.days, data.commits
-        @buildGraph()
-      , this)
-
-  prepareData: (@days, @commits) ->
-    @collectParents()
-    @graphHeight = $(@element).height()
-    @graphWidth = $(@element).width()
-    ch = Math.max(@graphHeight, @offsetY + @unitTime * @mtime + 150)
-    cw = Math.max(@graphWidth, @offsetX + @unitSpace * @mspace + 300)
-    @r = Raphael(@element.get(0), cw, ch)
-    @top = @r.set()
-    @barHeight = Math.max(@graphHeight, @unitTime * @days.length + 320)
-
-    for c in @commits
-      c.isParent = true  if c.id of @parents
-      @preparedCommits[c.id] = c
-      @markCommit(c)
-
-    @collectColors()
-
-  collectParents: ->
-    for c in @commits
-      @mtime = Math.max(@mtime, c.time)
-      @mspace = Math.max(@mspace, c.space)
-      for p in c.parents
-        @parents[p[0]] = true
-        @mspace = Math.max(@mspace, p[1])
-
-  collectColors: ->
-    k = 0
-    while k < @mspace
-      @colors.push Raphael.getColor(.8)
-      # Skipping a few colors in the spectrum to get more contrast between colors
-      Raphael.getColor()
-      Raphael.getColor()
-      k++
-
-  buildGraph: ->
-    r = @r
-    cuday = 0
-    cumonth = ""
-
-    r.rect(0, 0, 40, @barHeight).attr fill: "#222"
-    r.rect(40, 0, 30, @barHeight).attr fill: "#444"
-
-    for day, mm in @days
-      if cuday isnt day[0] || cumonth isnt day[1]
-        # Dates
-        r.text(55, @offsetY + @unitTime * mm, day[0])
-          .attr(
-            font: "12px Monaco, monospace"
-            fill: "#BBB"
-          )
-        cuday = day[0]
-
-      if cumonth isnt day[1]
-        # Months
-        r.text(20, @offsetY + @unitTime * mm, day[1])
-          .attr(
-            font: "12px Monaco, monospace"
-            fill: "#EEE"
-          )
-        cumonth = day[1]
-
-    @renderPartialGraph()
-
-    @bindEvents()
-
-  renderPartialGraph: ->
-    start = Math.floor((@element.scrollTop() - @offsetY) / @unitTime) - 10
-    if start < 0
-      isGraphEdge = true
-      start = 0
-    end = start + 40
-    if @commits.length < end
-      isGraphEdge = true
-      end = @commits.length
-
-    if @prev_start == -1 or Math.abs(@prev_start - start) > 10 or isGraphEdge
-      i = start
-
-      @prev_start = start
-
-      while i < end
-        commit = @commits[i]
-        i += 1
-
-        if commit.hasDrawn isnt true
-          x = @offsetX + @unitSpace * (@mspace - commit.space)
-          y = @offsetY + @unitTime * commit.time
-
-          @drawDot(x, y, commit)
-
-          @drawLines(x, y, commit)
-
-          @appendLabel(x, y, commit)
-
-          @appendAnchor(x, y, commit)
-
-          commit.hasDrawn = true
-
-      @top.toFront()
-
-  bindEvents: ->
-    element = @element
-
-    $(element).scroll (event) =>
-      @renderPartialGraph()
-
-  scrollDown: =>
-    @element.scrollTop @element.scrollTop() + 50
-    @renderPartialGraph()
-
-  scrollUp: =>
-    @element.scrollTop @element.scrollTop() - 50
-    @renderPartialGraph()
-
-  scrollLeft: =>
-    @element.scrollLeft @element.scrollLeft() - 50
-    @renderPartialGraph()
-
-  scrollRight: =>
-    @element.scrollLeft @element.scrollLeft() + 50
-    @renderPartialGraph()
-
-  scrollBottom: =>
-    @element.scrollTop @element.find('svg').height()
-
-  scrollTop: =>
-    @element.scrollTop 0
-
-  appendLabel: (x, y, commit) ->
-    return unless commit.refs
-
-    r = @r
-    shortrefs = commit.refs
-    # Truncate if longer than 15 chars
-    shortrefs = shortrefs.substr(0, 15) + "…"  if shortrefs.length > 17
-    text = r.text(x + 4, y, shortrefs).attr(
-      "text-anchor": "start"
-      font: "10px Monaco, monospace"
-      fill: "#FFF"
-      title: commit.refs
-    )
-    textbox = text.getBBox()
-    # Create rectangle based on the size of the textbox
-    rect = r.rect(x, y - 7, textbox.width + 5, textbox.height + 5, 4).attr(
-      fill: "#000"
-      "fill-opacity": .5
-      stroke: "none"
-    )
-    triangle = r.path(["M", x - 5, y, "L", x - 15, y - 4, "L", x - 15, y + 4, "Z"]).attr(
-      fill: "#000"
-      "fill-opacity": .5
-      stroke: "none"
-    )
-
-    label = r.set(rect, text)
-    label.transform(["t", -rect.getBBox().width - 15, 0])
-
-    # Set text to front
-    text.toFront()
-
-  appendAnchor: (x, y, commit) ->
-    r = @r
-    top = @top
-    options = @options
-    anchor = r.circle(x, y, 10).attr(
-      fill: "#000"
-      opacity: 0
-      cursor: "pointer"
-    ).click(->
-      window.open options.commit_url.replace("%s", commit.id), "_blank"
-    ).hover(->
-      @tooltip = r.commitTooltip(x + 5, y, commit)
-      top.push @tooltip.insertBefore(this)
-    , ->
-      @tooltip and @tooltip.remove() and delete @tooltip
-    )
-    top.push anchor
-
-  drawDot: (x, y, commit) ->
-    r = @r
-    r.circle(x, y, 3).attr(
-      fill: @colors[commit.space]
-      stroke: "none"
-    )
-
-    avatar_box_x = @offsetX + @unitSpace * @mspace + 10
-    avatar_box_y = y - 10
-    r.rect(avatar_box_x, avatar_box_y, 20, 20).attr(
-      stroke: @colors[commit.space]
-      "stroke-width": 2
-    )
-    r.image(commit.author.icon, avatar_box_x, avatar_box_y, 20, 20)
-    r.text(@offsetX + @unitSpace * @mspace + 35, y, commit.message.split("\n")[0]).attr(
-      "text-anchor": "start"
-      font: "14px Monaco, monospace"
-    )
-
-  drawLines: (x, y, commit) ->
-    r = @r
-    for parent, i in commit.parents
-      parentCommit = @preparedCommits[parent[0]]
-      parentY = @offsetY + @unitTime * parentCommit.time
-      parentX1 = @offsetX + @unitSpace * (@mspace - parentCommit.space)
-      parentX2 = @offsetX + @unitSpace * (@mspace - parent[1])
-
-      # Set line color
-      if parentCommit.space <= commit.space
-        color = @colors[commit.space]
-
-      else
-        color = @colors[parentCommit.space]
-
-      # Build line shape
-      if parent[1] is commit.space
-        offset = [0, 5]
-        arrow = "l-2,5,4,0,-2,-5,0,5"
-
-      else if parent[1] < commit.space
-        offset = [3, 3]
-        arrow = "l5,0,-2,4,-3,-4,4,2"
-
-      else
-        offset = [-3, 3]
-        arrow = "l-5,0,2,4,3,-4,-4,2"
-
-      # Start point
-      route = ["M", x + offset[0], y + offset[1]]
-
-      # Add arrow if not first parent
-      if i > 0
-        route.push(arrow)
-
-      # Circumvent if overlap
-      if commit.space isnt parentCommit.space or commit.space isnt parent[1]
-        route.push(
-          "L", parentX2, y + 10,
-          "L", parentX2, parentY - 5,
-        )
-
-      # End point
-      route.push("L", parentX1, parentY)
-
-      r
-        .path(route)
-        .attr(
-          stroke: color
-          "stroke-width": 2)
-
-  markCommit: (commit) ->
-    if commit.id is @options.commit_id
-      r = @r
-      x = @offsetX + @unitSpace * (@mspace - commit.space)
-      y = @offsetY + @unitTime * commit.time
-      r.path(["M", x + 5, y, "L", x + 15, y + 4, "L", x + 15, y - 4, "Z"]).attr(
-        fill: "#000"
-        "fill-opacity": .5
-        stroke: "none"
-      )
-      # Displayed in the center
-      @element.scrollTop(y - @graphHeight / 2)
-
-Raphael::commitTooltip = (x, y, commit) ->
-  boxWidth = 300
-  boxHeight = 200
-  icon = @image(gon.relative_url_root + commit.author.icon, x, y, 20, 20)
-  nameText = @text(x + 25, y + 10, commit.author.name)
-  idText = @text(x, y + 35, commit.id)
-  messageText = @text(x, y + 50, commit.message)
-  textSet = @set(icon, nameText, idText, messageText).attr(
-    "text-anchor": "start"
-    font: "12px Monaco, monospace"
-  )
-  nameText.attr(
-    font: "14px Arial"
-    "font-weight": "bold"
-  )
-
-  idText.attr fill: "#AAA"
-  @textWrap messageText, boxWidth - 50
-  rect = @rect(x - 10, y - 10, boxWidth, 100, 4).attr(
-    fill: "#FFF"
-    stroke: "#000"
-    "stroke-linecap": "round"
-    "stroke-width": 2
-  )
-  tooltip = @set(rect, textSet)
-  rect.attr(
-    height: tooltip.getBBox().height + 10
-    width: tooltip.getBBox().width + 10
-  )
-
-  tooltip.transform ["t", 20, 20]
-  tooltip
-
-Raphael::textWrap = (t, width) ->
-  content = t.attr("text")
-  abc = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-  t.attr text: abc
-  letterWidth = t.getBBox().width / abc.length
-  t.attr text: content
-  words = content.split(" ")
-  x = 0
-  s = []
-
-  for word in words
-    if x + (word.length * letterWidth) > width
-      s.push "\n"
-      x = 0
-    x += word.length * letterWidth
-    s.push word + " "
-
-  t.attr text: s.join("")
-  b = t.getBBox()
-  h = Math.abs(b.y2) - Math.abs(b.y) + 1
-  t.attr y: b.y + h
diff --git a/app/assets/javascripts/network/network.js b/app/assets/javascripts/network/network.js
new file mode 100644
index 00000000000..7baebcd100a
--- /dev/null
+++ b/app/assets/javascripts/network/network.js
@@ -0,0 +1,19 @@
+(function() {
+  this.Network = (function() {
+    function Network(opts) {
+      var vph;
+      $("#filter_ref").click(function() {
+        return $(this).closest('form').submit();
+      });
+      this.branch_graph = new BranchGraph($(".network-graph"), opts);
+      vph = $(window).height() - 250;
+      $('.network-graph').css({
+        'height': vph + 'px'
+      });
+    }
+
+    return Network;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/network/network.js.coffee b/app/assets/javascripts/network/network.js.coffee
deleted file mode 100644
index f4ef07a50a7..00000000000
--- a/app/assets/javascripts/network/network.js.coffee
+++ /dev/null
@@ -1,9 +0,0 @@
-class @Network
-  constructor: (opts) ->
-    $("#filter_ref").click ->
-      $(this).closest('form').submit()
-
-    @branch_graph = new BranchGraph($(".network-graph"), opts)
-
-    vph = $(window).height() - 250
-    $('.network-graph').css 'height': (vph + 'px')
diff --git a/app/assets/javascripts/network/network_bundle.js b/app/assets/javascripts/network/network_bundle.js
new file mode 100644
index 00000000000..6a7422a7755
--- /dev/null
+++ b/app/assets/javascripts/network/network_bundle.js
@@ -0,0 +1,16 @@
+
+/*= require_tree . */
+
+(function() {
+  $(function() {
+    var network_graph;
+    network_graph = new Network({
+      url: $(".network-graph").attr('data-url'),
+      commit_url: $(".network-graph").attr('data-commit-url'),
+      ref: $(".network-graph").attr('data-ref'),
+      commit_id: $(".network-graph").attr('data-commit-id')
+    });
+    return new ShortcutsNetwork(network_graph.branch_graph);
+  });
+
+}).call(this);
diff --git a/app/assets/javascripts/new_branch_form.js b/app/assets/javascripts/new_branch_form.js
new file mode 100644
index 00000000000..20aa2fced27
--- /dev/null
+++ b/app/assets/javascripts/new_branch_form.js
@@ -0,0 +1,104 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
+    indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
+
+  this.NewBranchForm = (function() {
+    function NewBranchForm(form, availableRefs) {
+      this.validate = bind(this.validate, this);
+      this.branchNameError = form.find('.js-branch-name-error');
+      this.name = form.find('.js-branch-name');
+      this.ref = form.find('#ref');
+      this.setupAvailableRefs(availableRefs);
+      this.setupRestrictions();
+      this.addBinding();
+      this.init();
+    }
+
+    NewBranchForm.prototype.addBinding = function() {
+      return this.name.on('blur', this.validate);
+    };
+
+    NewBranchForm.prototype.init = function() {
+      if (this.name.val().length > 0) {
+        return this.name.trigger('blur');
+      }
+    };
+
+    NewBranchForm.prototype.setupAvailableRefs = function(availableRefs) {
+      return this.ref.autocomplete({
+        source: availableRefs,
+        minLength: 1
+      });
+    };
+
+    NewBranchForm.prototype.setupRestrictions = function() {
+      var endsWith, invalid, single, startsWith;
+      startsWith = {
+        pattern: /^(\/|\.)/g,
+        prefix: "can't start with",
+        conjunction: "or"
+      };
+      endsWith = {
+        pattern: /(\/|\.|\.lock)$/g,
+        prefix: "can't end in",
+        conjunction: "or"
+      };
+      invalid = {
+        pattern: /(\s|~|\^|:|\?|\*|\[|\\|\.\.|@\{|\/{2,}){1}/g,
+        prefix: "can't contain",
+        conjunction: ", "
+      };
+      single = {
+        pattern: /^@+$/g,
+        prefix: "can't be",
+        conjunction: "or"
+      };
+      return this.restrictions = [startsWith, invalid, endsWith, single];
+    };
+
+    NewBranchForm.prototype.validate = function() {
+      var errorMessage, errors, formatter, unique, validator;
+      this.branchNameError.empty();
+      unique = function(values, value) {
+        if (indexOf.call(values, value) < 0) {
+          values.push(value);
+        }
+        return values;
+      };
+      formatter = function(values, restriction) {
+        var formatted;
+        formatted = values.map(function(value) {
+          switch (false) {
+            case !/\s/.test(value):
+              return 'spaces';
+            case !/\/{2,}/g.test(value):
+              return 'consecutive slashes';
+            default:
+              return "'" + value + "'";
+          }
+        });
+        return restriction.prefix + " " + (formatted.join(restriction.conjunction));
+      };
+      validator = (function(_this) {
+        return function(errors, restriction) {
+          var matched;
+          matched = _this.name.val().match(restriction.pattern);
+          if (matched) {
+            return errors.concat(formatter(matched.reduce(unique, []), restriction));
+          } else {
+            return errors;
+          }
+        };
+      })(this);
+      errors = this.restrictions.reduce(validator, []);
+      if (errors.length > 0) {
+        errorMessage = $("<span/>").text(errors.join(', '));
+        return this.branchNameError.append(errorMessage);
+      }
+    };
+
+    return NewBranchForm;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/new_branch_form.js.coffee b/app/assets/javascripts/new_branch_form.js.coffee
deleted file mode 100644
index 4b350854f78..00000000000
--- a/app/assets/javascripts/new_branch_form.js.coffee
+++ /dev/null
@@ -1,78 +0,0 @@
-class @NewBranchForm
-  constructor: (form, availableRefs) ->
-    @branchNameError = form.find('.js-branch-name-error')
-    @name = form.find('.js-branch-name')
-    @ref  = form.find('#ref')
-
-    @setupAvailableRefs(availableRefs)
-    @setupRestrictions()
-    @addBinding()
-    @init()
-
-  addBinding: ->
-    @name.on 'blur', @validate
-
-  init: ->
-    @name.trigger 'blur' if @name.val().length > 0
-
-  setupAvailableRefs: (availableRefs) ->
-    @ref.autocomplete
-      source: availableRefs,
-      minLength: 1
-
-  setupRestrictions: ->
-    startsWith = {
-      pattern: /^(\/|\.)/g,
-      prefix: "can't start with",
-      conjunction: "or"
-    }
-
-    endsWith = {
-      pattern: /(\/|\.|\.lock)$/g,
-      prefix: "can't end in",
-      conjunction: "or"
-    }
-
-    invalid = {
-      pattern: /(\s|~|\^|:|\?|\*|\[|\\|\.\.|@\{|\/{2,}){1}/g
-      prefix: "can't contain",
-      conjunction: ", "
-    }
-
-    single = {
-      pattern: /^@+$/g
-      prefix: "can't be",
-      conjunction: "or"
-    }
-
-    @restrictions = [startsWith, invalid, endsWith, single]
-
-  validate: =>
-    @branchNameError.empty()
-
-    unique = (values, value) ->
-      values.push(value) unless value in values
-      values
-
-    formatter = (values, restriction) ->
-      formatted = values.map (value) ->
-        switch
-          when /\s/.test value then 'spaces'
-          when /\/{2,}/g.test value then 'consecutive slashes'
-          else "'#{value}'"
-
-      "#{restriction.prefix} #{formatted.join(restriction.conjunction)}"
-
-    validator = (errors, restriction) =>
-      matched = @name.val().match(restriction.pattern)
-
-      if matched
-        errors.concat formatter(matched.reduce(unique, []), restriction)
-      else
-        errors
-
-    errors = @restrictions.reduce validator, []
-
-    if errors.length > 0
-      errorMessage = $("<span/>").text(errors.join(', '))
-      @branchNameError.append(errorMessage)
diff --git a/app/assets/javascripts/new_commit_form.js b/app/assets/javascripts/new_commit_form.js
new file mode 100644
index 00000000000..21bf8867f7b
--- /dev/null
+++ b/app/assets/javascripts/new_commit_form.js
@@ -0,0 +1,34 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.NewCommitForm = (function() {
+    function NewCommitForm(form) {
+      this.renderDestination = bind(this.renderDestination, this);
+      this.newBranch = form.find('.js-target-branch');
+      this.originalBranch = form.find('.js-original-branch');
+      this.createMergeRequest = form.find('.js-create-merge-request');
+      this.createMergeRequestContainer = form.find('.js-create-merge-request-container');
+      this.renderDestination();
+      this.newBranch.keyup(this.renderDestination);
+    }
+
+    NewCommitForm.prototype.renderDestination = function() {
+      var different;
+      different = this.newBranch.val() !== this.originalBranch.val();
+      if (different) {
+        this.createMergeRequestContainer.show();
+        if (!this.wasDifferent) {
+          this.createMergeRequest.prop('checked', true);
+        }
+      } else {
+        this.createMergeRequestContainer.hide();
+        this.createMergeRequest.prop('checked', false);
+      }
+      return this.wasDifferent = different;
+    };
+
+    return NewCommitForm;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/new_commit_form.js.coffee b/app/assets/javascripts/new_commit_form.js.coffee
deleted file mode 100644
index 03f0f51acfa..00000000000
--- a/app/assets/javascripts/new_commit_form.js.coffee
+++ /dev/null
@@ -1,21 +0,0 @@
-class @NewCommitForm
-  constructor: (form) ->
-    @newBranch = form.find('.js-target-branch')
-    @originalBranch = form.find('.js-original-branch')
-    @createMergeRequest = form.find('.js-create-merge-request')
-    @createMergeRequestContainer = form.find('.js-create-merge-request-container')
-
-    @renderDestination()
-    @newBranch.keyup @renderDestination
-
-  renderDestination: =>
-    different = @newBranch.val() != @originalBranch.val()
-
-    if different
-      @createMergeRequestContainer.show()
-      @createMergeRequest.prop('checked', true) unless @wasDifferent
-    else
-      @createMergeRequestContainer.hide()
-      @createMergeRequest.prop('checked', false)
-
-    @wasDifferent = different
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
new file mode 100644
index 00000000000..9ece474d994
--- /dev/null
+++ b/app/assets/javascripts/notes.js
@@ -0,0 +1,732 @@
+
+/*= require autosave */
+
+
+/*= require autosize */
+
+
+/*= require dropzone */
+
+
+/*= require dropzone_input */
+
+
+/*= require gfm_auto_complete */
+
+
+/*= require jquery.atwho */
+
+
+/*= require task_list */
+
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.Notes = (function() {
+    var isMetaKey;
+
+    Notes.interval = null;
+
+    function Notes(notes_url, note_ids, last_fetched_at, view) {
+      this.updateTargetButtons = bind(this.updateTargetButtons, this);
+      this.updateCloseButton = bind(this.updateCloseButton, this);
+      this.visibilityChange = bind(this.visibilityChange, this);
+      this.cancelDiscussionForm = bind(this.cancelDiscussionForm, this);
+      this.addDiffNote = bind(this.addDiffNote, this);
+      this.setupDiscussionNoteForm = bind(this.setupDiscussionNoteForm, this);
+      this.replyToDiscussionNote = bind(this.replyToDiscussionNote, this);
+      this.removeNote = bind(this.removeNote, this);
+      this.cancelEdit = bind(this.cancelEdit, this);
+      this.updateNote = bind(this.updateNote, this);
+      this.addDiscussionNote = bind(this.addDiscussionNote, this);
+      this.addNoteError = bind(this.addNoteError, this);
+      this.addNote = bind(this.addNote, this);
+      this.resetMainTargetForm = bind(this.resetMainTargetForm, this);
+      this.refresh = bind(this.refresh, this);
+      this.keydownNoteText = bind(this.keydownNoteText, this);
+      this.notes_url = notes_url;
+      this.note_ids = note_ids;
+      this.last_fetched_at = last_fetched_at;
+      this.view = view;
+      this.noteable_url = document.URL;
+      this.notesCountBadge || (this.notesCountBadge = $(".issuable-details").find(".notes-tab .badge"));
+      this.basePollingInterval = 15000;
+      this.maxPollingSteps = 4;
+      this.cleanBinding();
+      this.addBinding();
+      this.setPollingInterval();
+      this.setupMainTargetNoteForm();
+      this.initTaskList();
+    }
+
+    Notes.prototype.addBinding = function() {
+      $(document).on("ajax:success", ".js-main-target-form", this.addNote);
+      $(document).on("ajax:success", ".js-discussion-note-form", this.addDiscussionNote);
+      $(document).on("ajax:error", ".js-main-target-form", this.addNoteError);
+      $(document).on("ajax:success", "form.edit-note", this.updateNote);
+      $(document).on("click", ".js-note-edit", this.showEditForm);
+      $(document).on("click", ".note-edit-cancel", this.cancelEdit);
+      $(document).on("click", ".js-comment-button", this.updateCloseButton);
+      $(document).on("keyup input", ".js-note-text", this.updateTargetButtons);
+      $(document).on("click", ".js-note-delete", this.removeNote);
+      $(document).on("click", ".js-note-attachment-delete", this.removeAttachment);
+      $(document).on("ajax:complete", ".js-main-target-form", this.reenableTargetFormSubmitButton);
+      $(document).on("ajax:success", ".js-main-target-form", this.resetMainTargetForm);
+      $(document).on("click", ".js-note-discard", this.resetMainTargetForm);
+      $(document).on("change", ".js-note-attachment-input", this.updateFormAttachment);
+      $(document).on("click", ".js-discussion-reply-button", this.replyToDiscussionNote);
+      $(document).on("click", ".js-add-diff-note-button", this.addDiffNote);
+      $(document).on("click", ".js-close-discussion-note-form", this.cancelDiscussionForm);
+      $(document).on("visibilitychange", this.visibilityChange);
+      $(document).on("issuable:change", this.refresh);
+      return $(document).on("keydown", ".js-note-text", this.keydownNoteText);
+    };
+
+    Notes.prototype.cleanBinding = function() {
+      $(document).off("ajax:success", ".js-main-target-form");
+      $(document).off("ajax:success", ".js-discussion-note-form");
+      $(document).off("ajax:success", "form.edit-note");
+      $(document).off("click", ".js-note-edit");
+      $(document).off("click", ".note-edit-cancel");
+      $(document).off("click", ".js-note-delete");
+      $(document).off("click", ".js-note-attachment-delete");
+      $(document).off("ajax:complete", ".js-main-target-form");
+      $(document).off("ajax:success", ".js-main-target-form");
+      $(document).off("click", ".js-discussion-reply-button");
+      $(document).off("click", ".js-add-diff-note-button");
+      $(document).off("visibilitychange");
+      $(document).off("keyup", ".js-note-text");
+      $(document).off("click", ".js-note-target-reopen");
+      $(document).off("click", ".js-note-target-close");
+      $(document).off("click", ".js-note-discard");
+      $(document).off("keydown", ".js-note-text");
+      $('.note .js-task-list-container').taskList('disable');
+      return $(document).off('tasklist:changed', '.note .js-task-list-container');
+    };
+
+    Notes.prototype.keydownNoteText = function(e) {
+      var $textarea, discussionNoteForm, editNote, myLastNote, myLastNoteEditBtn, newText, originalText;
+      if (isMetaKey(e)) {
+        return;
+      }
+      $textarea = $(e.target);
+      switch (e.which) {
+        case 38:
+          if ($textarea.val() !== '') {
+            return;
+          }
+          myLastNote = $("li.note[data-author-id='" + gon.current_user_id + "'][data-editable]:last");
+          if (myLastNote.length) {
+            myLastNoteEditBtn = myLastNote.find('.js-note-edit');
+            return myLastNoteEditBtn.trigger('click', [true, myLastNote]);
+          }
+          break;
+        case 27:
+          discussionNoteForm = $textarea.closest('.js-discussion-note-form');
+          if (discussionNoteForm.length) {
+            if ($textarea.val() !== '') {
+              if (!confirm('Are you sure you want to cancel creating this comment?')) {
+                return;
+              }
+            }
+            this.removeDiscussionNoteForm(discussionNoteForm);
+            return;
+          }
+          editNote = $textarea.closest('.note');
+          if (editNote.length) {
+            originalText = $textarea.closest('form').data('original-note');
+            newText = $textarea.val();
+            if (originalText !== newText) {
+              if (!confirm('Are you sure you want to cancel editing this comment?')) {
+                return;
+              }
+            }
+            return this.removeNoteEditForm(editNote);
+          }
+      }
+    };
+
+    isMetaKey = function(e) {
+      return e.metaKey || e.ctrlKey || e.altKey || e.shiftKey;
+    };
+
+    Notes.prototype.initRefresh = function() {
+      clearInterval(Notes.interval);
+      return Notes.interval = setInterval((function(_this) {
+        return function() {
+          return _this.refresh();
+        };
+      })(this), this.pollingInterval);
+    };
+
+    Notes.prototype.refresh = function() {
+      if (!document.hidden && document.URL.indexOf(this.noteable_url) === 0) {
+        return this.getContent();
+      }
+    };
+
+    Notes.prototype.getContent = function() {
+      if (this.refreshing) {
+        return;
+      }
+      this.refreshing = true;
+      return $.ajax({
+        url: this.notes_url,
+        data: "last_fetched_at=" + this.last_fetched_at,
+        dataType: "json",
+        success: (function(_this) {
+          return function(data) {
+            var notes;
+            notes = data.notes;
+            _this.last_fetched_at = data.last_fetched_at;
+            _this.setPollingInterval(data.notes.length);
+            return $.each(notes, function(i, note) {
+              if (note.discussion_html != null) {
+                return _this.renderDiscussionNote(note);
+              } else {
+                return _this.renderNote(note);
+              }
+            });
+          };
+        })(this)
+      }).always((function(_this) {
+        return function() {
+          return _this.refreshing = false;
+        };
+      })(this));
+    };
+
+
+    /*
+    Increase @pollingInterval up to 120 seconds on every function call,
+    if `shouldReset` has a truthy value, 'null' or 'undefined' the variable
+    will reset to @basePollingInterval.
+    
+    Note: this function is used to gradually increase the polling interval
+    if there aren't new notes coming from the server
+     */
+
+    Notes.prototype.setPollingInterval = function(shouldReset) {
+      var nthInterval;
+      if (shouldReset == null) {
+        shouldReset = true;
+      }
+      nthInterval = this.basePollingInterval * Math.pow(2, this.maxPollingSteps - 1);
+      if (shouldReset) {
+        this.pollingInterval = this.basePollingInterval;
+      } else if (this.pollingInterval < nthInterval) {
+        this.pollingInterval *= 2;
+      }
+      return this.initRefresh();
+    };
+
+
+    /*
+    Render note in main comments area.
+    
+    Note: for rendering inline notes use renderDiscussionNote
+     */
+
+    Notes.prototype.renderNote = function(note) {
+      var $notesList, votesBlock;
+      if (!note.valid) {
+        if (note.award) {
+          new Flash('You have already awarded this emoji!', 'alert');
+        }
+        return;
+      }
+      if (note.award) {
+        votesBlock = $('.js-awards-block').eq(0);
+        gl.awardsHandler.addAwardToEmojiBar(votesBlock, note.name);
+        return gl.awardsHandler.scrollToAwards();
+      } else if (this.isNewNote(note)) {
+        this.note_ids.push(note.id);
+        $notesList = $('ul.main-notes-list');
+        $notesList.append(note.html).syntaxHighlight();
+        gl.utils.localTimeAgo($notesList.find("#note_" + note.id + " .js-timeago"), false);
+        this.initTaskList();
+        return this.updateNotesCount(1);
+      }
+    };
+
+
+    /*
+    Check if note does not exists on page
+     */
+
+    Notes.prototype.isNewNote = function(note) {
+      return $.inArray(note.id, this.note_ids) === -1;
+    };
+
+    Notes.prototype.isParallelView = function() {
+      return this.view === 'parallel';
+    };
+
+
+    /*
+    Render note in discussion area.
+    
+    Note: for rendering inline notes use renderDiscussionNote
+     */
+
+    Notes.prototype.renderDiscussionNote = function(note) {
+      var discussionContainer, form, note_html, row;
+      if (!this.isNewNote(note)) {
+        return;
+      }
+      this.note_ids.push(note.id);
+      form = $("#new-discussion-note-form-" + note.discussion_id);
+      if ((note.original_discussion_id != null) && form.length === 0) {
+        form = $("#new-discussion-note-form-" + note.original_discussion_id);
+      }
+      row = form.closest("tr");
+      note_html = $(note.html);
+      note_html.syntaxHighlight();
+      discussionContainer = $(".notes[data-discussion-id='" + note.discussion_id + "']");
+      if ((note.original_discussion_id != null) && discussionContainer.length === 0) {
+        discussionContainer = $(".notes[data-discussion-id='" + note.original_discussion_id + "']");
+      }
+      if (discussionContainer.length === 0) {
+        row.after(note.diff_discussion_html);
+        row.next().find(".note").remove();
+        discussionContainer = $(".notes[data-discussion-id='" + note.discussion_id + "']");
+        discussionContainer.append(note_html);
+        if ($('body').attr('data-page').indexOf('projects:merge_request') === 0) {
+          $('ul.main-notes-list').append(note.discussion_html).syntaxHighlight();
+        }
+      } else {
+        discussionContainer.append(note_html);
+      }
+      gl.utils.localTimeAgo($('.js-timeago', note_html), false);
+      return this.updateNotesCount(1);
+    };
+
+
+    /*
+    Called in response the main target form has been successfully submitted.
+    
+    Removes any errors.
+    Resets text and preview.
+    Resets buttons.
+     */
+
+    Notes.prototype.resetMainTargetForm = function(e) {
+      var form;
+      form = $(".js-main-target-form");
+      form.find(".js-errors").remove();
+      form.find(".js-md-write-button").click();
+      form.find(".js-note-text").val("").trigger("input");
+      form.find(".js-note-text").data("autosave").reset();
+      return this.updateTargetButtons(e);
+    };
+
+    Notes.prototype.reenableTargetFormSubmitButton = function() {
+      var form;
+      form = $(".js-main-target-form");
+      return form.find(".js-note-text").trigger("input");
+    };
+
+
+    /*
+    Shows the main form and does some setup on it.
+    
+    Sets some hidden fields in the form.
+     */
+
+    Notes.prototype.setupMainTargetNoteForm = function() {
+      var form;
+      form = $(".js-new-note-form");
+      this.formClone = form.clone();
+      this.setupNoteForm(form);
+      form.removeClass("js-new-note-form");
+      form.addClass("js-main-target-form");
+      form.find("#note_line_code").remove();
+      form.find("#note_position").remove();
+      form.find("#note_type").remove();
+      return this.parentTimeline = form.parents('.timeline');
+    };
+
+
+    /*
+    General note form setup.
+    
+    deactivates the submit button when text is empty
+    hides the preview button when text is empty
+    setup GFM auto complete
+    show the form
+     */
+
+    Notes.prototype.setupNoteForm = function(form) {
+      var textarea;
+      new GLForm(form);
+      textarea = form.find(".js-note-text");
+      return new Autosave(textarea, ["Note", form.find("#note_noteable_type").val(), form.find("#note_noteable_id").val(), form.find("#note_commit_id").val(), form.find("#note_type").val(), form.find("#note_line_code").val(), form.find("#note_position").val()]);
+    };
+
+
+    /*
+    Called in response to the new note form being submitted
+    
+    Adds new note to list.
+     */
+
+    Notes.prototype.addNote = function(xhr, note, status) {
+      return this.renderNote(note);
+    };
+
+    Notes.prototype.addNoteError = function(xhr, note, status) {
+      return new Flash('Your comment could not be submitted! Please check your network connection and try again.', 'alert', this.parentTimeline);
+    };
+
+
+    /*
+    Called in response to the new note form being submitted
+    
+    Adds new note to list.
+     */
+
+    Notes.prototype.addDiscussionNote = function(xhr, note, status) {
+      this.renderDiscussionNote(note);
+      return this.removeDiscussionNoteForm($(xhr.target));
+    };
+
+
+    /*
+    Called in response to the edit note form being submitted
+    
+    Updates the current note field.
+     */
+
+    Notes.prototype.updateNote = function(_xhr, note, _status) {
+      var $html, $note_li;
+      $html = $(note.html);
+      gl.utils.localTimeAgo($('.js-timeago', $html));
+      $html.syntaxHighlight();
+      $html.find('.js-task-list-container').taskList('enable');
+      $note_li = $('.note-row-' + note.id);
+      return $note_li.replaceWith($html);
+    };
+
+
+    /*
+    Called in response to clicking the edit note link
+    
+    Replaces the note text with the note edit form
+    Adds a data attribute to the form with the original content of the note for cancellations
+     */
+
+    Notes.prototype.showEditForm = function(e, scrollTo, myLastNote) {
+      var $noteText, done, form, note;
+      e.preventDefault();
+      note = $(this).closest(".note");
+      note.addClass("is-editting");
+      form = note.find(".note-edit-form");
+      form.addClass('current-note-edit-form');
+      note.find(".js-note-attachment-delete").show();
+      done = function($noteText) {
+        var noteTextVal;
+        noteTextVal = $noteText.val();
+        form.find('form.edit-note').data('original-note', noteTextVal);
+        return $noteText.val('').val(noteTextVal);
+      };
+      new GLForm(form);
+      if ((scrollTo != null) && (myLastNote != null)) {
+        $('html, body').scrollTop($(document).height());
+        return $('html, body').animate({
+          scrollTop: myLastNote.offset().top - 150
+        }, 500, function() {
+          var $noteText;
+          $noteText = form.find(".js-note-text");
+          $noteText.focus();
+          return done($noteText);
+        });
+      } else {
+        $noteText = form.find('.js-note-text');
+        $noteText.focus();
+        return done($noteText);
+      }
+    };
+
+
+    /*
+    Called in response to clicking the edit note link
+    
+    Hides edit form and restores the original note text to the editor textarea.
+     */
+
+    Notes.prototype.cancelEdit = function(e) {
+      var note;
+      e.preventDefault();
+      note = $(e.target).closest('.note');
+      return this.removeNoteEditForm(note);
+    };
+
+    Notes.prototype.removeNoteEditForm = function(note) {
+      var form;
+      form = note.find(".current-note-edit-form");
+      note.removeClass("is-editting");
+      form.removeClass("current-note-edit-form");
+      return form.find(".js-note-text").val(form.find('form.edit-note').data('original-note'));
+    };
+
+
+    /*
+    Called in response to deleting a note of any kind.
+    
+    Removes the actual note from view.
+    Removes the whole discussion if the last note is being removed.
+     */
+
+    Notes.prototype.removeNote = function(e) {
+      var noteId;
+      noteId = $(e.currentTarget).closest(".note").attr("id");
+      $(".note[id='" + noteId + "']").each((function(_this) {
+        return function(i, el) {
+          var note, notes;
+          note = $(el);
+          notes = note.closest(".notes");
+          if (notes.find(".note").length === 1) {
+            notes.closest(".timeline-entry").remove();
+            notes.closest("tr").remove();
+          }
+          return note.remove();
+        };
+      })(this));
+      return this.updateNotesCount(-1);
+    };
+
+
+    /*
+    Called in response to clicking the delete attachment link
+    
+    Removes the attachment wrapper view, including image tag if it exists
+    Resets the note editing form
+     */
+
+    Notes.prototype.removeAttachment = function() {
+      var note;
+      note = $(this).closest(".note");
+      note.find(".note-attachment").remove();
+      note.find(".note-body > .note-text").show();
+      note.find(".note-header").show();
+      return note.find(".current-note-edit-form").remove();
+    };
+
+
+    /*
+    Called when clicking on the "reply" button for a diff line.
+    
+    Shows the note form below the notes.
+     */
+
+    Notes.prototype.replyToDiscussionNote = function(e) {
+      var form, replyLink;
+      form = this.formClone.clone();
+      replyLink = $(e.target).closest(".js-discussion-reply-button");
+      replyLink.hide();
+      replyLink.after(form);
+      return this.setupDiscussionNoteForm(replyLink, form);
+    };
+
+
+    /*
+    Shows the diff or discussion form and does some setup on it.
+    
+    Sets some hidden fields in the form.
+    
+    Note: dataHolder must have the "discussionId", "lineCode", "noteableType"
+    and "noteableId" data attributes set.
+     */
+
+    Notes.prototype.setupDiscussionNoteForm = function(dataHolder, form) {
+      form.attr('id', "new-discussion-note-form-" + (dataHolder.data("discussionId")));
+      form.attr("data-line-code", dataHolder.data("lineCode"));
+      form.find("#note_type").val(dataHolder.data("noteType"));
+      form.find("#line_type").val(dataHolder.data("lineType"));
+      form.find("#note_commit_id").val(dataHolder.data("commitId"));
+      form.find("#note_line_code").val(dataHolder.data("lineCode"));
+      form.find("#note_position").val(dataHolder.attr("data-position"));
+      form.find("#note_noteable_type").val(dataHolder.data("noteableType"));
+      form.find("#note_noteable_id").val(dataHolder.data("noteableId"));
+      form.find('.js-note-discard').show().removeClass('js-note-discard').addClass('js-close-discussion-note-form').text(form.find('.js-close-discussion-note-form').data('cancel-text'));
+      this.setupNoteForm(form);
+      form.find(".js-note-text").focus();
+      return form.removeClass('js-main-target-form').addClass("discussion-form js-discussion-note-form");
+    };
+
+
+    /*
+    Called when clicking on the "add a comment" button on the side of a diff line.
+    
+    Inserts a temporary row for the form below the line.
+    Sets up the form and shows it.
+     */
+
+    Notes.prototype.addDiffNote = function(e) {
+      var $link, addForm, hasNotes, lineType, newForm, nextRow, noteForm, notesContent, replyButton, row, rowCssToAdd, targetContent;
+      e.preventDefault();
+      $link = $(e.currentTarget);
+      row = $link.closest("tr");
+      nextRow = row.next();
+      hasNotes = nextRow.is(".notes_holder");
+      addForm = false;
+      targetContent = ".notes_content";
+      rowCssToAdd = "<tr class=\"notes_holder js-temp-notes-holder\"><td class=\"notes_line\" colspan=\"2\"></td><td class=\"notes_content\"></td></tr>";
+      if (this.isParallelView()) {
+        lineType = $link.data("lineType");
+        targetContent += "." + lineType;
+        rowCssToAdd = "<tr class=\"notes_holder js-temp-notes-holder\"><td class=\"notes_line\"></td><td class=\"notes_content parallel old\"></td><td class=\"notes_line\"></td><td class=\"notes_content parallel new\"></td></tr>";
+      }
+      if (hasNotes) {
+        notesContent = nextRow.find(targetContent);
+        if (notesContent.length) {
+          replyButton = notesContent.find(".js-discussion-reply-button:visible");
+          if (replyButton.length) {
+            e.target = replyButton[0];
+            $.proxy(this.replyToDiscussionNote, replyButton[0], e).call();
+          } else {
+            noteForm = notesContent.find(".js-discussion-note-form");
+            if (noteForm.length === 0) {
+              addForm = true;
+            }
+          }
+        }
+      } else {
+        row.after(rowCssToAdd);
+        addForm = true;
+      }
+      if (addForm) {
+        newForm = this.formClone.clone();
+        newForm.appendTo(row.next().find(targetContent));
+        return this.setupDiscussionNoteForm($link, newForm);
+      }
+    };
+
+
+    /*
+    Called in response to "cancel" on a diff note form.
+    
+    Shows the reply button again.
+    Removes the form and if necessary it's temporary row.
+     */
+
+    Notes.prototype.removeDiscussionNoteForm = function(form) {
+      var glForm, row;
+      row = form.closest("tr");
+      glForm = form.data('gl-form');
+      glForm.destroy();
+      form.find(".js-note-text").data("autosave").reset();
+      form.prev(".js-discussion-reply-button").show();
+      if (row.is(".js-temp-notes-holder")) {
+        return row.remove();
+      } else {
+        return form.remove();
+      }
+    };
+
+    Notes.prototype.cancelDiscussionForm = function(e) {
+      var form;
+      e.preventDefault();
+      form = $(e.target).closest(".js-discussion-note-form");
+      return this.removeDiscussionNoteForm(form);
+    };
+
+
+    /*
+    Called after an attachment file has been selected.
+    
+    Updates the file name for the selected attachment.
+     */
+
+    Notes.prototype.updateFormAttachment = function() {
+      var filename, form;
+      form = $(this).closest("form");
+      filename = $(this).val().replace(/^.*[\\\/]/, "");
+      return form.find(".js-attachment-filename").text(filename);
+    };
+
+
+    /*
+    Called when the tab visibility changes
+     */
+
+    Notes.prototype.visibilityChange = function() {
+      return this.refresh();
+    };
+
+    Notes.prototype.updateCloseButton = function(e) {
+      var closebtn, form, textarea;
+      textarea = $(e.target);
+      form = textarea.parents('form');
+      closebtn = form.find('.js-note-target-close');
+      return closebtn.text(closebtn.data('original-text'));
+    };
+
+    Notes.prototype.updateTargetButtons = function(e) {
+      var closebtn, closetext, discardbtn, form, reopenbtn, reopentext, textarea;
+      textarea = $(e.target);
+      form = textarea.parents('form');
+      reopenbtn = form.find('.js-note-target-reopen');
+      closebtn = form.find('.js-note-target-close');
+      discardbtn = form.find('.js-note-discard');
+      if (textarea.val().trim().length > 0) {
+        reopentext = reopenbtn.data('alternative-text');
+        closetext = closebtn.data('alternative-text');
+        if (reopenbtn.text() !== reopentext) {
+          reopenbtn.text(reopentext);
+        }
+        if (closebtn.text() !== closetext) {
+          closebtn.text(closetext);
+        }
+        if (reopenbtn.is(':not(.btn-comment-and-reopen)')) {
+          reopenbtn.addClass('btn-comment-and-reopen');
+        }
+        if (closebtn.is(':not(.btn-comment-and-close)')) {
+          closebtn.addClass('btn-comment-and-close');
+        }
+        if (discardbtn.is(':hidden')) {
+          return discardbtn.show();
+        }
+      } else {
+        reopentext = reopenbtn.data('original-text');
+        closetext = closebtn.data('original-text');
+        if (reopenbtn.text() !== reopentext) {
+          reopenbtn.text(reopentext);
+        }
+        if (closebtn.text() !== closetext) {
+          closebtn.text(closetext);
+        }
+        if (reopenbtn.is('.btn-comment-and-reopen')) {
+          reopenbtn.removeClass('btn-comment-and-reopen');
+        }
+        if (closebtn.is('.btn-comment-and-close')) {
+          closebtn.removeClass('btn-comment-and-close');
+        }
+        if (discardbtn.is(':visible')) {
+          return discardbtn.hide();
+        }
+      }
+    };
+
+    Notes.prototype.initTaskList = function() {
+      this.enableTaskList();
+      return $(document).on('tasklist:changed', '.note .js-task-list-container', this.updateTaskList);
+    };
+
+    Notes.prototype.enableTaskList = function() {
+      return $('.note .js-task-list-container').taskList('enable');
+    };
+
+    Notes.prototype.updateTaskList = function() {
+      return $('form', this).submit();
+    };
+
+    Notes.prototype.updateNotesCount = function(updateCount) {
+      return this.notesCountBadge.text(parseInt(this.notesCountBadge.text()) + updateCount);
+    };
+
+    return Notes;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
deleted file mode 100644
index 0ea54faae1a..00000000000
--- a/app/assets/javascripts/notes.js.coffee
+++ /dev/null
@@ -1,694 +0,0 @@
-#= require autosave
-#= require autosize
-#= require dropzone
-#= require dropzone_input
-#= require gfm_auto_complete
-#= require jquery.atwho
-#= require task_list
-
-class @Notes
-  @interval: null
-
-  constructor: (notes_url, note_ids, last_fetched_at, view) ->
-    @notes_url = notes_url
-    @note_ids = note_ids
-    @last_fetched_at = last_fetched_at
-    @view = view
-    @noteable_url = document.URL
-    @notesCountBadge ||= $(".issuable-details").find(".notes-tab .badge")
-    @basePollingInterval = 15000
-    @maxPollingSteps = 4
-
-    @cleanBinding()
-    @addBinding()
-    @setPollingInterval()
-    @setupMainTargetNoteForm()
-    @initTaskList()
-
-  addBinding: ->
-    # add note to UI after creation
-    $(document).on "ajax:success", ".js-main-target-form", @addNote
-    $(document).on "ajax:success", ".js-discussion-note-form", @addDiscussionNote
-
-    # catch note ajax errors
-    $(document).on "ajax:error", ".js-main-target-form", @addNoteError
-
-    # change note in UI after update
-    $(document).on "ajax:success", "form.edit-note", @updateNote
-
-    # Edit note link
-    $(document).on "click", ".js-note-edit", @showEditForm
-    $(document).on "click", ".note-edit-cancel", @cancelEdit
-
-    # Reopen and close actions for Issue/MR combined with note form submit
-    $(document).on "click", ".js-comment-button", @updateCloseButton
-    $(document).on "keyup input", ".js-note-text", @updateTargetButtons
-
-    # remove a note (in general)
-    $(document).on "click", ".js-note-delete", @removeNote
-
-    # delete note attachment
-    $(document).on "click", ".js-note-attachment-delete", @removeAttachment
-
-    # reset main target form after submit
-    $(document).on "ajax:complete", ".js-main-target-form", @reenableTargetFormSubmitButton
-    $(document).on "ajax:success", ".js-main-target-form", @resetMainTargetForm
-
-    # reset main target form when clicking discard
-    $(document).on "click", ".js-note-discard", @resetMainTargetForm
-
-    # update the file name when an attachment is selected
-    $(document).on "change", ".js-note-attachment-input", @updateFormAttachment
-
-    # reply to diff/discussion notes
-    $(document).on "click", ".js-discussion-reply-button", @replyToDiscussionNote
-
-    # add diff note
-    $(document).on "click", ".js-add-diff-note-button", @addDiffNote
-
-    # hide diff note form
-    $(document).on "click", ".js-close-discussion-note-form", @cancelDiscussionForm
-
-    # fetch notes when tab becomes visible
-    $(document).on "visibilitychange", @visibilityChange
-
-    # when issue status changes, we need to refresh data
-    $(document).on "issuable:change", @refresh
-
-    # when a key is clicked on the notes
-    $(document).on "keydown", ".js-note-text", @keydownNoteText
-
-  cleanBinding: ->
-    $(document).off "ajax:success", ".js-main-target-form"
-    $(document).off "ajax:success", ".js-discussion-note-form"
-    $(document).off "ajax:success", "form.edit-note"
-    $(document).off "click", ".js-note-edit"
-    $(document).off "click", ".note-edit-cancel"
-    $(document).off "click", ".js-note-delete"
-    $(document).off "click", ".js-note-attachment-delete"
-    $(document).off "ajax:complete", ".js-main-target-form"
-    $(document).off "ajax:success", ".js-main-target-form"
-    $(document).off "click", ".js-discussion-reply-button"
-    $(document).off "click", ".js-add-diff-note-button"
-    $(document).off "visibilitychange"
-    $(document).off "keyup", ".js-note-text"
-    $(document).off "click", ".js-note-target-reopen"
-    $(document).off "click", ".js-note-target-close"
-    $(document).off "click", ".js-note-discard"
-    $(document).off "keydown", ".js-note-text"
-
-    $('.note .js-task-list-container').taskList('disable')
-    $(document).off 'tasklist:changed', '.note .js-task-list-container'
-
-  keydownNoteText: (e) =>
-    return if isMetaKey e
-
-    $textarea = $(e.target)
-
-    # Edit previous note when UP arrow is hit
-    switch e.which
-      when 38
-        return unless $textarea.val() is ''
-
-        myLastNote = $("li.note[data-author-id='#{gon.current_user_id}'][data-editable]:last")
-        if myLastNote.length
-          myLastNoteEditBtn = myLastNote.find('.js-note-edit')
-          myLastNoteEditBtn.trigger('click', [true, myLastNote])
-
-      # Cancel creating diff note or editing any note when ESCAPE is hit
-      when 27
-        discussionNoteForm = $textarea.closest('.js-discussion-note-form')
-        if discussionNoteForm.length
-          if $textarea.val() isnt ''
-            return unless confirm('Are you sure you want to cancel creating this comment?')
-
-          @removeDiscussionNoteForm(discussionNoteForm)
-          return
-
-        editNote = $textarea.closest('.note')
-        if editNote.length
-          originalText = $textarea.closest('form').data('original-note')
-          newText = $textarea.val()
-          if originalText isnt newText
-            return unless confirm('Are you sure you want to cancel editing this comment?')
-
-          @removeNoteEditForm(editNote)
-
-
-  isMetaKey = (e) ->
-    (e.metaKey or e.ctrlKey or e.altKey or e.shiftKey)
-
-  initRefresh: ->
-    clearInterval(Notes.interval)
-    Notes.interval = setInterval =>
-      @refresh()
-    , @pollingInterval
-
-  refresh: =>
-    if not document.hidden and document.URL.indexOf(@noteable_url) is 0
-      @getContent()
-
-  getContent: ->
-    return if @refreshing
-
-    @refreshing = true
-
-    $.ajax
-      url: @notes_url
-      data: "last_fetched_at=" + @last_fetched_at
-      dataType: "json"
-      success: (data) =>
-        notes = data.notes
-        @last_fetched_at = data.last_fetched_at
-        @setPollingInterval(data.notes.length)
-        $.each notes, (i, note) =>
-          if note.discussion_with_diff_html?
-            @renderDiscussionNote(note)
-          else
-            @renderNote(note)
-    .always () =>
-      @refreshing = false
-
-  ###
-  Increase @pollingInterval up to 120 seconds on every function call,
-  if `shouldReset` has a truthy value, 'null' or 'undefined' the variable
-  will reset to @basePollingInterval.
-
-  Note: this function is used to gradually increase the polling interval
-  if there aren't new notes coming from the server
-  ###
-  setPollingInterval: (shouldReset = true) ->
-    nthInterval = @basePollingInterval * Math.pow(2, @maxPollingSteps - 1)
-    if shouldReset
-      @pollingInterval = @basePollingInterval
-    else if @pollingInterval < nthInterval
-      @pollingInterval *= 2
-
-    @initRefresh()
-
-  ###
-  Render note in main comments area.
-
-  Note: for rendering inline notes use renderDiscussionNote
-  ###
-  renderNote: (note) ->
-    unless note.valid
-      if note.award
-        new Flash('You have already awarded this emoji!', 'alert')
-      return
-
-    if note.award
-      votesBlock = $('.js-awards-block').eq 0
-      gl.awardsHandler.addAwardToEmojiBar votesBlock, note.name
-      gl.awardsHandler.scrollToAwards()
-
-    # render note if it not present in loaded list
-    # or skip if rendered
-    else if @isNewNote(note)
-      @note_ids.push(note.id)
-
-      $notesList = $('ul.main-notes-list')
-
-      $notesList
-        .append(note.html)
-        .syntaxHighlight()
-
-      # Update datetime format on the recent note
-      gl.utils.localTimeAgo($notesList.find("#note_#{note.id} .js-timeago"), false)
-
-      @initTaskList()
-      @updateNotesCount(1)
-
-
-  ###
-  Check if note does not exists on page
-  ###
-  isNewNote: (note) ->
-    $.inArray(note.id, @note_ids) == -1
-
-  isParallelView: ->
-    @view == 'parallel'
-
-  ###
-  Render note in discussion area.
-
-  Note: for rendering inline notes use renderDiscussionNote
-  ###
-  renderDiscussionNote: (note) ->
-    return unless @isNewNote(note)
-
-    @note_ids.push(note.id)
-    form = $("#new-discussion-note-form-#{note.discussion_id}")
-    if note.original_discussion_id? and form.length is 0
-      form = $("#new-discussion-note-form-#{note.original_discussion_id}")
-    row = form.closest("tr")
-    note_html = $(note.html)
-    note_html.syntaxHighlight()
-
-    # is this the first note of discussion?
-    discussionContainer = $(".notes[data-discussion-id='" + note.discussion_id + "']")
-    if note.original_discussion_id? and discussionContainer.length is 0
-      discussionContainer = $(".notes[data-discussion-id='" + note.original_discussion_id + "']")
-    if discussionContainer.length is 0
-      # insert the note and the reply button after the temp row
-      row.after note.discussion_html
-
-      # remove the note (will be added again below)
-      row.next().find(".note").remove()
-
-      # Before that, the container didn't exist
-      discussionContainer = $(".notes[data-discussion-id='" + note.discussion_id + "']")
-
-      # Add note to 'Changes' page discussions
-      discussionContainer.append note_html
-
-      # Init discussion on 'Discussion' page if it is merge request page
-      if $('body').attr('data-page').indexOf('projects:merge_request') is 0
-        $('ul.main-notes-list')
-          .append(note.discussion_with_diff_html)
-          .syntaxHighlight()
-    else
-      # append new note to all matching discussions
-      discussionContainer.append note_html
-
-    gl.utils.localTimeAgo($('.js-timeago', note_html), false)
-
-    @updateNotesCount(1)
-
-  ###
-  Called in response the main target form has been successfully submitted.
-
-  Removes any errors.
-  Resets text and preview.
-  Resets buttons.
-  ###
-  resetMainTargetForm: (e) =>
-    form = $(".js-main-target-form")
-
-    # remove validation errors
-    form.find(".js-errors").remove()
-
-    # reset text and preview
-    form.find(".js-md-write-button").click()
-    form.find(".js-note-text").val("").trigger "input"
-
-    form.find(".js-note-text").data("autosave").reset()
-
-    @updateTargetButtons(e)
-
-  reenableTargetFormSubmitButton: ->
-    form = $(".js-main-target-form")
-
-    form.find(".js-note-text").trigger "input"
-
-  ###
-  Shows the main form and does some setup on it.
-
-  Sets some hidden fields in the form.
-  ###
-  setupMainTargetNoteForm: ->
-    # find the form
-    form = $(".js-new-note-form")
-
-    # Set a global clone of the form for later cloning
-    @formClone = form.clone()
-
-    # show the form
-    @setupNoteForm(form)
-
-    # fix classes
-    form.removeClass "js-new-note-form"
-    form.addClass "js-main-target-form"
-
-    form.find("#note_line_code").remove()
-    form.find("#note_position").remove()
-    form.find("#note_type").remove()
-
-    @parentTimeline = form.parents('.timeline')
-
-  ###
-  General note form setup.
-
-  deactivates the submit button when text is empty
-  hides the preview button when text is empty
-  setup GFM auto complete
-  show the form
-  ###
-  setupNoteForm: (form) ->
-    new GLForm form
-
-    textarea = form.find(".js-note-text")
-
-    new Autosave textarea, [
-      "Note"
-      form.find("#note_noteable_type").val()
-      form.find("#note_noteable_id").val()
-      form.find("#note_commit_id").val()
-      form.find("#note_type").val()
-      form.find("#note_line_code").val()
-      form.find("#note_position").val()
-    ]
-
-  ###
-  Called in response to the new note form being submitted
-
-  Adds new note to list.
-  ###
-  addNote: (xhr, note, status) =>
-    @renderNote(note)
-
-  addNoteError: (xhr, note, status) =>
-    new Flash('Your comment could not be submitted! Please check your network connection and try again.', 'alert', @parentTimeline)
-
-  ###
-  Called in response to the new note form being submitted
-
-  Adds new note to list.
-  ###
-  addDiscussionNote: (xhr, note, status) =>
-    @renderDiscussionNote(note)
-
-    # cleanup after successfully creating a diff/discussion note
-    @removeDiscussionNoteForm($(xhr.target))
-
-  ###
-  Called in response to the edit note form being submitted
-
-  Updates the current note field.
-  ###
-  updateNote: (_xhr, note, _status) =>
-    # Convert returned HTML to a jQuery object so we can modify it further
-    $html = $(note.html)
-
-    gl.utils.localTimeAgo($('.js-timeago', $html))
-
-    $html.syntaxHighlight()
-    $html.find('.js-task-list-container').taskList('enable')
-
-    # Find the note's `li` element by ID and replace it with the updated HTML
-    $note_li = $('.note-row-' + note.id)
-    $note_li.replaceWith($html)
-
-  ###
-  Called in response to clicking the edit note link
-
-  Replaces the note text with the note edit form
-  Adds a data attribute to the form with the original content of the note for cancellations
-  ###
-  showEditForm: (e, scrollTo, myLastNote) ->
-    e.preventDefault()
-    note = $(this).closest(".note")
-    note.addClass "is-editting"
-    form = note.find(".note-edit-form")
-
-    form.addClass('current-note-edit-form')
-
-    # Show the attachment delete link
-    note.find(".js-note-attachment-delete").show()
-
-    done = ($noteText) ->
-      # Neat little trick to put the cursor at the end
-      noteTextVal = $noteText.val()
-      # Store the original note text in a data attribute to retrieve if a user cancels edit.
-      form.find('form.edit-note').data 'original-note', noteTextVal
-      $noteText.val('').val(noteTextVal);
-
-    new GLForm form
-    if scrollTo? and myLastNote?
-      # scroll to the bottom
-      # so the open of the last element doesn't make a jump
-      $('html, body').scrollTop($(document).height());
-      $('html, body').animate({
-        scrollTop: myLastNote.offset().top - 150
-      }, 500, ->
-        $noteText = form.find(".js-note-text")
-        $noteText.focus()
-        done($noteText)
-      );
-    else
-      $noteText = form.find('.js-note-text')
-      $noteText.focus()
-      done($noteText)
-
-  ###
-  Called in response to clicking the edit note link
-
-  Hides edit form and restores the original note text to the editor textarea.
-  ###
-  cancelEdit: (e) =>
-    e.preventDefault()
-    note = $(e.target).closest('.note')
-    @removeNoteEditForm(note)
-
-  removeNoteEditForm: (note) ->
-    form = note.find(".current-note-edit-form")
-    note.removeClass "is-editting"
-    form.removeClass("current-note-edit-form")
-    # Replace markdown textarea text with original note text.
-    form.find(".js-note-text").val(form.find('form.edit-note').data('original-note'))
-
-  ###
-  Called in response to deleting a note of any kind.
-
-  Removes the actual note from view.
-  Removes the whole discussion if the last note is being removed.
-  ###
-  removeNote: (e) =>
-    noteId = $(e.currentTarget)
-               .closest(".note")
-               .attr("id")
-
-    # A same note appears in the "Discussion" and in the "Changes" tab, we have
-    # to remove all. Using $(".note[id='noteId']") ensure we get all the notes,
-    # where $("#noteId") would return only one.
-    $(".note[id='#{noteId}']").each (i, el) =>
-      note  = $(el)
-      notes = note.closest(".notes")
-
-      # check if this is the last note for this line
-      if notes.find(".note").length is 1
-
-        # "Discussions" tab
-        notes.closest(".timeline-entry").remove()
-
-        # "Changes" tab / commit view
-        notes.closest("tr").remove()
-
-      note.remove()
-
-    # Decrement the "Discussions" counter only once
-    @updateNotesCount(-1)
-
-  ###
-  Called in response to clicking the delete attachment link
-
-  Removes the attachment wrapper view, including image tag if it exists
-  Resets the note editing form
-  ###
-  removeAttachment: ->
-    note = $(this).closest(".note")
-    note.find(".note-attachment").remove()
-    note.find(".note-body > .note-text").show()
-    note.find(".note-header").show()
-    note.find(".current-note-edit-form").remove()
-
-  ###
-  Called when clicking on the "reply" button for a diff line.
-
-  Shows the note form below the notes.
-  ###
-  replyToDiscussionNote: (e) =>
-    form = @formClone.clone()
-    replyLink = $(e.target).closest(".js-discussion-reply-button")
-    replyLink.hide()
-
-    # insert the form after the button
-    replyLink.after form
-
-    # show the form
-    @setupDiscussionNoteForm(replyLink, form)
-
-  ###
-  Shows the diff or discussion form and does some setup on it.
-
-  Sets some hidden fields in the form.
-
-  Note: dataHolder must have the "discussionId", "lineCode", "noteableType"
-  and "noteableId" data attributes set.
-  ###
-  setupDiscussionNoteForm: (dataHolder, form) =>
-    # setup note target
-    form.attr 'id', "new-discussion-note-form-#{dataHolder.data("discussionId")}"
-    form.attr "data-line-code", dataHolder.data("lineCode")
-    form.find("#note_type").val dataHolder.data("noteType")
-    form.find("#line_type").val dataHolder.data("lineType")
-    form.find("#note_commit_id").val dataHolder.data("commitId")
-    form.find("#note_line_code").val dataHolder.data("lineCode")
-    form.find("#note_position").val dataHolder.attr("data-position")
-    form.find("#note_noteable_type").val dataHolder.data("noteableType")
-    form.find("#note_noteable_id").val dataHolder.data("noteableId")
-    form.find('.js-note-discard')
-        .show()
-        .removeClass('js-note-discard')
-        .addClass('js-close-discussion-note-form')
-        .text(form.find('.js-close-discussion-note-form').data('cancel-text'))
-    @setupNoteForm form
-    form.find(".js-note-text").focus()
-    form
-      .removeClass('js-main-target-form')
-      .addClass("discussion-form js-discussion-note-form")
-
-  ###
-  Called when clicking on the "add a comment" button on the side of a diff line.
-
-  Inserts a temporary row for the form below the line.
-  Sets up the form and shows it.
-  ###
-  addDiffNote: (e) =>
-    e.preventDefault()
-    $link = $(e.currentTarget)
-    row = $link.closest("tr")
-    nextRow = row.next()
-    hasNotes = nextRow.is(".notes_holder")
-    addForm = false
-    targetContent = ".notes_content"
-    rowCssToAdd = "<tr class=\"notes_holder js-temp-notes-holder\"><td class=\"notes_line\" colspan=\"2\"></td><td class=\"notes_content\"></td></tr>"
-
-    # In parallel view, look inside the correct left/right pane
-    if @isParallelView()
-      lineType = $link.data("lineType")
-      targetContent += "." + lineType
-      rowCssToAdd = "<tr class=\"notes_holder js-temp-notes-holder\"><td class=\"notes_line\"></td><td class=\"notes_content parallel old\"></td><td class=\"notes_line\"></td><td class=\"notes_content parallel new\"></td></tr>"
-
-    if hasNotes
-      notesContent = nextRow.find(targetContent)
-      if notesContent.length
-        replyButton = notesContent.find(".js-discussion-reply-button:visible")
-        if replyButton.length
-          e.target = replyButton[0]
-          $.proxy(@replyToDiscussionNote, replyButton[0], e).call()
-        else
-          # In parallel view, the form may not be present in one of the panes
-          noteForm = notesContent.find(".js-discussion-note-form")
-          if noteForm.length == 0
-            addForm = true
-    else
-      # add a notes row and insert the form
-      row.after rowCssToAdd
-      addForm = true
-
-    if addForm
-      newForm = @formClone.clone()
-      newForm.appendTo row.next().find(targetContent)
-
-      # show the form
-      @setupDiscussionNoteForm $link, newForm
-
-  ###
-  Called in response to "cancel" on a diff note form.
-
-  Shows the reply button again.
-  Removes the form and if necessary it's temporary row.
-  ###
-  removeDiscussionNoteForm: (form)->
-    row = form.closest("tr")
-
-    glForm = form.data 'gl-form'
-    glForm.destroy()
-
-    form.find(".js-note-text").data("autosave").reset()
-
-    # show the reply button (will only work for replies)
-    form.prev(".js-discussion-reply-button").show()
-    if row.is(".js-temp-notes-holder")
-      # remove temporary row for diff lines
-      row.remove()
-    else
-      # only remove the form
-      form.remove()
-
-  cancelDiscussionForm: (e) =>
-    e.preventDefault()
-    form = $(e.target).closest(".js-discussion-note-form")
-    @removeDiscussionNoteForm(form)
-
-  ###
-  Called after an attachment file has been selected.
-
-  Updates the file name for the selected attachment.
-  ###
-  updateFormAttachment: ->
-    form = $(this).closest("form")
-
-    # get only the basename
-    filename = $(this).val().replace(/^.*[\\\/]/, "")
-    form.find(".js-attachment-filename").text filename
-
-  ###
-  Called when the tab visibility changes
-  ###
-  visibilityChange: =>
-    @refresh()
-
-  updateCloseButton: (e) =>
-    textarea = $(e.target)
-    form = textarea.parents('form')
-    closebtn = form.find('.js-note-target-close')
-    closebtn.text(closebtn.data('original-text'))
-
-  updateTargetButtons: (e) =>
-    textarea = $(e.target)
-    form = textarea.parents('form')
-    reopenbtn = form.find('.js-note-target-reopen')
-    closebtn = form.find('.js-note-target-close')
-    discardbtn = form.find('.js-note-discard')
-
-    if textarea.val().trim().length > 0
-      reopentext = reopenbtn.data('alternative-text')
-      closetext = closebtn.data('alternative-text')
-
-      if reopenbtn.text() isnt reopentext
-        reopenbtn.text(reopentext)
-
-      if closebtn.text() isnt closetext
-        closebtn.text(closetext)
-
-      if reopenbtn.is(':not(.btn-comment-and-reopen)')
-        reopenbtn.addClass('btn-comment-and-reopen')
-
-      if closebtn.is(':not(.btn-comment-and-close)')
-        closebtn.addClass('btn-comment-and-close')
-
-      if discardbtn.is(':hidden')
-        discardbtn.show()
-    else
-      reopentext = reopenbtn.data('original-text')
-      closetext = closebtn.data('original-text')
-
-      if reopenbtn.text() isnt reopentext
-        reopenbtn.text(reopentext)
-
-      if closebtn.text() isnt closetext
-        closebtn.text(closetext)
-
-      if reopenbtn.is('.btn-comment-and-reopen')
-        reopenbtn.removeClass('btn-comment-and-reopen')
-
-      if closebtn.is('.btn-comment-and-close')
-        closebtn.removeClass('btn-comment-and-close')
-
-      if discardbtn.is(':visible')
-        discardbtn.hide()
-
-  initTaskList: ->
-    @enableTaskList()
-    $(document).on 'tasklist:changed', '.note .js-task-list-container', @updateTaskList
-
-  enableTaskList: ->
-    $('.note .js-task-list-container').taskList('enable')
-
-  updateTaskList: ->
-    $('form', this).submit()
-
-  updateNotesCount: (updateCount) ->
-    @notesCountBadge.text(parseInt(@notesCountBadge.text()) + updateCount)
diff --git a/app/assets/javascripts/notifications_dropdown.js b/app/assets/javascripts/notifications_dropdown.js
new file mode 100644
index 00000000000..a41e9d3fabe
--- /dev/null
+++ b/app/assets/javascripts/notifications_dropdown.js
@@ -0,0 +1,30 @@
+(function() {
+  this.NotificationsDropdown = (function() {
+    function NotificationsDropdown() {
+      $(document).off('click', '.update-notification').on('click', '.update-notification', function(e) {
+        var form, label, notificationLevel;
+        e.preventDefault();
+        if ($(this).is('.is-active') && $(this).data('notification-level') === 'custom') {
+          return;
+        }
+        notificationLevel = $(this).data('notification-level');
+        label = $(this).data('notification-title');
+        form = $(this).parents('.notification-form:first');
+        form.find('.js-notification-loading').toggleClass('fa-bell fa-spin fa-spinner');
+        form.find('#notification_setting_level').val(notificationLevel);
+        return form.submit();
+      });
+      $(document).off('ajax:success', '.notification-form').on('ajax:success', '.notification-form', function(e, data) {
+        if (data.saved) {
+          return $(e.currentTarget).closest('.notification-dropdown').replaceWith(data.html);
+        } else {
+          return new Flash('Failed to save new settings', 'alert');
+        }
+      });
+    }
+
+    return NotificationsDropdown;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/notifications_dropdown.js.coffee b/app/assets/javascripts/notifications_dropdown.js.coffee
deleted file mode 100644
index 0bbd082c156..00000000000
--- a/app/assets/javascripts/notifications_dropdown.js.coffee
+++ /dev/null
@@ -1,25 +0,0 @@
-class @NotificationsDropdown
-  constructor: ->
-    $(document)
-      .off 'click', '.update-notification'
-      .on 'click', '.update-notification', (e) ->
-        e.preventDefault()
-
-        return if $(this).is('.is-active') and $(this).data('notification-level') is 'custom'
-
-        notificationLevel = $(@).data 'notification-level'
-        label = $(@).data 'notification-title'
-        form = $(this).parents('.notification-form:first')
-        form.find('.js-notification-loading').toggleClass 'fa-bell fa-spin fa-spinner'
-        form.find('#notification_setting_level').val(notificationLevel)
-        form.submit()
-
-    $(document)
-      .off 'ajax:success', '.notification-form'
-      .on 'ajax:success', '.notification-form', (e, data) ->
-        if data.saved
-          $(e.currentTarget)
-            .closest('.notification-dropdown')
-            .replaceWith(data.html)
-        else
-          new Flash('Failed to save new settings', 'alert')
diff --git a/app/assets/javascripts/notifications_form.js b/app/assets/javascripts/notifications_form.js
new file mode 100644
index 00000000000..6b2ef17ef6b
--- /dev/null
+++ b/app/assets/javascripts/notifications_form.js
@@ -0,0 +1,58 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.NotificationsForm = (function() {
+    function NotificationsForm() {
+      this.toggleCheckbox = bind(this.toggleCheckbox, this);
+      this.removeEventListeners();
+      this.initEventListeners();
+    }
+
+    NotificationsForm.prototype.removeEventListeners = function() {
+      return $(document).off('change', '.js-custom-notification-event');
+    };
+
+    NotificationsForm.prototype.initEventListeners = function() {
+      return $(document).on('change', '.js-custom-notification-event', this.toggleCheckbox);
+    };
+
+    NotificationsForm.prototype.toggleCheckbox = function(e) {
+      var $checkbox, $parent;
+      $checkbox = $(e.currentTarget);
+      $parent = $checkbox.closest('.checkbox');
+      return this.saveEvent($checkbox, $parent);
+    };
+
+    NotificationsForm.prototype.showCheckboxLoadingSpinner = function($parent) {
+      return $parent.addClass('is-loading').find('.custom-notification-event-loading').removeClass('fa-check').addClass('fa-spin fa-spinner').removeClass('is-done');
+    };
+
+    NotificationsForm.prototype.saveEvent = function($checkbox, $parent) {
+      var form;
+      form = $parent.parents('form:first');
+      return $.ajax({
+        url: form.attr('action'),
+        method: form.attr('method'),
+        dataType: 'json',
+        data: form.serialize(),
+        beforeSend: (function(_this) {
+          return function() {
+            return _this.showCheckboxLoadingSpinner($parent);
+          };
+        })(this)
+      }).done(function(data) {
+        $checkbox.enable();
+        if (data.saved) {
+          $parent.find('.custom-notification-event-loading').toggleClass('fa-spin fa-spinner fa-check is-done');
+          return setTimeout(function() {
+            return $parent.removeClass('is-loading').find('.custom-notification-event-loading').toggleClass('fa-spin fa-spinner fa-check is-done');
+          }, 2000);
+        }
+      });
+    };
+
+    return NotificationsForm;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/notifications_form.js.coffee b/app/assets/javascripts/notifications_form.js.coffee
deleted file mode 100644
index 3432428702a..00000000000
--- a/app/assets/javascripts/notifications_form.js.coffee
+++ /dev/null
@@ -1,49 +0,0 @@
-class @NotificationsForm
-  constructor: ->
-    @removeEventListeners()
-    @initEventListeners()
-
-  removeEventListeners: ->
-    $(document).off 'change', '.js-custom-notification-event'
-
-  initEventListeners: ->
-    $(document).on 'change', '.js-custom-notification-event', @toggleCheckbox
-
-  toggleCheckbox: (e) =>
-    $checkbox = $(e.currentTarget)
-    $parent = $checkbox.closest('.checkbox')
-    @saveEvent($checkbox, $parent)
-
-  showCheckboxLoadingSpinner: ($parent) ->
-    $parent
-      .addClass 'is-loading'
-      .find '.custom-notification-event-loading'
-      .removeClass 'fa-check'
-      .addClass 'fa-spin fa-spinner'
-      .removeClass 'is-done'
-
-  saveEvent: ($checkbox, $parent) ->
-    form = $parent.parents('form:first')
-
-    $.ajax(
-      url: form.attr('action')
-      method: form.attr('method')
-      dataType: 'json'
-      data: form.serialize()
-
-      beforeSend: =>
-        @showCheckboxLoadingSpinner($parent)
-    ).done (data) ->
-      $checkbox.enable()
-
-      if data.saved
-        $parent
-          .find '.custom-notification-event-loading'
-          .toggleClass 'fa-spin fa-spinner fa-check is-done'
-
-        setTimeout(->
-          $parent
-            .removeClass 'is-loading'
-            .find '.custom-notification-event-loading'
-            .toggleClass 'fa-spin fa-spinner fa-check is-done'
-        , 2000)
diff --git a/app/assets/javascripts/pager.js b/app/assets/javascripts/pager.js
new file mode 100644
index 00000000000..b81ed50cb48
--- /dev/null
+++ b/app/assets/javascripts/pager.js
@@ -0,0 +1,63 @@
+(function() {
+  this.Pager = {
+    init: function(limit, preload, disable, callback) {
+      this.limit = limit != null ? limit : 0;
+      this.disable = disable != null ? disable : false;
+      this.callback = callback != null ? callback : $.noop;
+      this.loading = $('.loading').first();
+      if (preload) {
+        this.offset = 0;
+        this.getOld();
+      } else {
+        this.offset = this.limit;
+      }
+      return this.initLoadMore();
+    },
+    getOld: function() {
+      this.loading.show();
+      return $.ajax({
+        type: "GET",
+        url: $(".content_list").data('href') || location.href,
+        data: "limit=" + this.limit + "&offset=" + this.offset,
+        complete: (function(_this) {
+          return function() {
+            return _this.loading.hide();
+          };
+        })(this),
+        success: function(data) {
+          Pager.append(data.count, data.html);
+          return Pager.callback();
+        },
+        dataType: "json"
+      });
+    },
+    append: function(count, html) {
+      $(".content_list").append(html);
+      if (count > 0) {
+        return this.offset += count;
+      } else {
+        return this.disable = true;
+      }
+    },
+    initLoadMore: function() {
+      $(document).unbind('scroll');
+      return $(document).endlessScroll({
+        bottomPixels: 400,
+        fireDelay: 1000,
+        fireOnce: true,
+        ceaseFire: function() {
+          return Pager.disable;
+        },
+        callback: (function(_this) {
+          return function(i) {
+            if (!_this.loading.is(':visible')) {
+              _this.loading.show();
+              return Pager.getOld();
+            }
+          };
+        })(this)
+      });
+    }
+  };
+
+}).call(this);
diff --git a/app/assets/javascripts/pager.js.coffee b/app/assets/javascripts/pager.js.coffee
deleted file mode 100644
index 8049c5c30e2..00000000000
--- a/app/assets/javascripts/pager.js.coffee
+++ /dev/null
@@ -1,44 +0,0 @@
-@Pager =
-  init: (@limit = 0, preload, @disable = false, @callback = $.noop) ->
-    @loading = $('.loading').first()
-
-    if preload
-      @offset = 0
-      @getOld()
-    else
-      @offset = @limit
-    @initLoadMore()
-
-  getOld: ->
-    @loading.show()
-    $.ajax
-      type: "GET"
-      url: $(".content_list").data('href') || location.href
-      data: "limit=" + @limit + "&offset=" + @offset
-      complete: =>
-        @loading.hide()
-      success: (data) ->
-        Pager.append(data.count, data.html)
-        Pager.callback()
-      dataType: "json"
-
-  append: (count, html) ->
-    $(".content_list").append html
-    if count > 0
-      @offset += count
-    else
-      @disable = true
-
-  initLoadMore: ->
-    $(document).unbind('scroll')
-    $(document).endlessScroll
-      bottomPixels: 400
-      fireDelay: 1000
-      fireOnce: true
-      ceaseFire: ->
-        Pager.disable
-
-      callback: (i) =>
-        unless @loading.is(':visible')
-          @loading.show()
-          Pager.getOld()
diff --git a/app/assets/javascripts/profile/application.js.coffee b/app/assets/javascripts/profile/application.js.coffee
deleted file mode 100644
index 91cacfece46..00000000000
--- a/app/assets/javascripts/profile/application.js.coffee
+++ /dev/null
@@ -1,2 +0,0 @@
-#
-#= require_tree .
diff --git a/app/assets/javascripts/profile/gl_crop.js b/app/assets/javascripts/profile/gl_crop.js
new file mode 100644
index 00000000000..a3eea316f67
--- /dev/null
+++ b/app/assets/javascripts/profile/gl_crop.js
@@ -0,0 +1,169 @@
+(function() {
+  var GitLabCrop,
+    bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  GitLabCrop = (function() {
+    var FILENAMEREGEX;
+
+    FILENAMEREGEX = /^.*[\\\/]/;
+
+    function GitLabCrop(input, opts) {
+      var ref, ref1, ref2, ref3, ref4;
+      if (opts == null) {
+        opts = {};
+      }
+      this.onUploadImageBtnClick = bind(this.onUploadImageBtnClick, this);
+      this.onModalHide = bind(this.onModalHide, this);
+      this.onModalShow = bind(this.onModalShow, this);
+      this.onPickImageClick = bind(this.onPickImageClick, this);
+      this.fileInput = $(input);
+      this.fileInput.attr('name', (this.fileInput.attr('name')) + "-trigger").attr('id', (this.fileInput.attr('id')) + "-trigger");
+      this.exportWidth = (ref = opts.exportWidth) != null ? ref : 200, this.exportHeight = (ref1 = opts.exportHeight) != null ? ref1 : 200, this.cropBoxWidth = (ref2 = opts.cropBoxWidth) != null ? ref2 : 200, this.cropBoxHeight = (ref3 = opts.cropBoxHeight) != null ? ref3 : 200, this.form = (ref4 = opts.form) != null ? ref4 : this.fileInput.parents('form'), this.filename = opts.filename, this.previewImage = opts.previewImage, this.modalCrop = opts.modalCrop, this.pickImageEl = opts.pickImageEl, this.uploadImageBtn = opts.uploadImageBtn, this.modalCropImg = opts.modalCropImg;
+      this.filename = this.getElement(this.filename);
+      this.previewImage = this.getElement(this.previewImage);
+      this.pickImageEl = this.getElement(this.pickImageEl);
+      this.modalCrop = _.isString(this.modalCrop) ? $(this.modalCrop) : this.modalCrop;
+      this.uploadImageBtn = _.isString(this.uploadImageBtn) ? $(this.uploadImageBtn) : this.uploadImageBtn;
+      this.modalCropImg = _.isString(this.modalCropImg) ? $(this.modalCropImg) : this.modalCropImg;
+      this.cropActionsBtn = this.modalCrop.find('[data-method]');
+      this.bindEvents();
+    }
+
+    GitLabCrop.prototype.getElement = function(selector) {
+      return $(selector, this.form);
+    };
+
+    GitLabCrop.prototype.bindEvents = function() {
+      var _this;
+      _this = this;
+      this.fileInput.on('change', function(e) {
+        return _this.onFileInputChange(e, this);
+      });
+      this.pickImageEl.on('click', this.onPickImageClick);
+      this.modalCrop.on('shown.bs.modal', this.onModalShow);
+      this.modalCrop.on('hidden.bs.modal', this.onModalHide);
+      this.uploadImageBtn.on('click', this.onUploadImageBtnClick);
+      this.cropActionsBtn.on('click', function(e) {
+        var btn;
+        btn = this;
+        return _this.onActionBtnClick(btn);
+      });
+      return this.croppedImageBlob = null;
+    };
+
+    GitLabCrop.prototype.onPickImageClick = function() {
+      return this.fileInput.trigger('click');
+    };
+
+    GitLabCrop.prototype.onModalShow = function() {
+      var _this;
+      _this = this;
+      return this.modalCropImg.cropper({
+        viewMode: 1,
+        center: false,
+        aspectRatio: 1,
+        modal: true,
+        scalable: false,
+        rotatable: false,
+        zoomable: true,
+        dragMode: 'move',
+        guides: false,
+        zoomOnTouch: false,
+        zoomOnWheel: false,
+        cropBoxMovable: false,
+        cropBoxResizable: false,
+        toggleDragModeOnDblclick: false,
+        built: function() {
+          var $image, container, cropBoxHeight, cropBoxWidth;
+          $image = $(this);
+          container = $image.cropper('getContainerData');
+          cropBoxWidth = _this.cropBoxWidth;
+          cropBoxHeight = _this.cropBoxHeight;
+          return $image.cropper('setCropBoxData', {
+            width: cropBoxWidth,
+            height: cropBoxHeight,
+            left: (container.width - cropBoxWidth) / 2,
+            top: (container.height - cropBoxHeight) / 2
+          });
+        }
+      });
+    };
+
+    GitLabCrop.prototype.onModalHide = function() {
+      return this.modalCropImg.attr('src', '').cropper('destroy');
+    };
+
+    GitLabCrop.prototype.onUploadImageBtnClick = function(e) {
+      e.preventDefault();
+      this.setBlob();
+      this.setPreview();
+      this.modalCrop.modal('hide');
+      return this.fileInput.val('');
+    };
+
+    GitLabCrop.prototype.onActionBtnClick = function(btn) {
+      var data, result;
+      data = $(btn).data();
+      if (this.modalCropImg.data('cropper') && data.method) {
+        return result = this.modalCropImg.cropper(data.method, data.option);
+      }
+    };
+
+    GitLabCrop.prototype.onFileInputChange = function(e, input) {
+      return this.readFile(input);
+    };
+
+    GitLabCrop.prototype.readFile = function(input) {
+      var _this, reader;
+      _this = this;
+      reader = new FileReader;
+      reader.onload = function() {
+        _this.modalCropImg.attr('src', reader.result);
+        return _this.modalCrop.modal('show');
+      };
+      return reader.readAsDataURL(input.files[0]);
+    };
+
+    GitLabCrop.prototype.dataURLtoBlob = function(dataURL) {
+      var array, binary, i, k, len, v;
+      binary = atob(dataURL.split(',')[1]);
+      array = [];
+      for (k = i = 0, len = binary.length; i < len; k = ++i) {
+        v = binary[k];
+        array.push(binary.charCodeAt(k));
+      }
+      return new Blob([new Uint8Array(array)], {
+        type: 'image/png'
+      });
+    };
+
+    GitLabCrop.prototype.setPreview = function() {
+      var filename;
+      this.previewImage.attr('src', this.dataURL);
+      filename = this.fileInput.val().replace(FILENAMEREGEX, '');
+      return this.filename.text(filename);
+    };
+
+    GitLabCrop.prototype.setBlob = function() {
+      this.dataURL = this.modalCropImg.cropper('getCroppedCanvas', {
+        width: 200,
+        height: 200
+      }).toDataURL('image/png');
+      return this.croppedImageBlob = this.dataURLtoBlob(this.dataURL);
+    };
+
+    GitLabCrop.prototype.getBlob = function() {
+      return this.croppedImageBlob;
+    };
+
+    return GitLabCrop;
+
+  })();
+
+  $.fn.glCrop = function(opts) {
+    return this.each(function() {
+      return $(this).data('glcrop', new GitLabCrop(this, opts));
+    });
+  };
+
+}).call(this);
diff --git a/app/assets/javascripts/profile/gl_crop.js.coffee b/app/assets/javascripts/profile/gl_crop.js.coffee
deleted file mode 100644
index df9bfdfa6cc..00000000000
--- a/app/assets/javascripts/profile/gl_crop.js.coffee
+++ /dev/null
@@ -1,152 +0,0 @@
-class GitLabCrop
-  # Matches everything but the file name
-  FILENAMEREGEX = /^.*[\\\/]/
-
-  constructor: (input, opts = {}) ->
-    @fileInput = $(input)
-
-    # We should rename to avoid spec to fail
-    # Form will submit the proper input filed with a file using FormData
-    @fileInput
-      .attr('name', "#{@fileInput.attr('name')}-trigger")
-      .attr('id', "#{@fileInput.attr('id')}-trigger")
-
-    # Set defaults
-    {
-      @exportWidth = 200
-      @exportHeight = 200
-      @cropBoxWidth = 200
-      @cropBoxHeight = 200
-      @form = @fileInput.parents('form')
-
-      # Required params
-      @filename
-      @previewImage
-      @modalCrop
-      @pickImageEl
-      @uploadImageBtn
-      @modalCropImg
-    } = opts
-
-    # Ensure needed elements are jquery objects
-    # If selector is provided we will convert them to a jQuery Object
-    @filename = @getElement(@filename)
-    @previewImage = @getElement(@previewImage)
-    @pickImageEl = @getElement(@pickImageEl)
-
-    # Modal elements usually are outside the @form element
-    @modalCrop = if _.isString(@modalCrop) then $(@modalCrop) else @modalCrop
-    @uploadImageBtn = if _.isString(@uploadImageBtn) then $(@uploadImageBtn) else @uploadImageBtn
-    @modalCropImg = if _.isString(@modalCropImg) then $(@modalCropImg) else @modalCropImg
-
-    @cropActionsBtn = @modalCrop.find('[data-method]')
-
-    @bindEvents()
-
-  getElement: (selector) ->
-    $(selector, @form)
-
-  bindEvents: ->
-    _this = @
-    @fileInput.on 'change', (e) ->
-      _this.onFileInputChange(e, @)
-
-    @pickImageEl.on 'click', @onPickImageClick
-    @modalCrop.on 'shown.bs.modal', @onModalShow
-    @modalCrop.on 'hidden.bs.modal', @onModalHide
-    @uploadImageBtn.on 'click', @onUploadImageBtnClick
-    @cropActionsBtn.on 'click', (e) ->
-      btn = @
-      _this.onActionBtnClick(btn)
-    @croppedImageBlob = null
-
-  onPickImageClick: =>
-    @fileInput.trigger('click')
-
-  onModalShow: =>
-    _this = @
-    @modalCropImg.cropper(
-      viewMode: 1
-      center: false
-      aspectRatio: 1
-      modal: true
-      scalable: false
-      rotatable: false
-      zoomable: true
-      dragMode: 'move'
-      guides: false
-      zoomOnTouch: false
-      zoomOnWheel: false
-      cropBoxMovable: false
-      cropBoxResizable: false
-      toggleDragModeOnDblclick: false
-      built: ->
-        $image = $(@)
-        container = $image.cropper 'getContainerData'
-        cropBoxWidth = _this.cropBoxWidth;
-        cropBoxHeight = _this.cropBoxHeight;
-
-        $image.cropper('setCropBoxData',
-          width: cropBoxWidth,
-          height: cropBoxHeight,
-          left: (container.width - cropBoxWidth) / 2,
-          top: (container.height - cropBoxHeight) / 2
-        )
-    )
-
-
-  onModalHide: =>
-    @modalCropImg
-      .attr('src', '') # Remove attached image
-      .cropper('destroy') # Destroy cropper instance
-
-  onUploadImageBtnClick: (e) =>
-    e.preventDefault()
-    @setBlob()
-    @setPreview()
-    @modalCrop.modal('hide')
-    @fileInput.val('')
-
-  onActionBtnClick: (btn) ->
-    data = $(btn).data()
-
-    if @modalCropImg.data('cropper') && data.method
-      result = @modalCropImg.cropper data.method, data.option
-
-  onFileInputChange: (e, input) ->
-    @readFile(input)
-
-  readFile: (input) ->
-    _this = @
-    reader = new FileReader
-    reader.onload = ->
-      _this.modalCropImg.attr('src', reader.result)
-      _this.modalCrop.modal('show')
-
-    reader.readAsDataURL(input.files[0])
-
-  dataURLtoBlob: (dataURL) ->
-    binary = atob(dataURL.split(',')[1])
-    array = []
-    for v, k in  binary
-      array.push(binary.charCodeAt(k))
-    new Blob([new Uint8Array(array)], type: 'image/png')
-
-  setPreview: ->
-    @previewImage.attr('src', @dataURL)
-    filename = @fileInput.val().replace(FILENAMEREGEX, '')
-    @filename.text(filename)
-
-  setBlob: ->
-    @dataURL = @modalCropImg.cropper('getCroppedCanvas',
-        width: 200
-        height: 200
-      ).toDataURL('image/png')
-    @croppedImageBlob = @dataURLtoBlob(@dataURL)
-
-  getBlob: ->
-    @croppedImageBlob
-
-$.fn.glCrop = (opts) ->
-  return @.each ->
-    $(@).data('glcrop', new GitLabCrop(@, opts))
diff --git a/app/assets/javascripts/profile/profile.js b/app/assets/javascripts/profile/profile.js
new file mode 100644
index 00000000000..ed1d87abafe
--- /dev/null
+++ b/app/assets/javascripts/profile/profile.js
@@ -0,0 +1,102 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.Profile = (function() {
+    function Profile(opts) {
+      var cropOpts, ref;
+      if (opts == null) {
+        opts = {};
+      }
+      this.onSubmitForm = bind(this.onSubmitForm, this);
+      this.form = (ref = opts.form) != null ? ref : $('.edit-user');
+      $('.js-preferences-form').on('change.preference', 'input[type=radio]', function() {
+        return $(this).parents('form').submit();
+      });
+      $('#user_notification_email').on('change', function() {
+        return $(this).parents('form').submit();
+      });
+      $('.update-username').on('ajax:before', function() {
+        $('.loading-username').show();
+        $(this).find('.update-success').hide();
+        return $(this).find('.update-failed').hide();
+      });
+      $('.update-username').on('ajax:complete', function() {
+        $('.loading-username').hide();
+        $(this).find('.btn-save').enable();
+        return $(this).find('.loading-gif').hide();
+      });
+      $('.update-notifications').on('ajax:success', function(e, data) {
+        if (data.saved) {
+          return new Flash("Notification settings saved", "notice");
+        } else {
+          return new Flash("Failed to save new settings", "alert");
+        }
+      });
+      this.bindEvents();
+      cropOpts = {
+        filename: '.js-avatar-filename',
+        previewImage: '.avatar-image .avatar',
+        modalCrop: '.modal-profile-crop',
+        pickImageEl: '.js-choose-user-avatar-button',
+        uploadImageBtn: '.js-upload-user-avatar',
+        modalCropImg: '.modal-profile-crop-image'
+      };
+      this.avatarGlCrop = $('.js-user-avatar-input').glCrop(cropOpts).data('glcrop');
+    }
+
+    Profile.prototype.bindEvents = function() {
+      return this.form.on('submit', this.onSubmitForm);
+    };
+
+    Profile.prototype.onSubmitForm = function(e) {
+      e.preventDefault();
+      return this.saveForm();
+    };
+
+    Profile.prototype.saveForm = function() {
+      var avatarBlob, formData, self;
+      self = this;
+      formData = new FormData(this.form[0]);
+      avatarBlob = this.avatarGlCrop.getBlob();
+      if (avatarBlob != null) {
+        formData.append('user[avatar]', avatarBlob, 'avatar.png');
+      }
+      return $.ajax({
+        url: this.form.attr('action'),
+        type: this.form.attr('method'),
+        data: formData,
+        dataType: "json",
+        processData: false,
+        contentType: false,
+        success: function(response) {
+          return new Flash(response.message, 'notice');
+        },
+        error: function(jqXHR) {
+          return new Flash(jqXHR.responseJSON.message, 'alert');
+        },
+        complete: function() {
+          window.scrollTo(0, 0);
+          return self.form.find(':input[disabled]').enable();
+        }
+      });
+    };
+
+    return Profile;
+
+  })();
+
+  $(function() {
+    $(document).on('focusout.ssh_key', '#key_key', function() {
+      var $title, comment;
+      $title = $('#key_title');
+      comment = $(this).val().match(/^\S+ \S+ (.+)\n?$/);
+      if (comment && comment.length > 1 && $title.val() === '') {
+        return $title.val(comment[1]).change();
+      }
+    });
+    if (gl.utils.getPagePath() === 'profiles') {
+      return new Profile();
+    }
+  });
+
+}).call(this);
diff --git a/app/assets/javascripts/profile/profile.js.coffee b/app/assets/javascripts/profile/profile.js.coffee
deleted file mode 100644
index f3b05f2c646..00000000000
--- a/app/assets/javascripts/profile/profile.js.coffee
+++ /dev/null
@@ -1,83 +0,0 @@
-class @Profile
-  constructor: (opts = {}) ->
-    {
-      @form = $('.edit-user')
-    } = opts
-
-    # Automatically submit the Preferences form when any of its radio buttons change
-    $('.js-preferences-form').on 'change.preference', 'input[type=radio]', ->
-      $(this).parents('form').submit()
-
-    # Automatically submit email form when it changes
-    $('#user_notification_email').on 'change', ->
-      $(this).parents('form').submit()
-
-    $('.update-username').on 'ajax:before', ->
-      $('.loading-username').show()
-      $(this).find('.update-success').hide()
-      $(this).find('.update-failed').hide()
-
-    $('.update-username').on 'ajax:complete', ->
-      $('.loading-username').hide()
-      $(this).find('.btn-save').enable()
-      $(this).find('.loading-gif').hide()
-
-    $('.update-notifications').on 'ajax:success', (e, data) ->
-      if data.saved
-        new Flash("Notification settings saved", "notice")
-      else
-        new Flash("Failed to save new settings", "alert")
-
-    @bindEvents()
-
-    cropOpts =
-      filename: '.js-avatar-filename'
-      previewImage: '.avatar-image .avatar'
-      modalCrop: '.modal-profile-crop'
-      pickImageEl: '.js-choose-user-avatar-button'
-      uploadImageBtn: '.js-upload-user-avatar'
-      modalCropImg: '.modal-profile-crop-image'
-
-    @avatarGlCrop = $('.js-user-avatar-input').glCrop(cropOpts).data 'glcrop'
-
-  bindEvents: ->
-    @form.on 'submit', @onSubmitForm
-
-  onSubmitForm: (e) =>
-    e.preventDefault()
-    @saveForm()
-
-  saveForm: ->
-    self = @
-    formData = new FormData(@form[0])
-
-    avatarBlob = @avatarGlCrop.getBlob()
-    formData.append('user[avatar]', avatarBlob, 'avatar.png') if avatarBlob?
-
-    $.ajax
-      url: @form.attr('action')
-      type: @form.attr('method')
-      data: formData
-      dataType: "json"
-      processData: false
-      contentType: false
-      success: (response) ->
-        new Flash(response.message, 'notice')
-      error: (jqXHR) ->
-        new Flash(jqXHR.responseJSON.message, 'alert')
-      complete: ->
-        window.scrollTo 0, 0
-        # Enable submit button after requests ends
-        self.form.find(':input[disabled]').enable()
-
-$ ->
-  # Extract the SSH Key title from its comment
-  $(document).on 'focusout.ssh_key', '#key_key', ->
-    $title  = $('#key_title')
-    comment = $(@).val().match(/^\S+ \S+ (.+)\n?$/)
-
-    if comment && comment.length > 1 && $title.val() == ''
-      $title.val(comment[1]).change()
-
-  if gl.utils.getPagePath() == 'profiles'
-    new Profile()
diff --git a/app/assets/javascripts/profile/profile_bundle.js b/app/assets/javascripts/profile/profile_bundle.js
new file mode 100644
index 00000000000..b95faadc8e7
--- /dev/null
+++ b/app/assets/javascripts/profile/profile_bundle.js
@@ -0,0 +1,7 @@
+
+/*= require_tree . */
+
+(function() {
+
+
+}).call(this);
diff --git a/app/assets/javascripts/project.js b/app/assets/javascripts/project.js
new file mode 100644
index 00000000000..e6663177161
--- /dev/null
+++ b/app/assets/javascripts/project.js
@@ -0,0 +1,103 @@
+(function() {
+  this.Project = (function() {
+    function Project() {
+      $('ul.clone-options-dropdown a').click(function() {
+        var url;
+        if ($(this).hasClass('active')) {
+          return;
+        }
+        $('.active').not($(this)).removeClass('active');
+        $(this).toggleClass('active');
+        url = $("#project_clone").val();
+        $('#project_clone').val(url);
+        return $('.clone').text(url);
+      });
+      this.initRefSwitcher();
+      $('.project-refs-select').on('change', function() {
+        return $(this).parents('form').submit();
+      });
+      $('.hide-no-ssh-message').on('click', function(e) {
+        var path;
+        path = '/';
+        $.cookie('hide_no_ssh_message', 'false', {
+          path: path
+        });
+        $(this).parents('.no-ssh-key-message').remove();
+        return e.preventDefault();
+      });
+      $('.hide-no-password-message').on('click', function(e) {
+        var path;
+        path = '/';
+        $.cookie('hide_no_password_message', 'false', {
+          path: path
+        });
+        $(this).parents('.no-password-message').remove();
+        return e.preventDefault();
+      });
+      this.projectSelectDropdown();
+    }
+
+    Project.prototype.projectSelectDropdown = function() {
+      new ProjectSelect();
+      $('.project-item-select').on('click', (function(_this) {
+        return function(e) {
+          return _this.changeProject($(e.currentTarget).val());
+        };
+      })(this));
+      return $('.js-projects-dropdown-toggle').on('click', function(e) {
+        e.preventDefault();
+        return $('.js-projects-dropdown').select2('open');
+      });
+    };
+
+    Project.prototype.changeProject = function(url) {
+      return window.location = url;
+    };
+
+    Project.prototype.initRefSwitcher = function() {
+      return $('.js-project-refs-dropdown').each(function() {
+        var $dropdown, selected;
+        $dropdown = $(this);
+        selected = $dropdown.data('selected');
+        return $dropdown.glDropdown({
+          data: function(term, callback) {
+            return $.ajax({
+              url: $dropdown.data('refs-url'),
+              data: {
+                ref: $dropdown.data('ref')
+              }
+            }).done(function(refs) {
+              return callback(refs);
+            });
+          },
+          selectable: true,
+          filterable: true,
+          filterByText: true,
+          fieldName: 'ref',
+          renderRow: function(ref) {
+            var link;
+            if (ref.header != null) {
+              return $('<li />').addClass('dropdown-header').text(ref.header);
+            } else {
+              link = $('<a />').attr('href', '#').addClass(ref === selected ? 'is-active' : '').text(ref).attr('data-ref', escape(ref));
+              return $('<li />').append(link);
+            }
+          },
+          id: function(obj, $el) {
+            return $el.attr('data-ref');
+          },
+          toggleLabel: function(obj, $el) {
+            return $el.text().trim();
+          },
+          clicked: function(e) {
+            return $dropdown.closest('form').submit();
+          }
+        });
+      });
+    };
+
+    return Project;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/project.js.coffee b/app/assets/javascripts/project.js.coffee
deleted file mode 100644
index 3288c801388..00000000000
--- a/app/assets/javascripts/project.js.coffee
+++ /dev/null
@@ -1,91 +0,0 @@
-class @Project
-  constructor: ->
-    # Git protocol switcher
-    $('ul.clone-options-dropdown a').click ->
-      return if $(@).hasClass('active')
-
-
-      # Remove the active class for all buttons (ssh, http, kerberos if shown)
-      $('.active').not($(@)).removeClass('active');
-      # Add the active class for the clicked button
-      $(@).toggleClass('active')
-
-      url = $("#project_clone").val()
-
-      # Update the input field
-      $('#project_clone').val(url)
-
-      # Update the command line instructions
-      $('.clone').text(url)
-
-    # Ref switcher
-    @initRefSwitcher()
-    $('.project-refs-select').on 'change', ->
-      $(@).parents('form').submit()
-
-    $('.hide-no-ssh-message').on 'click', (e) ->
-      path = '/'
-      $.cookie('hide_no_ssh_message', 'false', { path: path })
-      $(@).parents('.no-ssh-key-message').remove()
-      e.preventDefault()
-
-    $('.hide-no-password-message').on 'click', (e) ->
-      path = '/'
-      $.cookie('hide_no_password_message', 'false', { path: path })
-      $(@).parents('.no-password-message').remove()
-      e.preventDefault()
-
-    @projectSelectDropdown()
-
-  projectSelectDropdown: ->
-    new ProjectSelect()
-
-    $('.project-item-select').on 'click', (e) =>
-      @changeProject $(e.currentTarget).val()
-
-    $('.js-projects-dropdown-toggle').on 'click', (e) ->
-      e.preventDefault()
-
-      $('.js-projects-dropdown').select2('open')
-
-  changeProject: (url) ->
-    window.location = url
-
-  initRefSwitcher: ->
-    $('.js-project-refs-dropdown').each ->
-      $dropdown = $(@)
-      selected = $dropdown.data('selected')
-
-      $dropdown.glDropdown(
-        data: (term, callback) ->
-          $.ajax(
-            url: $dropdown.data('refs-url')
-            data:
-              ref: $dropdown.data('ref')
-          ).done (refs) ->
-            callback(refs)
-        selectable: true
-        filterable: true
-        filterByText: true
-        fieldName: 'ref'
-        renderRow: (ref) ->
-          if ref.header?
-            $('<li />')
-              .addClass('dropdown-header')
-              .text(ref.header)
-          else
-            link = $('<a />')
-              .attr('href', '#')
-              .addClass(if ref is selected then 'is-active' else '')
-              .text(ref)
-              .attr('data-ref', escape(ref))
-
-            $('<li />')
-              .append(link)
-        id: (obj, $el) ->
-          $el.attr('data-ref')
-        toggleLabel: (obj, $el) ->
-          $el.text().trim()
-        clicked: (e) ->
-          $dropdown.closest('form').submit()
-      )
diff --git a/app/assets/javascripts/project_avatar.js b/app/assets/javascripts/project_avatar.js
new file mode 100644
index 00000000000..277e71523d5
--- /dev/null
+++ b/app/assets/javascripts/project_avatar.js
@@ -0,0 +1,21 @@
+(function() {
+  this.ProjectAvatar = (function() {
+    function ProjectAvatar() {
+      $('.js-choose-project-avatar-button').bind('click', function() {
+        var form;
+        form = $(this).closest('form');
+        return form.find('.js-project-avatar-input').click();
+      });
+      $('.js-project-avatar-input').bind('change', function() {
+        var filename, form;
+        form = $(this).closest('form');
+        filename = $(this).val().replace(/^.*[\\\/]/, '');
+        return form.find('.js-avatar-filename').text(filename);
+      });
+    }
+
+    return ProjectAvatar;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/project_avatar.js.coffee b/app/assets/javascripts/project_avatar.js.coffee
deleted file mode 100644
index 8bec6e2ccca..00000000000
--- a/app/assets/javascripts/project_avatar.js.coffee
+++ /dev/null
@@ -1,9 +0,0 @@
-class @ProjectAvatar
-  constructor: ->
-    $('.js-choose-project-avatar-button').bind 'click', ->
-      form = $(this).closest('form')
-      form.find('.js-project-avatar-input').click()
-    $('.js-project-avatar-input').bind 'change', ->
-      form = $(this).closest('form')
-      filename = $(this).val().replace(/^.*[\\\/]/, '')
-      form.find('.js-avatar-filename').text(filename)
diff --git a/app/assets/javascripts/project_find_file.js b/app/assets/javascripts/project_find_file.js
new file mode 100644
index 00000000000..4925f0519f0
--- /dev/null
+++ b/app/assets/javascripts/project_find_file.js
@@ -0,0 +1,170 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.ProjectFindFile = (function() {
+    var highlighter;
+
+    function ProjectFindFile(element1, options) {
+      this.element = element1;
+      this.options = options;
+      this.goToBlob = bind(this.goToBlob, this);
+      this.goToTree = bind(this.goToTree, this);
+      this.selectRowDown = bind(this.selectRowDown, this);
+      this.selectRowUp = bind(this.selectRowUp, this);
+      this.filePaths = {};
+      this.inputElement = this.element.find(".file-finder-input");
+      this.initEvent();
+      this.inputElement.focus();
+      this.load(this.options.url);
+    }
+
+    ProjectFindFile.prototype.initEvent = function() {
+      this.inputElement.off("keyup");
+      this.inputElement.on("keyup", (function(_this) {
+        return function(event) {
+          var oldValue, ref, target, value;
+          target = $(event.target);
+          value = target.val();
+          oldValue = (ref = target.data("oldValue")) != null ? ref : "";
+          if (value !== oldValue) {
+            target.data("oldValue", value);
+            _this.findFile();
+            return _this.element.find("tr.tree-item").eq(0).addClass("selected").focus();
+          }
+        };
+      })(this));
+      return this.element.find(".tree-content-holder .tree-table").on("click", function(event) {
+        var path;
+        if (event.target.nodeName !== "A") {
+          path = this.element.find(".tree-item-file-name a", this).attr("href");
+          if (path) {
+            return location.href = path;
+          }
+        }
+      });
+    };
+
+    ProjectFindFile.prototype.findFile = function() {
+      var result, searchText;
+      searchText = this.inputElement.val();
+      result = searchText.length > 0 ? fuzzaldrinPlus.filter(this.filePaths, searchText) : this.filePaths;
+      return this.renderList(result, searchText);
+    };
+
+    ProjectFindFile.prototype.load = function(url) {
+      return $.ajax({
+        url: url,
+        method: "get",
+        dataType: "json",
+        success: (function(_this) {
+          return function(data) {
+            _this.element.find(".loading").hide();
+            _this.filePaths = data;
+            _this.findFile();
+            return _this.element.find(".files-slider tr.tree-item").eq(0).addClass("selected").focus();
+          };
+        })(this)
+      });
+    };
+
+    ProjectFindFile.prototype.renderList = function(filePaths, searchText) {
+      var blobItemUrl, filePath, html, i, j, len, matches, results;
+      this.element.find(".tree-table > tbody").empty();
+      results = [];
+      for (i = j = 0, len = filePaths.length; j < len; i = ++j) {
+        filePath = filePaths[i];
+        if (i === 20) {
+          break;
+        }
+        if (searchText) {
+          matches = fuzzaldrinPlus.match(filePath, searchText);
+        }
+        blobItemUrl = this.options.blobUrlTemplate + "/" + filePath;
+        html = this.makeHtml(filePath, matches, blobItemUrl);
+        results.push(this.element.find(".tree-table > tbody").append(html));
+      }
+      return results;
+    };
+
+    highlighter = function(element, text, matches) {
+      var highlightText, j, lastIndex, len, matchIndex, matchedChars, unmatched;
+      lastIndex = 0;
+      highlightText = "";
+      matchedChars = [];
+      for (j = 0, len = matches.length; j < len; j++) {
+        matchIndex = matches[j];
+        unmatched = text.substring(lastIndex, matchIndex);
+        if (unmatched) {
+          if (matchedChars.length) {
+            element.append(matchedChars.join("").bold());
+          }
+          matchedChars = [];
+          element.append(document.createTextNode(unmatched));
+        }
+        matchedChars.push(text[matchIndex]);
+        lastIndex = matchIndex + 1;
+      }
+      if (matchedChars.length) {
+        element.append(matchedChars.join("").bold());
+      }
+      return element.append(document.createTextNode(text.substring(lastIndex)));
+    };
+
+    ProjectFindFile.prototype.makeHtml = function(filePath, matches, blobItemUrl) {
+      var $tr;
+      $tr = $("<tr class='tree-item'><td class='tree-item-file-name'><i class='fa fa-file-text-o fa-fw'></i><span class='str-truncated'><a></a></span></td></tr>");
+      if (matches) {
+        $tr.find("a").replaceWith(highlighter($tr.find("a"), filePath, matches).attr("href", blobItemUrl));
+      } else {
+        $tr.find("a").attr("href", blobItemUrl).text(filePath);
+      }
+      return $tr;
+    };
+
+    ProjectFindFile.prototype.selectRow = function(type) {
+      var next, rows, selectedRow;
+      rows = this.element.find(".files-slider tr.tree-item");
+      selectedRow = this.element.find(".files-slider tr.tree-item.selected");
+      if (rows && rows.length > 0) {
+        if (selectedRow && selectedRow.length > 0) {
+          if (type === "UP") {
+            next = selectedRow.prev();
+          } else if (type === "DOWN") {
+            next = selectedRow.next();
+          }
+          if (next.length > 0) {
+            selectedRow.removeClass("selected");
+            selectedRow = next;
+          }
+        } else {
+          selectedRow = rows.eq(0);
+        }
+        return selectedRow.addClass("selected").focus();
+      }
+    };
+
+    ProjectFindFile.prototype.selectRowUp = function() {
+      return this.selectRow("UP");
+    };
+
+    ProjectFindFile.prototype.selectRowDown = function() {
+      return this.selectRow("DOWN");
+    };
+
+    ProjectFindFile.prototype.goToTree = function() {
+      return location.href = this.options.treeUrl;
+    };
+
+    ProjectFindFile.prototype.goToBlob = function() {
+      var path;
+      path = this.element.find(".tree-item.selected .tree-item-file-name a").attr("href");
+      if (path) {
+        return location.href = path;
+      }
+    };
+
+    return ProjectFindFile;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/project_find_file.js.coffee b/app/assets/javascripts/project_find_file.js.coffee
deleted file mode 100644
index 0dd32352c34..00000000000
--- a/app/assets/javascripts/project_find_file.js.coffee
+++ /dev/null
@@ -1,125 +0,0 @@
-class @ProjectFindFile

-  constructor: (@element, @options)->

-    @filePaths = {}

-    @inputElement = @element.find(".file-finder-input")

-

-    # init event

-    @initEvent()

-

-    # focus text input box

-    @inputElement.focus()

-

-    # load file list

-    @load(@options.url)

-

-  # init event

-  initEvent: ->

-    @inputElement.off "keyup"

-    @inputElement.on "keyup", (event) =>

-      target = $(event.target)

-      value = target.val()

-      oldValue = target.data("oldValue") ? ""

-

-      if value != oldValue

-        target.data("oldValue", value)

-        @findFile()

-        @element.find("tr.tree-item").eq(0).addClass("selected").focus()

-

-    @element.find(".tree-content-holder .tree-table").on "click", (event) ->

-      if (event.target.nodeName != "A")

-        path = @element.find(".tree-item-file-name a", this).attr("href")

-        location.href = path if path

-

-  # find file

-  findFile: ->

-    searchText = @inputElement.val()

-    result = if searchText.length > 0 then fuzzaldrinPlus.filter(@filePaths, searchText) else @filePaths

-    @renderList result, searchText

-

-  # files pathes load

-  load: (url) ->

-    $.ajax

-      url: url

-      method: "get"

-      dataType: "json"

-      success: (data) =>

-        @element.find(".loading").hide()

-        @filePaths = data

-        @findFile()

-        @element.find(".files-slider tr.tree-item").eq(0).addClass("selected").focus()

-

-  # render result

-  renderList: (filePaths, searchText) ->

-    @element.find(".tree-table > tbody").empty()

-

-    for filePath, i in filePaths

-      break if i == 20

-

-      if searchText

-        matches = fuzzaldrinPlus.match(filePath, searchText)

-

-      blobItemUrl = "#{@options.blobUrlTemplate}/#{filePath}"

-

-      html = @makeHtml filePath, matches, blobItemUrl

-      @element.find(".tree-table > tbody").append(html)

-

-  # highlight text(awefwbwgtc -> <b>a</b>wefw<b>b</b>wgt<b>c</b> )

-  highlighter = (element, text, matches) ->

-    lastIndex = 0

-    highlightText = ""

-    matchedChars = []

-

-    for matchIndex in matches

-      unmatched = text.substring(lastIndex, matchIndex)

-

-      if unmatched

-        element.append(matchedChars.join("").bold()) if matchedChars.length

-        matchedChars = []

-        element.append(document.createTextNode(unmatched))

-

-      matchedChars.push(text[matchIndex])

-      lastIndex = matchIndex + 1

-

-    element.append(matchedChars.join("").bold()) if matchedChars.length

-    element.append(document.createTextNode(text.substring(lastIndex)))

-

-  # make tbody row html

-  makeHtml: (filePath, matches, blobItemUrl) ->

-    $tr = $("<tr class='tree-item'><td class='tree-item-file-name'><i class='fa fa-file-text-o fa-fw'></i><span class='str-truncated'><a></a></span></td></tr>")

-    if matches

-      $tr.find("a").replaceWith(highlighter($tr.find("a"), filePath, matches).attr("href", blobItemUrl))

-    else

-      $tr.find("a").attr("href", blobItemUrl).text(filePath)

-

-    return $tr

-

-  selectRow: (type) ->

-    rows = @element.find(".files-slider tr.tree-item")

-    selectedRow = @element.find(".files-slider tr.tree-item.selected")

-

-    if rows && rows.length > 0

-      if selectedRow && selectedRow.length > 0

-        if type == "UP"

-          next = selectedRow.prev()

-        else if type == "DOWN"

-          next = selectedRow.next()

-

-        if next.length > 0

-          selectedRow.removeClass "selected"

-          selectedRow = next

-      else

-        selectedRow = rows.eq(0)

-      selectedRow.addClass("selected").focus()

-

-  selectRowUp: =>

-    @selectRow "UP"

-

-  selectRowDown: =>

-    @selectRow "DOWN"

-

-  goToTree: =>

-    location.href = @options.treeUrl

-

-  goToBlob: =>

-    path = @element.find(".tree-item.selected .tree-item-file-name a").attr("href")

-    location.href = path if path

diff --git a/app/assets/javascripts/project_fork.js b/app/assets/javascripts/project_fork.js
new file mode 100644
index 00000000000..d2261c51f35
--- /dev/null
+++ b/app/assets/javascripts/project_fork.js
@@ -0,0 +1,14 @@
+(function() {
+  this.ProjectFork = (function() {
+    function ProjectFork() {
+      $('.fork-thumbnail a').on('click', function() {
+        $('.fork-namespaces').hide();
+        return $('.save-project-loader').show();
+      });
+    }
+
+    return ProjectFork;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/project_fork.js.coffee b/app/assets/javascripts/project_fork.js.coffee
deleted file mode 100644
index e15a1c4ef76..00000000000
--- a/app/assets/javascripts/project_fork.js.coffee
+++ /dev/null
@@ -1,5 +0,0 @@
-class @ProjectFork
-  constructor: ->
-    $('.fork-thumbnail a').on 'click', ->
-      $('.fork-namespaces').hide()
-      $('.save-project-loader').show()
diff --git a/app/assets/javascripts/project_import.js b/app/assets/javascripts/project_import.js
new file mode 100644
index 00000000000..c61b0cf2fde
--- /dev/null
+++ b/app/assets/javascripts/project_import.js
@@ -0,0 +1,13 @@
+(function() {
+  this.ProjectImport = (function() {
+    function ProjectImport() {
+      setTimeout(function() {
+        return Turbolinks.visit(location.href);
+      }, 5000);
+    }
+
+    return ProjectImport;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/project_import.js.coffee b/app/assets/javascripts/project_import.js.coffee
deleted file mode 100644
index 6633564a079..00000000000
--- a/app/assets/javascripts/project_import.js.coffee
+++ /dev/null
@@ -1,5 +0,0 @@
-class @ProjectImport
-  constructor: ->
-    setTimeout ->
-       Turbolinks.visit(location.href)
-    , 5000
diff --git a/app/assets/javascripts/project_members.js b/app/assets/javascripts/project_members.js
new file mode 100644
index 00000000000..f6a796b325a
--- /dev/null
+++ b/app/assets/javascripts/project_members.js
@@ -0,0 +1,13 @@
+(function() {
+  this.ProjectMembers = (function() {
+    function ProjectMembers() {
+      $('li.project_member').bind('ajax:success', function() {
+        return $(this).fadeOut();
+      });
+    }
+
+    return ProjectMembers;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/project_members.js.coffee b/app/assets/javascripts/project_members.js.coffee
deleted file mode 100644
index 896ba7e53ee..00000000000
--- a/app/assets/javascripts/project_members.js.coffee
+++ /dev/null
@@ -1,4 +0,0 @@
-class @ProjectMembers
-  constructor: ->
-    $('li.project_member').bind 'ajax:success', ->
-      $(this).fadeOut()
diff --git a/app/assets/javascripts/project_new.js b/app/assets/javascripts/project_new.js
new file mode 100644
index 00000000000..798f15e40a0
--- /dev/null
+++ b/app/assets/javascripts/project_new.js
@@ -0,0 +1,40 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.ProjectNew = (function() {
+    function ProjectNew() {
+      this.toggleSettings = bind(this.toggleSettings, this);
+      $('.project-edit-container').on('ajax:before', (function(_this) {
+        return function() {
+          $('.project-edit-container').hide();
+          return $('.save-project-loader').show();
+        };
+      })(this));
+      this.toggleSettings();
+      this.toggleSettingsOnclick();
+    }
+
+    ProjectNew.prototype.toggleSettings = function() {
+      this._showOrHide('#project_builds_enabled', '.builds-feature');
+      return this._showOrHide('#project_merge_requests_enabled', '.merge-requests-feature');
+    };
+
+    ProjectNew.prototype.toggleSettingsOnclick = function() {
+      return $('#project_builds_enabled, #project_merge_requests_enabled').on('click', this.toggleSettings);
+    };
+
+    ProjectNew.prototype._showOrHide = function(checkElement, container) {
+      var $container;
+      $container = $(container);
+      if ($(checkElement).prop('checked')) {
+        return $container.show();
+      } else {
+        return $container.hide();
+      }
+    };
+
+    return ProjectNew;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/project_new.js.coffee b/app/assets/javascripts/project_new.js.coffee
deleted file mode 100644
index e48343a19b5..00000000000
--- a/app/assets/javascripts/project_new.js.coffee
+++ /dev/null
@@ -1,23 +0,0 @@
-class @ProjectNew
-  constructor: ->
-    $('.project-edit-container').on 'ajax:before', =>
-      $('.project-edit-container').hide()
-      $('.save-project-loader').show()
-    @toggleSettings()
-    @toggleSettingsOnclick()
-
-
-  toggleSettings: =>
-    @_showOrHide('#project_builds_enabled', '.builds-feature')
-    @_showOrHide('#project_merge_requests_enabled', '.merge-requests-feature')
-
-  toggleSettingsOnclick: ->
-    $('#project_builds_enabled, #project_merge_requests_enabled').on 'click', @toggleSettings
-
-  _showOrHide: (checkElement, container) ->
-    $container = $(container)
-
-    if $(checkElement).prop('checked')
-      $container.show()
-    else
-      $container.hide()
diff --git a/app/assets/javascripts/project_select.js b/app/assets/javascripts/project_select.js
new file mode 100644
index 00000000000..20b147500cf
--- /dev/null
+++ b/app/assets/javascripts/project_select.js
@@ -0,0 +1,102 @@
+(function() {
+  this.ProjectSelect = (function() {
+    function ProjectSelect() {
+      $('.js-projects-dropdown-toggle').each(function(i, dropdown) {
+        var $dropdown;
+        $dropdown = $(dropdown);
+        return $dropdown.glDropdown({
+          filterable: true,
+          filterRemote: true,
+          search: {
+            fields: ['name_with_namespace']
+          },
+          data: function(term, callback) {
+            var finalCallback, projectsCallback;
+            finalCallback = function(projects) {
+              return callback(projects);
+            };
+            if (this.includeGroups) {
+              projectsCallback = function(projects) {
+                var groupsCallback;
+                groupsCallback = function(groups) {
+                  var data;
+                  data = groups.concat(projects);
+                  return finalCallback(data);
+                };
+                return Api.groups(term, false, groupsCallback);
+              };
+            } else {
+              projectsCallback = finalCallback;
+            }
+            if (this.groupId) {
+              return Api.groupProjects(this.groupId, term, projectsCallback);
+            } else {
+              return Api.projects(term, this.orderBy, projectsCallback);
+            }
+          },
+          url: function(project) {
+            return project.web_url;
+          },
+          text: function(project) {
+            return project.name_with_namespace;
+          }
+        });
+      });
+      $('.ajax-project-select').each(function(i, select) {
+        var placeholder;
+        this.groupId = $(select).data('group-id');
+        this.includeGroups = $(select).data('include-groups');
+        this.orderBy = $(select).data('order-by') || 'id';
+        placeholder = "Search for project";
+        if (this.includeGroups) {
+          placeholder += " or group";
+        }
+        return $(select).select2({
+          placeholder: placeholder,
+          minimumInputLength: 0,
+          query: (function(_this) {
+            return function(query) {
+              var finalCallback, projectsCallback;
+              finalCallback = function(projects) {
+                var data;
+                data = {
+                  results: projects
+                };
+                return query.callback(data);
+              };
+              if (_this.includeGroups) {
+                projectsCallback = function(projects) {
+                  var groupsCallback;
+                  groupsCallback = function(groups) {
+                    var data;
+                    data = groups.concat(projects);
+                    return finalCallback(data);
+                  };
+                  return Api.groups(query.term, false, groupsCallback);
+                };
+              } else {
+                projectsCallback = finalCallback;
+              }
+              if (_this.groupId) {
+                return Api.groupProjects(_this.groupId, query.term, projectsCallback);
+              } else {
+                return Api.projects(query.term, _this.orderBy, projectsCallback);
+              }
+            };
+          })(this),
+          id: function(project) {
+            return project.web_url;
+          },
+          text: function(project) {
+            return project.name_with_namespace || project.name;
+          },
+          dropdownCssClass: "ajax-project-dropdown"
+        });
+      });
+    }
+
+    return ProjectSelect;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/project_select.js.coffee b/app/assets/javascripts/project_select.js.coffee
deleted file mode 100644
index 704bd8dee53..00000000000
--- a/app/assets/javascripts/project_select.js.coffee
+++ /dev/null
@@ -1,72 +0,0 @@
-class @ProjectSelect
-  constructor: ->
-    $('.js-projects-dropdown-toggle').each (i, dropdown) ->
-      $dropdown = $(dropdown)
-
-      $dropdown.glDropdown(
-        filterable: true
-        filterRemote: true
-        search:
-          fields: ['name_with_namespace']
-        data: (term, callback) ->
-          finalCallback = (projects) ->
-            callback projects
-
-          if @includeGroups
-            projectsCallback = (projects) ->
-              groupsCallback = (groups) ->
-                data = groups.concat(projects)
-                finalCallback(data)
-
-              Api.groups term, false, groupsCallback
-          else
-            projectsCallback = finalCallback
-
-          if @groupId
-            Api.groupProjects @groupId, term, projectsCallback
-          else
-            Api.projects term, @orderBy, projectsCallback
-        url: (project) ->
-          project.web_url
-        text: (project) ->
-          project.name_with_namespace
-      )
-
-    $('.ajax-project-select').each (i, select) ->
-      @groupId = $(select).data('group-id')
-      @includeGroups = $(select).data('include-groups')
-      @orderBy = $(select).data('order-by') || 'id'
-
-      placeholder = "Search for project"
-      placeholder += " or group" if @includeGroups
-
-      $(select).select2
-        placeholder: placeholder
-        minimumInputLength: 0
-        query: (query) =>
-          finalCallback = (projects) ->
-            data = { results: projects }
-            query.callback(data)
-
-          if @includeGroups
-            projectsCallback = (projects) ->
-              groupsCallback = (groups) ->
-                data = groups.concat(projects)
-                finalCallback(data)
-
-              Api.groups query.term, false, groupsCallback
-          else
-            projectsCallback = finalCallback
-
-          if @groupId
-            Api.groupProjects @groupId, query.term, projectsCallback
-          else
-            Api.projects query.term, @orderBy, projectsCallback
-
-        id: (project) ->
-          project.web_url
-
-        text: (project) ->
-          project.name_with_namespace || project.name
-
-        dropdownCssClass: "ajax-project-dropdown"
diff --git a/app/assets/javascripts/project_show.js b/app/assets/javascripts/project_show.js
new file mode 100644
index 00000000000..8ca4c427912
--- /dev/null
+++ b/app/assets/javascripts/project_show.js
@@ -0,0 +1,9 @@
+(function() {
+  this.ProjectShow = (function() {
+    function ProjectShow() {}
+
+    return ProjectShow;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/project_show.js.coffee b/app/assets/javascripts/project_show.js.coffee
deleted file mode 100644
index 1fdf28f2528..00000000000
--- a/app/assets/javascripts/project_show.js.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-class @ProjectShow
-  constructor: ->
-    # I kept class for future
diff --git a/app/assets/javascripts/projects_list.js b/app/assets/javascripts/projects_list.js
new file mode 100644
index 00000000000..4f415b05dbc
--- /dev/null
+++ b/app/assets/javascripts/projects_list.js
@@ -0,0 +1,48 @@
+(function() {
+  this.ProjectsList = {
+    init: function() {
+      $(".projects-list-filter").off('keyup');
+      this.initSearch();
+      return this.initPagination();
+    },
+    initSearch: function() {
+      var debounceFilter, projectsListFilter;
+      projectsListFilter = $('.projects-list-filter');
+      debounceFilter = _.debounce(ProjectsList.filterResults, 500);
+      return projectsListFilter.on('keyup', function(e) {
+        if (projectsListFilter.val() !== '') {
+          return debounceFilter();
+        }
+      });
+    },
+    filterResults: function() {
+      var form, project_filter_url, search;
+      $('.projects-list-holder').fadeTo(250, 0.5);
+      form = null;
+      form = $("form#project-filter-form");
+      search = $(".projects-list-filter").val();
+      project_filter_url = form.attr('action') + '?' + form.serialize();
+      return $.ajax({
+        type: "GET",
+        url: form.attr('action'),
+        data: form.serialize(),
+        complete: function() {
+          return $('.projects-list-holder').fadeTo(250, 1);
+        },
+        success: function(data) {
+          $('.projects-list-holder').replaceWith(data.html);
+          return history.replaceState({
+            page: project_filter_url
+          }, document.title, project_filter_url);
+        },
+        dataType: "json"
+      });
+    },
+    initPagination: function() {
+      return $('.projects-list-holder .pagination').on('ajax:success', function(e, data) {
+        return $('.projects-list-holder').replaceWith(data.html);
+      });
+    }
+  };
+
+}).call(this);
diff --git a/app/assets/javascripts/projects_list.js.coffee b/app/assets/javascripts/projects_list.js.coffee
deleted file mode 100644
index a7d78d9e461..00000000000
--- a/app/assets/javascripts/projects_list.js.coffee
+++ /dev/null
@@ -1,36 +0,0 @@
-@ProjectsList =
-  init: ->
-    $(".projects-list-filter").off('keyup')
-    this.initSearch()
-    this.initPagination()
-
-  initSearch: ->
-    projectsListFilter = $('.projects-list-filter')
-    debounceFilter = _.debounce ProjectsList.filterResults, 500
-    projectsListFilter.on 'keyup', (e) ->
-      debounceFilter() if projectsListFilter.val() isnt ''
-
-  filterResults: ->
-    $('.projects-list-holder').fadeTo(250, 0.5)
-
-    form = null
-    form = $("form#project-filter-form")
-    search = $(".projects-list-filter").val()
-    project_filter_url = form.attr('action') + '?' + form.serialize()
-
-    $.ajax
-      type: "GET"
-      url: form.attr('action')
-      data: form.serialize()
-      complete: ->
-        $('.projects-list-holder').fadeTo(250, 1)
-      success: (data) ->
-        $('.projects-list-holder').replaceWith(data.html)
-        # Change url so if user reload a page - search results are saved
-        history.replaceState {page: project_filter_url}, document.title, project_filter_url
-      dataType: "json"
-
-  initPagination: ->
-    $('.projects-list-holder .pagination').on('ajax:success', (e, data) ->
-      $('.projects-list-holder').replaceWith(data.html)
-    )
diff --git a/app/assets/javascripts/protected_branch_select.js b/app/assets/javascripts/protected_branch_select.js
new file mode 100644
index 00000000000..3a47fc972dc
--- /dev/null
+++ b/app/assets/javascripts/protected_branch_select.js
@@ -0,0 +1,72 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.ProtectedBranchSelect = (function() {
+    function ProtectedBranchSelect(currentProject) {
+      this.toggleCreateNewButton = bind(this.toggleCreateNewButton, this);
+      this.getProtectedBranches = bind(this.getProtectedBranches, this);
+      $('.dropdown-footer').hide();
+      this.dropdown = $('.js-protected-branch-select').glDropdown({
+        data: this.getProtectedBranches,
+        filterable: true,
+        remote: false,
+        search: {
+          fields: ['title']
+        },
+        selectable: true,
+        toggleLabel: function(selected) {
+          if (selected && 'id' in selected) {
+            return selected.title;
+          } else {
+            return 'Protected Branch';
+          }
+        },
+        fieldName: 'protected_branch[name]',
+        text: function(protected_branch) {
+          return _.escape(protected_branch.title);
+        },
+        id: function(protected_branch) {
+          return _.escape(protected_branch.id);
+        },
+        onFilter: this.toggleCreateNewButton,
+        clicked: function() {
+          return $('.protect-branch-btn').attr('disabled', false);
+        }
+      });
+      $('.create-new-protected-branch').on('click', (function(_this) {
+        return function(event) {
+          _this.dropdown.data('glDropdown').remote.execute();
+          return _this.dropdown.data('glDropdown').selectRowAtIndex(event, 0);
+        };
+      })(this));
+    }
+
+    ProtectedBranchSelect.prototype.getProtectedBranches = function(term, callback) {
+      if (this.selectedBranch) {
+        return callback(gon.open_branches.concat(this.selectedBranch));
+      } else {
+        return callback(gon.open_branches);
+      }
+    };
+
+    ProtectedBranchSelect.prototype.toggleCreateNewButton = function(branchName) {
+      this.selectedBranch = {
+        title: branchName,
+        id: branchName,
+        text: branchName
+      };
+      if (branchName === '') {
+        $('.protected-branch-select-footer-list').addClass('hidden');
+        return $('.dropdown-footer').hide();
+      } else {
+        $('.create-new-protected-branch').text("Create Protected Branch: " + branchName);
+        $('.protected-branch-select-footer-list').removeClass('hidden');
+        return $('.dropdown-footer').show();
+      }
+    };
+
+    return ProtectedBranchSelect;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/protected_branch_select.js.coffee b/app/assets/javascripts/protected_branch_select.js.coffee
deleted file mode 100644
index 6d45770ace9..00000000000
--- a/app/assets/javascripts/protected_branch_select.js.coffee
+++ /dev/null
@@ -1,40 +0,0 @@
-class @ProtectedBranchSelect
-  constructor: (currentProject) ->
-    $('.dropdown-footer').hide();
-    @dropdown = $('.js-protected-branch-select').glDropdown(
-      data: @getProtectedBranches
-      filterable: true
-      remote: false
-      search:
-        fields: ['title']
-      selectable: true
-      toggleLabel: (selected) -> if (selected and 'id' of selected) then selected.title else 'Protected Branch'
-      fieldName: 'protected_branch[name]'
-      text: (protected_branch) -> _.escape(protected_branch.title)
-      id: (protected_branch) -> _.escape(protected_branch.id)
-      onFilter: @toggleCreateNewButton
-      clicked: () -> $('.protect-branch-btn').attr('disabled', false)
-    )
-
-    $('.create-new-protected-branch').on 'click', (event) =>
-      # Refresh the dropdown's data, which ends up calling `getProtectedBranches`
-      @dropdown.data('glDropdown').remote.execute()
-      @dropdown.data('glDropdown').selectRowAtIndex(event, 0)
-
-  getProtectedBranches: (term, callback) =>
-    if @selectedBranch
-      callback(gon.open_branches.concat(@selectedBranch))
-    else
-      callback(gon.open_branches)
-
-  toggleCreateNewButton: (branchName) =>
-    @selectedBranch = { title: branchName, id: branchName, text: branchName }
-
-    if branchName is ''
-      $('.protected-branch-select-footer-list').addClass('hidden')
-      $('.dropdown-footer').hide();
-    else
-      $('.create-new-protected-branch').text("Create Protected Branch: #{branchName}")
-      $('.protected-branch-select-footer-list').removeClass('hidden')
-      $('.dropdown-footer').show();
-
diff --git a/app/assets/javascripts/protected_branches.js b/app/assets/javascripts/protected_branches.js
new file mode 100644
index 00000000000..db21a19964d
--- /dev/null
+++ b/app/assets/javascripts/protected_branches.js
@@ -0,0 +1,35 @@
+(function() {
+  $(function() {
+    return $(".protected-branches-list :checkbox").change(function(e) {
+      var can_push, id, name, obj, url;
+      name = $(this).attr("name");
+      if (name === "developers_can_push" || name === "developers_can_merge") {
+        id = $(this).val();
+        can_push = $(this).is(":checked");
+        url = $(this).data("url");
+        return $.ajax({
+          type: "PATCH",
+          url: url,
+          dataType: "json",
+          data: {
+            id: id,
+            protected_branch: (
+              obj = {},
+              obj["" + name] = can_push,
+              obj
+            )
+          },
+          success: function() {
+            var row;
+            row = $(e.target);
+            return row.closest('tr').effect('highlight');
+          },
+          error: function() {
+            return new Flash("Failed to update branch!", "alert");
+          }
+        });
+      }
+    });
+  });
+
+}).call(this);
diff --git a/app/assets/javascripts/protected_branches.js.coffee b/app/assets/javascripts/protected_branches.js.coffee
deleted file mode 100644
index 79c2306e4d2..00000000000
--- a/app/assets/javascripts/protected_branches.js.coffee
+++ /dev/null
@@ -1,22 +0,0 @@
-$ ->
-  $(".protected-branches-list :checkbox").change (e) ->
-    name = $(this).attr("name")
-    if name == "developers_can_push"
-      id = $(this).val()
-      checked = $(this).is(":checked")
-      url = $(this).data("url")
-      $.ajax
-        type: "PUT"
-        url: url
-        dataType: "json"
-        data:
-          id: id
-          protected_branch:
-            developers_can_push: checked
-
-        success: ->
-          row = $(e.target)
-          row.closest('tr').effect('highlight')
-
-        error: ->
-          new Flash("Failed to update branch!", "alert")
diff --git a/app/assets/javascripts/right_sidebar.js b/app/assets/javascripts/right_sidebar.js
new file mode 100644
index 00000000000..dc4d5113826
--- /dev/null
+++ b/app/assets/javascripts/right_sidebar.js
@@ -0,0 +1,201 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.Sidebar = (function() {
+    function Sidebar(currentUser) {
+      this.toggleTodo = bind(this.toggleTodo, this);
+      this.sidebar = $('aside');
+      this.addEventListeners();
+    }
+
+    Sidebar.prototype.addEventListeners = function() {
+      this.sidebar.on('click', '.sidebar-collapsed-icon', this, this.sidebarCollapseClicked);
+      $('.dropdown').on('hidden.gl.dropdown', this, this.onSidebarDropdownHidden);
+      $('.dropdown').on('loading.gl.dropdown', this.sidebarDropdownLoading);
+      $('.dropdown').on('loaded.gl.dropdown', this.sidebarDropdownLoaded);
+      $(document).off('click', '.js-sidebar-toggle').on('click', '.js-sidebar-toggle', function(e, triggered) {
+        var $allGutterToggleIcons, $this, $thisIcon;
+        e.preventDefault();
+        $this = $(this);
+        $thisIcon = $this.find('i');
+        $allGutterToggleIcons = $('.js-sidebar-toggle i');
+        if ($thisIcon.hasClass('fa-angle-double-right')) {
+          $allGutterToggleIcons.removeClass('fa-angle-double-right').addClass('fa-angle-double-left');
+          $('aside.right-sidebar').removeClass('right-sidebar-expanded').addClass('right-sidebar-collapsed');
+          $('.page-with-sidebar').removeClass('right-sidebar-expanded').addClass('right-sidebar-collapsed');
+        } else {
+          $allGutterToggleIcons.removeClass('fa-angle-double-left').addClass('fa-angle-double-right');
+          $('aside.right-sidebar').removeClass('right-sidebar-collapsed').addClass('right-sidebar-expanded');
+          $('.page-with-sidebar').removeClass('right-sidebar-collapsed').addClass('right-sidebar-expanded');
+        }
+        if (!triggered) {
+          return $.cookie("collapsed_gutter", $('.right-sidebar').hasClass('right-sidebar-collapsed'), {
+            path: '/'
+          });
+        }
+      });
+      return $(document).off('click', '.js-issuable-todo').on('click', '.js-issuable-todo', this.toggleTodo);
+    };
+
+    Sidebar.prototype.toggleTodo = function(e) {
+      var $btnText, $this, $todoLoading, ajaxType, url;
+      $this = $(e.currentTarget);
+      $todoLoading = $('.js-issuable-todo-loading');
+      $btnText = $('.js-issuable-todo-text', $this);
+      ajaxType = $this.attr('data-delete-path') ? 'DELETE' : 'POST';
+      if ($this.attr('data-delete-path')) {
+        url = "" + ($this.attr('data-delete-path'));
+      } else {
+        url = "" + ($this.data('url'));
+      }
+      return $.ajax({
+        url: url,
+        type: ajaxType,
+        dataType: 'json',
+        data: {
+          issuable_id: $this.data('issuable-id'),
+          issuable_type: $this.data('issuable-type')
+        },
+        beforeSend: (function(_this) {
+          return function() {
+            return _this.beforeTodoSend($this, $todoLoading);
+          };
+        })(this)
+      }).done((function(_this) {
+        return function(data) {
+          return _this.todoUpdateDone(data, $this, $btnText, $todoLoading);
+        };
+      })(this));
+    };
+
+    Sidebar.prototype.beforeTodoSend = function($btn, $todoLoading) {
+      $btn.disable();
+      return $todoLoading.removeClass('hidden');
+    };
+
+    Sidebar.prototype.todoUpdateDone = function(data, $btn, $btnText, $todoLoading) {
+      var $todoPendingCount;
+      $todoPendingCount = $('.todos-pending-count');
+      $todoPendingCount.text(data.count);
+      $btn.enable();
+      $todoLoading.addClass('hidden');
+      if (data.count === 0) {
+        $todoPendingCount.addClass('hidden');
+      } else {
+        $todoPendingCount.removeClass('hidden');
+      }
+      if (data.delete_path != null) {
+        $btn.attr('aria-label', $btn.data('mark-text')).attr('data-delete-path', data.delete_path);
+        return $btnText.text($btn.data('mark-text'));
+      } else {
+        $btn.attr('aria-label', $btn.data('todo-text')).removeAttr('data-delete-path');
+        return $btnText.text($btn.data('todo-text'));
+      }
+    };
+
+    Sidebar.prototype.sidebarDropdownLoading = function(e) {
+      var $loading, $sidebarCollapsedIcon, i, img;
+      $sidebarCollapsedIcon = $(this).closest('.block').find('.sidebar-collapsed-icon');
+      img = $sidebarCollapsedIcon.find('img');
+      i = $sidebarCollapsedIcon.find('i');
+      $loading = $('<i class="fa fa-spinner fa-spin"></i>');
+      if (img.length) {
+        img.before($loading);
+        return img.hide();
+      } else if (i.length) {
+        i.before($loading);
+        return i.hide();
+      }
+    };
+
+    Sidebar.prototype.sidebarDropdownLoaded = function(e) {
+      var $sidebarCollapsedIcon, i, img;
+      $sidebarCollapsedIcon = $(this).closest('.block').find('.sidebar-collapsed-icon');
+      img = $sidebarCollapsedIcon.find('img');
+      $sidebarCollapsedIcon.find('i.fa-spin').remove();
+      i = $sidebarCollapsedIcon.find('i');
+      if (img.length) {
+        return img.show();
+      } else {
+        return i.show();
+      }
+    };
+
+    Sidebar.prototype.sidebarCollapseClicked = function(e) {
+      var $block, sidebar;
+      if ($(e.currentTarget).hasClass('dont-change-state')) {
+        return;
+      }
+      sidebar = e.data;
+      e.preventDefault();
+      $block = $(this).closest('.block');
+      return sidebar.openDropdown($block);
+    };
+
+    Sidebar.prototype.openDropdown = function(blockOrName) {
+      var $block;
+      $block = _.isString(blockOrName) ? this.getBlock(blockOrName) : blockOrName;
+      $block.find('.edit-link').trigger('click');
+      if (!this.isOpen()) {
+        this.setCollapseAfterUpdate($block);
+        return this.toggleSidebar('open');
+      }
+    };
+
+    Sidebar.prototype.setCollapseAfterUpdate = function($block) {
+      $block.addClass('collapse-after-update');
+      return $('.page-with-sidebar').addClass('with-overlay');
+    };
+
+    Sidebar.prototype.onSidebarDropdownHidden = function(e) {
+      var $block, sidebar;
+      sidebar = e.data;
+      e.preventDefault();
+      $block = $(this).closest('.block');
+      return sidebar.sidebarDropdownHidden($block);
+    };
+
+    Sidebar.prototype.sidebarDropdownHidden = function($block) {
+      if ($block.hasClass('collapse-after-update')) {
+        $block.removeClass('collapse-after-update');
+        $('.page-with-sidebar').removeClass('with-overlay');
+        return this.toggleSidebar('hide');
+      }
+    };
+
+    Sidebar.prototype.triggerOpenSidebar = function() {
+      return this.sidebar.find('.js-sidebar-toggle').trigger('click');
+    };
+
+    Sidebar.prototype.toggleSidebar = function(action) {
+      if (action == null) {
+        action = 'toggle';
+      }
+      if (action === 'toggle') {
+        this.triggerOpenSidebar();
+      }
+      if (action === 'open') {
+        if (!this.isOpen()) {
+          this.triggerOpenSidebar();
+        }
+      }
+      if (action === 'hide') {
+        if (this.isOpen()) {
+          return this.triggerOpenSidebar();
+        }
+      }
+    };
+
+    Sidebar.prototype.isOpen = function() {
+      return this.sidebar.is('.right-sidebar-expanded');
+    };
+
+    Sidebar.prototype.getBlock = function(name) {
+      return this.sidebar.find(".block." + name);
+    };
+
+    return Sidebar;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/right_sidebar.js.coffee b/app/assets/javascripts/right_sidebar.js.coffee
deleted file mode 100644
index 12340bbce54..00000000000
--- a/app/assets/javascripts/right_sidebar.js.coffee
+++ /dev/null
@@ -1,172 +0,0 @@
-class @Sidebar
-  constructor: (currentUser) ->
-    @sidebar = $('aside')
-
-    @addEventListeners()
-
-  addEventListeners: ->
-    @sidebar.on('click', '.sidebar-collapsed-icon', @, @sidebarCollapseClicked)
-    $('.dropdown').on('hidden.gl.dropdown', @, @onSidebarDropdownHidden)
-    $('.dropdown').on('loading.gl.dropdown', @sidebarDropdownLoading)
-    $('.dropdown').on('loaded.gl.dropdown', @sidebarDropdownLoaded)
-
-
-    $(document)
-      .off 'click', '.js-sidebar-toggle'
-      .on 'click', '.js-sidebar-toggle', (e, triggered) ->
-        e.preventDefault()
-        $this = $(this)
-        $thisIcon = $this.find 'i'
-        $allGutterToggleIcons = $('.js-sidebar-toggle i')
-        if $thisIcon.hasClass('fa-angle-double-right')
-          $allGutterToggleIcons
-            .removeClass('fa-angle-double-right')
-            .addClass('fa-angle-double-left')
-          $('aside.right-sidebar')
-            .removeClass('right-sidebar-expanded')
-            .addClass('right-sidebar-collapsed')
-          $('.page-with-sidebar')
-            .removeClass('right-sidebar-expanded')
-            .addClass('right-sidebar-collapsed')
-        else
-          $allGutterToggleIcons
-            .removeClass('fa-angle-double-left')
-            .addClass('fa-angle-double-right')
-          $('aside.right-sidebar')
-            .removeClass('right-sidebar-collapsed')
-            .addClass('right-sidebar-expanded')
-          $('.page-with-sidebar')
-            .removeClass('right-sidebar-collapsed')
-            .addClass('right-sidebar-expanded')
-        if not triggered
-          $.cookie("collapsed_gutter",
-            $('.right-sidebar')
-              .hasClass('right-sidebar-collapsed'), { path: '/' })
-
-    $(document)
-      .off 'click', '.js-issuable-todo'
-      .on 'click', '.js-issuable-todo', @toggleTodo
-
-  toggleTodo: (e) =>
-    $this = $(e.currentTarget)
-    $todoLoading = $('.js-issuable-todo-loading')
-    $btnText = $('.js-issuable-todo-text', $this)
-    ajaxType = if $this.attr('data-delete-path') then 'DELETE' else 'POST'
-
-    if $this.attr('data-delete-path')
-      url = "#{$this.attr('data-delete-path')}"
-    else
-      url = "#{$this.data('url')}"
-
-    $.ajax(
-      url: url
-      type: ajaxType
-      dataType: 'json'
-      data:
-        issuable_id: $this.data('issuable-id')
-        issuable_type: $this.data('issuable-type')
-      beforeSend: =>
-        @beforeTodoSend($this, $todoLoading)
-    ).done (data) =>
-      @todoUpdateDone(data, $this, $btnText, $todoLoading)
-
-  beforeTodoSend: ($btn, $todoLoading) ->
-    $btn.disable()
-    $todoLoading.removeClass 'hidden'
-
-  todoUpdateDone: (data, $btn, $btnText, $todoLoading) ->
-    $todoPendingCount = $('.todos-pending-count')
-    $todoPendingCount.text data.count
-
-    $btn.enable()
-    $todoLoading.addClass 'hidden'
-
-    if data.count is 0
-      $todoPendingCount.addClass 'hidden'
-    else
-      $todoPendingCount.removeClass 'hidden'
-
-    if data.delete_path?
-      $btn
-        .attr 'aria-label', $btn.data('mark-text')
-        .attr 'data-delete-path', data.delete_path
-      $btnText.text $btn.data('mark-text')
-    else
-      $btn
-        .attr 'aria-label', $btn.data('todo-text')
-        .removeAttr 'data-delete-path'
-      $btnText.text $btn.data('todo-text')
-
-  sidebarDropdownLoading: (e) ->
-    $sidebarCollapsedIcon = $(@).closest('.block').find('.sidebar-collapsed-icon')
-    img = $sidebarCollapsedIcon.find('img')
-    i = $sidebarCollapsedIcon.find('i')
-    $loading = $('<i class="fa fa-spinner fa-spin"></i>')
-    if img.length
-      img.before($loading)
-      img.hide()
-    else if i.length
-      i.before($loading)
-      i.hide()
-
-  sidebarDropdownLoaded: (e) ->
-    $sidebarCollapsedIcon = $(@).closest('.block').find('.sidebar-collapsed-icon')
-    img = $sidebarCollapsedIcon.find('img')
-    $sidebarCollapsedIcon.find('i.fa-spin').remove()
-    i = $sidebarCollapsedIcon.find('i')
-    if img.length
-      img.show()
-    else
-      i.show()
-
-  sidebarCollapseClicked: (e) ->
-    sidebar = e.data
-    e.preventDefault()
-    $block = $(@).closest('.block')
-    sidebar.openDropdown($block);
-
-  openDropdown: (blockOrName) ->
-    $block = if _.isString(blockOrName) then @getBlock(blockOrName) else blockOrName
-
-    $block.find('.edit-link').trigger('click')
-
-    if not @isOpen()
-      @setCollapseAfterUpdate($block)
-      @toggleSidebar('open')
-
-  setCollapseAfterUpdate: ($block) ->
-    $block.addClass('collapse-after-update')
-    $('.page-with-sidebar').addClass('with-overlay')
-
-  onSidebarDropdownHidden: (e) ->
-    sidebar = e.data
-    e.preventDefault()
-    $block = $(@).closest('.block')
-    sidebar.sidebarDropdownHidden($block)
-
-  sidebarDropdownHidden: ($block) ->
-    if $block.hasClass('collapse-after-update')
-      $block.removeClass('collapse-after-update')
-      $('.page-with-sidebar').removeClass('with-overlay')
-      @toggleSidebar('hide')
-
-  triggerOpenSidebar: ->
-    @sidebar
-      .find('.js-sidebar-toggle')
-      .trigger('click')
-
-  toggleSidebar: (action = 'toggle') ->
-    if action is 'toggle'
-      @triggerOpenSidebar()
-
-    if action is 'open'
-      @triggerOpenSidebar() if not @isOpen()
-
-    if action is 'hide'
-      @triggerOpenSidebar() if @isOpen()
-
-  isOpen: ->
-    @sidebar.is('.right-sidebar-expanded')
-
-  getBlock: (name) ->
-    @sidebar.find(".block.#{name}")
diff --git a/app/assets/javascripts/search.js b/app/assets/javascripts/search.js
new file mode 100644
index 00000000000..d34346f862b
--- /dev/null
+++ b/app/assets/javascripts/search.js
@@ -0,0 +1,93 @@
+(function() {
+  this.Search = (function() {
+    function Search() {
+      var $groupDropdown, $projectDropdown;
+      $groupDropdown = $('.js-search-group-dropdown');
+      $projectDropdown = $('.js-search-project-dropdown');
+      this.eventListeners();
+      $groupDropdown.glDropdown({
+        selectable: true,
+        filterable: true,
+        fieldName: 'group_id',
+        data: function(term, callback) {
+          return Api.groups(term, null, function(data) {
+            data.unshift({
+              name: 'Any'
+            });
+            data.splice(1, 0, 'divider');
+            return callback(data);
+          });
+        },
+        id: function(obj) {
+          return obj.id;
+        },
+        text: function(obj) {
+          return obj.name;
+        },
+        toggleLabel: function(obj) {
+          return ($groupDropdown.data('default-label')) + " " + obj.name;
+        },
+        clicked: (function(_this) {
+          return function() {
+            return _this.submitSearch();
+          };
+        })(this)
+      });
+      $projectDropdown.glDropdown({
+        selectable: true,
+        filterable: true,
+        fieldName: 'project_id',
+        data: function(term, callback) {
+          return Api.projects(term, 'id', function(data) {
+            data.unshift({
+              name_with_namespace: 'Any'
+            });
+            data.splice(1, 0, 'divider');
+            return callback(data);
+          });
+        },
+        id: function(obj) {
+          return obj.id;
+        },
+        text: function(obj) {
+          return obj.name_with_namespace;
+        },
+        toggleLabel: function(obj) {
+          return ($projectDropdown.data('default-label')) + " " + obj.name_with_namespace;
+        },
+        clicked: (function(_this) {
+          return function() {
+            return _this.submitSearch();
+          };
+        })(this)
+      });
+    }
+
+    Search.prototype.eventListeners = function() {
+      $(document).off('keyup', '.js-search-input').on('keyup', '.js-search-input', this.searchKeyUp);
+      return $(document).off('click', '.js-search-clear').on('click', '.js-search-clear', this.clearSearchField);
+    };
+
+    Search.prototype.submitSearch = function() {
+      return $('.js-search-form').submit();
+    };
+
+    Search.prototype.searchKeyUp = function() {
+      var $input;
+      $input = $(this);
+      if ($input.val() === '') {
+        return $('.js-search-clear').addClass('hidden');
+      } else {
+        return $('.js-search-clear').removeClass('hidden');
+      }
+    };
+
+    Search.prototype.clearSearchField = function() {
+      return $('.js-search-input').val('').trigger('keyup').focus();
+    };
+
+    return Search;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/search.js.coffee b/app/assets/javascripts/search.js.coffee
deleted file mode 100644
index 661e1195f60..00000000000
--- a/app/assets/javascripts/search.js.coffee
+++ /dev/null
@@ -1,75 +0,0 @@
-class @Search
-  constructor: ->
-    $groupDropdown = $('.js-search-group-dropdown')
-    $projectDropdown = $('.js-search-project-dropdown')
-    @eventListeners()
-
-    $groupDropdown.glDropdown(
-      selectable: true
-      filterable: true
-      fieldName: 'group_id'
-      data: (term, callback) ->
-        Api.groups term, null, (data) ->
-          data.unshift(
-            name: 'Any'
-          )
-          data.splice 1, 0, 'divider'
-
-          callback(data)
-      id: (obj) ->
-        obj.id
-      text: (obj) ->
-        obj.name
-      toggleLabel: (obj) ->
-        "#{$groupDropdown.data('default-label')} #{obj.name}"
-      clicked: =>
-        @submitSearch()
-    )
-
-    $projectDropdown.glDropdown(
-      selectable: true
-      filterable: true
-      fieldName: 'project_id'
-      data: (term, callback) ->
-        Api.projects term, 'id', (data) ->
-          data.unshift(
-            name_with_namespace: 'Any'
-          )
-          data.splice 1, 0, 'divider'
-
-          callback(data)
-      id: (obj) ->
-        obj.id
-      text: (obj) ->
-        obj.name_with_namespace
-      toggleLabel: (obj) ->
-        "#{$projectDropdown.data('default-label')} #{obj.name_with_namespace}"
-      clicked: =>
-        @submitSearch()
-    )
-
-  eventListeners: ->
-    $(document)
-      .off 'keyup', '.js-search-input'
-      .on 'keyup', '.js-search-input', @searchKeyUp
-
-    $(document)
-      .off 'click', '.js-search-clear'
-      .on 'click', '.js-search-clear', @clearSearchField
-
-  submitSearch: ->
-    $('.js-search-form').submit()
-
-  searchKeyUp: ->
-    $input = $(@)
-
-    if $input.val() is ''
-      $('.js-search-clear').addClass 'hidden'
-    else
-      $('.js-search-clear').removeClass 'hidden'
-
-  clearSearchField: ->
-    $('.js-search-input')
-      .val ''
-      .trigger 'keyup'
-      .focus()
diff --git a/app/assets/javascripts/search_autocomplete.js b/app/assets/javascripts/search_autocomplete.js
new file mode 100644
index 00000000000..990f6536eb2
--- /dev/null
+++ b/app/assets/javascripts/search_autocomplete.js
@@ -0,0 +1,360 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.SearchAutocomplete = (function() {
+    var KEYCODE;
+
+    KEYCODE = {
+      ESCAPE: 27,
+      BACKSPACE: 8,
+      ENTER: 13
+    };
+
+    function SearchAutocomplete(opts) {
+      var ref, ref1, ref2, ref3, ref4;
+      if (opts == null) {
+        opts = {};
+      }
+      this.onSearchInputBlur = bind(this.onSearchInputBlur, this);
+      this.onClearInputClick = bind(this.onClearInputClick, this);
+      this.onSearchInputFocus = bind(this.onSearchInputFocus, this);
+      this.onSearchInputClick = bind(this.onSearchInputClick, this);
+      this.onSearchInputKeyUp = bind(this.onSearchInputKeyUp, this);
+      this.onSearchInputKeyDown = bind(this.onSearchInputKeyDown, this);
+      this.wrap = (ref = opts.wrap) != null ? ref : $('.search'), this.optsEl = (ref1 = opts.optsEl) != null ? ref1 : this.wrap.find('.search-autocomplete-opts'), this.autocompletePath = (ref2 = opts.autocompletePath) != null ? ref2 : this.optsEl.data('autocomplete-path'), this.projectId = (ref3 = opts.projectId) != null ? ref3 : this.optsEl.data('autocomplete-project-id') || '', this.projectRef = (ref4 = opts.projectRef) != null ? ref4 : this.optsEl.data('autocomplete-project-ref') || '';
+      this.dropdown = this.wrap.find('.dropdown');
+      this.dropdownContent = this.dropdown.find('.dropdown-content');
+      this.locationBadgeEl = this.getElement('.location-badge');
+      this.scopeInputEl = this.getElement('#scope');
+      this.searchInput = this.getElement('.search-input');
+      this.projectInputEl = this.getElement('#search_project_id');
+      this.groupInputEl = this.getElement('#group_id');
+      this.searchCodeInputEl = this.getElement('#search_code');
+      this.repositoryInputEl = this.getElement('#repository_ref');
+      this.clearInput = this.getElement('.js-clear-input');
+      this.saveOriginalState();
+      if (gon.current_user_id) {
+        this.createAutocomplete();
+      }
+      this.searchInput.addClass('disabled');
+      this.saveTextLength();
+      this.bindEvents();
+    }
+
+    SearchAutocomplete.prototype.getElement = function(selector) {
+      return this.wrap.find(selector);
+    };
+
+    SearchAutocomplete.prototype.saveOriginalState = function() {
+      return this.originalState = this.serializeState();
+    };
+
+    SearchAutocomplete.prototype.saveTextLength = function() {
+      return this.lastTextLength = this.searchInput.val().length;
+    };
+
+    SearchAutocomplete.prototype.createAutocomplete = function() {
+      return this.searchInput.glDropdown({
+        filterInputBlur: false,
+        filterable: true,
+        filterRemote: true,
+        highlight: true,
+        enterCallback: false,
+        filterInput: 'input#search',
+        search: {
+          fields: ['text']
+        },
+        data: this.getData.bind(this),
+        selectable: true,
+        clicked: this.onClick.bind(this)
+      });
+    };
+
+    SearchAutocomplete.prototype.getData = function(term, callback) {
+      var _this, contents, jqXHR;
+      _this = this;
+      if (!term) {
+        if (contents = this.getCategoryContents()) {
+          this.searchInput.data('glDropdown').filter.options.callback(contents);
+          this.enableAutocomplete();
+        }
+        return;
+      }
+      if (this.loadingSuggestions) {
+        return;
+      }
+      this.loadingSuggestions = true;
+      return jqXHR = $.get(this.autocompletePath, {
+        project_id: this.projectId,
+        project_ref: this.projectRef,
+        term: term
+      }, function(response) {
+        var data, firstCategory, i, lastCategory, len, suggestion;
+        if (!response.length) {
+          _this.disableAutocomplete();
+          return;
+        }
+        data = [];
+        firstCategory = true;
+        for (i = 0, len = response.length; i < len; i++) {
+          suggestion = response[i];
+          if (lastCategory !== suggestion.category) {
+            if (!firstCategory) {
+              data.push('separator');
+            }
+            if (firstCategory) {
+              firstCategory = false;
+            }
+            data.push({
+              header: suggestion.category
+            });
+            lastCategory = suggestion.category;
+          }
+          data.push({
+            id: (suggestion.category.toLowerCase()) + "-" + suggestion.id,
+            category: suggestion.category,
+            text: suggestion.label,
+            url: suggestion.url
+          });
+        }
+        if (data.length) {
+          data.push('separator');
+          data.push({
+            text: "Result name contains \"" + term + "\"",
+            url: "/search?search=" + term + "&project_id=" + (_this.projectInputEl.val()) + "&group_id=" + (_this.groupInputEl.val())
+          });
+        }
+        return callback(data);
+      }).always(function() {
+        return _this.loadingSuggestions = false;
+      });
+    };
+
+    SearchAutocomplete.prototype.getCategoryContents = function() {
+      var dashboardOptions, groupOptions, issuesPath, items, mrPath, name, options, projectOptions, userId, utils;
+      userId = gon.current_user_id;
+      utils = gl.utils, projectOptions = gl.projectOptions, groupOptions = gl.groupOptions, dashboardOptions = gl.dashboardOptions;
+      if (utils.isInGroupsPage() && groupOptions) {
+        options = groupOptions[utils.getGroupSlug()];
+      } else if (utils.isInProjectPage() && projectOptions) {
+        options = projectOptions[utils.getProjectSlug()];
+      } else if (dashboardOptions) {
+        options = dashboardOptions;
+      }
+      issuesPath = options.issuesPath, mrPath = options.mrPath, name = options.name;
+      items = [
+        {
+          header: "" + name
+        }, {
+          text: 'Issues assigned to me',
+          url: issuesPath + "/?assignee_id=" + userId
+        }, {
+          text: "Issues I've created",
+          url: issuesPath + "/?author_id=" + userId
+        }, 'separator', {
+          text: 'Merge requests assigned to me',
+          url: mrPath + "/?assignee_id=" + userId
+        }, {
+          text: "Merge requests I've created",
+          url: mrPath + "/?author_id=" + userId
+        }
+      ];
+      if (!name) {
+        items.splice(0, 1);
+      }
+      return items;
+    };
+
+    SearchAutocomplete.prototype.serializeState = function() {
+      return {
+        search_project_id: this.projectInputEl.val(),
+        group_id: this.groupInputEl.val(),
+        search_code: this.searchCodeInputEl.val(),
+        repository_ref: this.repositoryInputEl.val(),
+        scope: this.scopeInputEl.val(),
+        _location: this.locationBadgeEl.text()
+      };
+    };
+
+    SearchAutocomplete.prototype.bindEvents = function() {
+      this.searchInput.on('keydown', this.onSearchInputKeyDown);
+      this.searchInput.on('keyup', this.onSearchInputKeyUp);
+      this.searchInput.on('click', this.onSearchInputClick);
+      this.searchInput.on('focus', this.onSearchInputFocus);
+      this.searchInput.on('blur', this.onSearchInputBlur);
+      this.clearInput.on('click', this.onClearInputClick);
+      return this.locationBadgeEl.on('click', (function(_this) {
+        return function() {
+          return _this.searchInput.focus();
+        };
+      })(this));
+    };
+
+    SearchAutocomplete.prototype.enableAutocomplete = function() {
+      var _this;
+      if (!gon.current_user_id) {
+        return;
+      }
+      if (!this.dropdown.hasClass('open')) {
+        _this = this;
+        this.loadingSuggestions = false;
+        this.dropdown.addClass('open').trigger('shown.bs.dropdown');
+        return this.searchInput.removeClass('disabled');
+      }
+    };
+
+    SearchAutocomplete.prototype.onSearchInputKeyDown = function() {
+      return this.saveTextLength();
+    };
+
+    SearchAutocomplete.prototype.onSearchInputKeyUp = function(e) {
+      switch (e.keyCode) {
+        case KEYCODE.BACKSPACE:
+          if (this.lastTextLength === 0 && this.badgePresent()) {
+            this.removeLocationBadge();
+          }
+          if (this.lastTextLength === 1) {
+            this.disableAutocomplete();
+          }
+          if (this.lastTextLength > 1) {
+            this.enableAutocomplete();
+          }
+          break;
+        case KEYCODE.ESCAPE:
+          this.restoreOriginalState();
+          break;
+        default:
+          if (this.searchInput.val() === '') {
+            this.disableAutocomplete();
+          } else {
+            if (e.keyCode !== KEYCODE.ENTER) {
+              this.enableAutocomplete();
+            }
+          }
+      }
+      this.wrap.toggleClass('has-value', !!e.target.value);
+    };
+
+    SearchAutocomplete.prototype.onSearchInputClick = function(e) {
+      return e.stopImmediatePropagation();
+    };
+
+    SearchAutocomplete.prototype.onSearchInputFocus = function() {
+      this.isFocused = true;
+      this.wrap.addClass('search-active');
+      if (this.getValue() === '') {
+        return this.getData();
+      }
+    };
+
+    SearchAutocomplete.prototype.getValue = function() {
+      return this.searchInput.val();
+    };
+
+    SearchAutocomplete.prototype.onClearInputClick = function(e) {
+      e.preventDefault();
+      return this.searchInput.val('').focus();
+    };
+
+    SearchAutocomplete.prototype.onSearchInputBlur = function(e) {
+      this.isFocused = false;
+      this.wrap.removeClass('search-active');
+      if (this.searchInput.val() === '') {
+        return this.restoreOriginalState();
+      }
+    };
+
+    SearchAutocomplete.prototype.addLocationBadge = function(item) {
+      var badgeText, category, value;
+      category = item.category != null ? item.category + ": " : '';
+      value = item.value != null ? item.value : '';
+      badgeText = "" + category + value;
+      this.locationBadgeEl.text(badgeText).show();
+      return this.wrap.addClass('has-location-badge');
+    };
+
+    SearchAutocomplete.prototype.hasLocationBadge = function() {
+      return this.wrap.is('.has-location-badge');
+    };
+
+    SearchAutocomplete.prototype.restoreOriginalState = function() {
+      var i, input, inputs, len;
+      inputs = Object.keys(this.originalState);
+      for (i = 0, len = inputs.length; i < len; i++) {
+        input = inputs[i];
+        this.getElement("#" + input).val(this.originalState[input]);
+      }
+      if (this.originalState._location === '') {
+        return this.locationBadgeEl.hide();
+      } else {
+        return this.addLocationBadge({
+          value: this.originalState._location
+        });
+      }
+    };
+
+    SearchAutocomplete.prototype.badgePresent = function() {
+      return this.locationBadgeEl.length;
+    };
+
+    SearchAutocomplete.prototype.resetSearchState = function() {
+      var i, input, inputs, len, results;
+      inputs = Object.keys(this.originalState);
+      results = [];
+      for (i = 0, len = inputs.length; i < len; i++) {
+        input = inputs[i];
+        if (input === '_location') {
+          break;
+        }
+        results.push(this.getElement("#" + input).val(''));
+      }
+      return results;
+    };
+
+    SearchAutocomplete.prototype.removeLocationBadge = function() {
+      this.locationBadgeEl.hide();
+      this.resetSearchState();
+      this.wrap.removeClass('has-location-badge');
+      return this.disableAutocomplete();
+    };
+
+    SearchAutocomplete.prototype.disableAutocomplete = function() {
+      this.searchInput.addClass('disabled');
+      this.dropdown.removeClass('open');
+      return this.restoreMenu();
+    };
+
+    SearchAutocomplete.prototype.restoreMenu = function() {
+      var html;
+      html = "<ul> <li><a class='dropdown-menu-empty-link is-focused'>Loading...</a></li> </ul>";
+      return this.dropdownContent.html(html);
+    };
+
+    SearchAutocomplete.prototype.onClick = function(item, $el, e) {
+      if (location.pathname.indexOf(item.url) !== -1) {
+        e.preventDefault();
+        if (!this.badgePresent) {
+          if (item.category === 'Projects') {
+            this.projectInputEl.val(item.id);
+            this.addLocationBadge({
+              value: 'This project'
+            });
+          }
+          if (item.category === 'Groups') {
+            this.groupInputEl.val(item.id);
+            this.addLocationBadge({
+              value: 'This group'
+            });
+          }
+        }
+        $el.removeClass('is-active');
+        this.disableAutocomplete();
+        return this.searchInput.val('').focus();
+      }
+    };
+
+    return SearchAutocomplete;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/search_autocomplete.js.coffee b/app/assets/javascripts/search_autocomplete.js.coffee
deleted file mode 100644
index 72b1d3dfb1e..00000000000
--- a/app/assets/javascripts/search_autocomplete.js.coffee
+++ /dev/null
@@ -1,334 +0,0 @@
-class @SearchAutocomplete
-
-  KEYCODE =
-    ESCAPE: 27
-    BACKSPACE: 8
-    ENTER: 13
-
-  constructor: (opts = {}) ->
-    {
-      @wrap = $('.search')
-
-      @optsEl = @wrap.find('.search-autocomplete-opts')
-      @autocompletePath = @optsEl.data('autocomplete-path')
-      @projectId = @optsEl.data('autocomplete-project-id') || ''
-      @projectRef = @optsEl.data('autocomplete-project-ref') || ''
-
-    } = opts
-
-    # Dropdown Element
-    @dropdown = @wrap.find('.dropdown')
-    @dropdownContent = @dropdown.find('.dropdown-content')
-
-    @locationBadgeEl = @getElement('.location-badge')
-    @scopeInputEl = @getElement('#scope')
-    @searchInput = @getElement('.search-input')
-    @projectInputEl = @getElement('#search_project_id')
-    @groupInputEl = @getElement('#group_id')
-    @searchCodeInputEl = @getElement('#search_code')
-    @repositoryInputEl = @getElement('#repository_ref')
-    @clearInput = @getElement('.js-clear-input')
-
-    @saveOriginalState()
-
-    # Only when user is logged in
-    @createAutocomplete() if gon.current_user_id
-
-    @searchInput.addClass('disabled')
-
-    @saveTextLength()
-
-    @bindEvents()
-
-  # Finds an element inside wrapper element
-  getElement: (selector) ->
-    @wrap.find(selector)
-
-  saveOriginalState: ->
-    @originalState = @serializeState()
-
-  saveTextLength: ->
-    @lastTextLength = @searchInput.val().length
-
-  createAutocomplete: ->
-    @searchInput.glDropdown
-        filterInputBlur: false
-        filterable: true
-        filterRemote: true
-        highlight: true
-        enterCallback: false
-        filterInput: 'input#search'
-        search:
-          fields: ['text']
-        data: @getData.bind(@)
-        selectable: true
-        clicked: @onClick.bind(@)
-
-  getData: (term, callback) ->
-    _this = @
-
-    unless term
-      if contents = @getCategoryContents()
-        @searchInput.data('glDropdown').filter.options.callback contents
-        @enableAutocomplete()
-
-      return
-
-    # Prevent multiple ajax calls
-    return if @loadingSuggestions
-
-    @loadingSuggestions = true
-
-    jqXHR = $.get(@autocompletePath, {
-        project_id: @projectId
-        project_ref: @projectRef
-        term: term
-      }, (response) ->
-        # Hide dropdown menu if no suggestions returns
-        if !response.length
-          _this.disableAutocomplete()
-          return
-
-        data = []
-
-        # List results
-        firstCategory = true
-        for suggestion in response
-
-          # Add group header before list each group
-          if lastCategory isnt suggestion.category
-            data.push 'separator' if !firstCategory
-
-            firstCategory = false if firstCategory
-
-            data.push
-              header: suggestion.category
-
-            lastCategory = suggestion.category
-
-          data.push
-            id: "#{suggestion.category.toLowerCase()}-#{suggestion.id}"
-            category: suggestion.category
-            text: suggestion.label
-            url: suggestion.url
-
-        # Add option to proceed with the search
-        if data.length
-          data.push('separator')
-          data.push
-            text: "Result name contains \"#{term}\""
-            url: "/search?\
-                  search=#{term}\
-                  &project_id=#{_this.projectInputEl.val()}\
-                  &group_id=#{_this.groupInputEl.val()}"
-
-        callback(data)
-    ).always ->
-      _this.loadingSuggestions = false
-
-
-  getCategoryContents: ->
-
-    userId = gon.current_user_id
-    { utils, projectOptions, groupOptions, dashboardOptions } = gl
-
-    if utils.isInGroupsPage() and groupOptions
-      options = groupOptions[utils.getGroupSlug()]
-
-    else if utils.isInProjectPage() and projectOptions
-      options = projectOptions[utils.getProjectSlug()]
-
-    else if dashboardOptions
-      options = dashboardOptions
-
-    { issuesPath, mrPath, name } = options
-
-    items = [
-      { header: "#{name}" }
-      { text: 'Issues assigned to me', url: "#{issuesPath}/?assignee_id=#{userId}" }
-      { text: "Issues I've created",   url: "#{issuesPath}/?author_id=#{userId}"   }
-      'separator'
-      { text: 'Merge requests assigned to me', url: "#{mrPath}/?assignee_id=#{userId}" }
-      { text: "Merge requests I've created",   url: "#{mrPath}/?author_id=#{userId}"   }
-    ]
-
-    items.splice 0, 1 unless name
-
-    return items
-
-
-  serializeState: ->
-    {
-      # Search Criteria
-      search_project_id: @projectInputEl.val()
-      group_id: @groupInputEl.val()
-      search_code: @searchCodeInputEl.val()
-      repository_ref: @repositoryInputEl.val()
-      scope: @scopeInputEl.val()
-
-      # Location badge
-      _location: @locationBadgeEl.text()
-    }
-
-  bindEvents: ->
-    @searchInput.on 'keydown', @onSearchInputKeyDown
-    @searchInput.on 'keyup', @onSearchInputKeyUp
-    @searchInput.on 'click', @onSearchInputClick
-    @searchInput.on 'focus', @onSearchInputFocus
-    @searchInput.on 'blur', @onSearchInputBlur
-    @clearInput.on 'click', @onClearInputClick
-    @locationBadgeEl.on 'click', =>
-      @searchInput.focus()
-
-  enableAutocomplete: ->
-    # No need to enable anything if user is not logged in
-    return if !gon.current_user_id
-
-    unless @dropdown.hasClass('open')
-      _this = @
-      @loadingSuggestions = false
-
-      @dropdown
-        .addClass('open')
-        .trigger('shown.bs.dropdown')
-      @searchInput.removeClass('disabled')
-
-  onSearchInputKeyDown: =>
-    # Saves last length of the entered text
-    @saveTextLength()
-
-  onSearchInputKeyUp: (e) =>
-    switch e.keyCode
-      when KEYCODE.BACKSPACE
-        # when trying to remove the location badge
-        if @lastTextLength is 0 and @badgePresent()
-            @removeLocationBadge()
-
-        # When removing the last character and no badge is present
-        if @lastTextLength is 1
-          @disableAutocomplete()
-
-        # When removing any character from existin value
-        if @lastTextLength > 1
-          @enableAutocomplete()
-
-      when KEYCODE.ESCAPE
-        @restoreOriginalState()
-
-      else
-        # Handle the case when deleting the input value other than backspace
-        # e.g. Pressing ctrl + backspace or ctrl + x
-        if @searchInput.val() is ''
-          @disableAutocomplete()
-        else
-          # We should display the menu only when input is not empty
-          @enableAutocomplete() if e.keyCode isnt KEYCODE.ENTER
-
-    @wrap.toggleClass 'has-value', !!e.target.value
-
-    # Avoid falsy value to be returned
-    return
-
-  onSearchInputClick: (e) =>
-    # Prevents closing the dropdown menu
-    e.stopImmediatePropagation()
-
-  onSearchInputFocus: =>
-    @isFocused = true
-    @wrap.addClass('search-active')
-
-    @getData()  if @getValue() is ''
-
-
-  getValue: -> return @searchInput.val()
-
-
-  onClearInputClick: (e) =>
-    e.preventDefault()
-    @searchInput.val('').focus()
-
-  onSearchInputBlur: (e) =>
-    @isFocused = false
-    @wrap.removeClass('search-active')
-
-    # If input is blank then restore state
-    if @searchInput.val() is ''
-      @restoreOriginalState()
-
-  addLocationBadge: (item) ->
-    category = if item.category? then "#{item.category}: " else ''
-    value = if item.value? then item.value else ''
-
-    badgeText = "#{category}#{value}"
-    @locationBadgeEl.text(badgeText).show()
-    @wrap.addClass('has-location-badge')
-
-
-  hasLocationBadge: -> return @wrap.is '.has-location-badge'
-
-
-  restoreOriginalState: ->
-    inputs = Object.keys @originalState
-
-    for input in inputs
-      @getElement("##{input}").val(@originalState[input])
-
-    if @originalState._location is ''
-      @locationBadgeEl.hide()
-    else
-      @addLocationBadge(
-        value: @originalState._location
-      )
-
-  badgePresent: ->
-    @locationBadgeEl.length
-
-  resetSearchState: ->
-    inputs = Object.keys @originalState
-
-    for input in inputs
-
-      # _location isnt a input
-      break if input is '_location'
-
-      @getElement("##{input}").val('')
-
-
-  removeLocationBadge: ->
-
-    @locationBadgeEl.hide()
-    @resetSearchState()
-    @wrap.removeClass('has-location-badge')
-    @disableAutocomplete()
-
-
-  disableAutocomplete: ->
-    @searchInput.addClass('disabled')
-    @dropdown.removeClass('open')
-    @restoreMenu()
-
-  restoreMenu: ->
-    html = "<ul>
-              <li><a class='dropdown-menu-empty-link is-focused'>Loading...</a></li>
-            </ul>"
-    @dropdownContent.html(html)
-
-  onClick: (item, $el, e) ->
-    if location.pathname.indexOf(item.url) isnt -1
-      e.preventDefault()
-      if not @badgePresent
-        if item.category is 'Projects'
-          @projectInputEl.val(item.id)
-          @addLocationBadge(
-            value: 'This project'
-          )
-
-        if item.category is 'Groups'
-          @groupInputEl.val(item.id)
-          @addLocationBadge(
-            value: 'This group'
-          )
-
-      $el.removeClass('is-active')
-      @disableAutocomplete()
-      @searchInput.val('').focus()
diff --git a/app/assets/javascripts/shortcuts.js b/app/assets/javascripts/shortcuts.js
new file mode 100644
index 00000000000..3b28332854a
--- /dev/null
+++ b/app/assets/javascripts/shortcuts.js
@@ -0,0 +1,97 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.Shortcuts = (function() {
+    function Shortcuts(skipResetBindings) {
+      this.onToggleHelp = bind(this.onToggleHelp, this);
+      this.enabledHelp = [];
+      if (!skipResetBindings) {
+        Mousetrap.reset();
+      }
+      Mousetrap.bind('?', this.onToggleHelp);
+      Mousetrap.bind('s', Shortcuts.focusSearch);
+      Mousetrap.bind('f', (function(_this) {
+        return function(e) {
+          return _this.focusFilter(e);
+        };
+      })(this));
+      Mousetrap.bind(['ctrl+shift+p', 'command+shift+p'], this.toggleMarkdownPreview);
+      if (typeof findFileURL !== "undefined" && findFileURL !== null) {
+        Mousetrap.bind('t', function() {
+          return Turbolinks.visit(findFileURL);
+        });
+      }
+    }
+
+    Shortcuts.prototype.onToggleHelp = function(e) {
+      e.preventDefault();
+      return Shortcuts.toggleHelp(this.enabledHelp);
+    };
+
+    Shortcuts.prototype.toggleMarkdownPreview = function(e) {
+      return $(document).triggerHandler('markdown-preview:toggle', [e]);
+    };
+
+    Shortcuts.toggleHelp = function(location) {
+      var $modal;
+      $modal = $('#modal-shortcuts');
+      if ($modal.length) {
+        $modal.modal('toggle');
+        return;
+      }
+      return $.ajax({
+        url: gon.shortcuts_path,
+        dataType: 'script',
+        success: function(e) {
+          var i, l, len, results;
+          if (location && location.length > 0) {
+            results = [];
+            for (i = 0, len = location.length; i < len; i++) {
+              l = location[i];
+              results.push($(l).show());
+            }
+            return results;
+          } else {
+            $('.hidden-shortcut').show();
+            return $('.js-more-help-button').remove();
+          }
+        }
+      });
+    };
+
+    Shortcuts.prototype.focusFilter = function(e) {
+      if (this.filterInput == null) {
+        this.filterInput = $('input[type=search]', '.nav-controls');
+      }
+      this.filterInput.focus();
+      return e.preventDefault();
+    };
+
+    Shortcuts.focusSearch = function(e) {
+      $('#search').focus();
+      return e.preventDefault();
+    };
+
+    return Shortcuts;
+
+  })();
+
+  $(document).on('click.more_help', '.js-more-help-button', function(e) {
+    $(this).remove();
+    $('.hidden-shortcut').show();
+    return e.preventDefault();
+  });
+
+  Mousetrap.stopCallback = (function() {
+    var defaultStopCallback;
+    defaultStopCallback = Mousetrap.stopCallback;
+    return function(e, element, combo) {
+      if (['ctrl+shift+p', 'command+shift+p'].indexOf(combo) !== -1) {
+        return false;
+      } else {
+        return defaultStopCallback.apply(this, arguments);
+      }
+    };
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/shortcuts.js.coffee b/app/assets/javascripts/shortcuts.js.coffee
deleted file mode 100644
index 8c8689bacee..00000000000
--- a/app/assets/javascripts/shortcuts.js.coffee
+++ /dev/null
@@ -1,60 +0,0 @@
-class @Shortcuts
-  constructor: (skipResetBindings) ->
-    @enabledHelp = []
-    Mousetrap.reset() if not skipResetBindings
-    Mousetrap.bind '?', @onToggleHelp
-    Mousetrap.bind 's', Shortcuts.focusSearch
-    Mousetrap.bind 'f', (e) => @focusFilter e
-    Mousetrap.bind ['ctrl+shift+p', 'command+shift+p'], @toggleMarkdownPreview
-    Mousetrap.bind('t', -> Turbolinks.visit(findFileURL)) if findFileURL?
-
-  onToggleHelp: (e) =>
-    e.preventDefault()
-    Shortcuts.toggleHelp(@enabledHelp)
-
-  toggleMarkdownPreview: (e) ->
-    $(document).triggerHandler('markdown-preview:toggle', [e])
-
-  @toggleHelp: (location) ->
-    $modal = $('#modal-shortcuts')
-
-    if $modal.length
-      $modal.modal('toggle')
-      return
-
-    $.ajax(
-      url: gon.shortcuts_path,
-      dataType: 'script',
-      success: (e) ->
-        if location and location.length > 0
-          $(l).show() for l in location
-        else
-          $('.hidden-shortcut').show()
-          $('.js-more-help-button').remove()
-    )
-
-  focusFilter: (e) ->
-    @filterInput ?= $('input[type=search]', '.nav-controls')
-    @filterInput.focus()
-    e.preventDefault()
-
-  @focusSearch: (e) ->
-    $('#search').focus()
-    e.preventDefault()
-
-
-$(document).on 'click.more_help', '.js-more-help-button', (e) ->
-  $(@).remove()
-  $('.hidden-shortcut').show()
-  e.preventDefault()
-
-Mousetrap.stopCallback = (->
-  defaultStopCallback = Mousetrap.stopCallback
-
-  return (e, element, combo) ->
-    # allowed shortcuts if textarea, input, contenteditable are focused
-    if ['ctrl+shift+p', 'command+shift+p'].indexOf(combo) != -1
-      return false
-    else
-      return defaultStopCallback.apply(@, arguments)
-)()
diff --git a/app/assets/javascripts/shortcuts_blob.coffee b/app/assets/javascripts/shortcuts_blob.coffee
deleted file mode 100644
index 6d21e5d1150..00000000000
--- a/app/assets/javascripts/shortcuts_blob.coffee
+++ /dev/null
@@ -1,10 +0,0 @@
-#= require shortcuts
-
-class @ShortcutsBlob extends Shortcuts
-  constructor: (skipResetBindings) ->
-    super skipResetBindings
-    Mousetrap.bind('y', ShortcutsBlob.copyToClipboard)
-
-  @copyToClipboard: ->
-    clipboardButton = $('.btn-clipboard')
-    clipboardButton.click() if clipboardButton
diff --git a/app/assets/javascripts/shortcuts_blob.js b/app/assets/javascripts/shortcuts_blob.js
new file mode 100644
index 00000000000..b931eab638f
--- /dev/null
+++ b/app/assets/javascripts/shortcuts_blob.js
@@ -0,0 +1,28 @@
+
+/*= require shortcuts */
+
+(function() {
+  var extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  this.ShortcutsBlob = (function(superClass) {
+    extend(ShortcutsBlob, superClass);
+
+    function ShortcutsBlob(skipResetBindings) {
+      ShortcutsBlob.__super__.constructor.call(this, skipResetBindings);
+      Mousetrap.bind('y', ShortcutsBlob.copyToClipboard);
+    }
+
+    ShortcutsBlob.copyToClipboard = function() {
+      var clipboardButton;
+      clipboardButton = $('.btn-clipboard');
+      if (clipboardButton) {
+        return clipboardButton.click();
+      }
+    };
+
+    return ShortcutsBlob;
+
+  })(Shortcuts);
+
+}).call(this);
diff --git a/app/assets/javascripts/shortcuts_dashboard_navigation.js b/app/assets/javascripts/shortcuts_dashboard_navigation.js
new file mode 100644
index 00000000000..f7492a2aa5c
--- /dev/null
+++ b/app/assets/javascripts/shortcuts_dashboard_navigation.js
@@ -0,0 +1,39 @@
+
+/*= require shortcuts */
+
+(function() {
+  var extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  this.ShortcutsDashboardNavigation = (function(superClass) {
+    extend(ShortcutsDashboardNavigation, superClass);
+
+    function ShortcutsDashboardNavigation() {
+      ShortcutsDashboardNavigation.__super__.constructor.call(this);
+      Mousetrap.bind('g a', function() {
+        return ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-activity');
+      });
+      Mousetrap.bind('g i', function() {
+        return ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-issues');
+      });
+      Mousetrap.bind('g m', function() {
+        return ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-merge_requests');
+      });
+      Mousetrap.bind('g p', function() {
+        return ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-projects');
+      });
+    }
+
+    ShortcutsDashboardNavigation.findAndFollowLink = function(selector) {
+      var link;
+      link = $(selector).attr('href');
+      if (link) {
+        return window.location = link;
+      }
+    };
+
+    return ShortcutsDashboardNavigation;
+
+  })(Shortcuts);
+
+}).call(this);
diff --git a/app/assets/javascripts/shortcuts_dashboard_navigation.js.coffee b/app/assets/javascripts/shortcuts_dashboard_navigation.js.coffee
deleted file mode 100644
index cca2b8a1fcc..00000000000
--- a/app/assets/javascripts/shortcuts_dashboard_navigation.js.coffee
+++ /dev/null
@@ -1,14 +0,0 @@
-#= require shortcuts
-
-class @ShortcutsDashboardNavigation extends Shortcuts
- constructor: ->
-   super()
-   Mousetrap.bind('g a', -> ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-activity'))
-   Mousetrap.bind('g i', -> ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-issues'))
-   Mousetrap.bind('g m', -> ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-merge_requests'))
-   Mousetrap.bind('g p', -> ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-projects'))
-
- @findAndFollowLink: (selector) ->
-   link = $(selector).attr('href')
-   if link
-     window.location = link
diff --git a/app/assets/javascripts/shortcuts_find_file.js b/app/assets/javascripts/shortcuts_find_file.js
new file mode 100644
index 00000000000..6c78914d338
--- /dev/null
+++ b/app/assets/javascripts/shortcuts_find_file.js
@@ -0,0 +1,35 @@
+
+/*= require shortcuts_navigation */
+
+(function() {
+  var extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  this.ShortcutsFindFile = (function(superClass) {
+    extend(ShortcutsFindFile, superClass);
+
+    function ShortcutsFindFile(projectFindFile) {
+      var _oldStopCallback;
+      this.projectFindFile = projectFindFile;
+      ShortcutsFindFile.__super__.constructor.call(this);
+      _oldStopCallback = Mousetrap.stopCallback;
+      Mousetrap.stopCallback = (function(_this) {
+        return function(event, element, combo) {
+          if (element === _this.projectFindFile.inputElement[0] && (combo === 'up' || combo === 'down' || combo === 'esc' || combo === 'enter')) {
+            event.preventDefault();
+            return false;
+          }
+          return _oldStopCallback(event, element, combo);
+        };
+      })(this);
+      Mousetrap.bind('up', this.projectFindFile.selectRowUp);
+      Mousetrap.bind('down', this.projectFindFile.selectRowDown);
+      Mousetrap.bind('esc', this.projectFindFile.goToTree);
+      Mousetrap.bind('enter', this.projectFindFile.goToBlob);
+    }
+
+    return ShortcutsFindFile;
+
+  })(ShortcutsNavigation);
+
+}).call(this);
diff --git a/app/assets/javascripts/shortcuts_find_file.js.coffee b/app/assets/javascripts/shortcuts_find_file.js.coffee
deleted file mode 100644
index 311e80bae19..00000000000
--- a/app/assets/javascripts/shortcuts_find_file.js.coffee
+++ /dev/null
@@ -1,19 +0,0 @@
-#= require shortcuts_navigation
-
-class @ShortcutsFindFile extends ShortcutsNavigation
-  constructor: (@projectFindFile) ->
-    super()
-    _oldStopCallback = Mousetrap.stopCallback
-    # override to fire shortcuts action when focus in textbox
-    Mousetrap.stopCallback = (event, element, combo) =>
-      if element == @projectFindFile.inputElement[0] and (combo == 'up' or combo == 'down' or combo == 'esc' or combo == 'enter')
-        # when press up/down key in textbox, cusor prevent to move to home/end
-        event.preventDefault()
-        return false
-
-      return _oldStopCallback(event, element, combo)
-
-    Mousetrap.bind('up', @projectFindFile.selectRowUp)
-    Mousetrap.bind('down', @projectFindFile.selectRowDown)
-    Mousetrap.bind('esc', @projectFindFile.goToTree)
-    Mousetrap.bind('enter', @projectFindFile.goToBlob)
diff --git a/app/assets/javascripts/shortcuts_issuable.coffee b/app/assets/javascripts/shortcuts_issuable.coffee
deleted file mode 100644
index c93bcf3ceec..00000000000
--- a/app/assets/javascripts/shortcuts_issuable.coffee
+++ /dev/null
@@ -1,53 +0,0 @@
-#= require mousetrap
-#= require shortcuts_navigation
-
-class @ShortcutsIssuable extends ShortcutsNavigation
-  constructor: (isMergeRequest) ->
-    super()
-    Mousetrap.bind('a', @openSidebarDropdown.bind(@, 'assignee'))
-    Mousetrap.bind('m', @openSidebarDropdown.bind(@, 'milestone'))
-    Mousetrap.bind('r', =>
-      @replyWithSelectedText()
-      return false
-    )
-    Mousetrap.bind('e', =>
-      @editIssue()
-      return false
-    )
-    Mousetrap.bind('l', @openSidebarDropdown.bind(@, 'labels'))
-
-    if isMergeRequest
-      @enabledHelp.push('.hidden-shortcut.merge_requests')
-    else
-      @enabledHelp.push('.hidden-shortcut.issues')
-
-  replyWithSelectedText: ->
-    if window.getSelection
-      selected = window.getSelection().toString()
-      replyField = $('.js-main-target-form #note_note')
-
-      return if selected.trim() == ""
-
-      # Put a '>' character before each non-empty line in the selection
-      quote = _.map selected.split("\n"), (val) ->
-        "> #{val}\n" if val.trim() != ''
-
-      # If replyField already has some content, add a newline before our quote
-      separator = replyField.val().trim() != "" and "\n" or ''
-
-      replyField.val (_, current) ->
-        current + separator + quote.join('') + "\n"
-
-      # Trigger autosave for the added text
-      replyField.trigger('input')
-
-      # Focus the input field
-      replyField.focus()
-
-  editIssue: ->
-    $editBtn = $('.issuable-edit')
-    Turbolinks.visit($editBtn.attr('href'))
-
-  openSidebarDropdown: (name) ->
-    sidebar.openDropdown(name)
-    return false
diff --git a/app/assets/javascripts/shortcuts_issuable.js b/app/assets/javascripts/shortcuts_issuable.js
new file mode 100644
index 00000000000..3f3a8a9dfd9
--- /dev/null
+++ b/app/assets/javascripts/shortcuts_issuable.js
@@ -0,0 +1,75 @@
+
+/*= require mousetrap */
+
+
+/*= require shortcuts_navigation */
+
+(function() {
+  var extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  this.ShortcutsIssuable = (function(superClass) {
+    extend(ShortcutsIssuable, superClass);
+
+    function ShortcutsIssuable(isMergeRequest) {
+      ShortcutsIssuable.__super__.constructor.call(this);
+      Mousetrap.bind('a', this.openSidebarDropdown.bind(this, 'assignee'));
+      Mousetrap.bind('m', this.openSidebarDropdown.bind(this, 'milestone'));
+      Mousetrap.bind('r', (function(_this) {
+        return function() {
+          _this.replyWithSelectedText();
+          return false;
+        };
+      })(this));
+      Mousetrap.bind('e', (function(_this) {
+        return function() {
+          _this.editIssue();
+          return false;
+        };
+      })(this));
+      Mousetrap.bind('l', this.openSidebarDropdown.bind(this, 'labels'));
+      if (isMergeRequest) {
+        this.enabledHelp.push('.hidden-shortcut.merge_requests');
+      } else {
+        this.enabledHelp.push('.hidden-shortcut.issues');
+      }
+    }
+
+    ShortcutsIssuable.prototype.replyWithSelectedText = function() {
+      var quote, replyField, selected, separator;
+      if (window.getSelection) {
+        selected = window.getSelection().toString();
+        replyField = $('.js-main-target-form #note_note');
+        if (selected.trim() === "") {
+          return;
+        }
+        quote = _.map(selected.split("\n"), function(val) {
+          if (val.trim() !== '') {
+            return "> " + val + "\n";
+          }
+        });
+        separator = replyField.val().trim() !== "" && "\n" || '';
+        replyField.val(function(_, current) {
+          return current + separator + quote.join('') + "\n";
+        });
+        replyField.trigger('input');
+        return replyField.focus();
+      }
+    };
+
+    ShortcutsIssuable.prototype.editIssue = function() {
+      var $editBtn;
+      $editBtn = $('.issuable-edit');
+      return Turbolinks.visit($editBtn.attr('href'));
+    };
+
+    ShortcutsIssuable.prototype.openSidebarDropdown = function(name) {
+      sidebar.openDropdown(name);
+      return false;
+    };
+
+    return ShortcutsIssuable;
+
+  })(ShortcutsNavigation);
+
+}).call(this);
diff --git a/app/assets/javascripts/shortcuts_navigation.coffee b/app/assets/javascripts/shortcuts_navigation.coffee
deleted file mode 100644
index f39504e0645..00000000000
--- a/app/assets/javascripts/shortcuts_navigation.coffee
+++ /dev/null
@@ -1,23 +0,0 @@
-#= require shortcuts
-
-class @ShortcutsNavigation extends Shortcuts
-  constructor: ->
-    super()
-    Mousetrap.bind('g p', -> ShortcutsNavigation.findAndFollowLink('.shortcuts-project'))
-    Mousetrap.bind('g e', -> ShortcutsNavigation.findAndFollowLink('.shortcuts-project-activity'))
-    Mousetrap.bind('g f', -> ShortcutsNavigation.findAndFollowLink('.shortcuts-tree'))
-    Mousetrap.bind('g c', -> ShortcutsNavigation.findAndFollowLink('.shortcuts-commits'))
-    Mousetrap.bind('g b', -> ShortcutsNavigation.findAndFollowLink('.shortcuts-builds'))
-    Mousetrap.bind('g n', -> ShortcutsNavigation.findAndFollowLink('.shortcuts-network'))
-    Mousetrap.bind('g g', -> ShortcutsNavigation.findAndFollowLink('.shortcuts-graphs'))
-    Mousetrap.bind('g i', -> ShortcutsNavigation.findAndFollowLink('.shortcuts-issues'))
-    Mousetrap.bind('g m', -> ShortcutsNavigation.findAndFollowLink('.shortcuts-merge_requests'))
-    Mousetrap.bind('g w', -> ShortcutsNavigation.findAndFollowLink('.shortcuts-wiki'))
-    Mousetrap.bind('g s', -> ShortcutsNavigation.findAndFollowLink('.shortcuts-snippets'))
-    Mousetrap.bind('i', -> ShortcutsNavigation.findAndFollowLink('.shortcuts-new-issue'))
-    @enabledHelp.push('.hidden-shortcut.project')
-
-  @findAndFollowLink: (selector) ->
-   link = $(selector).attr('href')
-   if link
-     window.location = link
diff --git a/app/assets/javascripts/shortcuts_navigation.js b/app/assets/javascripts/shortcuts_navigation.js
new file mode 100644
index 00000000000..469e25482bb
--- /dev/null
+++ b/app/assets/javascripts/shortcuts_navigation.js
@@ -0,0 +1,64 @@
+
+/*= require shortcuts */
+
+(function() {
+  var extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  this.ShortcutsNavigation = (function(superClass) {
+    extend(ShortcutsNavigation, superClass);
+
+    function ShortcutsNavigation() {
+      ShortcutsNavigation.__super__.constructor.call(this);
+      Mousetrap.bind('g p', function() {
+        return ShortcutsNavigation.findAndFollowLink('.shortcuts-project');
+      });
+      Mousetrap.bind('g e', function() {
+        return ShortcutsNavigation.findAndFollowLink('.shortcuts-project-activity');
+      });
+      Mousetrap.bind('g f', function() {
+        return ShortcutsNavigation.findAndFollowLink('.shortcuts-tree');
+      });
+      Mousetrap.bind('g c', function() {
+        return ShortcutsNavigation.findAndFollowLink('.shortcuts-commits');
+      });
+      Mousetrap.bind('g b', function() {
+        return ShortcutsNavigation.findAndFollowLink('.shortcuts-builds');
+      });
+      Mousetrap.bind('g n', function() {
+        return ShortcutsNavigation.findAndFollowLink('.shortcuts-network');
+      });
+      Mousetrap.bind('g g', function() {
+        return ShortcutsNavigation.findAndFollowLink('.shortcuts-graphs');
+      });
+      Mousetrap.bind('g i', function() {
+        return ShortcutsNavigation.findAndFollowLink('.shortcuts-issues');
+      });
+      Mousetrap.bind('g m', function() {
+        return ShortcutsNavigation.findAndFollowLink('.shortcuts-merge_requests');
+      });
+      Mousetrap.bind('g w', function() {
+        return ShortcutsNavigation.findAndFollowLink('.shortcuts-wiki');
+      });
+      Mousetrap.bind('g s', function() {
+        return ShortcutsNavigation.findAndFollowLink('.shortcuts-snippets');
+      });
+      Mousetrap.bind('i', function() {
+        return ShortcutsNavigation.findAndFollowLink('.shortcuts-new-issue');
+      });
+      this.enabledHelp.push('.hidden-shortcut.project');
+    }
+
+    ShortcutsNavigation.findAndFollowLink = function(selector) {
+      var link;
+      link = $(selector).attr('href');
+      if (link) {
+        return window.location = link;
+      }
+    };
+
+    return ShortcutsNavigation;
+
+  })(Shortcuts);
+
+}).call(this);
diff --git a/app/assets/javascripts/shortcuts_network.js b/app/assets/javascripts/shortcuts_network.js
new file mode 100644
index 00000000000..fb2b39e757e
--- /dev/null
+++ b/app/assets/javascripts/shortcuts_network.js
@@ -0,0 +1,27 @@
+
+/*= require shortcuts_navigation */
+
+(function() {
+  var extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  this.ShortcutsNetwork = (function(superClass) {
+    extend(ShortcutsNetwork, superClass);
+
+    function ShortcutsNetwork(graph) {
+      this.graph = graph;
+      ShortcutsNetwork.__super__.constructor.call(this);
+      Mousetrap.bind(['left', 'h'], this.graph.scrollLeft);
+      Mousetrap.bind(['right', 'l'], this.graph.scrollRight);
+      Mousetrap.bind(['up', 'k'], this.graph.scrollUp);
+      Mousetrap.bind(['down', 'j'], this.graph.scrollDown);
+      Mousetrap.bind(['shift+up', 'shift+k'], this.graph.scrollTop);
+      Mousetrap.bind(['shift+down', 'shift+j'], this.graph.scrollBottom);
+      this.enabledHelp.push('.hidden-shortcut.network');
+    }
+
+    return ShortcutsNetwork;
+
+  })(ShortcutsNavigation);
+
+}).call(this);
diff --git a/app/assets/javascripts/shortcuts_network.js.coffee b/app/assets/javascripts/shortcuts_network.js.coffee
deleted file mode 100644
index cc95ad7ebfe..00000000000
--- a/app/assets/javascripts/shortcuts_network.js.coffee
+++ /dev/null
@@ -1,12 +0,0 @@
-#= require shortcuts_navigation
-
-class @ShortcutsNetwork extends ShortcutsNavigation
-  constructor: (@graph) ->
-    super()
-    Mousetrap.bind(['left', 'h'], @graph.scrollLeft)
-    Mousetrap.bind(['right', 'l'], @graph.scrollRight)
-    Mousetrap.bind(['up', 'k'], @graph.scrollUp)
-    Mousetrap.bind(['down', 'j'], @graph.scrollDown)
-    Mousetrap.bind(['shift+up', 'shift+k'], @graph.scrollTop)
-    Mousetrap.bind(['shift+down', 'shift+j'],  @graph.scrollBottom)
-    @enabledHelp.push('.hidden-shortcut.network')
diff --git a/app/assets/javascripts/sidebar.js b/app/assets/javascripts/sidebar.js
new file mode 100644
index 00000000000..bd0c1194b36
--- /dev/null
+++ b/app/assets/javascripts/sidebar.js
@@ -0,0 +1,41 @@
+(function() {
+  var collapsed, expanded, toggleSidebar;
+
+  collapsed = 'page-sidebar-collapsed';
+
+  expanded = 'page-sidebar-expanded';
+
+  toggleSidebar = function() {
+    $('.page-with-sidebar').toggleClass(collapsed + " " + expanded);
+    $('.navbar-fixed-top').toggleClass("header-collapsed header-expanded");
+    if ($.cookie('pin_nav') === 'true') {
+      $('.navbar-fixed-top').toggleClass('header-pinned-nav');
+      $('.page-with-sidebar').toggleClass('page-sidebar-pinned');
+    }
+    return setTimeout((function() {
+      var niceScrollBars;
+      niceScrollBars = $('.nav-sidebar').niceScroll();
+      return niceScrollBars.updateScrollBar();
+    }), 300);
+  };
+
+  $(document).off('click', 'body').on('click', 'body', function(e) {
+    var $nav, $target, $toggle, pageExpanded;
+    if ($.cookie('pin_nav') !== 'true') {
+      $target = $(e.target);
+      $nav = $target.closest('.sidebar-wrapper');
+      pageExpanded = $('.page-with-sidebar').hasClass('page-sidebar-expanded');
+      $toggle = $target.closest('.toggle-nav-collapse, .side-nav-toggle');
+      if ($nav.length === 0 && pageExpanded && $toggle.length === 0) {
+        $('.page-with-sidebar').toggleClass('page-sidebar-collapsed page-sidebar-expanded');
+        return $('.navbar-fixed-top').toggleClass('header-collapsed header-expanded');
+      }
+    }
+  });
+
+  $(document).on("click", '.toggle-nav-collapse, .side-nav-toggle', function(e) {
+    e.preventDefault();
+    return toggleSidebar();
+  });
+
+}).call(this);
diff --git a/app/assets/javascripts/sidebar.js.coffee b/app/assets/javascripts/sidebar.js.coffee
deleted file mode 100644
index 68009e58645..00000000000
--- a/app/assets/javascripts/sidebar.js.coffee
+++ /dev/null
@@ -1,37 +0,0 @@
-collapsed = 'page-sidebar-collapsed'
-expanded = 'page-sidebar-expanded'
-
-toggleSidebar = ->
-  $('.page-with-sidebar').toggleClass("#{collapsed} #{expanded}")
-  $('.navbar-fixed-top').toggleClass("header-collapsed header-expanded")
-
-  if $.cookie('pin_nav') is 'true'
-    $('.navbar-fixed-top').toggleClass('header-pinned-nav')
-    $('.page-with-sidebar').toggleClass('page-sidebar-pinned')
-
-  setTimeout ( ->
-    niceScrollBars = $('.nav-sidebar').niceScroll();
-    niceScrollBars.updateScrollBar();
-  ), 300
-
-$(document)
-  .off 'click', 'body'
-  .on 'click', 'body', (e) ->
-    unless $.cookie('pin_nav') is 'true'
-      $target = $(e.target)
-      $nav = $target.closest('.sidebar-wrapper')
-      pageExpanded = $('.page-with-sidebar').hasClass('page-sidebar-expanded')
-      $toggle = $target.closest('.toggle-nav-collapse, .side-nav-toggle')
-
-      if $nav.length is 0 and pageExpanded and $toggle.length is 0
-        $('.page-with-sidebar')
-          .toggleClass('page-sidebar-collapsed page-sidebar-expanded')
-
-        $('.navbar-fixed-top')
-          .toggleClass('header-collapsed header-expanded')
-
-$(document).on("click", '.toggle-nav-collapse, .side-nav-toggle', (e) ->
-  e.preventDefault()
-
-  toggleSidebar()
-)
diff --git a/app/assets/javascripts/single_file_diff.js b/app/assets/javascripts/single_file_diff.js
new file mode 100644
index 00000000000..b9ae497b0e5
--- /dev/null
+++ b/app/assets/javascripts/single_file_diff.js
@@ -0,0 +1,77 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.SingleFileDiff = (function() {
+    var COLLAPSED_HTML, ERROR_HTML, LOADING_HTML, WRAPPER;
+
+    WRAPPER = '<div class="diff-content diff-wrap-lines"></div>';
+
+    LOADING_HTML = '<i class="fa fa-spinner fa-spin"></i>';
+
+    ERROR_HTML = '<div class="nothing-here-block"><i class="fa fa-warning"></i> Could not load diff</div>';
+
+    COLLAPSED_HTML = '<div class="nothing-here-block diff-collapsed">This diff is collapsed. Click to expand it.</div>';
+
+    function SingleFileDiff(file) {
+      this.file = file;
+      this.toggleDiff = bind(this.toggleDiff, this);
+      this.content = $('.diff-content', this.file);
+      this.diffForPath = this.content.find('[data-diff-for-path]').data('diff-for-path');
+      this.isOpen = !this.diffForPath;
+      if (this.diffForPath) {
+        this.collapsedContent = this.content;
+        this.loadingContent = $(WRAPPER).addClass('loading').html(LOADING_HTML).hide();
+        this.content = null;
+        this.collapsedContent.after(this.loadingContent);
+      } else {
+        this.collapsedContent = $(WRAPPER).html(COLLAPSED_HTML).hide();
+        this.content.after(this.collapsedContent);
+      }
+      this.collapsedContent.on('click', this.toggleDiff);
+      $('.file-title > a', this.file).on('click', this.toggleDiff);
+    }
+
+    SingleFileDiff.prototype.toggleDiff = function(e) {
+      this.isOpen = !this.isOpen;
+      if (!this.isOpen && !this.hasError) {
+        this.content.hide();
+        return this.collapsedContent.show();
+      } else if (this.content) {
+        this.collapsedContent.hide();
+        return this.content.show();
+      } else {
+        return this.getContentHTML();
+      }
+    };
+
+    SingleFileDiff.prototype.getContentHTML = function() {
+      this.collapsedContent.hide();
+      this.loadingContent.show();
+      $.get(this.diffForPath, (function(_this) {
+        return function(data) {
+          _this.loadingContent.hide();
+          if (data.html) {
+            _this.content = $(data.html);
+            _this.content.syntaxHighlight();
+          } else {
+            _this.hasError = true;
+            _this.content = $(ERROR_HTML);
+          }
+          return _this.collapsedContent.after(_this.content);
+        };
+      })(this));
+    };
+
+    return SingleFileDiff;
+
+  })();
+
+  $.fn.singleFileDiff = function() {
+    return this.each(function() {
+      if (!$.data(this, 'singleFileDiff')) {
+        return $.data(this, 'singleFileDiff', new SingleFileDiff(this));
+      }
+    });
+  };
+
+}).call(this);
diff --git a/app/assets/javascripts/single_file_diff.js.coffee b/app/assets/javascripts/single_file_diff.js.coffee
deleted file mode 100644
index f3e225c3728..00000000000
--- a/app/assets/javascripts/single_file_diff.js.coffee
+++ /dev/null
@@ -1,54 +0,0 @@
-class @SingleFileDiff
-
-  WRAPPER = '<div class="diff-content diff-wrap-lines"></div>'
-  LOADING_HTML = '<i class="fa fa-spinner fa-spin"></i>'
-  ERROR_HTML = '<div class="nothing-here-block"><i class="fa fa-warning"></i> Could not load diff</div>'
-  COLLAPSED_HTML = '<div class="nothing-here-block diff-collapsed">This diff is collapsed. Click to expand it.</div>'
-
-  constructor: (@file) ->
-    @content = $('.diff-content', @file)
-    @diffForPath = @content.find('[data-diff-for-path]').data 'diff-for-path'
-    @isOpen = !@diffForPath
-
-    if @diffForPath
-      @collapsedContent = @content
-      @loadingContent = $(WRAPPER).addClass('loading').html(LOADING_HTML).hide()
-      @content = null
-      @collapsedContent.after(@loadingContent)
-    else
-      @collapsedContent = $(WRAPPER).html(COLLAPSED_HTML).hide()
-      @content.after(@collapsedContent)
-
-    @collapsedContent.on 'click', @toggleDiff
-
-    $('.file-title > a', @file).on 'click', @toggleDiff
-
-  toggleDiff: (e) =>
-    @isOpen = !@isOpen
-    if not @isOpen and not @hasError
-      @content.hide()
-      @collapsedContent.show()
-    else if @content
-      @collapsedContent.hide()
-      @content.show()
-    else
-      @getContentHTML()
-
-  getContentHTML: ->
-    @collapsedContent.hide()
-    @loadingContent.show()
-    $.get @diffForPath, (data) =>
-      @loadingContent.hide()
-      if data.html
-        @content = $(data.html)
-        @content.syntaxHighlight()
-      else
-        @hasError = true
-        @content = $(ERROR_HTML)
-      @collapsedContent.after(@content)
-    return
-
-$.fn.singleFileDiff = ->
-  return @each ->
-    if not $.data this, 'singleFileDiff'
-      $.data this, 'singleFileDiff', new SingleFileDiff this
diff --git a/app/assets/javascripts/star.js b/app/assets/javascripts/star.js
new file mode 100644
index 00000000000..10509313c12
--- /dev/null
+++ b/app/assets/javascripts/star.js
@@ -0,0 +1,31 @@
+(function() {
+  this.Star = (function() {
+    function Star() {
+      $('.project-home-panel .toggle-star').on('ajax:success', function(e, data, status, xhr) {
+        var $starIcon, $starSpan, $this, toggleStar;
+        $this = $(this);
+        $starSpan = $this.find('span');
+        $starIcon = $this.find('i');
+        toggleStar = function(isStarred) {
+          $this.parent().find('.star-count').text(data.star_count);
+          if (isStarred) {
+            $starSpan.removeClass('starred').text('Star');
+            gl.utils.updateTooltipTitle($this, 'Star project');
+            $starIcon.removeClass('fa-star').addClass('fa-star-o');
+          } else {
+            $starSpan.addClass('starred').text('Unstar');
+            gl.utils.updateTooltipTitle($this, 'Unstar project');
+            $starIcon.removeClass('fa-star-o').addClass('fa-star');
+          }
+        };
+        toggleStar($starSpan.hasClass('starred'));
+      }).on('ajax:error', function(e, xhr, status, error) {
+        new Flash('Star toggle failed. Try again later.', 'alert');
+      });
+    }
+
+    return Star;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/star.js.coffee b/app/assets/javascripts/star.js.coffee
deleted file mode 100644
index 01b28171f72..00000000000
--- a/app/assets/javascripts/star.js.coffee
+++ /dev/null
@@ -1,24 +0,0 @@
-class @Star
-  constructor: ->
-    $('.project-home-panel .toggle-star').on('ajax:success', (e, data, status, xhr) ->
-      $this = $(this)
-      $starSpan = $this.find('span')
-      $starIcon = $this.find('i')
-
-      toggleStar = (isStarred) ->
-        $this.parent().find('.star-count').text data.star_count
-        if isStarred
-          $starSpan.removeClass('starred').text 'Star'
-          gl.utils.updateTooltipTitle $this, 'Star project'
-          $starIcon.removeClass('fa-star').addClass 'fa-star-o'
-        else
-          $starSpan.addClass('starred').text 'Unstar'
-          gl.utils.updateTooltipTitle $this, 'Unstar project'
-          $starIcon.removeClass('fa-star-o').addClass 'fa-star'
-        return
-
-      toggleStar $starSpan.hasClass('starred')
-      return
-    ).on 'ajax:error', (e, xhr, status, error) ->
-      new Flash('Star toggle failed. Try again later.', 'alert')
-      return
diff --git a/app/assets/javascripts/subscription.js b/app/assets/javascripts/subscription.js
new file mode 100644
index 00000000000..5e3c5983d75
--- /dev/null
+++ b/app/assets/javascripts/subscription.js
@@ -0,0 +1,41 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.Subscription = (function() {
+    function Subscription(container) {
+      this.toggleSubscription = bind(this.toggleSubscription, this);
+      var $container;
+      $container = $(container);
+      this.url = $container.attr('data-url');
+      this.subscribe_button = $container.find('.js-subscribe-button');
+      this.subscription_status = $container.find('.subscription-status');
+      this.subscribe_button.unbind('click').click(this.toggleSubscription);
+    }
+
+    Subscription.prototype.toggleSubscription = function(event) {
+      var action, btn, current_status;
+      btn = $(event.currentTarget);
+      action = btn.find('span').text();
+      current_status = this.subscription_status.attr('data-status');
+      btn.addClass('disabled');
+      return $.post(this.url, (function(_this) {
+        return function() {
+          var status;
+          btn.removeClass('disabled');
+          status = current_status === 'subscribed' ? 'unsubscribed' : 'subscribed';
+          _this.subscription_status.attr('data-status', status);
+          action = status === 'subscribed' ? 'Unsubscribe' : 'Subscribe';
+          btn.find('span').text(action);
+          _this.subscription_status.find('>div').toggleClass('hidden');
+          if (btn.attr('data-original-title')) {
+            return btn.tooltip('hide').attr('data-original-title', action).tooltip('fixTitle');
+          }
+        };
+      })(this));
+    };
+
+    return Subscription;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/subscription.js.coffee b/app/assets/javascripts/subscription.js.coffee
deleted file mode 100644
index 08d494aba9f..00000000000
--- a/app/assets/javascripts/subscription.js.coffee
+++ /dev/null
@@ -1,26 +0,0 @@
-class @Subscription
-  constructor: (container) ->
-    $container = $(container)
-    @url = $container.attr('data-url')
-    @subscribe_button = $container.find('.js-subscribe-button')
-    @subscription_status = $container.find('.subscription-status')
-    @subscribe_button.unbind('click').click(@toggleSubscription)
-
-  toggleSubscription: (event) =>
-    btn = $(event.currentTarget)
-    action = btn.find('span').text()
-    current_status = @subscription_status.attr('data-status')
-    btn.addClass('disabled')
-
-    $.post @url, =>
-      btn.removeClass('disabled')
-      status = if current_status == 'subscribed' then 'unsubscribed' else 'subscribed'
-      @subscription_status.attr('data-status', status)
-      action = if status == 'subscribed' then 'Unsubscribe' else 'Subscribe'
-      btn.find('span').text(action)
-      @subscription_status.find('>div').toggleClass('hidden')
-
-      if btn.attr('data-original-title')
-        btn.tooltip('hide')
-          .attr('data-original-title', action)
-          .tooltip('fixTitle')
diff --git a/app/assets/javascripts/subscription_select.js b/app/assets/javascripts/subscription_select.js
new file mode 100644
index 00000000000..d6c219603d1
--- /dev/null
+++ b/app/assets/javascripts/subscription_select.js
@@ -0,0 +1,35 @@
+(function() {
+  this.SubscriptionSelect = (function() {
+    function SubscriptionSelect() {
+      $('.js-subscription-event').each(function(i, el) {
+        var fieldName;
+        fieldName = $(el).data("field-name");
+        return $(el).glDropdown({
+          selectable: true,
+          fieldName: fieldName,
+          toggleLabel: (function(_this) {
+            return function(selected, el, instance) {
+              var $item, label;
+              label = 'Subscription';
+              $item = instance.dropdown.find('.is-active');
+              if ($item.length) {
+                label = $item.text();
+              }
+              return label;
+            };
+          })(this),
+          clicked: function(item, $el, e) {
+            return e.preventDefault();
+          },
+          id: function(obj, el) {
+            return $(el).data("id");
+          }
+        });
+      });
+    }
+
+    return SubscriptionSelect;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/syntax_highlight.coffee b/app/assets/javascripts/syntax_highlight.coffee
deleted file mode 100644
index 980f0232d10..00000000000
--- a/app/assets/javascripts/syntax_highlight.coffee
+++ /dev/null
@@ -1,20 +0,0 @@
-# Syntax Highlighter
-#
-# Applies a syntax highlighting color scheme CSS class to any element with the
-# `js-syntax-highlight` class
-#
-# ### Example Markup
-#
-#   <div class="js-syntax-highlight"></div>
-#
-$.fn.syntaxHighlight = ->
-  if $(this).hasClass('js-syntax-highlight')
-    # Given the element itself, apply highlighting
-    $(this).addClass(gon.user_color_scheme)
-  else
-    # Given a parent element, recurse to any of its applicable children
-    $children = $(this).find('.js-syntax-highlight')
-    $children.syntaxHighlight() if $children.length
-
-$(document).on 'ready page:load', ->
-  $('.js-syntax-highlight').syntaxHighlight()
diff --git a/app/assets/javascripts/syntax_highlight.js b/app/assets/javascripts/syntax_highlight.js
new file mode 100644
index 00000000000..dba62638c78
--- /dev/null
+++ b/app/assets/javascripts/syntax_highlight.js
@@ -0,0 +1,18 @@
+(function() {
+  $.fn.syntaxHighlight = function() {
+    var $children;
+    if ($(this).hasClass('js-syntax-highlight')) {
+      return $(this).addClass(gon.user_color_scheme);
+    } else {
+      $children = $(this).find('.js-syntax-highlight');
+      if ($children.length) {
+        return $children.syntaxHighlight();
+      }
+    }
+  };
+
+  $(document).on('ready page:load', function() {
+    return $('.js-syntax-highlight').syntaxHighlight();
+  });
+
+}).call(this);
diff --git a/app/assets/javascripts/todos.js b/app/assets/javascripts/todos.js
new file mode 100644
index 00000000000..6e677fa8cc6
--- /dev/null
+++ b/app/assets/javascripts/todos.js
@@ -0,0 +1,144 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.Todos = (function() {
+    function Todos(opts) {
+      var ref;
+      if (opts == null) {
+        opts = {};
+      }
+      this.allDoneClicked = bind(this.allDoneClicked, this);
+      this.doneClicked = bind(this.doneClicked, this);
+      this.el = (ref = opts.el) != null ? ref : $('.js-todos-options');
+      this.perPage = this.el.data('perPage');
+      this.clearListeners();
+      this.initBtnListeners();
+    }
+
+    Todos.prototype.clearListeners = function() {
+      $('.done-todo').off('click');
+      $('.js-todos-mark-all').off('click');
+      return $('.todo').off('click');
+    };
+
+    Todos.prototype.initBtnListeners = function() {
+      $('.done-todo').on('click', this.doneClicked);
+      $('.js-todos-mark-all').on('click', this.allDoneClicked);
+      return $('.todo').on('click', this.goToTodoUrl);
+    };
+
+    Todos.prototype.doneClicked = function(e) {
+      var $this;
+      e.preventDefault();
+      e.stopImmediatePropagation();
+      $this = $(e.currentTarget);
+      $this.disable();
+      return $.ajax({
+        type: 'POST',
+        url: $this.attr('href'),
+        dataType: 'json',
+        data: {
+          '_method': 'delete'
+        },
+        success: (function(_this) {
+          return function(data) {
+            _this.redirectIfNeeded(data.count);
+            _this.clearDone($this.closest('li'));
+            return _this.updateBadges(data);
+          };
+        })(this)
+      });
+    };
+
+    Todos.prototype.allDoneClicked = function(e) {
+      var $this;
+      e.preventDefault();
+      e.stopImmediatePropagation();
+      $this = $(e.currentTarget);
+      $this.disable();
+      return $.ajax({
+        type: 'POST',
+        url: $this.attr('href'),
+        dataType: 'json',
+        data: {
+          '_method': 'delete'
+        },
+        success: (function(_this) {
+          return function(data) {
+            $this.remove();
+            $('.js-todos-list').remove();
+            return _this.updateBadges(data);
+          };
+        })(this)
+      });
+    };
+
+    Todos.prototype.clearDone = function($row) {
+      var $ul;
+      $ul = $row.closest('ul');
+      $row.remove();
+      if (!$ul.find('li').length) {
+        return $ul.parents('.panel').remove();
+      }
+    };
+
+    Todos.prototype.updateBadges = function(data) {
+      $('.todos-pending .badge, .todos-pending-count').text(data.count);
+      return $('.todos-done .badge').text(data.done_count);
+    };
+
+    Todos.prototype.getTotalPages = function() {
+      return this.el.data('totalPages');
+    };
+
+    Todos.prototype.getCurrentPage = function() {
+      return this.el.data('currentPage');
+    };
+
+    Todos.prototype.getTodosPerPage = function() {
+      return this.el.data('perPage');
+    };
+
+    Todos.prototype.redirectIfNeeded = function(total) {
+      var currPage, currPages, newPages, pageParams, url;
+      currPages = this.getTotalPages();
+      currPage = this.getCurrentPage();
+      if (!total) {
+        location.reload();
+        return;
+      }
+      if (!currPages) {
+        return;
+      }
+      newPages = Math.ceil(total / this.getTodosPerPage());
+      url = location.href;
+      if (newPages !== currPages) {
+        if (currPages > 1 && currPage === currPages) {
+          pageParams = {
+            page: currPages - 1
+          };
+          url = gl.utils.mergeUrlParams(pageParams, url);
+        }
+        return Turbolinks.visit(url);
+      }
+    };
+
+    Todos.prototype.goToTodoUrl = function(e) {
+      var todoLink;
+      todoLink = $(this).data('url');
+      if (!todoLink) {
+        return;
+      }
+      if (e.metaKey || e.which === 2) {
+        e.preventDefault();
+        return window.open(todoLink, '_blank');
+      } else {
+        return Turbolinks.visit(todoLink);
+      }
+    };
+
+    return Todos;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/todos.js.coffee b/app/assets/javascripts/todos.js.coffee
deleted file mode 100644
index 10bef96f43d..00000000000
--- a/app/assets/javascripts/todos.js.coffee
+++ /dev/null
@@ -1,110 +0,0 @@
-class @Todos
-  constructor: (opts = {}) ->
-    {
-      @el = $('.js-todos-options')
-    } = opts
-
-    @perPage = @el.data('perPage')
-
-    @clearListeners()
-    @initBtnListeners()
-
-  clearListeners: ->
-    $('.done-todo').off('click')
-    $('.js-todos-mark-all').off('click')
-    $('.todo').off('click')
-
-  initBtnListeners: ->
-    $('.done-todo').on('click', @doneClicked)
-    $('.js-todos-mark-all').on('click', @allDoneClicked)
-    $('.todo').on('click', @goToTodoUrl)
-
-  doneClicked: (e) =>
-    e.preventDefault()
-    e.stopImmediatePropagation()
-
-    $this = $(e.currentTarget)
-    $this.disable()
-
-    $.ajax
-      type: 'POST'
-      url: $this.attr('href')
-      dataType: 'json'
-      data: '_method': 'delete'
-      success: (data) =>
-        @redirectIfNeeded data.count
-        @clearDone $this.closest('li')
-        @updateBadges data
-
-  allDoneClicked: (e) =>
-    e.preventDefault()
-    e.stopImmediatePropagation()
-
-    $this = $(e.currentTarget)
-    $this.disable()
-
-    $.ajax
-      type: 'POST'
-      url: $this.attr('href')
-      dataType: 'json'
-      data: '_method': 'delete'
-      success: (data) =>
-        $this.remove()
-        $('.js-todos-list').remove()
-        @updateBadges data
-
-  clearDone: ($row) ->
-    $ul = $row.closest('ul')
-    $row.remove()
-
-    if not $ul.find('li').length
-      $ul.parents('.panel').remove()
-
-  updateBadges: (data) ->
-    $('.todos-pending .badge, .todos-pending-count').text data.count
-    $('.todos-done .badge').text data.done_count
-
-  getTotalPages: ->
-    @el.data('totalPages')
-
-  getCurrentPage: ->
-    @el.data('currentPage')
-
-  getTodosPerPage: ->
-    @el.data('perPage')
-
-  redirectIfNeeded: (total) ->
-    currPages = @getTotalPages()
-    currPage = @getCurrentPage()
-
-    # Refresh if no remaining Todos
-    if not total
-      location.reload()
-      return
-
-    # Do nothing if no pagination
-    return if not currPages
-
-    newPages = Math.ceil(total / @getTodosPerPage())
-    url = location.href # Includes query strings
-
-    # If new total of pages is different than we have now
-    if newPages isnt currPages
-      # Redirect to previous page if there's one available
-      if currPages > 1 and currPage is currPages
-        pageParams =
-          page: currPages - 1
-        url = gl.utils.mergeUrlParams(pageParams, url)
-
-      Turbolinks.visit(url)
-
-  goToTodoUrl: (e)->
-    todoLink = $(this).data('url')
-    return unless todoLink
-
-    # Allow Meta-Click or Mouse3-click to open in a new tab
-    if e.metaKey or e.which is 2
-      e.preventDefault()
-      window.open(todoLink,'_blank')
-    else
-      Turbolinks.visit(todoLink)
diff --git a/app/assets/javascripts/tree.js b/app/assets/javascripts/tree.js
new file mode 100644
index 00000000000..78e159a7ed9
--- /dev/null
+++ b/app/assets/javascripts/tree.js
@@ -0,0 +1,65 @@
+(function() {
+  this.TreeView = (function() {
+    function TreeView() {
+      this.initKeyNav();
+      $(".tree-content-holder .tree-item").on('click', function(e) {
+        var $clickedEl, path;
+        $clickedEl = $(e.target);
+        path = $('.tree-item-file-name a', this).attr('href');
+        if (!$clickedEl.is('a') && !$clickedEl.is('.str-truncated')) {
+          if (e.metaKey || e.which === 2) {
+            e.preventDefault();
+            return window.open(path, '_blank');
+          } else {
+            return Turbolinks.visit(path);
+          }
+        }
+      });
+      $('span.log_loading:first').removeClass('hide');
+    }
+
+    TreeView.prototype.initKeyNav = function() {
+      var li, liSelected;
+      li = $("tr.tree-item");
+      liSelected = null;
+      return $('body').keydown(function(e) {
+        var next, path;
+        if ($("input:focus").length > 0 && (e.which === 38 || e.which === 40)) {
+          return false;
+        }
+        if (e.which === 40) {
+          if (liSelected) {
+            next = liSelected.next();
+            if (next.length > 0) {
+              liSelected.removeClass("selected");
+              liSelected = next.addClass("selected");
+            }
+          } else {
+            liSelected = li.eq(0).addClass("selected");
+          }
+          return $(liSelected).focus();
+        } else if (e.which === 38) {
+          if (liSelected) {
+            next = liSelected.prev();
+            if (next.length > 0) {
+              liSelected.removeClass("selected");
+              liSelected = next.addClass("selected");
+            }
+          } else {
+            liSelected = li.last().addClass("selected");
+          }
+          return $(liSelected).focus();
+        } else if (e.which === 13) {
+          path = $('.tree-item.selected .tree-item-file-name a').attr('href');
+          if (path) {
+            return Turbolinks.visit(path);
+          }
+        }
+      });
+    };
+
+    return TreeView;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/tree.js.coffee b/app/assets/javascripts/tree.js.coffee
deleted file mode 100644
index 83de584f2d9..00000000000
--- a/app/assets/javascripts/tree.js.coffee
+++ /dev/null
@@ -1,50 +0,0 @@
-class @TreeView
-  constructor: ->
-    @initKeyNav()
-
-    # Code browser tree slider
-    # Make the entire tree-item row clickable, but not if clicking another link (like a commit message)
-    $(".tree-content-holder .tree-item").on 'click', (e) ->
-      $clickedEl = $(e.target)
-      path = $('.tree-item-file-name a', this).attr('href')
-
-      if not $clickedEl.is('a') and not $clickedEl.is('.str-truncated')
-        if e.metaKey or e.which is 2
-          e.preventDefault()
-          window.open path, '_blank'
-        else
-          Turbolinks.visit path
-
-    # Show the "Loading commit data" for only the first element
-    $('span.log_loading:first').removeClass('hide')
-
-  initKeyNav: ->
-    li = $("tr.tree-item")
-    liSelected = null
-    $('body').keydown (e) ->
-      if $("input:focus").length > 0 && (e.which == 38 || e.which == 40)
-        return false
-
-      if e.which is 40
-        if liSelected
-          next = liSelected.next()
-          if next.length > 0
-            liSelected.removeClass "selected"
-            liSelected = next.addClass("selected")
-        else
-          liSelected = li.eq(0).addClass("selected")
-
-        $(liSelected).focus()
-      else if e.which is 38
-        if liSelected
-          next = liSelected.prev()
-          if next.length > 0
-            liSelected.removeClass "selected"
-            liSelected = next.addClass("selected")
-        else
-          liSelected = li.last().addClass("selected")
-
-        $(liSelected).focus()
-      else if e.which is 13
-        path = $('.tree-item.selected .tree-item-file-name a').attr('href')
-        if path then Turbolinks.visit(path)
diff --git a/app/assets/javascripts/u2f/authenticate.js b/app/assets/javascripts/u2f/authenticate.js
new file mode 100644
index 00000000000..9ba847fb0c2
--- /dev/null
+++ b/app/assets/javascripts/u2f/authenticate.js
@@ -0,0 +1,89 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.U2FAuthenticate = (function() {
+    function U2FAuthenticate(container, u2fParams) {
+      this.container = container;
+      this.renderNotSupported = bind(this.renderNotSupported, this);
+      this.renderAuthenticated = bind(this.renderAuthenticated, this);
+      this.renderError = bind(this.renderError, this);
+      this.renderInProgress = bind(this.renderInProgress, this);
+      this.renderSetup = bind(this.renderSetup, this);
+      this.renderTemplate = bind(this.renderTemplate, this);
+      this.authenticate = bind(this.authenticate, this);
+      this.start = bind(this.start, this);
+      this.appId = u2fParams.app_id;
+      this.challenge = u2fParams.challenge;
+      this.signRequests = u2fParams.sign_requests.map(function(request) {
+        return _(request).omit('challenge');
+      });
+    }
+
+    U2FAuthenticate.prototype.start = function() {
+      if (U2FUtil.isU2FSupported()) {
+        return this.renderSetup();
+      } else {
+        return this.renderNotSupported();
+      }
+    };
+
+    U2FAuthenticate.prototype.authenticate = function() {
+      return u2f.sign(this.appId, this.challenge, this.signRequests, (function(_this) {
+        return function(response) {
+          var error;
+          if (response.errorCode) {
+            error = new U2FError(response.errorCode);
+            return _this.renderError(error);
+          } else {
+            return _this.renderAuthenticated(JSON.stringify(response));
+          }
+        };
+      })(this), 10);
+    };
+
+    U2FAuthenticate.prototype.templates = {
+      "notSupported": "#js-authenticate-u2f-not-supported",
+      "setup": '#js-authenticate-u2f-setup',
+      "inProgress": '#js-authenticate-u2f-in-progress',
+      "error": '#js-authenticate-u2f-error',
+      "authenticated": '#js-authenticate-u2f-authenticated'
+    };
+
+    U2FAuthenticate.prototype.renderTemplate = function(name, params) {
+      var template, templateString;
+      templateString = $(this.templates[name]).html();
+      template = _.template(templateString);
+      return this.container.html(template(params));
+    };
+
+    U2FAuthenticate.prototype.renderSetup = function() {
+      this.renderTemplate('setup');
+      return this.container.find('#js-login-u2f-device').on('click', this.renderInProgress);
+    };
+
+    U2FAuthenticate.prototype.renderInProgress = function() {
+      this.renderTemplate('inProgress');
+      return this.authenticate();
+    };
+
+    U2FAuthenticate.prototype.renderError = function(error) {
+      this.renderTemplate('error', {
+        error_message: error.message()
+      });
+      return this.container.find('#js-u2f-try-again').on('click', this.renderSetup);
+    };
+
+    U2FAuthenticate.prototype.renderAuthenticated = function(deviceResponse) {
+      this.renderTemplate('authenticated');
+      return this.container.find("#js-device-response").val(deviceResponse);
+    };
+
+    U2FAuthenticate.prototype.renderNotSupported = function() {
+      return this.renderTemplate('notSupported');
+    };
+
+    return U2FAuthenticate;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/u2f/authenticate.js.coffee b/app/assets/javascripts/u2f/authenticate.js.coffee
deleted file mode 100644
index 6deb902c8de..00000000000
--- a/app/assets/javascripts/u2f/authenticate.js.coffee
+++ /dev/null
@@ -1,63 +0,0 @@
-# Authenticate U2F (universal 2nd factor) devices for users to authenticate with.
-#
-# State Flow #1: setup -> in_progress -> authenticated -> POST to server
-# State Flow #2: setup -> in_progress -> error -> setup
-
-class @U2FAuthenticate
-  constructor: (@container, u2fParams) ->
-    @appId = u2fParams.app_id
-    @challenges = u2fParams.challenges
-    @signRequests = u2fParams.sign_requests
-
-  start: () =>
-    if U2FUtil.isU2FSupported()
-      @renderSetup()
-    else
-      @renderNotSupported()
-
-  authenticate: () =>
-    u2f.sign(@appId, @challenges, @signRequests, (response) =>
-      if response.errorCode
-        error = new U2FError(response.errorCode)
-        @renderError(error);
-      else
-        @renderAuthenticated(JSON.stringify(response))
-    , 10)
-
-  #############
-  # Rendering #
-  #############
-
-  templates: {
-    "notSupported": "#js-authenticate-u2f-not-supported",
-    "setup": '#js-authenticate-u2f-setup',
-    "inProgress": '#js-authenticate-u2f-in-progress',
-    "error": '#js-authenticate-u2f-error',
-    "authenticated": '#js-authenticate-u2f-authenticated'
-  }
-
-  renderTemplate: (name, params) =>
-    templateString = $(@templates[name]).html()
-    template = _.template(templateString)
-    @container.html(template(params))
-
-  renderSetup: () =>
-    @renderTemplate('setup')
-    @container.find('#js-login-u2f-device').on('click', @renderInProgress)
-
-  renderInProgress: () =>
-    @renderTemplate('inProgress')
-    @authenticate()
-
-  renderError: (error) =>
-    @renderTemplate('error', {error_message: error.message()})
-    @container.find('#js-u2f-try-again').on('click', @renderSetup)
-
-  renderAuthenticated: (deviceResponse) =>
-    @renderTemplate('authenticated')
-    # Prefer to do this instead of interpolating using Underscore templates
-    # because of JSON escaping issues.
-    @container.find("#js-device-response").val(deviceResponse)
-
-  renderNotSupported: () =>
-    @renderTemplate('notSupported')
diff --git a/app/assets/javascripts/u2f/error.js b/app/assets/javascripts/u2f/error.js
new file mode 100644
index 00000000000..bc48c67c4f2
--- /dev/null
+++ b/app/assets/javascripts/u2f/error.js
@@ -0,0 +1,27 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.U2FError = (function() {
+    function U2FError(errorCode) {
+      this.errorCode = errorCode;
+      this.message = bind(this.message, this);
+      this.httpsDisabled = window.location.protocol !== 'https:';
+      console.error("U2F Error Code: " + this.errorCode);
+    }
+
+    U2FError.prototype.message = function() {
+      switch (false) {
+        case !(this.errorCode === u2f.ErrorCodes.BAD_REQUEST && this.httpsDisabled):
+          return "U2F only works with HTTPS-enabled websites. Contact your administrator for more details.";
+        case this.errorCode !== u2f.ErrorCodes.DEVICE_INELIGIBLE:
+          return "This device has already been registered with us.";
+        default:
+          return "There was a problem communicating with your device.";
+      }
+    };
+
+    return U2FError;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/u2f/error.js.coffee b/app/assets/javascripts/u2f/error.js.coffee
deleted file mode 100644
index 1a2fc3e757f..00000000000
--- a/app/assets/javascripts/u2f/error.js.coffee
+++ /dev/null
@@ -1,13 +0,0 @@
-class @U2FError
-  constructor: (@errorCode) ->
-    @httpsDisabled = (window.location.protocol isnt 'https:')
-    console.error("U2F Error Code: #{@errorCode}")
-
-  message: () =>
-    switch
-      when (@errorCode is u2f.ErrorCodes.BAD_REQUEST and @httpsDisabled)
-        "U2F only works with HTTPS-enabled websites. Contact your administrator for more details."
-      when @errorCode is u2f.ErrorCodes.DEVICE_INELIGIBLE
-        "This device has already been registered with us."
-      else
-        "There was a problem communicating with your device."
diff --git a/app/assets/javascripts/u2f/register.js b/app/assets/javascripts/u2f/register.js
new file mode 100644
index 00000000000..c87e0840df3
--- /dev/null
+++ b/app/assets/javascripts/u2f/register.js
@@ -0,0 +1,87 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.U2FRegister = (function() {
+    function U2FRegister(container, u2fParams) {
+      this.container = container;
+      this.renderNotSupported = bind(this.renderNotSupported, this);
+      this.renderRegistered = bind(this.renderRegistered, this);
+      this.renderError = bind(this.renderError, this);
+      this.renderInProgress = bind(this.renderInProgress, this);
+      this.renderSetup = bind(this.renderSetup, this);
+      this.renderTemplate = bind(this.renderTemplate, this);
+      this.register = bind(this.register, this);
+      this.start = bind(this.start, this);
+      this.appId = u2fParams.app_id;
+      this.registerRequests = u2fParams.register_requests;
+      this.signRequests = u2fParams.sign_requests;
+    }
+
+    U2FRegister.prototype.start = function() {
+      if (U2FUtil.isU2FSupported()) {
+        return this.renderSetup();
+      } else {
+        return this.renderNotSupported();
+      }
+    };
+
+    U2FRegister.prototype.register = function() {
+      return u2f.register(this.appId, this.registerRequests, this.signRequests, (function(_this) {
+        return function(response) {
+          var error;
+          if (response.errorCode) {
+            error = new U2FError(response.errorCode);
+            return _this.renderError(error);
+          } else {
+            return _this.renderRegistered(JSON.stringify(response));
+          }
+        };
+      })(this), 10);
+    };
+
+    U2FRegister.prototype.templates = {
+      "notSupported": "#js-register-u2f-not-supported",
+      "setup": '#js-register-u2f-setup',
+      "inProgress": '#js-register-u2f-in-progress',
+      "error": '#js-register-u2f-error',
+      "registered": '#js-register-u2f-registered'
+    };
+
+    U2FRegister.prototype.renderTemplate = function(name, params) {
+      var template, templateString;
+      templateString = $(this.templates[name]).html();
+      template = _.template(templateString);
+      return this.container.html(template(params));
+    };
+
+    U2FRegister.prototype.renderSetup = function() {
+      this.renderTemplate('setup');
+      return this.container.find('#js-setup-u2f-device').on('click', this.renderInProgress);
+    };
+
+    U2FRegister.prototype.renderInProgress = function() {
+      this.renderTemplate('inProgress');
+      return this.register();
+    };
+
+    U2FRegister.prototype.renderError = function(error) {
+      this.renderTemplate('error', {
+        error_message: error.message()
+      });
+      return this.container.find('#js-u2f-try-again').on('click', this.renderSetup);
+    };
+
+    U2FRegister.prototype.renderRegistered = function(deviceResponse) {
+      this.renderTemplate('registered');
+      return this.container.find("#js-device-response").val(deviceResponse);
+    };
+
+    U2FRegister.prototype.renderNotSupported = function() {
+      return this.renderTemplate('notSupported');
+    };
+
+    return U2FRegister;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/u2f/register.js.coffee b/app/assets/javascripts/u2f/register.js.coffee
deleted file mode 100644
index 74472cfa120..00000000000
--- a/app/assets/javascripts/u2f/register.js.coffee
+++ /dev/null
@@ -1,63 +0,0 @@
-# Register U2F (universal 2nd factor) devices for users to authenticate with.
-#
-# State Flow #1: setup -> in_progress -> registered -> POST to server
-# State Flow #2: setup -> in_progress -> error -> setup
-
-class @U2FRegister
-  constructor: (@container, u2fParams) ->
-    @appId = u2fParams.app_id
-    @registerRequests = u2fParams.register_requests
-    @signRequests = u2fParams.sign_requests
-
-  start: () =>
-    if U2FUtil.isU2FSupported()
-      @renderSetup()
-    else
-      @renderNotSupported()
-
-  register: () =>
-    u2f.register(@appId, @registerRequests, @signRequests, (response) =>
-      if response.errorCode
-        error = new U2FError(response.errorCode)
-        @renderError(error);
-      else
-        @renderRegistered(JSON.stringify(response))
-    , 10)
-
-  #############
-  # Rendering #
-  #############
-
-  templates: {
-    "notSupported": "#js-register-u2f-not-supported",
-    "setup": '#js-register-u2f-setup',
-    "inProgress": '#js-register-u2f-in-progress',
-    "error": '#js-register-u2f-error',
-    "registered": '#js-register-u2f-registered'
-  }
-
-  renderTemplate: (name, params) =>
-    templateString = $(@templates[name]).html()
-    template = _.template(templateString)
-    @container.html(template(params))
-
-  renderSetup: () =>
-    @renderTemplate('setup')
-    @container.find('#js-setup-u2f-device').on('click', @renderInProgress)
-
-  renderInProgress: () =>
-    @renderTemplate('inProgress')
-    @register()
-
-  renderError: (error) =>
-    @renderTemplate('error', {error_message: error.message()})
-    @container.find('#js-u2f-try-again').on('click', @renderSetup)
-
-  renderRegistered: (deviceResponse) =>
-    @renderTemplate('registered')
-    # Prefer to do this instead of interpolating using Underscore templates
-    # because of JSON escaping issues.
-    @container.find("#js-device-response").val(deviceResponse)
-
-  renderNotSupported: () =>
-    @renderTemplate('notSupported')
diff --git a/app/assets/javascripts/u2f/util.js b/app/assets/javascripts/u2f/util.js
new file mode 100644
index 00000000000..907e640161a
--- /dev/null
+++ b/app/assets/javascripts/u2f/util.js
@@ -0,0 +1,13 @@
+(function() {
+  this.U2FUtil = (function() {
+    function U2FUtil() {}
+
+    U2FUtil.isU2FSupported = function() {
+      return window.u2f;
+    };
+
+    return U2FUtil;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/u2f/util.js.coffee.erb b/app/assets/javascripts/u2f/util.js.coffee.erb
deleted file mode 100644
index d59341c38b9..00000000000
--- a/app/assets/javascripts/u2f/util.js.coffee.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Helper class for U2F (universal 2nd factor) device registration and authentication.
-
-class @U2FUtil
-  @isU2FSupported: ->
-    if @testMode
-      true
-    else
-      gon.u2f.browser_supports_u2f
-
-  @enableTestMode: ->
-    @testMode = true
-
-<% if Rails.env.test? %>
-U2FUtil.enableTestMode();
-<% end %>
diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
new file mode 100644
index 00000000000..b46390ad8f4
--- /dev/null
+++ b/app/assets/javascripts/user.js
@@ -0,0 +1,31 @@
+(function() {
+  this.User = (function() {
+    function User(opts) {
+      this.opts = opts;
+      $('.profile-groups-avatars').tooltip({
+        "placement": "top"
+      });
+      this.initTabs();
+      $('.hide-project-limit-message').on('click', function(e) {
+        var path;
+        path = '/';
+        $.cookie('hide_project_limit_message', 'false', {
+          path: path
+        });
+        $(this).parents('.project-limit-message').remove();
+        return e.preventDefault();
+      });
+    }
+
+    User.prototype.initTabs = function() {
+      return new UserTabs({
+        parentEl: '.user-profile',
+        action: this.opts.action
+      });
+    };
+
+    return User;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/user.js.coffee b/app/assets/javascripts/user.js.coffee
deleted file mode 100644
index 2882a90d118..00000000000
--- a/app/assets/javascripts/user.js.coffee
+++ /dev/null
@@ -1,17 +0,0 @@
-class @User
-  constructor: (@opts) ->
-    $('.profile-groups-avatars').tooltip("placement": "top")
-
-    @initTabs()
-
-    $('.hide-project-limit-message').on 'click', (e) ->
-      path = '/'
-      $.cookie('hide_project_limit_message', 'false', { path: path })
-      $(@).parents('.project-limit-message').remove()
-      e.preventDefault()
-
-  initTabs: ->
-    new UserTabs(
-        parentEl: '.user-profile'
-        action: @opts.action
-      )
diff --git a/app/assets/javascripts/user_tabs.js b/app/assets/javascripts/user_tabs.js
new file mode 100644
index 00000000000..e5e75701fee
--- /dev/null
+++ b/app/assets/javascripts/user_tabs.js
@@ -0,0 +1,119 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.UserTabs = (function() {
+    function UserTabs(opts) {
+      this.tabShown = bind(this.tabShown, this);
+      var i, item, len, ref, ref1, ref2, ref3;
+      this.action = (ref = opts.action) != null ? ref : 'activity', this.defaultAction = (ref1 = opts.defaultAction) != null ? ref1 : 'activity', this.parentEl = (ref2 = opts.parentEl) != null ? ref2 : $(document);
+      if (typeof this.parentEl === 'string') {
+        this.parentEl = $(this.parentEl);
+      }
+      this._location = location;
+      this.loaded = {};
+      ref3 = this.parentEl.find('.nav-links a');
+      for (i = 0, len = ref3.length; i < len; i++) {
+        item = ref3[i];
+        this.loaded[$(item).attr('data-action')] = false;
+      }
+      this.actions = Object.keys(this.loaded);
+      this.bindEvents();
+      if (this.action === 'show') {
+        this.action = this.defaultAction;
+      }
+      this.activateTab(this.action);
+    }
+
+    UserTabs.prototype.bindEvents = function() {
+      return this.parentEl.off('shown.bs.tab', '.nav-links a[data-toggle="tab"]').on('shown.bs.tab', '.nav-links a[data-toggle="tab"]', this.tabShown);
+    };
+
+    UserTabs.prototype.tabShown = function(event) {
+      var $target, action, source;
+      $target = $(event.target);
+      action = $target.data('action');
+      source = $target.attr('href');
+      this.setTab(source, action);
+      return this.setCurrentAction(action);
+    };
+
+    UserTabs.prototype.activateTab = function(action) {
+      return this.parentEl.find(".nav-links .js-" + action + "-tab a").tab('show');
+    };
+
+    UserTabs.prototype.setTab = function(source, action) {
+      if (this.loaded[action] === true) {
+        return;
+      }
+      if (action === 'activity') {
+        this.loadActivities(source);
+      }
+      if (action === 'groups' || action === 'contributed' || action === 'projects' || action === 'snippets') {
+        return this.loadTab(source, action);
+      }
+    };
+
+    UserTabs.prototype.loadTab = function(source, action) {
+      return $.ajax({
+        beforeSend: (function(_this) {
+          return function() {
+            return _this.toggleLoading(true);
+          };
+        })(this),
+        complete: (function(_this) {
+          return function() {
+            return _this.toggleLoading(false);
+          };
+        })(this),
+        dataType: 'json',
+        type: 'GET',
+        url: source + ".json",
+        success: (function(_this) {
+          return function(data) {
+            var tabSelector;
+            tabSelector = 'div#' + action;
+            _this.parentEl.find(tabSelector).html(data.html);
+            _this.loaded[action] = true;
+            return gl.utils.localTimeAgo($('.js-timeago', tabSelector));
+          };
+        })(this)
+      });
+    };
+
+    UserTabs.prototype.loadActivities = function(source) {
+      var $calendarWrap;
+      if (this.loaded['activity'] === true) {
+        return;
+      }
+      $calendarWrap = this.parentEl.find('.user-calendar');
+      $calendarWrap.load($calendarWrap.data('href'));
+      new Activities();
+      return this.loaded['activity'] = true;
+    };
+
+    UserTabs.prototype.toggleLoading = function(status) {
+      return this.parentEl.find('.loading-status .loading').toggle(status);
+    };
+
+    UserTabs.prototype.setCurrentAction = function(action) {
+      var new_state, regExp;
+      regExp = new RegExp('\/(' + this.actions.join('|') + ')(\.html)?\/?$');
+      new_state = this._location.pathname;
+      new_state = new_state.replace(/\/+$/, "");
+      new_state = new_state.replace(regExp, '');
+      if (action !== this.defaultAction) {
+        new_state += "/" + action;
+      }
+      new_state += this._location.search + this._location.hash;
+      history.replaceState({
+        turbolinks: true,
+        url: new_state
+      }, document.title, new_state);
+      return new_state;
+    };
+
+    return UserTabs;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/user_tabs.js.coffee b/app/assets/javascripts/user_tabs.js.coffee
deleted file mode 100644
index 29dad21faed..00000000000
--- a/app/assets/javascripts/user_tabs.js.coffee
+++ /dev/null
@@ -1,156 +0,0 @@
-# UserTabs
-#
-# Handles persisting and restoring the current tab selection and lazily-loading
-# content on the Users#show page.
-#
-# ### Example Markup
-#
-#   <ul class="nav-links">
-#     <li class="activity-tab active">
-#       <a data-action="activity" data-target="#activity" data-toggle="tab" href="/u/username">
-#         Activity
-#       </a>
-#     </li>
-#     <li class="groups-tab">
-#       <a data-action="groups" data-target="#groups" data-toggle="tab" href="/u/username/groups">
-#         Groups
-#       </a>
-#     </li>
-#     <li class="contributed-tab">
-#       <a data-action="contributed" data-target="#contributed" data-toggle="tab" href="/u/username/contributed">
-#         Contributed projects
-#       </a>
-#     </li>
-#     <li class="projects-tab">
-#       <a data-action="projects" data-target="#projects" data-toggle="tab" href="/u/username/projects">
-#         Personal projects
-#       </a>
-#     </li>
-#    <li class="snippets-tab">
-#       <a data-action="snippets" data-target="#snippets" data-toggle="tab" href="/u/username/snippets">
-#       </a>
-#     </li>
-#   </ul>
-#
-#   <div class="tab-content">
-#     <div class="tab-pane" id="activity">
-#       Activity Content
-#     </div>
-#     <div class="tab-pane" id="groups">
-#       Groups Content
-#     </div>
-#     <div class="tab-pane" id="contributed">
-#       Contributed projects content
-#     </div>
-#     <div class="tab-pane" id="projects">
-#       Projects content
-#     </div>
-#     <div class="tab-pane" id="snippets">
-#       Snippets content
-#     </div>
-#   </div>
-#
-#   <div class="loading-status">
-#     <div class="loading">
-#       Loading Animation
-#     </div>
-#   </div>
-#
-class @UserTabs
-  constructor: (opts) ->
-    {
-      @action = 'activity'
-      @defaultAction = 'activity'
-      @parentEl = $(document)
-    } = opts
-
-    # Make jQuery object if selector is provided
-    @parentEl = $(@parentEl) if typeof @parentEl is 'string'
-
-    # Store the `location` object, allowing for easier stubbing in tests
-    @_location = location
-
-    # Set tab states
-    @loaded = {}
-    for item in @parentEl.find('.nav-links a')
-      @loaded[$(item).attr 'data-action'] = false
-
-    # Actions
-    @actions = Object.keys @loaded
-
-    @bindEvents()
-
-    # Set active tab
-    @action = @defaultAction if @action is 'show'
-    @activateTab(@action)
-
-  bindEvents: ->
-    # Toggle event listeners
-    @parentEl
-      .off 'shown.bs.tab', '.nav-links a[data-toggle="tab"]'
-      .on 'shown.bs.tab', '.nav-links a[data-toggle="tab"]', @tabShown
-
-  tabShown: (event) =>
-    $target = $(event.target)
-    action = $target.data('action')
-    source = $target.attr('href')
-
-    @setTab(source, action)
-    @setCurrentAction(action)
-
-  activateTab: (action) ->
-    @parentEl.find(".nav-links .js-#{action}-tab a").tab('show')
-
-  setTab: (source, action) ->
-    return if @loaded[action] is true
-
-    if action is 'activity'
-      @loadActivities(source)
-
-    if action in ['groups', 'contributed', 'projects', 'snippets']
-      @loadTab(source, action)
-
-  loadTab: (source, action) ->
-    $.ajax
-      beforeSend: => @toggleLoading(true)
-      complete:   => @toggleLoading(false)
-      dataType: 'json'
-      type: 'GET'
-      url: "#{source}.json"
-      success: (data) =>
-        tabSelector = 'div#' + action
-        @parentEl.find(tabSelector).html(data.html)
-        @loaded[action] = true
-
-        # Fix tooltips
-        gl.utils.localTimeAgo($('.js-timeago', tabSelector))
-
-  loadActivities: (source) ->
-    return if @loaded['activity'] is true
-
-    $calendarWrap = @parentEl.find('.user-calendar')
-    $calendarWrap.load($calendarWrap.data('href'))
-
-    new Activities()
-    @loaded['activity'] = true
-
-  toggleLoading: (status) ->
-    @parentEl.find('.loading-status .loading').toggle(status)
-
-  setCurrentAction: (action) ->
-    # Remove possible actions from URL
-    regExp = new RegExp('\/(' + @actions.join('|') + ')(\.html)?\/?$')
-    new_state = @_location.pathname
-    new_state = new_state.replace(/\/+$/, "") # remove trailing slashes
-    new_state = new_state.replace(regExp, '')
-
-    # Append the new action if we're on a tab other than 'activity'
-    unless action == @defaultAction
-      new_state += "/#{action}"
-
-    # Ensure parameters and hash come along for the ride
-    new_state += @_location.search + @_location.hash
-
-    history.replaceState {turbolinks: true, url: new_state}, document.title, new_state
-
-    new_state
diff --git a/app/assets/javascripts/users/application.js.coffee b/app/assets/javascripts/users/application.js.coffee
deleted file mode 100644
index 91cacfece46..00000000000
--- a/app/assets/javascripts/users/application.js.coffee
+++ /dev/null
@@ -1,2 +0,0 @@
-#
-#= require_tree .
diff --git a/app/assets/javascripts/users/calendar.js b/app/assets/javascripts/users/calendar.js
new file mode 100644
index 00000000000..8b3dbf5f5ae
--- /dev/null
+++ b/app/assets/javascripts/users/calendar.js
@@ -0,0 +1,192 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.Calendar = (function() {
+    function Calendar(timestamps, calendar_activities_path) {
+      var group, i;
+      this.calendar_activities_path = calendar_activities_path;
+      this.clickDay = bind(this.clickDay, this);
+      this.currentSelectedDate = '';
+      this.daySpace = 1;
+      this.daySize = 15;
+      this.daySizeWithSpace = this.daySize + (this.daySpace * 2);
+      this.monthNames = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+      this.months = [];
+      this.timestampsTmp = [];
+      i = 0;
+      group = 0;
+      _.each(timestamps, (function(_this) {
+        return function(count, date) {
+          var day, innerArray, newDate;
+          newDate = new Date(parseInt(date) * 1000);
+          day = newDate.getDay();
+          if ((day === 0 && i !== 0) || i === 0) {
+            _this.timestampsTmp.push([]);
+            group++;
+          }
+          innerArray = _this.timestampsTmp[group - 1];
+          innerArray.push({
+            count: count,
+            date: newDate,
+            day: day
+          });
+          return i++;
+        };
+      })(this));
+      this.colorKey = this.initColorKey();
+      this.color = this.initColor();
+      this.renderSvg(group);
+      this.renderDays();
+      this.renderMonths();
+      this.renderDayTitles();
+      this.renderKey();
+      this.initTooltips();
+    }
+
+    Calendar.prototype.renderSvg = function(group) {
+      return this.svg = d3.select('.js-contrib-calendar').append('svg').attr('width', (group + 1) * this.daySizeWithSpace).attr('height', 167).attr('class', 'contrib-calendar');
+    };
+
+    Calendar.prototype.renderDays = function() {
+      return this.svg.selectAll('g').data(this.timestampsTmp).enter().append('g').attr('transform', (function(_this) {
+        return function(group, i) {
+          _.each(group, function(stamp, a) {
+            var lastMonth, lastMonthX, month, x;
+            if (a === 0 && stamp.day === 0) {
+              month = stamp.date.getMonth();
+              x = (_this.daySizeWithSpace * i + 1) + _this.daySizeWithSpace;
+              lastMonth = _.last(_this.months);
+              if (lastMonth != null) {
+                lastMonthX = lastMonth.x;
+              }
+              if (lastMonth == null) {
+                return _this.months.push({
+                  month: month,
+                  x: x
+                });
+              } else if (month !== lastMonth.month && x - _this.daySizeWithSpace !== lastMonthX) {
+                return _this.months.push({
+                  month: month,
+                  x: x
+                });
+              }
+            }
+          });
+          return "translate(" + ((_this.daySizeWithSpace * i + 1) + _this.daySizeWithSpace) + ", 18)";
+        };
+      })(this)).selectAll('rect').data(function(stamp) {
+        return stamp;
+      }).enter().append('rect').attr('x', '0').attr('y', (function(_this) {
+        return function(stamp, i) {
+          return _this.daySizeWithSpace * stamp.day;
+        };
+      })(this)).attr('width', this.daySize).attr('height', this.daySize).attr('title', (function(_this) {
+        return function(stamp) {
+          var contribText, date, dateText;
+          date = new Date(stamp.date);
+          contribText = 'No contributions';
+          if (stamp.count > 0) {
+            contribText = stamp.count + " contribution" + (stamp.count > 1 ? 's' : '');
+          }
+          dateText = dateFormat(date, 'mmm d, yyyy');
+          return contribText + "<br />" + (gl.utils.getDayName(date)) + " " + dateText;
+        };
+      })(this)).attr('class', 'user-contrib-cell js-tooltip').attr('fill', (function(_this) {
+        return function(stamp) {
+          if (stamp.count !== 0) {
+            return _this.color(Math.min(stamp.count, 40));
+          } else {
+            return '#ededed';
+          }
+        };
+      })(this)).attr('data-container', 'body').on('click', this.clickDay);
+    };
+
+    Calendar.prototype.renderDayTitles = function() {
+      var days;
+      days = [
+        {
+          text: 'M',
+          y: 29 + (this.daySizeWithSpace * 1)
+        }, {
+          text: 'W',
+          y: 29 + (this.daySizeWithSpace * 3)
+        }, {
+          text: 'F',
+          y: 29 + (this.daySizeWithSpace * 5)
+        }
+      ];
+      return this.svg.append('g').selectAll('text').data(days).enter().append('text').attr('text-anchor', 'middle').attr('x', 8).attr('y', function(day) {
+        return day.y;
+      }).text(function(day) {
+        return day.text;
+      }).attr('class', 'user-contrib-text');
+    };
+
+    Calendar.prototype.renderMonths = function() {
+      return this.svg.append('g').selectAll('text').data(this.months).enter().append('text').attr('x', function(date) {
+        return date.x;
+      }).attr('y', 10).attr('class', 'user-contrib-text').text((function(_this) {
+        return function(date) {
+          return _this.monthNames[date.month];
+        };
+      })(this));
+    };
+
+    Calendar.prototype.renderKey = function() {
+      var keyColors;
+      keyColors = ['#ededed', this.colorKey(0), this.colorKey(1), this.colorKey(2), this.colorKey(3)];
+      return this.svg.append('g').attr('transform', "translate(18, " + (this.daySizeWithSpace * 8 + 16) + ")").selectAll('rect').data(keyColors).enter().append('rect').attr('width', this.daySize).attr('height', this.daySize).attr('x', (function(_this) {
+        return function(color, i) {
+          return _this.daySizeWithSpace * i;
+        };
+      })(this)).attr('y', 0).attr('fill', function(color) {
+        return color;
+      });
+    };
+
+    Calendar.prototype.initColor = function() {
+      var colorRange;
+      colorRange = ['#ededed', this.colorKey(0), this.colorKey(1), this.colorKey(2), this.colorKey(3)];
+      return d3.scale.threshold().domain([0, 10, 20, 30]).range(colorRange);
+    };
+
+    Calendar.prototype.initColorKey = function() {
+      return d3.scale.linear().range(['#acd5f2', '#254e77']).domain([0, 3]);
+    };
+
+    Calendar.prototype.clickDay = function(stamp) {
+      var formatted_date;
+      if (this.currentSelectedDate !== stamp.date) {
+        this.currentSelectedDate = stamp.date;
+        formatted_date = this.currentSelectedDate.getFullYear() + "-" + (this.currentSelectedDate.getMonth() + 1) + "-" + this.currentSelectedDate.getDate();
+        return $.ajax({
+          url: this.calendar_activities_path,
+          data: {
+            date: formatted_date
+          },
+          cache: false,
+          dataType: 'html',
+          beforeSend: function() {
+            return $('.user-calendar-activities').html('<div class="text-center"><i class="fa fa-spinner fa-spin user-calendar-activities-loading"></i></div>');
+          },
+          success: function(data) {
+            return $('.user-calendar-activities').html(data);
+          }
+        });
+      } else {
+        return $('.user-calendar-activities').html('');
+      }
+    };
+
+    Calendar.prototype.initTooltips = function() {
+      return $('.js-contrib-calendar .js-tooltip').tooltip({
+        html: true
+      });
+    };
+
+    return Calendar;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/users/calendar.js.coffee b/app/assets/javascripts/users/calendar.js.coffee
deleted file mode 100644
index c49ba5186f2..00000000000
--- a/app/assets/javascripts/users/calendar.js.coffee
+++ /dev/null
@@ -1,194 +0,0 @@
-class @Calendar
-  constructor: (timestamps, @calendar_activities_path) ->
-    @currentSelectedDate = ''
-    @daySpace = 1
-    @daySize = 15
-    @daySizeWithSpace = @daySize + (@daySpace * 2)
-    @monthNames = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
-    @months = []
-
-    # Loop through the timestamps to create a group of objects
-    # The group of objects will be grouped based on the day of the week they are
-    @timestampsTmp = []
-    i = 0
-    group = 0
-    _.each timestamps, (count, date) =>
-      newDate = new Date parseInt(date) * 1000
-      day = newDate.getDay()
-
-      # Create a new group array if this is the first day of the week
-      # or if is first object
-      if (day is 0 and i isnt 0) or i is 0
-        @timestampsTmp.push []
-        group++
-
-      innerArray = @timestampsTmp[group-1]
-
-      # Push to the inner array the values that will be used to render map
-      innerArray.push
-        count: count
-        date: newDate
-        day: day
-
-      i++
-
-    # Init color functions
-    @colorKey = @initColorKey()
-    @color = @initColor()
-
-    # Init the svg element
-    @renderSvg(group)
-    @renderDays()
-    @renderMonths()
-    @renderDayTitles()
-    @renderKey()
-
-    @initTooltips()
-
-  renderSvg: (group) ->
-    @svg = d3.select '.js-contrib-calendar'
-      .append 'svg'
-      .attr 'width', (group + 1) * @daySizeWithSpace
-      .attr 'height', 167
-      .attr 'class', 'contrib-calendar'
-
-  renderDays: ->
-    @svg.selectAll 'g'
-      .data @timestampsTmp
-      .enter()
-      .append 'g'
-      .attr 'transform', (group, i) =>
-        _.each group, (stamp, a) =>
-          if a is 0 and stamp.day is 0
-            month = stamp.date.getMonth()
-            x = (@daySizeWithSpace * i + 1) + @daySizeWithSpace
-            lastMonth = _.last(@months)
-            if lastMonth?
-              lastMonthX = lastMonth.x
-
-            if !lastMonth?
-              @months.push
-                month: month
-                x: x
-            else if month isnt lastMonth.month and x - @daySizeWithSpace isnt lastMonthX
-              @months.push
-                month: month
-                x: x
-
-        "translate(#{(@daySizeWithSpace * i + 1) + @daySizeWithSpace}, 18)"
-      .selectAll 'rect'
-      .data (stamp) ->
-        stamp
-      .enter()
-      .append 'rect'
-      .attr 'x', '0'
-      .attr 'y', (stamp, i) =>
-        (@daySizeWithSpace * stamp.day)
-      .attr 'width', @daySize
-      .attr 'height', @daySize
-      .attr 'title', (stamp) =>
-        date = new Date(stamp.date)
-        contribText = 'No contributions'
-
-        if stamp.count > 0
-          contribText = "#{stamp.count} contribution#{if stamp.count > 1 then 's' else ''}"
-
-        dateText = dateFormat(date, 'mmm d, yyyy')
-
-        "#{contribText}<br />#{gl.utils.getDayName(date)} #{dateText}"
-      .attr 'class', 'user-contrib-cell js-tooltip'
-      .attr 'fill', (stamp) =>
-        if stamp.count isnt 0
-          @color(Math.min(stamp.count, 40))
-        else
-          '#ededed'
-      .attr 'data-container', 'body'
-      .on 'click', @clickDay
-
-  renderDayTitles: ->
-    days = [{
-      text: 'M'
-      y: 29 + (@daySizeWithSpace * 1)
-    }, {
-      text: 'W'
-      y: 29 + (@daySizeWithSpace * 3)
-    }, {
-      text: 'F'
-      y: 29 + (@daySizeWithSpace * 5)
-    }]
-    @svg.append 'g'
-      .selectAll 'text'
-      .data days
-      .enter()
-      .append 'text'
-      .attr 'text-anchor', 'middle'
-      .attr 'x', 8
-      .attr 'y', (day) ->
-        day.y
-      .text (day) ->
-        day.text
-      .attr 'class', 'user-contrib-text'
-
-  renderMonths: ->
-    @svg.append 'g'
-      .selectAll 'text'
-      .data @months
-      .enter()
-      .append 'text'
-      .attr 'x', (date) ->
-        date.x
-      .attr 'y', 10
-      .attr 'class', 'user-contrib-text'
-      .text (date) =>
-        @monthNames[date.month]
-
-  renderKey: ->
-    keyColors = ['#ededed', @colorKey(0), @colorKey(1), @colorKey(2), @colorKey(3)]
-    @svg.append 'g'
-      .attr 'transform', "translate(18, #{@daySizeWithSpace * 8 + 16})"
-      .selectAll 'rect'
-      .data keyColors
-      .enter()
-      .append 'rect'
-      .attr 'width', @daySize
-      .attr 'height', @daySize
-      .attr 'x', (color, i) =>
-        @daySizeWithSpace * i
-      .attr 'y', 0
-      .attr 'fill', (color) ->
-        color
-
-  initColor: ->
-    colorRange = ['#ededed', @colorKey(0), @colorKey(1), @colorKey(2), @colorKey(3)]
-    d3.scale
-      .threshold()
-      .domain([0, 10, 20, 30])
-      .range(colorRange)
-
-  initColorKey: ->
-    d3.scale
-      .linear()
-      .range(['#acd5f2', '#254e77'])
-      .domain([0, 3])
-
-  clickDay: (stamp) =>
-    if @currentSelectedDate isnt stamp.date
-      @currentSelectedDate = stamp.date
-      formatted_date = @currentSelectedDate.getFullYear() + "-" + (@currentSelectedDate.getMonth()+1) + "-" + @currentSelectedDate.getDate()
-
-      $.ajax
-        url: @calendar_activities_path
-        data:
-          date: formatted_date
-        cache: false
-        dataType: 'html'
-        beforeSend: ->
-          $('.user-calendar-activities').html '<div class="text-center"><i class="fa fa-spinner fa-spin user-calendar-activities-loading"></i></div>'
-        success: (data) ->
-          $('.user-calendar-activities').html data
-    else
-      $('.user-calendar-activities').html ''
-
-  initTooltips: ->
-    $('.js-contrib-calendar .js-tooltip').tooltip
-      html: true
diff --git a/app/assets/javascripts/users/users_bundle.js b/app/assets/javascripts/users/users_bundle.js
new file mode 100644
index 00000000000..b95faadc8e7
--- /dev/null
+++ b/app/assets/javascripts/users/users_bundle.js
@@ -0,0 +1,7 @@
+
+/*= require_tree . */
+
+(function() {
+
+
+}).call(this);
diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js
new file mode 100644
index 00000000000..64a29d36cdf
--- /dev/null
+++ b/app/assets/javascripts/users_select.js
@@ -0,0 +1,342 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
+    slice = [].slice;
+
+  this.UsersSelect = (function() {
+    function UsersSelect(currentUser) {
+      this.users = bind(this.users, this);
+      this.user = bind(this.user, this);
+      this.usersPath = "/autocomplete/users.json";
+      this.userPath = "/autocomplete/users/:id.json";
+      if (currentUser != null) {
+        this.currentUser = JSON.parse(currentUser);
+      }
+      $('.js-user-search').each((function(_this) {
+        return function(i, dropdown) {
+          var $block, $collapsedSidebar, $dropdown, $loading, $selectbox, $value, abilityName, assignTo, assigneeTemplate, collapsedAssigneeTemplate, defaultLabel, firstUser, issueURL, selectedId, showAnyUser, showNullUser;
+          $dropdown = $(dropdown);
+          _this.projectId = $dropdown.data('project-id');
+          _this.showCurrentUser = $dropdown.data('current-user');
+          showNullUser = $dropdown.data('null-user');
+          showAnyUser = $dropdown.data('any-user');
+          firstUser = $dropdown.data('first-user');
+          _this.authorId = $dropdown.data('author-id');
+          selectedId = $dropdown.data('selected');
+          defaultLabel = $dropdown.data('default-label');
+          issueURL = $dropdown.data('issueUpdate');
+          $selectbox = $dropdown.closest('.selectbox');
+          $block = $selectbox.closest('.block');
+          abilityName = $dropdown.data('ability-name');
+          $value = $block.find('.value');
+          $collapsedSidebar = $block.find('.sidebar-collapsed-user');
+          $loading = $block.find('.block-loading').fadeOut();
+          $block.on('click', '.js-assign-yourself', function(e) {
+            e.preventDefault();
+            return assignTo(_this.currentUser.id);
+          });
+          assignTo = function(selected) {
+            var data;
+            data = {};
+            data[abilityName] = {};
+            data[abilityName].assignee_id = selected != null ? selected : null;
+            $loading.fadeIn();
+            $dropdown.trigger('loading.gl.dropdown');
+            return $.ajax({
+              type: 'PUT',
+              dataType: 'json',
+              url: issueURL,
+              data: data
+            }).done(function(data) {
+              var user;
+              $dropdown.trigger('loaded.gl.dropdown');
+              $loading.fadeOut();
+              $selectbox.hide();
+              if (data.assignee) {
+                user = {
+                  name: data.assignee.name,
+                  username: data.assignee.username,
+                  avatar: data.assignee.avatar_url
+                };
+              } else {
+                user = {
+                  name: 'Unassigned',
+                  username: '',
+                  avatar: ''
+                };
+              }
+              $value.html(assigneeTemplate(user));
+              $collapsedSidebar.attr('title', user.name).tooltip('fixTitle');
+              return $collapsedSidebar.html(collapsedAssigneeTemplate(user));
+            });
+          };
+          collapsedAssigneeTemplate = _.template('<% if( avatar ) { %> <a class="author_link" href="/u/<%- username %>"> <img width="24" class="avatar avatar-inline s24" alt="" src="<%- avatar %>"> </a> <% } else { %> <i class="fa fa-user"></i> <% } %>');
+          assigneeTemplate = _.template('<% if (username) { %> <a class="author_link bold" href="/u/<%- username %>"> <% if( avatar ) { %> <img width="32" class="avatar avatar-inline s32" alt="" src="<%- avatar %>"> <% } %> <span class="author"><%- name %></span> <span class="username"> @<%- username %> </span> </a> <% } else { %> <span class="no-value assign-yourself"> No assignee - <a href="#" class="js-assign-yourself"> assign yourself </a> </span> <% } %>');
+          return $dropdown.glDropdown({
+            data: function(term, callback) {
+              var isAuthorFilter;
+              isAuthorFilter = $('.js-author-search');
+              return _this.users(term, function(users) {
+                var anyUser, index, j, len, name, obj, showDivider;
+                if (term.length === 0) {
+                  showDivider = 0;
+                  if (firstUser) {
+                    for (index = j = 0, len = users.length; j < len; index = ++j) {
+                      obj = users[index];
+                      if (obj.username === firstUser) {
+                        users.splice(index, 1);
+                        users.unshift(obj);
+                        break;
+                      }
+                    }
+                  }
+                  if (showNullUser) {
+                    showDivider += 1;
+                    users.unshift({
+                      beforeDivider: true,
+                      name: 'Unassigned',
+                      id: 0
+                    });
+                  }
+                  if (showAnyUser) {
+                    showDivider += 1;
+                    name = showAnyUser;
+                    if (name === true) {
+                      name = 'Any User';
+                    }
+                    anyUser = {
+                      beforeDivider: true,
+                      name: name,
+                      id: null
+                    };
+                    users.unshift(anyUser);
+                  }
+                }
+                if (showDivider) {
+                  users.splice(showDivider, 0, "divider");
+                }
+                return callback(users);
+              });
+            },
+            filterable: true,
+            filterRemote: true,
+            search: {
+              fields: ['name', 'username']
+            },
+            selectable: true,
+            fieldName: $dropdown.data('field-name'),
+            toggleLabel: function(selected) {
+              if (selected && 'id' in selected) {
+                if (selected.text) {
+                  return selected.text;
+                } else {
+                  return selected.name;
+                }
+              } else {
+                return defaultLabel;
+              }
+            },
+            inputId: 'issue_assignee_id',
+            hidden: function(e) {
+              $selectbox.hide();
+              return $value.css('display', '');
+            },
+            clicked: function(user) {
+              var isIssueIndex, isMRIndex, page, selected;
+              page = $('body').data('page');
+              isIssueIndex = page === 'projects:issues:index';
+              isMRIndex = (page === page && page === 'projects:merge_requests:index');
+              if ($dropdown.hasClass('js-filter-bulk-update')) {
+                return;
+              }
+              if ($dropdown.hasClass('js-filter-submit') && (isIssueIndex || isMRIndex)) {
+                selectedId = user.id;
+                return Issuable.filterResults($dropdown.closest('form'));
+              } else if ($dropdown.hasClass('js-filter-submit')) {
+                return $dropdown.closest('form').submit();
+              } else {
+                selected = $dropdown.closest('.selectbox').find("input[name='" + ($dropdown.data('field-name')) + "']").val();
+                return assignTo(selected);
+              }
+            },
+            renderRow: function(user) {
+              var avatar, img, listClosingTags, listWithName, listWithUserName, selected, username;
+              username = user.username ? "@" + user.username : "";
+              avatar = user.avatar_url ? user.avatar_url : false;
+              selected = user.id === selectedId ? "is-active" : "";
+              img = "";
+              if (user.beforeDivider != null) {
+                "<li> <a href='#' class='" + selected + "'> " + user.name + " </a> </li>";
+              } else {
+                if (avatar) {
+                  img = "<img src='" + avatar + "' class='avatar avatar-inline' width='30' />";
+                }
+              }
+              listWithName = "<li> <a href='#' class='dropdown-menu-user-link " + selected + "'> " + img + " <strong class='dropdown-menu-user-full-name'> " + user.name + " </strong>";
+              listWithUserName = "<span class='dropdown-menu-user-username'> " + username + " </span>";
+              listClosingTags = "</a> </li>";
+              if (username === '') {
+                listWithUserName = '';
+              }
+              return listWithName + listWithUserName + listClosingTags;
+            }
+          });
+        };
+      })(this));
+      $('.ajax-users-select').each((function(_this) {
+        return function(i, select) {
+          var firstUser, showAnyUser, showEmailUser, showNullUser;
+          _this.projectId = $(select).data('project-id');
+          _this.groupId = $(select).data('group-id');
+          _this.showCurrentUser = $(select).data('current-user');
+          _this.authorId = $(select).data('author-id');
+          showNullUser = $(select).data('null-user');
+          showAnyUser = $(select).data('any-user');
+          showEmailUser = $(select).data('email-user');
+          firstUser = $(select).data('first-user');
+          return $(select).select2({
+            placeholder: "Search for a user",
+            multiple: $(select).hasClass('multiselect'),
+            minimumInputLength: 0,
+            query: function(query) {
+              return _this.users(query.term, function(users) {
+                var anyUser, data, emailUser, index, j, len, name, nullUser, obj, ref;
+                data = {
+                  results: users
+                };
+                if (query.term.length === 0) {
+                  if (firstUser) {
+                    ref = data.results;
+                    for (index = j = 0, len = ref.length; j < len; index = ++j) {
+                      obj = ref[index];
+                      if (obj.username === firstUser) {
+                        data.results.splice(index, 1);
+                        data.results.unshift(obj);
+                        break;
+                      }
+                    }
+                  }
+                  if (showNullUser) {
+                    nullUser = {
+                      name: 'Unassigned',
+                      id: 0
+                    };
+                    data.results.unshift(nullUser);
+                  }
+                  if (showAnyUser) {
+                    name = showAnyUser;
+                    if (name === true) {
+                      name = 'Any User';
+                    }
+                    anyUser = {
+                      name: name,
+                      id: null
+                    };
+                    data.results.unshift(anyUser);
+                  }
+                }
+                if (showEmailUser && data.results.length === 0 && query.term.match(/^[^@]+@[^@]+$/)) {
+                  emailUser = {
+                    name: "Invite \"" + query.term + "\"",
+                    username: query.term,
+                    id: query.term
+                  };
+                  data.results.unshift(emailUser);
+                }
+                return query.callback(data);
+              });
+            },
+            initSelection: function() {
+              var args;
+              args = 1 <= arguments.length ? slice.call(arguments, 0) : [];
+              return _this.initSelection.apply(_this, args);
+            },
+            formatResult: function() {
+              var args;
+              args = 1 <= arguments.length ? slice.call(arguments, 0) : [];
+              return _this.formatResult.apply(_this, args);
+            },
+            formatSelection: function() {
+              var args;
+              args = 1 <= arguments.length ? slice.call(arguments, 0) : [];
+              return _this.formatSelection.apply(_this, args);
+            },
+            dropdownCssClass: "ajax-users-dropdown",
+            escapeMarkup: function(m) {
+              return m;
+            }
+          });
+        };
+      })(this));
+    }
+
+    UsersSelect.prototype.initSelection = function(element, callback) {
+      var id, nullUser;
+      id = $(element).val();
+      if (id === "0") {
+        nullUser = {
+          name: 'Unassigned'
+        };
+        return callback(nullUser);
+      } else if (id !== "") {
+        return this.user(id, callback);
+      }
+    };
+
+    UsersSelect.prototype.formatResult = function(user) {
+      var avatar;
+      if (user.avatar_url) {
+        avatar = user.avatar_url;
+      } else {
+        avatar = gon.default_avatar_url;
+      }
+      return "<div class='user-result " + (!user.username ? 'no-username' : void 0) + "'> <div class='user-image'><img class='avatar s24' src='" + avatar + "'></div> <div class='user-name'>" + user.name + "</div> <div class='user-username'>" + (user.username || "") + "</div> </div>";
+    };
+
+    UsersSelect.prototype.formatSelection = function(user) {
+      return user.name;
+    };
+
+    UsersSelect.prototype.user = function(user_id, callback) {
+      var url;
+      url = this.buildUrl(this.userPath);
+      url = url.replace(':id', user_id);
+      return $.ajax({
+        url: url,
+        dataType: "json"
+      }).done(function(user) {
+        return callback(user);
+      });
+    };
+
+    UsersSelect.prototype.users = function(query, callback) {
+      var url;
+      url = this.buildUrl(this.usersPath);
+      return $.ajax({
+        url: url,
+        data: {
+          search: query,
+          per_page: 20,
+          active: true,
+          project_id: this.projectId,
+          group_id: this.groupId,
+          current_user: this.showCurrentUser,
+          author_id: this.authorId
+        },
+        dataType: "json"
+      }).done(function(users) {
+        return callback(users);
+      });
+    };
+
+    UsersSelect.prototype.buildUrl = function(url) {
+      if (gon.relative_url_root != null) {
+        url = gon.relative_url_root.replace(/\/$/, '') + url;
+      }
+      return url;
+    };
+
+    return UsersSelect;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee
deleted file mode 100644
index e061f042ca9..00000000000
--- a/app/assets/javascripts/users_select.js.coffee
+++ /dev/null
@@ -1,333 +0,0 @@
-class @UsersSelect
-  constructor: (currentUser) ->
-    @usersPath = "/autocomplete/users.json"
-    @userPath = "/autocomplete/users/:id.json"
-    if currentUser?
-      @currentUser = JSON.parse(currentUser)
-
-    $('.js-user-search').each (i, dropdown) =>
-      $dropdown = $(dropdown)
-      @projectId = $dropdown.data('project-id')
-      @showCurrentUser = $dropdown.data('current-user')
-      showNullUser = $dropdown.data('null-user')
-      showAnyUser = $dropdown.data('any-user')
-      firstUser = $dropdown.data('first-user')
-      @authorId = $dropdown.data('author-id')
-      selectedId = $dropdown.data('selected')
-      defaultLabel = $dropdown.data('default-label')
-      issueURL = $dropdown.data('issueUpdate')
-      $selectbox = $dropdown.closest('.selectbox')
-      $block = $selectbox.closest('.block')
-      abilityName = $dropdown.data('ability-name')
-      $value = $block.find('.value')
-      $collapsedSidebar = $block.find('.sidebar-collapsed-user')
-      $loading = $block.find('.block-loading').fadeOut()
-
-      $block.on('click', '.js-assign-yourself', (e) =>
-        e.preventDefault()
-        assignTo(@currentUser.id)
-      )
-
-      assignTo = (selected) ->
-        data = {}
-        data[abilityName] = {}
-        data[abilityName].assignee_id = if selected? then selected else null
-        $loading
-          .fadeIn()
-        $dropdown.trigger('loading.gl.dropdown')
-        $.ajax(
-          type: 'PUT'
-          dataType: 'json'
-          url: issueURL
-          data: data
-        ).done (data) ->
-          $dropdown.trigger('loaded.gl.dropdown')
-          $loading.fadeOut()
-          $selectbox.hide()
-
-          if data.assignee
-            user =
-              name: data.assignee.name
-              username: data.assignee.username
-              avatar: data.assignee.avatar_url
-          else
-            user =
-              name: 'Unassigned'
-              username: ''
-              avatar: ''
-          $value.html(assigneeTemplate(user))
-
-          $collapsedSidebar
-            .attr('title', user.name)
-            .tooltip('fixTitle')
-
-          $collapsedSidebar.html(collapsedAssigneeTemplate(user))
-
-
-      collapsedAssigneeTemplate = _.template(
-        '<% if( avatar ) { %>
-        <a class="author_link" href="/u/<%- username %>">
-          <img width="24" class="avatar avatar-inline s24" alt="" src="<%- avatar %>">
-        </a>
-        <% } else { %>
-        <i class="fa fa-user"></i>
-        <% } %>'
-      )
-
-      assigneeTemplate = _.template(
-        '<% if (username) { %>
-        <a class="author_link bold" href="/u/<%- username %>">
-          <% if( avatar ) { %>
-          <img width="32" class="avatar avatar-inline s32" alt="" src="<%- avatar %>">
-          <% } %>
-          <span class="author"><%- name %></span>
-          <span class="username">
-            @<%- username %>
-          </span>
-        </a>
-          <% } else { %>
-        <span class="no-value assign-yourself">
-          No assignee -
-          <a href="#" class="js-assign-yourself">
-            assign yourself
-          </a>
-        </span>
-          <% } %>'
-      )
-
-      $dropdown.glDropdown(
-        data: (term, callback) =>
-          isAuthorFilter = $('.js-author-search')
-
-          @users term, (users) =>
-            if term.length is 0
-              showDivider = 0
-
-              if firstUser
-                # Move current user to the front of the list
-                for obj, index in users
-                  if obj.username == firstUser
-                    users.splice(index, 1)
-                    users.unshift(obj)
-                    break
-
-              if showNullUser
-                showDivider += 1
-                users.unshift(
-                  beforeDivider: true
-                  name: 'Unassigned',
-                  id: 0
-                )
-
-              if showAnyUser
-                showDivider += 1
-                name = showAnyUser
-                name = 'Any User' if name == true
-                anyUser = {
-                  beforeDivider: true
-                  name: name,
-                  id: null
-                }
-                users.unshift(anyUser)
-
-            if showDivider
-              users.splice(showDivider, 0, "divider")
-
-            # Send the data back
-            callback users
-        filterable: true
-        filterRemote: true
-        search:
-          fields: ['name', 'username']
-        selectable: true
-        fieldName: $dropdown.data('field-name')
-
-        toggleLabel: (selected) ->
-          if selected && 'id' of selected
-            if selected.text then selected.text else selected.name
-          else
-            defaultLabel
-
-        inputId: 'issue_assignee_id'
-
-        hidden: (e) ->
-          $selectbox.hide()
-          # display:block overrides the hide-collapse rule
-          $value.css('display', '')
-
-        clicked: (user, $el, e) ->
-          page = $('body').data 'page'
-          isIssueIndex = page is 'projects:issues:index'
-          isMRIndex = page is page is 'projects:merge_requests:index'
-          if $dropdown.hasClass('js-filter-bulk-update') or $dropdown.hasClass('js-issuable-form-dropdown')
-            e.preventDefault()
-            selectedId = user.id
-            return
-
-          if $dropdown.hasClass('js-filter-submit') and (isIssueIndex or isMRIndex)
-            selectedId = user.id
-            Issuable.filterResults $dropdown.closest('form')
-          else if $dropdown.hasClass 'js-filter-submit'
-            $dropdown.closest('form').submit()
-          else
-            selected = $dropdown
-              .closest('.selectbox')
-              .find("input[name='#{$dropdown.data('field-name')}']").val()
-            assignTo(selected)
-        id: (user) ->
-          user.id
-        renderRow: (user) ->
-          username = if user.username then "@#{user.username}" else ""
-          avatar = if user.avatar_url then user.avatar_url else false
-          selected = if user.id is selectedId then "is-active" else ""
-          img = ""
-
-          if user.beforeDivider?
-            "<li>
-              <a href='#' class='#{selected}'>
-                #{user.name}
-              </a>
-            </li>"
-          else
-            if avatar
-              img = "<img src='#{avatar}' class='avatar avatar-inline' width='30' />"
-
-          # split into three parts so we can remove the username section if nessesary
-          listWithName = "<li>
-            <a href='#' class='dropdown-menu-user-link #{selected}'>
-              #{img}
-              <strong class='dropdown-menu-user-full-name'>
-                #{user.name}
-              </strong>"
-
-          listWithUserName = "<span class='dropdown-menu-user-username'>
-                #{username}
-              </span>"
-          listClosingTags = "</a>
-          </li>"
-
-
-          if username is ''
-            listWithUserName = ''
-
-          listWithName + listWithUserName + listClosingTags
-      )
-
-    $('.ajax-users-select').each (i, select) =>
-      @projectId = $(select).data('project-id')
-      @groupId = $(select).data('group-id')
-      @showCurrentUser = $(select).data('current-user')
-      @authorId = $(select).data('author-id')
-      showNullUser = $(select).data('null-user')
-      showAnyUser = $(select).data('any-user')
-      showEmailUser = $(select).data('email-user')
-      firstUser = $(select).data('first-user')
-
-      $(select).select2
-        placeholder: "Search for a user"
-        multiple: $(select).hasClass('multiselect')
-        minimumInputLength: 0
-        query: (query) =>
-          @users query.term, (users) =>
-            data = { results: users }
-
-            if query.term.length == 0
-              if firstUser
-                # Move current user to the front of the list
-                for obj, index in data.results
-                  if obj.username == firstUser
-                    data.results.splice(index, 1)
-                    data.results.unshift(obj)
-                    break
-
-              if showNullUser
-                nullUser = {
-                  name: 'Unassigned',
-                  id: 0
-                }
-                data.results.unshift(nullUser)
-
-              if showAnyUser
-                name = showAnyUser
-                name = 'Any User' if name == true
-                anyUser = {
-                  name: name,
-                  id: null
-                }
-                data.results.unshift(anyUser)
-
-            if showEmailUser && data.results.length == 0 && query.term.match(/^[^@]+@[^@]+$/)
-              emailUser = {
-                name: "Invite \"#{query.term}\"",
-                username: query.term,
-                id: query.term
-              }
-              data.results.unshift(emailUser)
-
-            query.callback(data)
-
-        initSelection: (args...) =>
-          @initSelection(args...)
-        formatResult: (args...) =>
-          @formatResult(args...)
-        formatSelection: (args...) =>
-          @formatSelection(args...)
-        dropdownCssClass: "ajax-users-dropdown"
-        escapeMarkup: (m) -> # we do not want to escape markup since we are displaying html in results
-          m
-
-  initSelection: (element, callback) ->
-    id = $(element).val()
-    if id == "0"
-      nullUser = { name: 'Unassigned' }
-      callback(nullUser)
-    else if id != ""
-      @user(id, callback)
-
-  formatResult: (user) ->
-    if user.avatar_url
-      avatar = user.avatar_url
-    else
-      avatar = gon.default_avatar_url
-
-    "<div class='user-result #{'no-username' unless user.username}'>
-       <div class='user-image'><img class='avatar s24' src='#{avatar}'></div>
-       <div class='user-name'>#{user.name}</div>
-       <div class='user-username'>#{user.username || ""}</div>
-     </div>"
-
-  formatSelection: (user) ->
-    user.name
-
-  user: (user_id, callback) =>
-    url = @buildUrl(@userPath)
-    url = url.replace(':id', user_id)
-
-    $.ajax(
-      url: url
-      dataType: "json"
-    ).done (user) ->
-      callback(user)
-
-  # Return users list. Filtered by query
-  # Only active users retrieved
-  users: (query, callback) =>
-    url = @buildUrl(@usersPath)
-
-    $.ajax(
-      url: url
-      data:
-        search: query
-        per_page: 20
-        active: true
-        project_id: @projectId
-        group_id: @groupId
-        current_user: @showCurrentUser
-        author_id: @authorId
-      dataType: "json"
-    ).done (users) ->
-      callback(users)
-
-  buildUrl: (url) ->
-    url = gon.relative_url_root.replace(/\/$/, '') + url if gon.relative_url_root?
-    return url
diff --git a/app/assets/javascripts/wikis.js b/app/assets/javascripts/wikis.js
new file mode 100644
index 00000000000..35401231fbf
--- /dev/null
+++ b/app/assets/javascripts/wikis.js
@@ -0,0 +1,37 @@
+
+/*= require latinise */
+
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.Wikis = (function() {
+    function Wikis() {
+      this.slugify = bind(this.slugify, this);
+      $('.new-wiki-page').on('submit', (function(_this) {
+        return function(e) {
+          var field, path, slug;
+          $('[data-error~=slug]').addClass('hidden');
+          field = $('#new_wiki_path');
+          slug = _this.slugify(field.val());
+          if (slug.length > 0) {
+            path = field.attr('data-wikis-path');
+            location.href = path + '/' + slug;
+            return e.preventDefault();
+          }
+        };
+      })(this));
+    }
+
+    Wikis.prototype.dasherize = function(value) {
+      return value.replace(/[_\s]+/g, '-');
+    };
+
+    Wikis.prototype.slugify = function(value) {
+      return this.dasherize(value.trim().toLowerCase().latinise());
+    };
+
+    return Wikis;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/wikis.js.coffee b/app/assets/javascripts/wikis.js.coffee
deleted file mode 100644
index 1ee827f1fa3..00000000000
--- a/app/assets/javascripts/wikis.js.coffee
+++ /dev/null
@@ -1,19 +0,0 @@
-#= require latinise
-
-class @Wikis
-  constructor: ->
-    $('.new-wiki-page').on 'submit', (e) =>
-      $('[data-error~=slug]').addClass('hidden')
-      field = $('#new_wiki_path')
-      slug = @slugify(field.val())
-
-      if (slug.length > 0)
-        path = field.attr('data-wikis-path')
-        location.href = path + '/' + slug
-        e.preventDefault()
-
-  dasherize: (value) ->
-    value.replace(/[_\s]+/g, '-')
-
-  slugify: (value) =>
-    @dasherize(value.trim().toLowerCase().latinise())
diff --git a/app/assets/javascripts/zen_mode.js b/app/assets/javascripts/zen_mode.js
new file mode 100644
index 00000000000..71236c6a27d
--- /dev/null
+++ b/app/assets/javascripts/zen_mode.js
@@ -0,0 +1,80 @@
+
+/*= provides zen_mode:enter */
+
+
+/*= provides zen_mode:leave */
+
+
+/*= require jquery.scrollTo */
+
+
+/*= require dropzone */
+
+
+/*= require mousetrap */
+
+
+/*= require mousetrap/pause */
+
+(function() {
+  this.ZenMode = (function() {
+    function ZenMode() {
+      this.active_backdrop = null;
+      this.active_textarea = null;
+      $(document).on('click', '.js-zen-enter', function(e) {
+        e.preventDefault();
+        return $(e.currentTarget).trigger('zen_mode:enter');
+      });
+      $(document).on('click', '.js-zen-leave', function(e) {
+        e.preventDefault();
+        return $(e.currentTarget).trigger('zen_mode:leave');
+      });
+      $(document).on('zen_mode:enter', (function(_this) {
+        return function(e) {
+          return _this.enter($(e.target).closest('.md-area').find('.zen-backdrop'));
+        };
+      })(this));
+      $(document).on('zen_mode:leave', (function(_this) {
+        return function(e) {
+          return _this.exit();
+        };
+      })(this));
+      $(document).on('keydown', function(e) {
+        if (e.keyCode === 27) {
+          e.preventDefault();
+          return $(document).trigger('zen_mode:leave');
+        }
+      });
+    }
+
+    ZenMode.prototype.enter = function(backdrop) {
+      Mousetrap.pause();
+      this.active_backdrop = $(backdrop);
+      this.active_backdrop.addClass('fullscreen');
+      this.active_textarea = this.active_backdrop.find('textarea');
+      this.active_textarea.removeAttr('style');
+      return this.active_textarea.focus();
+    };
+
+    ZenMode.prototype.exit = function() {
+      if (this.active_textarea) {
+        Mousetrap.unpause();
+        this.active_textarea.closest('.zen-backdrop').removeClass('fullscreen');
+        this.scrollTo(this.active_textarea);
+        this.active_textarea = null;
+        this.active_backdrop = null;
+        return Dropzone.forElement('.div-dropzone').enable();
+      }
+    };
+
+    ZenMode.prototype.scrollTo = function(zen_area) {
+      return $.scrollTo(zen_area, 0, {
+        offset: -150
+      });
+    };
+
+    return ZenMode;
+
+  })();
+
+}).call(this);
diff --git a/app/assets/javascripts/zen_mode.js.coffee b/app/assets/javascripts/zen_mode.js.coffee
deleted file mode 100644
index 99f35ecfb0f..00000000000
--- a/app/assets/javascripts/zen_mode.js.coffee
+++ /dev/null
@@ -1,80 +0,0 @@
-# Zen Mode (full screen) textarea
-#
-#= provides zen_mode:enter
-#= provides zen_mode:leave
-#
-#= require jquery.scrollTo
-#= require dropzone
-#= require mousetrap
-#= require mousetrap/pause
-#
-# ### Events
-#
-# `zen_mode:enter`
-#
-# Fired when the "Edit in fullscreen" link is clicked.
-#
-# **Synchronicity** Sync
-# **Bubbles** Yes
-# **Cancelable** No
-# **Target** a.js-zen-enter
-#
-# `zen_mode:leave`
-#
-# Fired when the "Leave Fullscreen" link is clicked.
-#
-# **Synchronicity** Sync
-# **Bubbles** Yes
-# **Cancelable** No
-# **Target** a.js-zen-leave
-#
-class @ZenMode
-  constructor: ->
-    @active_backdrop = null
-    @active_textarea = null
-
-    $(document).on 'click', '.js-zen-enter', (e) ->
-      e.preventDefault()
-      $(e.currentTarget).trigger('zen_mode:enter')
-
-    $(document).on 'click', '.js-zen-leave', (e) ->
-      e.preventDefault()
-      $(e.currentTarget).trigger('zen_mode:leave')
-
-    $(document).on 'zen_mode:enter', (e) =>
-      @enter($(e.target).closest('.md-area').find('.zen-backdrop'))
-    $(document).on 'zen_mode:leave', (e) =>
-      @exit()
-
-    $(document).on 'keydown', (e) ->
-      if e.keyCode == 27 # Esc
-        e.preventDefault()
-        $(document).trigger('zen_mode:leave')
-
-  enter: (backdrop) ->
-    Mousetrap.pause()
-
-    @active_backdrop = $(backdrop)
-    @active_backdrop.addClass('fullscreen')
-
-    @active_textarea = @active_backdrop.find('textarea')
-
-    # Prevent a user-resized textarea from persisting to fullscreen
-    @active_textarea.removeAttr('style')
-    @active_textarea.focus()
-
-  exit: ->
-    if @active_textarea
-      Mousetrap.unpause()
-
-      @active_textarea.closest('.zen-backdrop').removeClass('fullscreen')
-
-      @scrollTo(@active_textarea)
-
-      @active_textarea = null
-      @active_backdrop = null
-
-      Dropzone.forElement('.div-dropzone').enable()
-
-  scrollTo: (zen_area) ->
-    $.scrollTo(zen_area, 0, offset: -150)
diff --git a/app/assets/stylesheets/framework/avatar.scss b/app/assets/stylesheets/framework/avatar.scss
index 8b6ddf8ba18..c79b22d4d21 100644
--- a/app/assets/stylesheets/framework/avatar.scss
+++ b/app/assets/stylesheets/framework/avatar.scss
@@ -5,6 +5,7 @@
   height: 40px;
   padding: 0;
   @include border-radius($avatar_radius);
+  border: 1px solid rgba(0, 0, 0, .1);
 
   &.avatar-inline {
     float: none;
@@ -15,8 +16,9 @@
     &.s24 { margin-right: 4px; }
   }
 
-  &.group-avatar, &.project-avatar, &.avatar-tile {
+  &.avatar-tile {
     @include border-radius(0);
+    border: none;
   }
 
   &.s16 { width: 16px; height: 16px; margin-right: 6px; }
@@ -43,12 +45,12 @@
   &.s16 { font-size: 12px; line-height: 1.33; }
   &.s24 { font-size: 14px; line-height: 1.8; }
   &.s26 { font-size: 20px; line-height: 1.33; }
-  &.s32 { font-size: 20px; line-height: 32px; }
-  &.s40 { font-size: 16px; line-height: 40px; }
-  &.s60 { font-size: 32px; line-height: 60px; }
-  &.s70 { font-size: 34px; line-height: 70px; }
-  &.s90 { font-size: 36px; line-height: 90px; }
-  &.s110 { font-size: 40px; line-height: 112px; font-weight: 300; }
-  &.s140 { font-size: 72px; line-height: 140px; }
-  &.s160 { font-size: 96px; line-height: 160px; }
+  &.s32 { font-size: 20px; line-height: 30px; }
+  &.s40 { font-size: 16px; line-height: 38px; }
+  &.s60 { font-size: 32px; line-height: 58px; }
+  &.s70 { font-size: 34px; line-height: 68px; }
+  &.s90 { font-size: 36px; line-height: 88px; }
+  &.s110 { font-size: 40px; line-height: 108px; font-weight: 300; }
+  &.s140 { font-size: 72px; line-height: 138px; }
+  &.s160 { font-size: 96px; line-height: 158px; }
 }
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index ad94e457cfd..7ce203d2ec7 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -232,7 +232,9 @@
 .nav-block {
   .controls {
     float: right;
-    margin-top: 11px;
+    margin-top: 8px;
+    padding-bottom: 7px;
+    border-bottom: 1px solid $border-color;
   }
 }
 
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index 590b8f54363..473530cf094 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -49,6 +49,17 @@
     border-color: $border-dark;
     color: $color;
   }
+
+  svg {
+
+    path {
+      fill: $color;
+    }
+
+    use {
+      stroke: $color;
+    }
+  }
 }
 
 @mixin btn-green {
@@ -124,6 +135,15 @@
     @include btn-green;
   }
 
+  &.btn-inverted {
+    &.btn-success,
+    &.btn-new,
+    &.btn-create,
+    &.btn-save {
+      @include btn-outline($white-light, $green-normal, $green-normal, $green-light, $white-light, $green-light);
+    }
+  }
+
   &.btn-gray {
     @include btn-gray;
   }
@@ -173,6 +193,13 @@
   .caret {
     margin-left: 5px;
   }
+
+  svg {
+    height: 15px;
+    width: auto;
+    position: relative;
+    top: 2px;
+  }
 }
 
 .btn-lg {
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 3fd0e12568d..c54eb0d6479 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -56,7 +56,7 @@
     position: absolute;
     top: 50%;
     right: 6px;
-    margin-top: -6px;
+    margin-top: -4px;
     color: $dropdown-toggle-icon-color;
     font-size: 10px;
   }
@@ -350,6 +350,7 @@
 
 .dropdown-input-field, .default-dropdown-input {
   width: 100%;
+  min-height: 30px;
   padding: 0 7px;
   color: $dropdown-input-color;
   line-height: 30px;
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss
index 71e4b50f2af..407f1873431 100644
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -70,7 +70,7 @@
     }
 
     &.wiki {
-      padding: $gl-padding;
+      padding: 30px $gl-padding;
 
       .highlight {
         margin-bottom: 9px;
diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss
index 5d3273ea64d..96565da1bc9 100644
--- a/app/assets/stylesheets/framework/markdown_area.scss
+++ b/app/assets/stylesheets/framework/markdown_area.scss
@@ -98,13 +98,30 @@
 
 .md {
   &.md-preview-holder {
-    code {
-      white-space: pre-wrap;
-      word-break: keep-all;
-    }
-
+    // Reset ul style types since we're nested inside a ul already
     @include bulleted-list;
   }
+
+  // On diffs code should wrap nicely and not overflow
+  code {
+    white-space: pre-wrap;
+    word-break: keep-all;
+  }
+
+  hr {
+    // Darken 'whitesmoke' a bit to make it more visible in note bodies
+    border-color: darken(#f5f5f5, 8%);
+    margin: 10px 0;
+  }
+
+  // Border around images in issue and MR comments.
+  img:not(.emoji) {
+    border: 1px solid $table-border-gray;
+    padding: 5px;
+    margin: 5px 0;
+    // Ensure that image does not exceed viewport
+    max-height: calc(100vh - 100px);
+  }
 }
 
 .toolbar-group {
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index d52e8f00172..3fa4a22258d 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -198,6 +198,10 @@ header.header-pinned-nav {
 
   .sidebar-collapsed-icon {
     cursor: pointer;
+
+    .btn {
+      background-color: $gray-light;
+    }
   }
 }
 
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index 3575984b229..8659604cb8b 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -37,39 +37,41 @@
   }
 
   h1 {
-    font-size: 1.3em;
+    font-size: 2em;
     font-weight: 600;
-    margin: 24px 0 12px;
-    padding: 0 0 10px;
-    border-bottom: 1px solid #e7e9ed;
+    margin: 1em 0 10px;
+    padding: 0 0 0.3em;
+    border-bottom: 1px solid $btn-default-border;
     color: $gl-gray-dark;
   }
 
   h2 {
-    font-size: 1.2em;
+    font-size: 1.6em;
     font-weight: 600;
-    margin: 24px 0 12px;
+    margin: 1em 0 10px;
+    padding-bottom: 0.3em;
+    border-bottom: 1px solid $btn-default-border;
     color: $gl-gray-dark;
   }
 
   h3 {
-    margin: 24px 0 12px;
-    font-size: 1.1em;
+    margin: 1em 0 10px;
+    font-size: 1.4em;
   }
 
   h4 {
-    margin: 24px 0 12px;
-    font-size: 0.98em;
+    margin: 1em 0 10px;
+    font-size: 1.25em;
   }
 
   h5 {
-    margin: 24px 0 12px;
-    font-size: 0.95em;
+    margin: 1em 0 10px;
+    font-size: 1em;
   }
 
   h6 {
-    margin: 24px 0 12px;
-    font-size: 0.90em;
+    margin: 1em 0 10px;
+    font-size: 0.95em;
   }
 
   blockquote {
@@ -115,7 +117,7 @@
 
   ul, ol {
     padding: 0;
-    margin: 6px 0 6px 28px !important;
+    margin: 3px 0 3px 28px !important;
   }
 
   li {
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index f0e7002e4cd..1882d4e888d 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -16,7 +16,7 @@ $border-color:          #e5e5e5;
 $focus-border-color:    #3aabf0;
 $table-border-color:    #f0f0f0;
 $background-color:      #fafafa;
-$dark-background-color: #f7f7f7;
+$dark-background-color: #f5f5f5;
 $table-text-gray:       #8f8f8f;
 
 /*
diff --git a/app/assets/stylesheets/mailers/repository_push_email.scss b/app/assets/stylesheets/mailers/repository_push_email.scss
index 7f645d3089d..33aedf1f7c1 100644
--- a/app/assets/stylesheets/mailers/repository_push_email.scss
+++ b/app/assets/stylesheets/mailers/repository_push_email.scss
@@ -10,83 +10,48 @@
 // preference): plain class selectors, type (element name) selectors, or
 // explicit child selectors.
 
-table.code {
-  width: 100%;
+.code {
+  background-color: #fff;
   font-family: monospace;
-  border: none;
-  border-collapse: separate;
-  margin: 0;
-  padding: 0;
+  font-size: $code_font_size;
   -premailer-cellpadding: 0;
   -premailer-cellspacing: 0;
   -premailer-width: 100%;
 
-  > tr > td {
+  > tr {
     line-height: $code_line_height;
-    font-family: monospace;
-    font-size: $code_font_size;
-
-    &.diff-line-num {
-      margin: 0;
-      padding: 0;
-      border: none;
-      padding: 0 5px;
-      border-right: 1px solid;
-      text-align: right;
-      min-width: 35px;
-      max-width: 50px;
-      width: 35px;
-    }
-
-    &.line_content {
-      display: block;
-      margin: 0;
-      padding: 0 0.5em;
-      border: none;
-      white-space: pre;
-    }
   }
 }
 
-.line-numbers, .diff-line-num {
+.diff-line-num {
+  padding: 0 5px;
+  text-align: right;
+  width: 35px;
   background-color: $background-color;
-}
-
-.diff-line-num, .diff-line-num a {
   color: $black-transparent;
-}
-
-pre.code, .diff-line-num {
-  border-color: $table-border-gray;
-}
+  border-right: 1px solid $table-border-gray;
 
-.code.white, pre.code, .line_content {
-  background-color: #fff;
-  color: #333;
-}
-
-.diff-line-num {
   &.old {
     background-color: $line-number-old;
-    border-color: $line-removed-dark;
+    border-right-color: $line-removed-dark;
   }
 
   &.new {
     background-color: $line-number-new;
-    border-color: $line-added-dark;
-  }
-
-  &.hll:not(.empty-cell) {
-    background-color: $line-number-select;
-    border-color: $line-select-yellow-dark;
+    border-right-color: $line-added-dark;
   }
 }
 
 .line_content {
+  padding-left: 0.5em;
+  padding-right: 0.5em;
+  white-space: pre;
+
   &.old {
     background-color: $line-removed;
 
-    > .line > span.idiff, > .line > span > span.idiff {
+    > .line > span.idiff,
+    > .line > span > span.idiff {
       background-color: $line-removed-dark;
     }
   }
@@ -94,7 +59,8 @@ pre.code, .diff-line-num {
   &.new {
     background-color: $line-added;
 
-    > .line > span.idiff, > .line > span > span.idiff {
+    > .line > span.idiff,
+    > .line > span > span.idiff {
       background-color: $line-added-dark;
     }
   }
@@ -103,14 +69,6 @@ pre.code, .diff-line-num {
     color: $black-transparent;
     background-color: $match-line;
   }
-
-  &.hll:not(.empty-cell) {
-    background-color: $line-select-yellow;
-  }
-}
-
-pre > .hll {
-  background-color: #f8eec7 !important;
 }
 
 span.highlight_word {
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index 99a2cd306cf..e26f8f7080d 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -53,6 +53,14 @@
       left: 70px;
     }
   }
+
+  .nav-links {
+    svg {
+      position: relative;
+      top: 2px;
+      margin-right: 3px;
+    }
+  }
 }
 
 .build-header {
diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss
index 35ab28b3fea..bbe0c6c5f1f 100644
--- a/app/assets/stylesheets/pages/commit.scss
+++ b/app/assets/stylesheets/pages/commit.scss
@@ -68,6 +68,12 @@
   }
 }
 
+.ci-status-link {
+  svg {
+    overflow: visible;
+  }
+}
+
 .commit-box {
   border-top: 1px solid $border-color;
 
diff --git a/app/assets/stylesheets/pages/dashboard.scss b/app/assets/stylesheets/pages/dashboard.scss
index cf7567513ec..42928ee279c 100644
--- a/app/assets/stylesheets/pages/dashboard.scss
+++ b/app/assets/stylesheets/pages/dashboard.scss
@@ -36,10 +36,6 @@
 
 .dash-project-avatar {
   float: left;
-
-  .avatar {
-    @include border-radius(50%);
-  }
 }
 
 .dash-project-access-icon {
diff --git a/app/assets/stylesheets/pages/emojis.scss b/app/assets/stylesheets/pages/emojis.scss
index b731abc7450..f17797b2381 100644
--- a/app/assets/stylesheets/pages/emojis.scss
+++ b/app/assets/stylesheets/pages/emojis.scss
@@ -1,4 +1,4 @@
-.emoji-0023-20E3 { background-position: 0 0; }
+.emoji-0023-20E3 { background-position: 0 0px; }
 .emoji-002A-20E3 { background-position: -20px 0; }
 .emoji-0030-20E3 { background-position: 0 -20px; }
 .emoji-0031-20E3 { background-position: -20px -20px; }
@@ -452,1271 +452,1344 @@
 .emoji-1F391 { background-position: -420px -200px; }
 .emoji-1F392 { background-position: -420px -220px; }
 .emoji-1F393 { background-position: -420px -240px; }
-.emoji-1F394 { background-position: -420px -260px; }
-.emoji-1F395 { background-position: -420px -280px; }
-.emoji-1F396 { background-position: -420px -300px; }
-.emoji-1F397 { background-position: -420px -320px; }
-.emoji-1F398 { background-position: -420px -340px; }
-.emoji-1F399 { background-position: -420px -360px; }
-.emoji-1F39A { background-position: -420px -380px; }
-.emoji-1F39B { background-position: -420px -400px; }
-.emoji-1F39C { background-position: 0 -420px; }
-.emoji-1F39D { background-position: -20px -420px; }
-.emoji-1F39E { background-position: -40px -420px; }
-.emoji-1F39F { background-position: -60px -420px; }
-.emoji-1F3A0 { background-position: -80px -420px; }
-.emoji-1F3A1 { background-position: -100px -420px; }
-.emoji-1F3A2 { background-position: -120px -420px; }
-.emoji-1F3A3 { background-position: -140px -420px; }
-.emoji-1F3A4 { background-position: -160px -420px; }
-.emoji-1F3A5 { background-position: -180px -420px; }
-.emoji-1F3A6 { background-position: -200px -420px; }
-.emoji-1F3A7 { background-position: -220px -420px; }
-.emoji-1F3A8 { background-position: -240px -420px; }
-.emoji-1F3A9 { background-position: -260px -420px; }
-.emoji-1F3AA { background-position: -280px -420px; }
-.emoji-1F3AB { background-position: -300px -420px; }
-.emoji-1F3AC { background-position: -320px -420px; }
-.emoji-1F3AD { background-position: -340px -420px; }
-.emoji-1F3AE { background-position: -360px -420px; }
-.emoji-1F3AF { background-position: -380px -420px; }
-.emoji-1F3B0 { background-position: -400px -420px; }
-.emoji-1F3B1 { background-position: -420px -420px; }
-.emoji-1F3B2 { background-position: -440px 0; }
-.emoji-1F3B3 { background-position: -440px -20px; }
-.emoji-1F3B4 { background-position: -440px -40px; }
-.emoji-1F3B5 { background-position: -440px -60px; }
-.emoji-1F3B6 { background-position: -440px -80px; }
-.emoji-1F3B7 { background-position: -440px -100px; }
-.emoji-1F3B8 { background-position: -440px -120px; }
-.emoji-1F3B9 { background-position: -440px -140px; }
-.emoji-1F3BA { background-position: -440px -160px; }
-.emoji-1F3BB { background-position: -440px -180px; }
-.emoji-1F3BC { background-position: -440px -200px; }
-.emoji-1F3BD { background-position: -440px -220px; }
-.emoji-1F3BE { background-position: -440px -240px; }
-.emoji-1F3BF { background-position: -440px -260px; }
-.emoji-1F3C0 { background-position: -440px -280px; }
-.emoji-1F3C1 { background-position: -440px -300px; }
-.emoji-1F3C2 { background-position: -440px -320px; }
-.emoji-1F3C3 { background-position: -440px -340px; }
-.emoji-1F3C3-1F3FB { background-position: -440px -360px; }
-.emoji-1F3C3-1F3FC { background-position: -440px -380px; }
-.emoji-1F3C3-1F3FD { background-position: -440px -400px; }
-.emoji-1F3C3-1F3FE { background-position: -440px -420px; }
-.emoji-1F3C3-1F3FF { background-position: 0 -440px; }
-.emoji-1F3C4 { background-position: -20px -440px; }
-.emoji-1F3C4-1F3FB { background-position: -40px -440px; }
-.emoji-1F3C4-1F3FC { background-position: -60px -440px; }
-.emoji-1F3C4-1F3FD { background-position: -80px -440px; }
-.emoji-1F3C4-1F3FE { background-position: -100px -440px; }
-.emoji-1F3C4-1F3FF { background-position: -120px -440px; }
-.emoji-1F3C5 { background-position: -140px -440px; }
-.emoji-1F3C6 { background-position: -160px -440px; }
-.emoji-1F3C7 { background-position: -180px -440px; }
-.emoji-1F3C7-1F3FB { background-position: -200px -440px; }
-.emoji-1F3C7-1F3FC { background-position: -220px -440px; }
-.emoji-1F3C7-1F3FD { background-position: -240px -440px; }
-.emoji-1F3C7-1F3FE { background-position: -260px -440px; }
-.emoji-1F3C7-1F3FF { background-position: -280px -440px; }
-.emoji-1F3C8 { background-position: -300px -440px; }
-.emoji-1F3C9 { background-position: -320px -440px; }
-.emoji-1F3CA { background-position: -340px -440px; }
-.emoji-1F3CA-1F3FB { background-position: -360px -440px; }
-.emoji-1F3CA-1F3FC { background-position: -380px -440px; }
-.emoji-1F3CA-1F3FD { background-position: -400px -440px; }
-.emoji-1F3CA-1F3FE { background-position: -420px -440px; }
-.emoji-1F3CA-1F3FF { background-position: -440px -440px; }
-.emoji-1F3CB { background-position: -460px 0; }
-.emoji-1F3CB-1F3FB { background-position: -460px -20px; }
-.emoji-1F3CB-1F3FC { background-position: -460px -40px; }
-.emoji-1F3CB-1F3FD { background-position: -460px -60px; }
-.emoji-1F3CB-1F3FE { background-position: -460px -80px; }
-.emoji-1F3CB-1F3FF { background-position: -460px -100px; }
-.emoji-1F3CC { background-position: -460px -120px; }
-.emoji-1F3CD { background-position: -460px -140px; }
-.emoji-1F3CE { background-position: -460px -160px; }
-.emoji-1F3CF { background-position: -460px -180px; }
-.emoji-1F3D0 { background-position: -460px -200px; }
-.emoji-1F3D1 { background-position: -460px -220px; }
-.emoji-1F3D2 { background-position: -460px -240px; }
-.emoji-1F3D3 { background-position: -460px -260px; }
-.emoji-1F3D4 { background-position: -460px -280px; }
-.emoji-1F3D5 { background-position: -460px -300px; }
-.emoji-1F3D6 { background-position: -460px -320px; }
-.emoji-1F3D7 { background-position: -460px -340px; }
-.emoji-1F3D8 { background-position: -460px -360px; }
-.emoji-1F3D9 { background-position: -460px -380px; }
-.emoji-1F3DA { background-position: -460px -400px; }
-.emoji-1F3DB { background-position: -460px -420px; }
-.emoji-1F3DC { background-position: -460px -440px; }
-.emoji-1F3DD { background-position: 0 -460px; }
-.emoji-1F3DE { background-position: -20px -460px; }
-.emoji-1F3DF { background-position: -40px -460px; }
-.emoji-1F3E0 { background-position: -60px -460px; }
-.emoji-1F3E1 { background-position: -80px -460px; }
-.emoji-1F3E2 { background-position: -100px -460px; }
-.emoji-1F3E3 { background-position: -120px -460px; }
-.emoji-1F3E4 { background-position: -140px -460px; }
-.emoji-1F3E5 { background-position: -160px -460px; }
-.emoji-1F3E6 { background-position: -180px -460px; }
-.emoji-1F3E7 { background-position: -200px -460px; }
-.emoji-1F3E8 { background-position: -220px -460px; }
-.emoji-1F3E9 { background-position: -240px -460px; }
-.emoji-1F3EA { background-position: -260px -460px; }
-.emoji-1F3EB { background-position: -280px -460px; }
-.emoji-1F3EC { background-position: -300px -460px; }
-.emoji-1F3ED { background-position: -320px -460px; }
-.emoji-1F3EE { background-position: -340px -460px; }
-.emoji-1F3EF { background-position: -360px -460px; }
-.emoji-1F3F0 { background-position: -380px -460px; }
-.emoji-1F3F1 { background-position: -400px -460px; }
-.emoji-1F3F2 { background-position: -420px -460px; }
-.emoji-1F3F3 { background-position: -440px -460px; }
-.emoji-1F3F4 { background-position: -460px -460px; }
-.emoji-1F3F5 { background-position: -480px 0; }
-.emoji-1F3F6 { background-position: -480px -20px; }
-.emoji-1F3F7 { background-position: -480px -40px; }
-.emoji-1F3F8 { background-position: -480px -60px; }
-.emoji-1F3F9 { background-position: -480px -80px; }
-.emoji-1F3FA { background-position: -480px -100px; }
-.emoji-1F3FB { background-position: -480px -120px; }
-.emoji-1F3FC { background-position: -480px -140px; }
-.emoji-1F3FD { background-position: -480px -160px; }
-.emoji-1F3FE { background-position: -480px -180px; }
-.emoji-1F3FF { background-position: -480px -200px; }
-.emoji-1F400 { background-position: -480px -220px; }
-.emoji-1F401 { background-position: -480px -240px; }
-.emoji-1F402 { background-position: -480px -260px; }
-.emoji-1F403 { background-position: -480px -280px; }
-.emoji-1F404 { background-position: -480px -300px; }
-.emoji-1F405 { background-position: -480px -320px; }
-.emoji-1F406 { background-position: -480px -340px; }
-.emoji-1F407 { background-position: -480px -360px; }
-.emoji-1F408 { background-position: -480px -380px; }
-.emoji-1F409 { background-position: -480px -400px; }
-.emoji-1F40A { background-position: -480px -420px; }
-.emoji-1F40B { background-position: -480px -440px; }
-.emoji-1F40C { background-position: -480px -460px; }
-.emoji-1F40D { background-position: 0 -480px; }
-.emoji-1F40E { background-position: -20px -480px; }
-.emoji-1F40F { background-position: -40px -480px; }
-.emoji-1F410 { background-position: -60px -480px; }
-.emoji-1F411 { background-position: -80px -480px; }
-.emoji-1F412 { background-position: -100px -480px; }
-.emoji-1F413 { background-position: -120px -480px; }
-.emoji-1F414 { background-position: -140px -480px; }
-.emoji-1F415 { background-position: -160px -480px; }
-.emoji-1F416 { background-position: -180px -480px; }
-.emoji-1F417 { background-position: -200px -480px; }
-.emoji-1F418 { background-position: -220px -480px; }
-.emoji-1F419 { background-position: -240px -480px; }
-.emoji-1F41A { background-position: -260px -480px; }
-.emoji-1F41B { background-position: -280px -480px; }
-.emoji-1F41C { background-position: -300px -480px; }
-.emoji-1F41D { background-position: -320px -480px; }
-.emoji-1F41E { background-position: -340px -480px; }
-.emoji-1F41F { background-position: -360px -480px; }
-.emoji-1F420 { background-position: -380px -480px; }
-.emoji-1F421 { background-position: -400px -480px; }
-.emoji-1F422 { background-position: -420px -480px; }
-.emoji-1F423 { background-position: -440px -480px; }
-.emoji-1F424 { background-position: -460px -480px; }
-.emoji-1F425 { background-position: -480px -480px; }
-.emoji-1F426 { background-position: -500px 0; }
-.emoji-1F427 { background-position: -500px -20px; }
-.emoji-1F428 { background-position: -500px -40px; }
-.emoji-1F429 { background-position: -500px -60px; }
-.emoji-1F42A { background-position: -500px -80px; }
-.emoji-1F42B { background-position: -500px -100px; }
-.emoji-1F42C { background-position: -500px -120px; }
-.emoji-1F42D { background-position: -500px -140px; }
-.emoji-1F42E { background-position: -500px -160px; }
-.emoji-1F42F { background-position: -500px -180px; }
-.emoji-1F430 { background-position: -500px -200px; }
-.emoji-1F431 { background-position: -500px -220px; }
-.emoji-1F432 { background-position: -500px -240px; }
-.emoji-1F433 { background-position: -500px -260px; }
-.emoji-1F434 { background-position: -500px -280px; }
-.emoji-1F435 { background-position: -500px -300px; }
-.emoji-1F436 { background-position: -500px -320px; }
-.emoji-1F437 { background-position: -500px -340px; }
-.emoji-1F438 { background-position: -500px -360px; }
-.emoji-1F439 { background-position: -500px -380px; }
-.emoji-1F43A { background-position: -500px -400px; }
-.emoji-1F43B { background-position: -500px -420px; }
-.emoji-1F43C { background-position: -500px -440px; }
-.emoji-1F43D { background-position: -500px -460px; }
-.emoji-1F43E { background-position: -500px -480px; }
-.emoji-1F43F { background-position: 0 -500px; }
-.emoji-1F440 { background-position: -20px -500px; }
-.emoji-1F441 { background-position: -40px -500px; }
-.emoji-1F441-1F5E8 { background-position: -60px -500px; }
-.emoji-1F442 { background-position: -80px -500px; }
-.emoji-1F442-1F3FB { background-position: -100px -500px; }
-.emoji-1F442-1F3FC { background-position: -120px -500px; }
-.emoji-1F442-1F3FD { background-position: -140px -500px; }
-.emoji-1F442-1F3FE { background-position: -160px -500px; }
-.emoji-1F442-1F3FF { background-position: -180px -500px; }
-.emoji-1F443 { background-position: -200px -500px; }
-.emoji-1F443-1F3FB { background-position: -220px -500px; }
-.emoji-1F443-1F3FC { background-position: -240px -500px; }
-.emoji-1F443-1F3FD { background-position: -260px -500px; }
-.emoji-1F443-1F3FE { background-position: -280px -500px; }
-.emoji-1F443-1F3FF { background-position: -300px -500px; }
-.emoji-1F444 { background-position: -320px -500px; }
-.emoji-1F445 { background-position: -340px -500px; }
-.emoji-1F446 { background-position: -360px -500px; }
-.emoji-1F446-1F3FB { background-position: -380px -500px; }
-.emoji-1F446-1F3FC { background-position: -400px -500px; }
-.emoji-1F446-1F3FD { background-position: -420px -500px; }
-.emoji-1F446-1F3FE { background-position: -440px -500px; }
-.emoji-1F446-1F3FF { background-position: -460px -500px; }
-.emoji-1F447 { background-position: -480px -500px; }
-.emoji-1F447-1F3FB { background-position: -500px -500px; }
-.emoji-1F447-1F3FC { background-position: -520px 0; }
-.emoji-1F447-1F3FD { background-position: -520px -20px; }
-.emoji-1F447-1F3FE { background-position: -520px -40px; }
-.emoji-1F447-1F3FF { background-position: -520px -60px; }
-.emoji-1F448 { background-position: -520px -80px; }
-.emoji-1F448-1F3FB { background-position: -520px -100px; }
-.emoji-1F448-1F3FC { background-position: -520px -120px; }
-.emoji-1F448-1F3FD { background-position: -520px -140px; }
-.emoji-1F448-1F3FE { background-position: -520px -160px; }
-.emoji-1F448-1F3FF { background-position: -520px -180px; }
-.emoji-1F449 { background-position: -520px -200px; }
-.emoji-1F449-1F3FB { background-position: -520px -220px; }
-.emoji-1F449-1F3FC { background-position: -520px -240px; }
-.emoji-1F449-1F3FD { background-position: -520px -260px; }
-.emoji-1F449-1F3FE { background-position: -520px -280px; }
-.emoji-1F449-1F3FF { background-position: -520px -300px; }
-.emoji-1F44A { background-position: -520px -320px; }
-.emoji-1F44A-1F3FB { background-position: -520px -340px; }
-.emoji-1F44A-1F3FC { background-position: -520px -360px; }
-.emoji-1F44A-1F3FD { background-position: -520px -380px; }
-.emoji-1F44A-1F3FE { background-position: -520px -400px; }
-.emoji-1F44A-1F3FF { background-position: -520px -420px; }
-.emoji-1F44B { background-position: -520px -440px; }
-.emoji-1F44B-1F3FB { background-position: -520px -460px; }
-.emoji-1F44B-1F3FC { background-position: -520px -480px; }
-.emoji-1F44B-1F3FD { background-position: -520px -500px; }
-.emoji-1F44B-1F3FE { background-position: 0 -520px; }
-.emoji-1F44B-1F3FF { background-position: -20px -520px; }
-.emoji-1F44C { background-position: -40px -520px; }
-.emoji-1F44C-1F3FB { background-position: -60px -520px; }
-.emoji-1F44C-1F3FC { background-position: -80px -520px; }
-.emoji-1F44C-1F3FD { background-position: -100px -520px; }
-.emoji-1F44C-1F3FE { background-position: -120px -520px; }
-.emoji-1F44C-1F3FF { background-position: -140px -520px; }
-.emoji-1F44D { background-position: -160px -520px; }
-.emoji-1F44D-1F3FB { background-position: -180px -520px; }
-.emoji-1F44D-1F3FC { background-position: -200px -520px; }
-.emoji-1F44D-1F3FD { background-position: -220px -520px; }
-.emoji-1F44D-1F3FE { background-position: -240px -520px; }
-.emoji-1F44D-1F3FF { background-position: -260px -520px; }
-.emoji-1F44E { background-position: -280px -520px; }
-.emoji-1F44E-1F3FB { background-position: -300px -520px; }
-.emoji-1F44E-1F3FC { background-position: -320px -520px; }
-.emoji-1F44E-1F3FD { background-position: -340px -520px; }
-.emoji-1F44E-1F3FE { background-position: -360px -520px; }
-.emoji-1F44E-1F3FF { background-position: -380px -520px; }
-.emoji-1F44F { background-position: -400px -520px; }
-.emoji-1F44F-1F3FB { background-position: -420px -520px; }
-.emoji-1F44F-1F3FC { background-position: -440px -520px; }
-.emoji-1F44F-1F3FD { background-position: -460px -520px; }
-.emoji-1F44F-1F3FE { background-position: -480px -520px; }
-.emoji-1F44F-1F3FF { background-position: -500px -520px; }
-.emoji-1F450 { background-position: -520px -520px; }
-.emoji-1F450-1F3FB { background-position: -540px 0; }
-.emoji-1F450-1F3FC { background-position: -540px -20px; }
-.emoji-1F450-1F3FD { background-position: -540px -40px; }
-.emoji-1F450-1F3FE { background-position: -540px -60px; }
-.emoji-1F450-1F3FF { background-position: -540px -80px; }
-.emoji-1F451 { background-position: -540px -100px; }
-.emoji-1F452 { background-position: -540px -120px; }
-.emoji-1F453 { background-position: -540px -140px; }
-.emoji-1F454 { background-position: -540px -160px; }
-.emoji-1F455 { background-position: -540px -180px; }
-.emoji-1F456 { background-position: -540px -200px; }
-.emoji-1F457 { background-position: -540px -220px; }
-.emoji-1F458 { background-position: -540px -240px; }
-.emoji-1F459 { background-position: -540px -260px; }
-.emoji-1F45A { background-position: -540px -280px; }
-.emoji-1F45B { background-position: -540px -300px; }
-.emoji-1F45C { background-position: -540px -320px; }
-.emoji-1F45D { background-position: -540px -340px; }
-.emoji-1F45E { background-position: -540px -360px; }
-.emoji-1F45F { background-position: -540px -380px; }
-.emoji-1F460 { background-position: -540px -400px; }
-.emoji-1F461 { background-position: -540px -420px; }
-.emoji-1F462 { background-position: -540px -440px; }
-.emoji-1F463 { background-position: -540px -460px; }
-.emoji-1F464 { background-position: -540px -480px; }
-.emoji-1F465 { background-position: -540px -500px; }
-.emoji-1F466 { background-position: -540px -520px; }
-.emoji-1F466-1F3FB { background-position: 0 -540px; }
-.emoji-1F466-1F3FC { background-position: -20px -540px; }
-.emoji-1F466-1F3FD { background-position: -40px -540px; }
-.emoji-1F466-1F3FE { background-position: -60px -540px; }
-.emoji-1F466-1F3FF { background-position: -80px -540px; }
-.emoji-1F467 { background-position: -100px -540px; }
-.emoji-1F467-1F3FB { background-position: -120px -540px; }
-.emoji-1F467-1F3FC { background-position: -140px -540px; }
-.emoji-1F467-1F3FD { background-position: -160px -540px; }
-.emoji-1F467-1F3FE { background-position: -180px -540px; }
-.emoji-1F467-1F3FF { background-position: -200px -540px; }
-.emoji-1F468 { background-position: -220px -540px; }
-.emoji-1F468-1F3FB { background-position: -240px -540px; }
-.emoji-1F468-1F3FC { background-position: -260px -540px; }
-.emoji-1F468-1F3FD { background-position: -280px -540px; }
-.emoji-1F468-1F3FE { background-position: -300px -540px; }
-.emoji-1F468-1F3FF { background-position: -320px -540px; }
-.emoji-1F468-1F468-1F466 { background-position: -340px -540px; }
-.emoji-1F468-1F468-1F466-1F466 { background-position: -360px -540px; }
-.emoji-1F468-1F468-1F467 { background-position: -380px -540px; }
-.emoji-1F468-1F468-1F467-1F466 { background-position: -400px -540px; }
-.emoji-1F468-1F468-1F467-1F467 { background-position: -420px -540px; }
-.emoji-1F468-1F469-1F466-1F466 { background-position: -440px -540px; }
-.emoji-1F468-1F469-1F467 { background-position: -460px -540px; }
-.emoji-1F468-1F469-1F467-1F466 { background-position: -480px -540px; }
-.emoji-1F468-1F469-1F467-1F467 { background-position: -500px -540px; }
-.emoji-1F468-2764-1F468 { background-position: -520px -540px; }
-.emoji-1F468-2764-1F48B-1F468 { background-position: -540px -540px; }
-.emoji-1F469 { background-position: -560px 0; }
-.emoji-1F469-1F3FB { background-position: -560px -20px; }
-.emoji-1F469-1F3FC { background-position: -560px -40px; }
-.emoji-1F469-1F3FD { background-position: -560px -60px; }
-.emoji-1F469-1F3FE { background-position: -560px -80px; }
-.emoji-1F469-1F3FF { background-position: -560px -100px; }
-.emoji-1F469-1F469-1F466 { background-position: -560px -120px; }
-.emoji-1F469-1F469-1F466-1F466 { background-position: -560px -140px; }
-.emoji-1F469-1F469-1F467 { background-position: -560px -160px; }
-.emoji-1F469-1F469-1F467-1F466 { background-position: -560px -180px; }
-.emoji-1F469-1F469-1F467-1F467 { background-position: -560px -200px; }
-.emoji-1F469-2764-1F469 { background-position: -560px -220px; }
-.emoji-1F469-2764-1F48B-1F469 { background-position: -560px -240px; }
-.emoji-1F46A { background-position: -560px -260px; }
-.emoji-1F46B { background-position: -560px -280px; }
-.emoji-1F46C { background-position: -560px -300px; }
-.emoji-1F46D { background-position: -560px -320px; }
-.emoji-1F46E { background-position: -560px -340px; }
-.emoji-1F46E-1F3FB { background-position: -560px -360px; }
-.emoji-1F46E-1F3FC { background-position: -560px -380px; }
-.emoji-1F46E-1F3FD { background-position: -560px -400px; }
-.emoji-1F46E-1F3FE { background-position: -560px -420px; }
-.emoji-1F46E-1F3FF { background-position: -560px -440px; }
-.emoji-1F46F { background-position: -560px -460px; }
-.emoji-1F470 { background-position: -560px -480px; }
-.emoji-1F470-1F3FB { background-position: -560px -500px; }
-.emoji-1F470-1F3FC { background-position: -560px -520px; }
-.emoji-1F470-1F3FD { background-position: -560px -540px; }
-.emoji-1F470-1F3FE { background-position: 0 -560px; }
-.emoji-1F470-1F3FF { background-position: -20px -560px; }
-.emoji-1F471 { background-position: -40px -560px; }
-.emoji-1F471-1F3FB { background-position: -60px -560px; }
-.emoji-1F471-1F3FC { background-position: -80px -560px; }
-.emoji-1F471-1F3FD { background-position: -100px -560px; }
-.emoji-1F471-1F3FE { background-position: -120px -560px; }
-.emoji-1F471-1F3FF { background-position: -140px -560px; }
-.emoji-1F472 { background-position: -160px -560px; }
-.emoji-1F472-1F3FB { background-position: -180px -560px; }
-.emoji-1F472-1F3FC { background-position: -200px -560px; }
-.emoji-1F472-1F3FD { background-position: -220px -560px; }
-.emoji-1F472-1F3FE { background-position: -240px -560px; }
-.emoji-1F472-1F3FF { background-position: -260px -560px; }
-.emoji-1F473 { background-position: -280px -560px; }
-.emoji-1F473-1F3FB { background-position: -300px -560px; }
-.emoji-1F473-1F3FC { background-position: -320px -560px; }
-.emoji-1F473-1F3FD { background-position: -340px -560px; }
-.emoji-1F473-1F3FE { background-position: -360px -560px; }
-.emoji-1F473-1F3FF { background-position: -380px -560px; }
-.emoji-1F474 { background-position: -400px -560px; }
-.emoji-1F474-1F3FB { background-position: -420px -560px; }
-.emoji-1F474-1F3FC { background-position: -440px -560px; }
-.emoji-1F474-1F3FD { background-position: -460px -560px; }
-.emoji-1F474-1F3FE { background-position: -480px -560px; }
-.emoji-1F474-1F3FF { background-position: -500px -560px; }
-.emoji-1F475 { background-position: -520px -560px; }
-.emoji-1F475-1F3FB { background-position: -540px -560px; }
-.emoji-1F475-1F3FC { background-position: -560px -560px; }
-.emoji-1F475-1F3FD { background-position: -580px 0; }
-.emoji-1F475-1F3FE { background-position: -580px -20px; }
-.emoji-1F475-1F3FF { background-position: -580px -40px; }
-.emoji-1F476 { background-position: -580px -60px; }
-.emoji-1F476-1F3FB { background-position: -580px -80px; }
-.emoji-1F476-1F3FC { background-position: -580px -100px; }
-.emoji-1F476-1F3FD { background-position: -580px -120px; }
-.emoji-1F476-1F3FE { background-position: -580px -140px; }
-.emoji-1F476-1F3FF { background-position: -580px -160px; }
-.emoji-1F477 { background-position: -580px -180px; }
-.emoji-1F477-1F3FB { background-position: -580px -200px; }
-.emoji-1F477-1F3FC { background-position: -580px -220px; }
-.emoji-1F477-1F3FD { background-position: -580px -240px; }
-.emoji-1F477-1F3FE { background-position: -580px -260px; }
-.emoji-1F477-1F3FF { background-position: -580px -280px; }
-.emoji-1F478 { background-position: -580px -300px; }
-.emoji-1F478-1F3FB { background-position: -580px -320px; }
-.emoji-1F478-1F3FC { background-position: -580px -340px; }
-.emoji-1F478-1F3FD { background-position: -580px -360px; }
-.emoji-1F478-1F3FE { background-position: -580px -380px; }
-.emoji-1F478-1F3FF { background-position: -580px -400px; }
-.emoji-1F479 { background-position: -580px -420px; }
-.emoji-1F47A { background-position: -580px -440px; }
-.emoji-1F47B { background-position: -580px -460px; }
-.emoji-1F47C { background-position: -580px -480px; }
-.emoji-1F47C-1F3FB { background-position: -580px -500px; }
-.emoji-1F47C-1F3FC { background-position: -580px -520px; }
-.emoji-1F47C-1F3FD { background-position: -580px -540px; }
-.emoji-1F47C-1F3FE { background-position: -580px -560px; }
-.emoji-1F47C-1F3FF { background-position: 0 -580px; }
-.emoji-1F47D { background-position: -20px -580px; }
-.emoji-1F47E { background-position: -40px -580px; }
-.emoji-1F47F { background-position: -60px -580px; }
-.emoji-1F480 { background-position: -80px -580px; }
-.emoji-1F481 { background-position: -100px -580px; }
-.emoji-1F481-1F3FB { background-position: -120px -580px; }
-.emoji-1F481-1F3FC { background-position: -140px -580px; }
-.emoji-1F481-1F3FD { background-position: -160px -580px; }
-.emoji-1F481-1F3FE { background-position: -180px -580px; }
-.emoji-1F481-1F3FF { background-position: -200px -580px; }
-.emoji-1F482 { background-position: -220px -580px; }
-.emoji-1F482-1F3FB { background-position: -240px -580px; }
-.emoji-1F482-1F3FC { background-position: -260px -580px; }
-.emoji-1F482-1F3FD { background-position: -280px -580px; }
-.emoji-1F482-1F3FE { background-position: -300px -580px; }
-.emoji-1F482-1F3FF { background-position: -320px -580px; }
-.emoji-1F483 { background-position: -340px -580px; }
-.emoji-1F483-1F3FB { background-position: -360px -580px; }
-.emoji-1F483-1F3FC { background-position: -380px -580px; }
-.emoji-1F483-1F3FD { background-position: -400px -580px; }
-.emoji-1F483-1F3FE { background-position: -420px -580px; }
-.emoji-1F483-1F3FF { background-position: -440px -580px; }
-.emoji-1F484 { background-position: -460px -580px; }
-.emoji-1F485 { background-position: -480px -580px; }
-.emoji-1F485-1F3FB { background-position: -500px -580px; }
-.emoji-1F485-1F3FC { background-position: -520px -580px; }
-.emoji-1F485-1F3FD { background-position: -540px -580px; }
-.emoji-1F485-1F3FE { background-position: -560px -580px; }
-.emoji-1F485-1F3FF { background-position: -580px -580px; }
-.emoji-1F486 { background-position: -600px 0; }
-.emoji-1F486-1F3FB { background-position: -600px -20px; }
-.emoji-1F486-1F3FC { background-position: -600px -40px; }
-.emoji-1F486-1F3FD { background-position: -600px -60px; }
-.emoji-1F486-1F3FE { background-position: -600px -80px; }
-.emoji-1F486-1F3FF { background-position: -600px -100px; }
-.emoji-1F487 { background-position: -600px -120px; }
-.emoji-1F487-1F3FB { background-position: -600px -140px; }
-.emoji-1F487-1F3FC { background-position: -600px -160px; }
-.emoji-1F487-1F3FD { background-position: -600px -180px; }
-.emoji-1F487-1F3FE { background-position: -600px -200px; }
-.emoji-1F487-1F3FF { background-position: -600px -220px; }
-.emoji-1F488 { background-position: -600px -240px; }
-.emoji-1F489 { background-position: -600px -260px; }
-.emoji-1F48A { background-position: -600px -280px; }
-.emoji-1F48B { background-position: -600px -300px; }
-.emoji-1F48C { background-position: -600px -320px; }
-.emoji-1F48D { background-position: -600px -340px; }
-.emoji-1F48E { background-position: -600px -360px; }
-.emoji-1F48F { background-position: -600px -380px; }
-.emoji-1F490 { background-position: -600px -400px; }
-.emoji-1F491 { background-position: -600px -420px; }
-.emoji-1F492 { background-position: -600px -440px; }
-.emoji-1F493 { background-position: -600px -460px; }
-.emoji-1F494 { background-position: -600px -480px; }
-.emoji-1F495 { background-position: -600px -500px; }
-.emoji-1F496 { background-position: -600px -520px; }
-.emoji-1F497 { background-position: -600px -540px; }
-.emoji-1F498 { background-position: -600px -560px; }
-.emoji-1F499 { background-position: -600px -580px; }
-.emoji-1F49A { background-position: 0 -600px; }
-.emoji-1F49B { background-position: -20px -600px; }
-.emoji-1F49C { background-position: -40px -600px; }
-.emoji-1F49D { background-position: -60px -600px; }
-.emoji-1F49E { background-position: -80px -600px; }
-.emoji-1F49F { background-position: -100px -600px; }
-.emoji-1F4A0 { background-position: -120px -600px; }
-.emoji-1F4A1 { background-position: -140px -600px; }
-.emoji-1F4A2 { background-position: -160px -600px; }
-.emoji-1F4A3 { background-position: -180px -600px; }
-.emoji-1F4A4 { background-position: -200px -600px; }
-.emoji-1F4A5 { background-position: -220px -600px; }
-.emoji-1F4A6 { background-position: -240px -600px; }
-.emoji-1F4A7 { background-position: -260px -600px; }
-.emoji-1F4A8 { background-position: -280px -600px; }
-.emoji-1F4A9 { background-position: -300px -600px; }
-.emoji-1F4AA { background-position: -320px -600px; }
-.emoji-1F4AA-1F3FB { background-position: -340px -600px; }
-.emoji-1F4AA-1F3FC { background-position: -360px -600px; }
-.emoji-1F4AA-1F3FD { background-position: -380px -600px; }
-.emoji-1F4AA-1F3FE { background-position: -400px -600px; }
-.emoji-1F4AA-1F3FF { background-position: -420px -600px; }
-.emoji-1F4AB { background-position: -440px -600px; }
-.emoji-1F4AC { background-position: -460px -600px; }
-.emoji-1F4AD { background-position: -480px -600px; }
-.emoji-1F4AE { background-position: -500px -600px; }
-.emoji-1F4AF { background-position: -520px -600px; }
-.emoji-1F4B0 { background-position: -540px -600px; }
-.emoji-1F4B1 { background-position: -560px -600px; }
-.emoji-1F4B2 { background-position: -580px -600px; }
-.emoji-1F4B3 { background-position: -600px -600px; }
-.emoji-1F4B4 { background-position: -620px 0; }
-.emoji-1F4B5 { background-position: -620px -20px; }
-.emoji-1F4B6 { background-position: -620px -40px; }
-.emoji-1F4B7 { background-position: -620px -60px; }
-.emoji-1F4B8 { background-position: -620px -80px; }
-.emoji-1F4B9 { background-position: -620px -100px; }
-.emoji-1F4BA { background-position: -620px -120px; }
-.emoji-1F4BB { background-position: -620px -140px; }
-.emoji-1F4BC { background-position: -620px -160px; }
-.emoji-1F4BD { background-position: -620px -180px; }
-.emoji-1F4BE { background-position: -620px -200px; }
-.emoji-1F4BF { background-position: -620px -220px; }
-.emoji-1F4C0 { background-position: -620px -240px; }
-.emoji-1F4C1 { background-position: -620px -260px; }
-.emoji-1F4C2 { background-position: -620px -280px; }
-.emoji-1F4C3 { background-position: -620px -300px; }
-.emoji-1F4C4 { background-position: -620px -320px; }
-.emoji-1F4C5 { background-position: -620px -340px; }
-.emoji-1F4C6 { background-position: -620px -360px; }
-.emoji-1F4C7 { background-position: -620px -380px; }
-.emoji-1F4C8 { background-position: -620px -400px; }
-.emoji-1F4C9 { background-position: -620px -420px; }
-.emoji-1F4CA { background-position: -620px -440px; }
-.emoji-1F4CB { background-position: -620px -460px; }
-.emoji-1F4CC { background-position: -620px -480px; }
-.emoji-1F4CD { background-position: -620px -500px; }
-.emoji-1F4CE { background-position: -620px -520px; }
-.emoji-1F4CF { background-position: -620px -540px; }
-.emoji-1F4D0 { background-position: -620px -560px; }
-.emoji-1F4D1 { background-position: -620px -580px; }
-.emoji-1F4D2 { background-position: -620px -600px; }
-.emoji-1F4D3 { background-position: 0 -620px; }
-.emoji-1F4D4 { background-position: -20px -620px; }
-.emoji-1F4D5 { background-position: -40px -620px; }
-.emoji-1F4D6 { background-position: -60px -620px; }
-.emoji-1F4D7 { background-position: -80px -620px; }
-.emoji-1F4D8 { background-position: -100px -620px; }
-.emoji-1F4D9 { background-position: -120px -620px; }
-.emoji-1F4DA { background-position: -140px -620px; }
-.emoji-1F4DB { background-position: -160px -620px; }
-.emoji-1F4DC { background-position: -180px -620px; }
-.emoji-1F4DD { background-position: -200px -620px; }
-.emoji-1F4DE { background-position: -220px -620px; }
-.emoji-1F4DF { background-position: -240px -620px; }
-.emoji-1F4E0 { background-position: -260px -620px; }
-.emoji-1F4E1 { background-position: -280px -620px; }
-.emoji-1F4E2 { background-position: -300px -620px; }
-.emoji-1F4E3 { background-position: -320px -620px; }
-.emoji-1F4E4 { background-position: -340px -620px; }
-.emoji-1F4E5 { background-position: -360px -620px; }
-.emoji-1F4E6 { background-position: -380px -620px; }
-.emoji-1F4E7 { background-position: -400px -620px; }
-.emoji-1F4E8 { background-position: -420px -620px; }
-.emoji-1F4E9 { background-position: -440px -620px; }
-.emoji-1F4EA { background-position: -460px -620px; }
-.emoji-1F4EB { background-position: -480px -620px; }
-.emoji-1F4EC { background-position: -500px -620px; }
-.emoji-1F4ED { background-position: -520px -620px; }
-.emoji-1F4EE { background-position: -540px -620px; }
-.emoji-1F4EF { background-position: -560px -620px; }
-.emoji-1F4F0 { background-position: -580px -620px; }
-.emoji-1F4F1 { background-position: -600px -620px; }
-.emoji-1F4F2 { background-position: -620px -620px; }
-.emoji-1F4F3 { background-position: -640px 0; }
-.emoji-1F4F4 { background-position: -640px -20px; }
-.emoji-1F4F5 { background-position: -640px -40px; }
-.emoji-1F4F6 { background-position: -640px -60px; }
-.emoji-1F4F7 { background-position: -640px -80px; }
-.emoji-1F4F8 { background-position: -640px -100px; }
-.emoji-1F4F9 { background-position: -640px -120px; }
-.emoji-1F4FA { background-position: -640px -140px; }
-.emoji-1F4FB { background-position: -640px -160px; }
-.emoji-1F4FC { background-position: -640px -180px; }
-.emoji-1F4FD { background-position: -640px -200px; }
-.emoji-1F4FE { background-position: -640px -220px; }
-.emoji-1F4FF { background-position: -640px -240px; }
-.emoji-1F500 { background-position: -640px -260px; }
-.emoji-1F501 { background-position: -640px -280px; }
-.emoji-1F502 { background-position: -640px -300px; }
-.emoji-1F503 { background-position: -640px -320px; }
-.emoji-1F504 { background-position: -640px -340px; }
-.emoji-1F505 { background-position: -640px -360px; }
-.emoji-1F506 { background-position: -640px -380px; }
-.emoji-1F507 { background-position: -640px -400px; }
-.emoji-1F508 { background-position: -640px -420px; }
-.emoji-1F509 { background-position: -640px -440px; }
-.emoji-1F50A { background-position: -640px -460px; }
-.emoji-1F50B { background-position: -640px -480px; }
-.emoji-1F50C { background-position: -640px -500px; }
-.emoji-1F50D { background-position: -640px -520px; }
-.emoji-1F50E { background-position: -640px -540px; }
-.emoji-1F50F { background-position: -640px -560px; }
-.emoji-1F510 { background-position: -640px -580px; }
-.emoji-1F511 { background-position: -640px -600px; }
-.emoji-1F512 { background-position: -640px -620px; }
-.emoji-1F513 { background-position: 0 -640px; }
-.emoji-1F514 { background-position: -20px -640px; }
-.emoji-1F515 { background-position: -40px -640px; }
-.emoji-1F516 { background-position: -60px -640px; }
-.emoji-1F517 { background-position: -80px -640px; }
-.emoji-1F518 { background-position: -100px -640px; }
-.emoji-1F519 { background-position: -120px -640px; }
-.emoji-1F51A { background-position: -140px -640px; }
-.emoji-1F51B { background-position: -160px -640px; }
-.emoji-1F51C { background-position: -180px -640px; }
-.emoji-1F51D { background-position: -200px -640px; }
-.emoji-1F51E { background-position: -220px -640px; }
-.emoji-1F51F { background-position: -240px -640px; }
-.emoji-1F520 { background-position: -260px -640px; }
-.emoji-1F521 { background-position: -280px -640px; }
-.emoji-1F522 { background-position: -300px -640px; }
-.emoji-1F523 { background-position: -320px -640px; }
-.emoji-1F524 { background-position: -340px -640px; }
-.emoji-1F525 { background-position: -360px -640px; }
-.emoji-1F526 { background-position: -380px -640px; }
-.emoji-1F527 { background-position: -400px -640px; }
-.emoji-1F528 { background-position: -420px -640px; }
-.emoji-1F529 { background-position: -440px -640px; }
-.emoji-1F52A { background-position: -460px -640px; }
-.emoji-1F52B { background-position: -480px -640px; }
-.emoji-1F52C { background-position: -500px -640px; }
-.emoji-1F52D { background-position: -520px -640px; }
-.emoji-1F52E { background-position: -540px -640px; }
-.emoji-1F52F { background-position: -560px -640px; }
-.emoji-1F530 { background-position: -580px -640px; }
-.emoji-1F531 { background-position: -600px -640px; }
-.emoji-1F532 { background-position: -620px -640px; }
-.emoji-1F533 { background-position: -640px -640px; }
-.emoji-1F534 { background-position: -660px 0; }
-.emoji-1F535 { background-position: -660px -20px; }
-.emoji-1F536 { background-position: -660px -40px; }
-.emoji-1F537 { background-position: -660px -60px; }
-.emoji-1F538 { background-position: -660px -80px; }
-.emoji-1F539 { background-position: -660px -100px; }
-.emoji-1F53A { background-position: -660px -120px; }
-.emoji-1F53B { background-position: -660px -140px; }
-.emoji-1F53C { background-position: -660px -160px; }
-.emoji-1F53D { background-position: -660px -180px; }
-.emoji-1F546 { background-position: -660px -200px; }
-.emoji-1F547 { background-position: -660px -220px; }
-.emoji-1F548 { background-position: -660px -240px; }
-.emoji-1F549 { background-position: -660px -260px; }
-.emoji-1F54A { background-position: -660px -280px; }
-.emoji-1F54B { background-position: -660px -300px; }
-.emoji-1F54C { background-position: -660px -320px; }
-.emoji-1F54D { background-position: -660px -340px; }
-.emoji-1F54E { background-position: -660px -360px; }
-.emoji-1F550 { background-position: -660px -380px; }
-.emoji-1F551 { background-position: -660px -400px; }
-.emoji-1F552 { background-position: -660px -420px; }
-.emoji-1F553 { background-position: -660px -440px; }
-.emoji-1F554 { background-position: -660px -460px; }
-.emoji-1F555 { background-position: -660px -480px; }
-.emoji-1F556 { background-position: -660px -500px; }
-.emoji-1F557 { background-position: -660px -520px; }
-.emoji-1F558 { background-position: -660px -540px; }
-.emoji-1F559 { background-position: -660px -560px; }
-.emoji-1F55A { background-position: -660px -580px; }
-.emoji-1F55B { background-position: -660px -600px; }
-.emoji-1F55C { background-position: -660px -620px; }
-.emoji-1F55D { background-position: -660px -640px; }
-.emoji-1F55E { background-position: 0 -660px; }
-.emoji-1F55F { background-position: -20px -660px; }
-.emoji-1F560 { background-position: -40px -660px; }
-.emoji-1F561 { background-position: -60px -660px; }
-.emoji-1F562 { background-position: -80px -660px; }
-.emoji-1F563 { background-position: -100px -660px; }
-.emoji-1F564 { background-position: -120px -660px; }
-.emoji-1F565 { background-position: -140px -660px; }
-.emoji-1F566 { background-position: -160px -660px; }
-.emoji-1F567 { background-position: -180px -660px; }
-.emoji-1F568 { background-position: -200px -660px; }
-.emoji-1F569 { background-position: -220px -660px; }
-.emoji-1F56A { background-position: -240px -660px; }
-.emoji-1F56B { background-position: -260px -660px; }
-.emoji-1F56C { background-position: -280px -660px; }
-.emoji-1F56D { background-position: -300px -660px; }
-.emoji-1F56E { background-position: -320px -660px; }
-.emoji-1F56F { background-position: -340px -660px; }
-.emoji-1F570 { background-position: -360px -660px; }
-.emoji-1F571 { background-position: -380px -660px; }
-.emoji-1F572 { background-position: -400px -660px; }
-.emoji-1F573 { background-position: -420px -660px; }
-.emoji-1F574 { background-position: -440px -660px; }
-.emoji-1F575 { background-position: -460px -660px; }
-.emoji-1F575-1F3FB { background-position: -480px -660px; }
-.emoji-1F575-1F3FC { background-position: -500px -660px; }
-.emoji-1F575-1F3FD { background-position: -520px -660px; }
-.emoji-1F575-1F3FE { background-position: -540px -660px; }
-.emoji-1F575-1F3FF { background-position: -560px -660px; }
-.emoji-1F576 { background-position: -580px -660px; }
-.emoji-1F577 { background-position: -600px -660px; }
-.emoji-1F578 { background-position: -620px -660px; }
-.emoji-1F579 { background-position: -640px -660px; }
-.emoji-1F57B { background-position: -660px -660px; }
-.emoji-1F57E { background-position: -680px 0; }
-.emoji-1F57F { background-position: -680px -20px; }
-.emoji-1F581 { background-position: -680px -40px; }
-.emoji-1F582 { background-position: -680px -60px; }
-.emoji-1F583 { background-position: -680px -80px; }
-.emoji-1F585 { background-position: -680px -100px; }
-.emoji-1F586 { background-position: -680px -120px; }
-.emoji-1F587 { background-position: -680px -140px; }
-.emoji-1F588 { background-position: -680px -160px; }
-.emoji-1F589 { background-position: -680px -180px; }
-.emoji-1F58A { background-position: -680px -200px; }
-.emoji-1F58B { background-position: -680px -220px; }
-.emoji-1F58C { background-position: -680px -240px; }
-.emoji-1F58D { background-position: -680px -260px; }
-.emoji-1F58E { background-position: -680px -280px; }
-.emoji-1F58F { background-position: -680px -300px; }
-.emoji-1F590 { background-position: -680px -320px; }
-.emoji-1F590-1F3FB { background-position: -680px -340px; }
-.emoji-1F590-1F3FC { background-position: -680px -360px; }
-.emoji-1F590-1F3FD { background-position: -680px -380px; }
-.emoji-1F590-1F3FE { background-position: -680px -400px; }
-.emoji-1F590-1F3FF { background-position: -680px -420px; }
-.emoji-1F591 { background-position: -680px -440px; }
-.emoji-1F592 { background-position: -680px -460px; }
-.emoji-1F593 { background-position: -680px -480px; }
-.emoji-1F594 { background-position: -680px -500px; }
-.emoji-1F595 { background-position: -680px -520px; }
-.emoji-1F595-1F3FB { background-position: -680px -540px; }
-.emoji-1F595-1F3FC { background-position: -680px -560px; }
-.emoji-1F595-1F3FD { background-position: -680px -580px; }
-.emoji-1F595-1F3FE { background-position: -680px -600px; }
-.emoji-1F595-1F3FF { background-position: -680px -620px; }
-.emoji-1F596 { background-position: -680px -640px; }
-.emoji-1F596-1F3FB { background-position: -680px -660px; }
-.emoji-1F596-1F3FC { background-position: 0 -680px; }
-.emoji-1F596-1F3FD { background-position: -20px -680px; }
-.emoji-1F596-1F3FE { background-position: -40px -680px; }
-.emoji-1F596-1F3FF { background-position: -60px -680px; }
-.emoji-1F597 { background-position: -80px -680px; }
-.emoji-1F598 { background-position: -100px -680px; }
-.emoji-1F599 { background-position: -120px -680px; }
-.emoji-1F59E { background-position: -140px -680px; }
-.emoji-1F59F { background-position: -160px -680px; }
-.emoji-1F5A5 { background-position: -180px -680px; }
-.emoji-1F5A6 { background-position: -200px -680px; }
-.emoji-1F5A7 { background-position: -220px -680px; }
-.emoji-1F5A8 { background-position: -240px -680px; }
-.emoji-1F5A9 { background-position: -260px -680px; }
-.emoji-1F5AA { background-position: -280px -680px; }
-.emoji-1F5AB { background-position: -300px -680px; }
-.emoji-1F5AD { background-position: -320px -680px; }
-.emoji-1F5AE { background-position: -340px -680px; }
-.emoji-1F5AF { background-position: -360px -680px; }
-.emoji-1F5B1 { background-position: -380px -680px; }
-.emoji-1F5B2 { background-position: -400px -680px; }
-.emoji-1F5B3 { background-position: -420px -680px; }
-.emoji-1F5B4 { background-position: -440px -680px; }
-.emoji-1F5B8 { background-position: -460px -680px; }
-.emoji-1F5B9 { background-position: -480px -680px; }
-.emoji-1F5BC { background-position: -500px -680px; }
-.emoji-1F5BD { background-position: -520px -680px; }
-.emoji-1F5BE { background-position: -540px -680px; }
-.emoji-1F5C0 { background-position: -560px -680px; }
-.emoji-1F5C1 { background-position: -580px -680px; }
-.emoji-1F5C2 { background-position: -600px -680px; }
-.emoji-1F5C3 { background-position: -620px -680px; }
-.emoji-1F5C4 { background-position: -640px -680px; }
-.emoji-1F5C6 { background-position: -660px -680px; }
-.emoji-1F5C7 { background-position: -680px -680px; }
-.emoji-1F5C9 { background-position: -700px 0; }
-.emoji-1F5CA { background-position: -700px -20px; }
-.emoji-1F5CE { background-position: -700px -40px; }
-.emoji-1F5CF { background-position: -700px -60px; }
-.emoji-1F5D0 { background-position: -700px -80px; }
-.emoji-1F5D1 { background-position: -700px -100px; }
-.emoji-1F5D2 { background-position: -700px -120px; }
-.emoji-1F5D3 { background-position: -700px -140px; }
-.emoji-1F5D4 { background-position: -700px -160px; }
-.emoji-1F5D8 { background-position: -700px -180px; }
-.emoji-1F5D9 { background-position: -700px -200px; }
-.emoji-1F5DC { background-position: -700px -220px; }
-.emoji-1F5DD { background-position: -700px -240px; }
-.emoji-1F5DE { background-position: -700px -260px; }
-.emoji-1F5E0 { background-position: -700px -280px; }
-.emoji-1F5E1 { background-position: -700px -300px; }
-.emoji-1F5E2 { background-position: -700px -320px; }
-.emoji-1F5E3 { background-position: -700px -340px; }
-.emoji-1F5E8 { background-position: -700px -360px; }
-.emoji-1F5E9 { background-position: -700px -380px; }
-.emoji-1F5EA { background-position: -700px -400px; }
-.emoji-1F5EB { background-position: -700px -420px; }
-.emoji-1F5EC { background-position: -700px -440px; }
-.emoji-1F5ED { background-position: -700px -460px; }
-.emoji-1F5EE { background-position: -700px -480px; }
-.emoji-1F5EF { background-position: -700px -500px; }
-.emoji-1F5F0 { background-position: -700px -520px; }
-.emoji-1F5F1 { background-position: -700px -540px; }
-.emoji-1F5F2 { background-position: -700px -560px; }
-.emoji-1F5F3 { background-position: -700px -580px; }
-.emoji-1F5F4 { background-position: -700px -600px; }
-.emoji-1F5F5 { background-position: -700px -620px; }
-.emoji-1F5F8 { background-position: -700px -640px; }
-.emoji-1F5F9 { background-position: -700px -660px; }
-.emoji-1F5FA { background-position: -700px -680px; }
-.emoji-1F5FB { background-position: 0 -700px; }
-.emoji-1F5FC { background-position: -20px -700px; }
-.emoji-1F5FD { background-position: -40px -700px; }
-.emoji-1F5FE { background-position: -60px -700px; }
-.emoji-1F5FF { background-position: -80px -700px; }
-.emoji-1F600 { background-position: -100px -700px; }
-.emoji-1F601 { background-position: -120px -700px; }
-.emoji-1F602 { background-position: -140px -700px; }
-.emoji-1F603 { background-position: -160px -700px; }
-.emoji-1F604 { background-position: -180px -700px; }
-.emoji-1F605 { background-position: -200px -700px; }
-.emoji-1F606 { background-position: -220px -700px; }
-.emoji-1F607 { background-position: -240px -700px; }
-.emoji-1F608 { background-position: -260px -700px; }
-.emoji-1F609 { background-position: -280px -700px; }
-.emoji-1F60A { background-position: -300px -700px; }
-.emoji-1F60B { background-position: -320px -700px; }
-.emoji-1F60C { background-position: -340px -700px; }
-.emoji-1F60D { background-position: -360px -700px; }
-.emoji-1F60E { background-position: -380px -700px; }
-.emoji-1F60F { background-position: -400px -700px; }
-.emoji-1F610 { background-position: -420px -700px; }
-.emoji-1F611 { background-position: -440px -700px; }
-.emoji-1F612 { background-position: -460px -700px; }
-.emoji-1F613 { background-position: -480px -700px; }
-.emoji-1F614 { background-position: -500px -700px; }
-.emoji-1F615 { background-position: -520px -700px; }
-.emoji-1F616 { background-position: -540px -700px; }
-.emoji-1F617 { background-position: -560px -700px; }
-.emoji-1F618 { background-position: -580px -700px; }
-.emoji-1F619 { background-position: -600px -700px; }
-.emoji-1F61A { background-position: -620px -700px; }
-.emoji-1F61B { background-position: -640px -700px; }
-.emoji-1F61C { background-position: -660px -700px; }
-.emoji-1F61D { background-position: -680px -700px; }
-.emoji-1F61E { background-position: -700px -700px; }
-.emoji-1F61F { background-position: -720px 0; }
-.emoji-1F620 { background-position: -720px -20px; }
-.emoji-1F621 { background-position: -720px -40px; }
-.emoji-1F622 { background-position: -720px -60px; }
-.emoji-1F623 { background-position: -720px -80px; }
-.emoji-1F624 { background-position: -720px -100px; }
-.emoji-1F625 { background-position: -720px -120px; }
-.emoji-1F626 { background-position: -720px -140px; }
-.emoji-1F627 { background-position: -720px -160px; }
-.emoji-1F628 { background-position: -720px -180px; }
-.emoji-1F629 { background-position: -720px -200px; }
-.emoji-1F62A { background-position: -720px -220px; }
-.emoji-1F62B { background-position: -720px -240px; }
-.emoji-1F62C { background-position: -720px -260px; }
-.emoji-1F62D { background-position: -720px -280px; }
-.emoji-1F62E { background-position: -720px -300px; }
-.emoji-1F62F { background-position: -720px -320px; }
-.emoji-1F630 { background-position: -720px -340px; }
-.emoji-1F631 { background-position: -720px -360px; }
-.emoji-1F632 { background-position: -720px -380px; }
-.emoji-1F633 { background-position: -720px -400px; }
-.emoji-1F634 { background-position: -720px -420px; }
-.emoji-1F635 { background-position: -720px -440px; }
-.emoji-1F636 { background-position: -720px -460px; }
-.emoji-1F637 { background-position: -720px -480px; }
-.emoji-1F638 { background-position: -720px -500px; }
-.emoji-1F639 { background-position: -720px -520px; }
-.emoji-1F63A { background-position: -720px -540px; }
-.emoji-1F63B { background-position: -720px -560px; }
-.emoji-1F63C { background-position: -720px -580px; }
-.emoji-1F63D { background-position: -720px -600px; }
-.emoji-1F63E { background-position: -720px -620px; }
-.emoji-1F63F { background-position: -720px -640px; }
-.emoji-1F640 { background-position: -720px -660px; }
-.emoji-1F641 { background-position: -720px -680px; }
-.emoji-1F642 { background-position: -720px -700px; }
-.emoji-1F643 { background-position: 0 -720px; }
-.emoji-1F644 { background-position: -20px -720px; }
-.emoji-1F645 { background-position: -40px -720px; }
-.emoji-1F645-1F3FB { background-position: -60px -720px; }
-.emoji-1F645-1F3FC { background-position: -80px -720px; }
-.emoji-1F645-1F3FD { background-position: -100px -720px; }
-.emoji-1F645-1F3FE { background-position: -120px -720px; }
-.emoji-1F645-1F3FF { background-position: -140px -720px; }
-.emoji-1F646 { background-position: -160px -720px; }
-.emoji-1F646-1F3FB { background-position: -180px -720px; }
-.emoji-1F646-1F3FC { background-position: -200px -720px; }
-.emoji-1F646-1F3FD { background-position: -220px -720px; }
-.emoji-1F646-1F3FE { background-position: -240px -720px; }
-.emoji-1F646-1F3FF { background-position: -260px -720px; }
-.emoji-1F647 { background-position: -280px -720px; }
-.emoji-1F647-1F3FB { background-position: -300px -720px; }
-.emoji-1F647-1F3FC { background-position: -320px -720px; }
-.emoji-1F647-1F3FD { background-position: -340px -720px; }
-.emoji-1F647-1F3FE { background-position: -360px -720px; }
-.emoji-1F647-1F3FF { background-position: -380px -720px; }
-.emoji-1F648 { background-position: -400px -720px; }
-.emoji-1F649 { background-position: -420px -720px; }
-.emoji-1F64A { background-position: -440px -720px; }
-.emoji-1F64B { background-position: -460px -720px; }
-.emoji-1F64B-1F3FB { background-position: -480px -720px; }
-.emoji-1F64B-1F3FC { background-position: -500px -720px; }
-.emoji-1F64B-1F3FD { background-position: -520px -720px; }
-.emoji-1F64B-1F3FE { background-position: -540px -720px; }
-.emoji-1F64B-1F3FF { background-position: -560px -720px; }
-.emoji-1F64C { background-position: -580px -720px; }
-.emoji-1F64C-1F3FB { background-position: -600px -720px; }
-.emoji-1F64C-1F3FC { background-position: -620px -720px; }
-.emoji-1F64C-1F3FD { background-position: -640px -720px; }
-.emoji-1F64C-1F3FE { background-position: -660px -720px; }
-.emoji-1F64C-1F3FF { background-position: -680px -720px; }
-.emoji-1F64D { background-position: -700px -720px; }
-.emoji-1F64D-1F3FB { background-position: -720px -720px; }
-.emoji-1F64D-1F3FC { background-position: -740px 0; }
-.emoji-1F64D-1F3FD { background-position: -740px -20px; }
-.emoji-1F64D-1F3FE { background-position: -740px -40px; }
-.emoji-1F64D-1F3FF { background-position: -740px -60px; }
-.emoji-1F64E { background-position: -740px -80px; }
-.emoji-1F64E-1F3FB { background-position: -740px -100px; }
-.emoji-1F64E-1F3FC { background-position: -740px -120px; }
-.emoji-1F64E-1F3FD { background-position: -740px -140px; }
-.emoji-1F64E-1F3FE { background-position: -740px -160px; }
-.emoji-1F64E-1F3FF { background-position: -740px -180px; }
-.emoji-1F64F { background-position: -740px -200px; }
-.emoji-1F64F-1F3FB { background-position: -740px -220px; }
-.emoji-1F64F-1F3FC { background-position: -740px -240px; }
-.emoji-1F64F-1F3FD { background-position: -740px -260px; }
-.emoji-1F64F-1F3FE { background-position: -740px -280px; }
-.emoji-1F64F-1F3FF { background-position: -740px -300px; }
-.emoji-1F680 { background-position: -740px -320px; }
-.emoji-1F681 { background-position: -740px -340px; }
-.emoji-1F682 { background-position: -740px -360px; }
-.emoji-1F683 { background-position: -740px -380px; }
-.emoji-1F684 { background-position: -740px -400px; }
-.emoji-1F685 { background-position: -740px -420px; }
-.emoji-1F686 { background-position: -740px -440px; }
-.emoji-1F687 { background-position: -740px -460px; }
-.emoji-1F688 { background-position: -740px -480px; }
-.emoji-1F689 { background-position: -740px -500px; }
-.emoji-1F68A { background-position: -740px -520px; }
-.emoji-1F68B { background-position: -740px -540px; }
-.emoji-1F68C { background-position: -740px -560px; }
-.emoji-1F68D { background-position: -740px -580px; }
-.emoji-1F68E { background-position: -740px -600px; }
-.emoji-1F68F { background-position: -740px -620px; }
-.emoji-1F690 { background-position: -740px -640px; }
-.emoji-1F691 { background-position: -740px -660px; }
-.emoji-1F692 { background-position: -740px -680px; }
-.emoji-1F693 { background-position: -740px -700px; }
-.emoji-1F694 { background-position: -740px -720px; }
-.emoji-1F695 { background-position: 0 -740px; }
-.emoji-1F696 { background-position: -20px -740px; }
-.emoji-1F697 { background-position: -40px -740px; }
-.emoji-1F698 { background-position: -60px -740px; }
-.emoji-1F699 { background-position: -80px -740px; }
-.emoji-1F69A { background-position: -100px -740px; }
-.emoji-1F69B { background-position: -120px -740px; }
-.emoji-1F69C { background-position: -140px -740px; }
-.emoji-1F69D { background-position: -160px -740px; }
-.emoji-1F69E { background-position: -180px -740px; }
-.emoji-1F69F { background-position: -200px -740px; }
-.emoji-1F6A0 { background-position: -220px -740px; }
-.emoji-1F6A1 { background-position: -240px -740px; }
-.emoji-1F6A2 { background-position: -260px -740px; }
-.emoji-1F6A3 { background-position: -280px -740px; }
-.emoji-1F6A3-1F3FB { background-position: -300px -740px; }
-.emoji-1F6A3-1F3FC { background-position: -320px -740px; }
-.emoji-1F6A3-1F3FD { background-position: -340px -740px; }
-.emoji-1F6A3-1F3FE { background-position: -360px -740px; }
-.emoji-1F6A3-1F3FF { background-position: -380px -740px; }
-.emoji-1F6A4 { background-position: -400px -740px; }
-.emoji-1F6A5 { background-position: -420px -740px; }
-.emoji-1F6A6 { background-position: -440px -740px; }
-.emoji-1F6A7 { background-position: -460px -740px; }
-.emoji-1F6A8 { background-position: -480px -740px; }
-.emoji-1F6A9 { background-position: -500px -740px; }
-.emoji-1F6AA { background-position: -520px -740px; }
-.emoji-1F6AB { background-position: -540px -740px; }
-.emoji-1F6AC { background-position: -560px -740px; }
-.emoji-1F6AD { background-position: -580px -740px; }
-.emoji-1F6AE { background-position: -600px -740px; }
-.emoji-1F6AF { background-position: -620px -740px; }
-.emoji-1F6B0 { background-position: -640px -740px; }
-.emoji-1F6B1 { background-position: -660px -740px; }
-.emoji-1F6B2 { background-position: -680px -740px; }
-.emoji-1F6B3 { background-position: -700px -740px; }
-.emoji-1F6B4 { background-position: -720px -740px; }
-.emoji-1F6B4-1F3FB { background-position: -740px -740px; }
-.emoji-1F6B4-1F3FC { background-position: -760px 0; }
-.emoji-1F6B4-1F3FD { background-position: -760px -20px; }
-.emoji-1F6B4-1F3FE { background-position: -760px -40px; }
-.emoji-1F6B4-1F3FF { background-position: -760px -60px; }
-.emoji-1F6B5 { background-position: -760px -80px; }
-.emoji-1F6B5-1F3FB { background-position: -760px -100px; }
-.emoji-1F6B5-1F3FC { background-position: -760px -120px; }
-.emoji-1F6B5-1F3FD { background-position: -760px -140px; }
-.emoji-1F6B5-1F3FE { background-position: -760px -160px; }
-.emoji-1F6B5-1F3FF { background-position: -760px -180px; }
-.emoji-1F6B6 { background-position: -760px -200px; }
-.emoji-1F6B6-1F3FB { background-position: -760px -220px; }
-.emoji-1F6B6-1F3FC { background-position: -760px -240px; }
-.emoji-1F6B6-1F3FD { background-position: -760px -260px; }
-.emoji-1F6B6-1F3FE { background-position: -760px -280px; }
-.emoji-1F6B6-1F3FF { background-position: -760px -300px; }
-.emoji-1F6B7 { background-position: -760px -320px; }
-.emoji-1F6B8 { background-position: -760px -340px; }
-.emoji-1F6B9 { background-position: -760px -360px; }
-.emoji-1F6BA { background-position: -760px -380px; }
-.emoji-1F6BB { background-position: -760px -400px; }
-.emoji-1F6BC { background-position: -760px -420px; }
-.emoji-1F6BD { background-position: -760px -440px; }
-.emoji-1F6BE { background-position: -760px -460px; }
-.emoji-1F6BF { background-position: -760px -480px; }
-.emoji-1F6C0 { background-position: -760px -500px; }
-.emoji-1F6C0-1F3FB { background-position: -760px -520px; }
-.emoji-1F6C0-1F3FC { background-position: -760px -540px; }
-.emoji-1F6C0-1F3FD { background-position: -760px -560px; }
-.emoji-1F6C0-1F3FE { background-position: -760px -580px; }
-.emoji-1F6C0-1F3FF { background-position: -760px -600px; }
-.emoji-1F6C1 { background-position: -760px -620px; }
-.emoji-1F6C2 { background-position: -760px -640px; }
-.emoji-1F6C3 { background-position: -760px -660px; }
-.emoji-1F6C4 { background-position: -760px -680px; }
-.emoji-1F6C5 { background-position: -760px -700px; }
-.emoji-1F6C6 { background-position: -760px -720px; }
-.emoji-1F6C7 { background-position: -760px -740px; }
-.emoji-1F6C8 { background-position: 0 -760px; }
-.emoji-1F6C9 { background-position: -20px -760px; }
-.emoji-1F6CA { background-position: -40px -760px; }
-.emoji-1F6CB { background-position: -60px -760px; }
-.emoji-1F6CC { background-position: -80px -760px; }
-.emoji-1F6CD { background-position: -100px -760px; }
-.emoji-1F6CE { background-position: -120px -760px; }
-.emoji-1F6CF { background-position: -140px -760px; }
-.emoji-1F6D0 { background-position: -160px -760px; }
-.emoji-1F6E0 { background-position: -180px -760px; }
-.emoji-1F6E1 { background-position: -200px -760px; }
-.emoji-1F6E2 { background-position: -220px -760px; }
-.emoji-1F6E3 { background-position: -240px -760px; }
-.emoji-1F6E4 { background-position: -260px -760px; }
-.emoji-1F6E5 { background-position: -280px -760px; }
-.emoji-1F6E6 { background-position: -300px -760px; }
-.emoji-1F6E7 { background-position: -320px -760px; }
-.emoji-1F6E8 { background-position: -340px -760px; }
-.emoji-1F6E9 { background-position: -360px -760px; }
-.emoji-1F6EA { background-position: -380px -760px; }
-.emoji-1F6EB { background-position: -400px -760px; }
-.emoji-1F6EC { background-position: -420px -760px; }
-.emoji-1F6F0 { background-position: -440px -760px; }
-.emoji-1F6F1 { background-position: -460px -760px; }
-.emoji-1F6F2 { background-position: -480px -760px; }
-.emoji-1F6F3 { background-position: -500px -760px; }
-.emoji-1F910 { background-position: -520px -760px; }
-.emoji-1F911 { background-position: -540px -760px; }
-.emoji-1F912 { background-position: -560px -760px; }
-.emoji-1F913 { background-position: -580px -760px; }
-.emoji-1F914 { background-position: -600px -760px; }
-.emoji-1F915 { background-position: -620px -760px; }
-.emoji-1F916 { background-position: -640px -760px; }
-.emoji-1F917 { background-position: -660px -760px; }
-.emoji-1F918 { background-position: -680px -760px; }
-.emoji-1F918-1F3FB { background-position: -700px -760px; }
-.emoji-1F918-1F3FC { background-position: -720px -760px; }
-.emoji-1F918-1F3FD { background-position: -740px -760px; }
-.emoji-1F918-1F3FE { background-position: -760px -760px; }
-.emoji-1F918-1F3FF { background-position: -780px 0; }
-.emoji-1F980 { background-position: -780px -20px; }
-.emoji-1F981 { background-position: -780px -40px; }
-.emoji-1F982 { background-position: -780px -60px; }
-.emoji-1F983 { background-position: -780px -80px; }
-.emoji-1F984 { background-position: -780px -100px; }
-.emoji-1F9C0 { background-position: -780px -120px; }
-.emoji-203C { background-position: -780px -140px; }
-.emoji-2049 { background-position: -780px -160px; }
-.emoji-2122 { background-position: -780px -180px; }
-.emoji-2139 { background-position: -780px -200px; }
-.emoji-2194 { background-position: -780px -220px; }
-.emoji-2195 { background-position: -780px -240px; }
-.emoji-2196 { background-position: -780px -260px; }
-.emoji-2197 { background-position: -780px -280px; }
-.emoji-2198 { background-position: -780px -300px; }
-.emoji-2199 { background-position: -780px -320px; }
-.emoji-21A9 { background-position: -780px -340px; }
-.emoji-21AA { background-position: -780px -360px; }
-.emoji-231A { background-position: -780px -380px; }
-.emoji-231B { background-position: -780px -400px; }
-.emoji-2328 { background-position: -780px -420px; }
-.emoji-23E9 { background-position: -780px -440px; }
-.emoji-23EA { background-position: -780px -460px; }
-.emoji-23EB { background-position: -780px -480px; }
-.emoji-23EC { background-position: -780px -500px; }
-.emoji-23ED { background-position: -780px -520px; }
-.emoji-23EE { background-position: -780px -540px; }
-.emoji-23EF { background-position: -780px -560px; }
-.emoji-23F0 { background-position: -780px -580px; }
-.emoji-23F1 { background-position: -780px -600px; }
-.emoji-23F2 { background-position: -780px -620px; }
-.emoji-23F3 { background-position: -780px -640px; }
-.emoji-23F8 { background-position: -780px -660px; }
-.emoji-23F9 { background-position: -780px -680px; }
-.emoji-23FA { background-position: -780px -700px; }
-.emoji-24C2 { background-position: -780px -720px; }
-.emoji-25AA { background-position: -780px -740px; }
-.emoji-25AB { background-position: -780px -760px; }
-.emoji-25B6 { background-position: 0 -780px; }
-.emoji-25C0 { background-position: -20px -780px; }
-.emoji-25FB { background-position: -40px -780px; }
-.emoji-25FC { background-position: -60px -780px; }
-.emoji-25FD { background-position: -80px -780px; }
-.emoji-25FE { background-position: -100px -780px; }
-.emoji-2600 { background-position: -120px -780px; }
-.emoji-2601 { background-position: -140px -780px; }
-.emoji-2602 { background-position: -160px -780px; }
-.emoji-2603 { background-position: -180px -780px; }
-.emoji-2604 { background-position: -200px -780px; }
-.emoji-260E { background-position: -220px -780px; }
-.emoji-2611 { background-position: -240px -780px; }
-.emoji-2614 { background-position: -260px -780px; }
-.emoji-2615 { background-position: -280px -780px; }
-.emoji-2618 { background-position: -300px -780px; }
-.emoji-261D { background-position: -320px -780px; }
-.emoji-261D-1F3FB { background-position: -340px -780px; }
-.emoji-261D-1F3FC { background-position: -360px -780px; }
-.emoji-261D-1F3FD { background-position: -380px -780px; }
-.emoji-261D-1F3FE { background-position: -400px -780px; }
-.emoji-261D-1F3FF { background-position: -420px -780px; }
-.emoji-2620 { background-position: -440px -780px; }
-.emoji-2622 { background-position: -460px -780px; }
-.emoji-2623 { background-position: -480px -780px; }
-.emoji-2626 { background-position: -500px -780px; }
-.emoji-262A { background-position: -520px -780px; }
-.emoji-262E { background-position: -540px -780px; }
-.emoji-262F { background-position: -560px -780px; }
-.emoji-2638 { background-position: -580px -780px; }
-.emoji-2639 { background-position: -600px -780px; }
-.emoji-263A { background-position: -620px -780px; }
-.emoji-2648 { background-position: -640px -780px; }
-.emoji-2649 { background-position: -660px -780px; }
-.emoji-264A { background-position: -680px -780px; }
-.emoji-264B { background-position: -700px -780px; }
-.emoji-264C { background-position: -720px -780px; }
-.emoji-264D { background-position: -740px -780px; }
-.emoji-264E { background-position: -760px -780px; }
-.emoji-264F { background-position: -780px -780px; }
-.emoji-2650 { background-position: -800px 0; }
-.emoji-2651 { background-position: -800px -20px; }
-.emoji-2652 { background-position: -800px -40px; }
-.emoji-2653 { background-position: -800px -60px; }
-.emoji-2660 { background-position: -800px -80px; }
-.emoji-2663 { background-position: -800px -100px; }
-.emoji-2665 { background-position: -800px -120px; }
-.emoji-2666 { background-position: -800px -140px; }
-.emoji-2668 { background-position: -800px -160px; }
-.emoji-267B { background-position: -800px -180px; }
-.emoji-267F { background-position: -800px -200px; }
-.emoji-2692 { background-position: -800px -220px; }
-.emoji-2693 { background-position: -800px -240px; }
-.emoji-2694 { background-position: -800px -260px; }
-.emoji-2696 { background-position: -800px -280px; }
-.emoji-2697 { background-position: -800px -300px; }
-.emoji-2699 { background-position: -800px -320px; }
-.emoji-269B { background-position: -800px -340px; }
-.emoji-269C { background-position: -800px -360px; }
-.emoji-26A0 { background-position: -800px -380px; }
-.emoji-26A1 { background-position: -800px -400px; }
-.emoji-26AA { background-position: -800px -420px; }
-.emoji-26AB { background-position: -800px -440px; }
-.emoji-26B0 { background-position: -800px -460px; }
-.emoji-26B1 { background-position: -800px -480px; }
-.emoji-26BD { background-position: -800px -500px; }
-.emoji-26BE { background-position: -800px -520px; }
-.emoji-26C4 { background-position: -800px -540px; }
-.emoji-26C5 { background-position: -800px -560px; }
-.emoji-26C8 { background-position: -800px -580px; }
-.emoji-26CE { background-position: -800px -600px; }
-.emoji-26CF { background-position: -800px -620px; }
-.emoji-26D1 { background-position: -800px -640px; }
-.emoji-26D3 { background-position: -800px -660px; }
-.emoji-26D4 { background-position: -800px -680px; }
-.emoji-26E9 { background-position: -800px -700px; }
-.emoji-26EA { background-position: -800px -720px; }
-.emoji-26F0 { background-position: -800px -740px; }
-.emoji-26F1 { background-position: -800px -760px; }
-.emoji-26F2 { background-position: -800px -780px; }
-.emoji-26F3 { background-position: 0 -800px; }
-.emoji-26F4 { background-position: -20px -800px; }
-.emoji-26F5 { background-position: -40px -800px; }
-.emoji-26F7 { background-position: -60px -800px; }
-.emoji-26F8 { background-position: -80px -800px; }
-.emoji-26F9 { background-position: -100px -800px; }
-.emoji-26F9-1F3FB { background-position: -120px -800px; }
-.emoji-26F9-1F3FC { background-position: -140px -800px; }
-.emoji-26F9-1F3FD { background-position: -160px -800px; }
-.emoji-26F9-1F3FE { background-position: -180px -800px; }
-.emoji-26F9-1F3FF { background-position: -200px -800px; }
-.emoji-26FA { background-position: -220px -800px; }
-.emoji-26FD { background-position: -240px -800px; }
-.emoji-2702 { background-position: -260px -800px; }
-.emoji-2705 { background-position: -280px -800px; }
-.emoji-2708 { background-position: -300px -800px; }
-.emoji-2709 { background-position: -320px -800px; }
-.emoji-270A { background-position: -340px -800px; }
-.emoji-270A-1F3FB { background-position: -360px -800px; }
-.emoji-270A-1F3FC { background-position: -380px -800px; }
-.emoji-270A-1F3FD { background-position: -400px -800px; }
-.emoji-270A-1F3FE { background-position: -420px -800px; }
-.emoji-270A-1F3FF { background-position: -440px -800px; }
-.emoji-270B { background-position: -460px -800px; }
-.emoji-270B-1F3FB { background-position: -480px -800px; }
-.emoji-270B-1F3FC { background-position: -500px -800px; }
-.emoji-270B-1F3FD { background-position: -520px -800px; }
-.emoji-270B-1F3FE { background-position: -540px -800px; }
-.emoji-270B-1F3FF { background-position: -560px -800px; }
-.emoji-270C { background-position: -580px -800px; }
-.emoji-270C-1F3FB { background-position: -600px -800px; }
-.emoji-270C-1F3FC { background-position: -620px -800px; }
-.emoji-270C-1F3FD { background-position: -640px -800px; }
-.emoji-270C-1F3FE { background-position: -660px -800px; }
-.emoji-270C-1F3FF { background-position: -680px -800px; }
-.emoji-270D { background-position: -700px -800px; }
-.emoji-270D-1F3FB { background-position: -720px -800px; }
-.emoji-270D-1F3FC { background-position: -740px -800px; }
-.emoji-270D-1F3FD { background-position: -760px -800px; }
-.emoji-270D-1F3FE { background-position: -780px -800px; }
-.emoji-270D-1F3FF { background-position: -800px -800px; }
-.emoji-270F { background-position: -820px 0; }
-.emoji-2712 { background-position: -820px -20px; }
-.emoji-2714 { background-position: -820px -40px; }
-.emoji-2716 { background-position: -820px -60px; }
-.emoji-271D { background-position: -820px -80px; }
-.emoji-2721 { background-position: -820px -100px; }
-.emoji-2728 { background-position: -820px -120px; }
-.emoji-2733 { background-position: -820px -140px; }
-.emoji-2734 { background-position: -820px -160px; }
-.emoji-2744 { background-position: -820px -180px; }
-.emoji-2747 { background-position: -820px -200px; }
-.emoji-274C { background-position: -820px -220px; }
-.emoji-274E { background-position: -820px -240px; }
-.emoji-2753 { background-position: -820px -260px; }
-.emoji-2754 { background-position: -820px -280px; }
-.emoji-2755 { background-position: -820px -300px; }
-.emoji-2757 { background-position: -820px -320px; }
-.emoji-2763 { background-position: -820px -340px; }
-.emoji-2764 { background-position: -820px -360px; }
-.emoji-2795 { background-position: -820px -380px; }
-.emoji-2796 { background-position: -820px -400px; }
-.emoji-2797 { background-position: -820px -420px; }
-.emoji-27A1 { background-position: -820px -440px; }
-.emoji-27B0 { background-position: -820px -460px; }
-.emoji-27BF { background-position: -820px -480px; }
-.emoji-2934 { background-position: -820px -500px; }
-.emoji-2935 { background-position: -820px -520px; }
-.emoji-2B05 { background-position: -820px -540px; }
-.emoji-2B06 { background-position: -820px -560px; }
-.emoji-2B07 { background-position: -820px -580px; }
-.emoji-2B1B { background-position: -820px -600px; }
-.emoji-2B1C { background-position: -820px -620px; }
-.emoji-2B50 { background-position: -820px -640px; }
-.emoji-2B55 { background-position: -820px -660px; }
-.emoji-3030 { background-position: -820px -680px; }
-.emoji-303D { background-position: -820px -700px; }
-.emoji-3297 { background-position: -820px -720px; }
-.emoji-3299 { background-position: -820px -740px; }
+.emoji-1F396 { background-position: -420px -260px; }
+.emoji-1F397 { background-position: -420px -280px; }
+.emoji-1F399 { background-position: -420px -300px; }
+.emoji-1F39A { background-position: -420px -320px; }
+.emoji-1F39B { background-position: -420px -340px; }
+.emoji-1F39E { background-position: -420px -360px; }
+.emoji-1F39F { background-position: -420px -380px; }
+.emoji-1F3A0 { background-position: -420px -400px; }
+.emoji-1F3A1 { background-position: 0 -420px; }
+.emoji-1F3A2 { background-position: -20px -420px; }
+.emoji-1F3A3 { background-position: -40px -420px; }
+.emoji-1F3A4 { background-position: -60px -420px; }
+.emoji-1F3A5 { background-position: -80px -420px; }
+.emoji-1F3A6 { background-position: -100px -420px; }
+.emoji-1F3A7 { background-position: -120px -420px; }
+.emoji-1F3A8 { background-position: -140px -420px; }
+.emoji-1F3A9 { background-position: -160px -420px; }
+.emoji-1F3AA { background-position: -180px -420px; }
+.emoji-1F3AB { background-position: -200px -420px; }
+.emoji-1F3AC { background-position: -220px -420px; }
+.emoji-1F3AD { background-position: -240px -420px; }
+.emoji-1F3AE { background-position: -260px -420px; }
+.emoji-1F3AF { background-position: -280px -420px; }
+.emoji-1F3B0 { background-position: -300px -420px; }
+.emoji-1F3B1 { background-position: -320px -420px; }
+.emoji-1F3B2 { background-position: -340px -420px; }
+.emoji-1F3B3 { background-position: -360px -420px; }
+.emoji-1F3B4 { background-position: -380px -420px; }
+.emoji-1F3B5 { background-position: -400px -420px; }
+.emoji-1F3B6 { background-position: -420px -420px; }
+.emoji-1F3B7 { background-position: -440px 0; }
+.emoji-1F3B8 { background-position: -440px -20px; }
+.emoji-1F3B9 { background-position: -440px -40px; }
+.emoji-1F3BA { background-position: -440px -60px; }
+.emoji-1F3BB { background-position: -440px -80px; }
+.emoji-1F3BC { background-position: -440px -100px; }
+.emoji-1F3BD { background-position: -440px -120px; }
+.emoji-1F3BE { background-position: -440px -140px; }
+.emoji-1F3BF { background-position: -440px -160px; }
+.emoji-1F3C0 { background-position: -440px -180px; }
+.emoji-1F3C1 { background-position: -440px -200px; }
+.emoji-1F3C2 { background-position: -440px -220px; }
+.emoji-1F3C3 { background-position: -440px -240px; }
+.emoji-1F3C3-1F3FB { background-position: -440px -260px; }
+.emoji-1F3C3-1F3FC { background-position: -440px -280px; }
+.emoji-1F3C3-1F3FD { background-position: -440px -300px; }
+.emoji-1F3C3-1F3FE { background-position: -440px -320px; }
+.emoji-1F3C3-1F3FF { background-position: -440px -340px; }
+.emoji-1F3C4 { background-position: -440px -360px; }
+.emoji-1F3C4-1F3FB { background-position: -440px -380px; }
+.emoji-1F3C4-1F3FC { background-position: -440px -400px; }
+.emoji-1F3C4-1F3FD { background-position: -440px -420px; }
+.emoji-1F3C4-1F3FE { background-position: 0 -440px; }
+.emoji-1F3C4-1F3FF { background-position: -20px -440px; }
+.emoji-1F3C5 { background-position: -40px -440px; }
+.emoji-1F3C6 { background-position: -60px -440px; }
+.emoji-1F3C7 { background-position: -80px -440px; }
+.emoji-1F3C7-1F3FB { background-position: -100px -440px; }
+.emoji-1F3C7-1F3FC { background-position: -120px -440px; }
+.emoji-1F3C7-1F3FD { background-position: -140px -440px; }
+.emoji-1F3C7-1F3FE { background-position: -160px -440px; }
+.emoji-1F3C7-1F3FF { background-position: -180px -440px; }
+.emoji-1F3C8 { background-position: -200px -440px; }
+.emoji-1F3C9 { background-position: -220px -440px; }
+.emoji-1F3CA { background-position: -240px -440px; }
+.emoji-1F3CA-1F3FB { background-position: -260px -440px; }
+.emoji-1F3CA-1F3FC { background-position: -280px -440px; }
+.emoji-1F3CA-1F3FD { background-position: -300px -440px; }
+.emoji-1F3CA-1F3FE { background-position: -320px -440px; }
+.emoji-1F3CA-1F3FF { background-position: -340px -440px; }
+.emoji-1F3CB { background-position: -360px -440px; }
+.emoji-1F3CB-1F3FB { background-position: -380px -440px; }
+.emoji-1F3CB-1F3FC { background-position: -400px -440px; }
+.emoji-1F3CB-1F3FD { background-position: -420px -440px; }
+.emoji-1F3CB-1F3FE { background-position: -440px -440px; }
+.emoji-1F3CB-1F3FF { background-position: -460px 0; }
+.emoji-1F3CC { background-position: -460px -20px; }
+.emoji-1F3CD { background-position: -460px -40px; }
+.emoji-1F3CE { background-position: -460px -60px; }
+.emoji-1F3CF { background-position: -460px -80px; }
+.emoji-1F3D0 { background-position: -460px -100px; }
+.emoji-1F3D1 { background-position: -460px -120px; }
+.emoji-1F3D2 { background-position: -460px -140px; }
+.emoji-1F3D3 { background-position: -460px -160px; }
+.emoji-1F3D4 { background-position: -460px -180px; }
+.emoji-1F3D5 { background-position: -460px -200px; }
+.emoji-1F3D6 { background-position: -460px -220px; }
+.emoji-1F3D7 { background-position: -460px -240px; }
+.emoji-1F3D8 { background-position: -460px -260px; }
+.emoji-1F3D9 { background-position: -460px -280px; }
+.emoji-1F3DA { background-position: -460px -300px; }
+.emoji-1F3DB { background-position: -460px -320px; }
+.emoji-1F3DC { background-position: -460px -340px; }
+.emoji-1F3DD { background-position: -460px -360px; }
+.emoji-1F3DE { background-position: -460px -380px; }
+.emoji-1F3DF { background-position: -460px -400px; }
+.emoji-1F3E0 { background-position: -460px -420px; }
+.emoji-1F3E1 { background-position: -460px -440px; }
+.emoji-1F3E2 { background-position: 0 -460px; }
+.emoji-1F3E3 { background-position: -20px -460px; }
+.emoji-1F3E4 { background-position: -40px -460px; }
+.emoji-1F3E5 { background-position: -60px -460px; }
+.emoji-1F3E6 { background-position: -80px -460px; }
+.emoji-1F3E7 { background-position: -100px -460px; }
+.emoji-1F3E8 { background-position: -120px -460px; }
+.emoji-1F3E9 { background-position: -140px -460px; }
+.emoji-1F3EA { background-position: -160px -460px; }
+.emoji-1F3EB { background-position: -180px -460px; }
+.emoji-1F3EC { background-position: -200px -460px; }
+.emoji-1F3ED { background-position: -220px -460px; }
+.emoji-1F3EE { background-position: -240px -460px; }
+.emoji-1F3EF { background-position: -260px -460px; }
+.emoji-1F3F0 { background-position: -280px -460px; }
+.emoji-1F3F3 { background-position: -300px -460px; }
+.emoji-1F3F4 { background-position: -320px -460px; }
+.emoji-1F3F5 { background-position: -340px -460px; }
+.emoji-1F3F7 { background-position: -360px -460px; }
+.emoji-1F3F8 { background-position: -380px -460px; }
+.emoji-1F3F9 { background-position: -400px -460px; }
+.emoji-1F3FA { background-position: -420px -460px; }
+.emoji-1F3FB { background-position: -440px -460px; }
+.emoji-1F3FC { background-position: -460px -460px; }
+.emoji-1F3FD { background-position: -480px 0; }
+.emoji-1F3FE { background-position: -480px -20px; }
+.emoji-1F3FF { background-position: -480px -40px; }
+.emoji-1F400 { background-position: -480px -60px; }
+.emoji-1F401 { background-position: -480px -80px; }
+.emoji-1F402 { background-position: -480px -100px; }
+.emoji-1F403 { background-position: -480px -120px; }
+.emoji-1F404 { background-position: -480px -140px; }
+.emoji-1F405 { background-position: -480px -160px; }
+.emoji-1F406 { background-position: -480px -180px; }
+.emoji-1F407 { background-position: -480px -200px; }
+.emoji-1F408 { background-position: -480px -220px; }
+.emoji-1F409 { background-position: -480px -240px; }
+.emoji-1F40A { background-position: -480px -260px; }
+.emoji-1F40B { background-position: -480px -280px; }
+.emoji-1F40C { background-position: -480px -300px; }
+.emoji-1F40D { background-position: -480px -320px; }
+.emoji-1F40E { background-position: -480px -340px; }
+.emoji-1F40F { background-position: -480px -360px; }
+.emoji-1F410 { background-position: -480px -380px; }
+.emoji-1F411 { background-position: -480px -400px; }
+.emoji-1F412 { background-position: -480px -420px; }
+.emoji-1F413 { background-position: -480px -440px; }
+.emoji-1F414 { background-position: -480px -460px; }
+.emoji-1F415 { background-position: 0 -480px; }
+.emoji-1F416 { background-position: -20px -480px; }
+.emoji-1F417 { background-position: -40px -480px; }
+.emoji-1F418 { background-position: -60px -480px; }
+.emoji-1F419 { background-position: -80px -480px; }
+.emoji-1F41A { background-position: -100px -480px; }
+.emoji-1F41B { background-position: -120px -480px; }
+.emoji-1F41C { background-position: -140px -480px; }
+.emoji-1F41D { background-position: -160px -480px; }
+.emoji-1F41E { background-position: -180px -480px; }
+.emoji-1F41F { background-position: -200px -480px; }
+.emoji-1F420 { background-position: -220px -480px; }
+.emoji-1F421 { background-position: -240px -480px; }
+.emoji-1F422 { background-position: -260px -480px; }
+.emoji-1F423 { background-position: -280px -480px; }
+.emoji-1F424 { background-position: -300px -480px; }
+.emoji-1F425 { background-position: -320px -480px; }
+.emoji-1F426 { background-position: -340px -480px; }
+.emoji-1F427 { background-position: -360px -480px; }
+.emoji-1F428 { background-position: -380px -480px; }
+.emoji-1F429 { background-position: -400px -480px; }
+.emoji-1F42A { background-position: -420px -480px; }
+.emoji-1F42B { background-position: -440px -480px; }
+.emoji-1F42C { background-position: -460px -480px; }
+.emoji-1F42D { background-position: -480px -480px; }
+.emoji-1F42E { background-position: -500px 0; }
+.emoji-1F42F { background-position: -500px -20px; }
+.emoji-1F430 { background-position: -500px -40px; }
+.emoji-1F431 { background-position: -500px -60px; }
+.emoji-1F432 { background-position: -500px -80px; }
+.emoji-1F433 { background-position: -500px -100px; }
+.emoji-1F434 { background-position: -500px -120px; }
+.emoji-1F435 { background-position: -500px -140px; }
+.emoji-1F436 { background-position: -500px -160px; }
+.emoji-1F437 { background-position: -500px -180px; }
+.emoji-1F438 { background-position: -500px -200px; }
+.emoji-1F439 { background-position: -500px -220px; }
+.emoji-1F43A { background-position: -500px -240px; }
+.emoji-1F43B { background-position: -500px -260px; }
+.emoji-1F43C { background-position: -500px -280px; }
+.emoji-1F43D { background-position: -500px -300px; }
+.emoji-1F43E { background-position: -500px -320px; }
+.emoji-1F43F { background-position: -500px -340px; }
+.emoji-1F440 { background-position: -500px -360px; }
+.emoji-1F441 { background-position: -500px -380px; }
+.emoji-1F441-1F5E8 { background-position: -500px -400px; }
+.emoji-1F442 { background-position: -500px -420px; }
+.emoji-1F442-1F3FB { background-position: -500px -440px; }
+.emoji-1F442-1F3FC { background-position: -500px -460px; }
+.emoji-1F442-1F3FD { background-position: -500px -480px; }
+.emoji-1F442-1F3FE { background-position: 0 -500px; }
+.emoji-1F442-1F3FF { background-position: -20px -500px; }
+.emoji-1F443 { background-position: -40px -500px; }
+.emoji-1F443-1F3FB { background-position: -60px -500px; }
+.emoji-1F443-1F3FC { background-position: -80px -500px; }
+.emoji-1F443-1F3FD { background-position: -100px -500px; }
+.emoji-1F443-1F3FE { background-position: -120px -500px; }
+.emoji-1F443-1F3FF { background-position: -140px -500px; }
+.emoji-1F444 { background-position: -160px -500px; }
+.emoji-1F445 { background-position: -180px -500px; }
+.emoji-1F446 { background-position: -200px -500px; }
+.emoji-1F446-1F3FB { background-position: -220px -500px; }
+.emoji-1F446-1F3FC { background-position: -240px -500px; }
+.emoji-1F446-1F3FD { background-position: -260px -500px; }
+.emoji-1F446-1F3FE { background-position: -280px -500px; }
+.emoji-1F446-1F3FF { background-position: -300px -500px; }
+.emoji-1F447 { background-position: -320px -500px; }
+.emoji-1F447-1F3FB { background-position: -340px -500px; }
+.emoji-1F447-1F3FC { background-position: -360px -500px; }
+.emoji-1F447-1F3FD { background-position: -380px -500px; }
+.emoji-1F447-1F3FE { background-position: -400px -500px; }
+.emoji-1F447-1F3FF { background-position: -420px -500px; }
+.emoji-1F448 { background-position: -440px -500px; }
+.emoji-1F448-1F3FB { background-position: -460px -500px; }
+.emoji-1F448-1F3FC { background-position: -480px -500px; }
+.emoji-1F448-1F3FD { background-position: -500px -500px; }
+.emoji-1F448-1F3FE { background-position: -520px 0; }
+.emoji-1F448-1F3FF { background-position: -520px -20px; }
+.emoji-1F449 { background-position: -520px -40px; }
+.emoji-1F449-1F3FB { background-position: -520px -60px; }
+.emoji-1F449-1F3FC { background-position: -520px -80px; }
+.emoji-1F449-1F3FD { background-position: -520px -100px; }
+.emoji-1F449-1F3FE { background-position: -520px -120px; }
+.emoji-1F449-1F3FF { background-position: -520px -140px; }
+.emoji-1F44A { background-position: -520px -160px; }
+.emoji-1F44A-1F3FB { background-position: -520px -180px; }
+.emoji-1F44A-1F3FC { background-position: -520px -200px; }
+.emoji-1F44A-1F3FD { background-position: -520px -220px; }
+.emoji-1F44A-1F3FE { background-position: -520px -240px; }
+.emoji-1F44A-1F3FF { background-position: -520px -260px; }
+.emoji-1F44B { background-position: -520px -280px; }
+.emoji-1F44B-1F3FB { background-position: -520px -300px; }
+.emoji-1F44B-1F3FC { background-position: -520px -320px; }
+.emoji-1F44B-1F3FD { background-position: -520px -340px; }
+.emoji-1F44B-1F3FE { background-position: -520px -360px; }
+.emoji-1F44B-1F3FF { background-position: -520px -380px; }
+.emoji-1F44C { background-position: -520px -400px; }
+.emoji-1F44C-1F3FB { background-position: -520px -420px; }
+.emoji-1F44C-1F3FC { background-position: -520px -440px; }
+.emoji-1F44C-1F3FD { background-position: -520px -460px; }
+.emoji-1F44C-1F3FE { background-position: -520px -480px; }
+.emoji-1F44C-1F3FF { background-position: -520px -500px; }
+.emoji-1F44D { background-position: 0 -520px; }
+.emoji-1F44D-1F3FB { background-position: -20px -520px; }
+.emoji-1F44D-1F3FC { background-position: -40px -520px; }
+.emoji-1F44D-1F3FD { background-position: -60px -520px; }
+.emoji-1F44D-1F3FE { background-position: -80px -520px; }
+.emoji-1F44D-1F3FF { background-position: -100px -520px; }
+.emoji-1F44E { background-position: -120px -520px; }
+.emoji-1F44E-1F3FB { background-position: -140px -520px; }
+.emoji-1F44E-1F3FC { background-position: -160px -520px; }
+.emoji-1F44E-1F3FD { background-position: -180px -520px; }
+.emoji-1F44E-1F3FE { background-position: -200px -520px; }
+.emoji-1F44E-1F3FF { background-position: -220px -520px; }
+.emoji-1F44F { background-position: -240px -520px; }
+.emoji-1F44F-1F3FB { background-position: -260px -520px; }
+.emoji-1F44F-1F3FC { background-position: -280px -520px; }
+.emoji-1F44F-1F3FD { background-position: -300px -520px; }
+.emoji-1F44F-1F3FE { background-position: -320px -520px; }
+.emoji-1F44F-1F3FF { background-position: -340px -520px; }
+.emoji-1F450 { background-position: -360px -520px; }
+.emoji-1F450-1F3FB { background-position: -380px -520px; }
+.emoji-1F450-1F3FC { background-position: -400px -520px; }
+.emoji-1F450-1F3FD { background-position: -420px -520px; }
+.emoji-1F450-1F3FE { background-position: -440px -520px; }
+.emoji-1F450-1F3FF { background-position: -460px -520px; }
+.emoji-1F451 { background-position: -480px -520px; }
+.emoji-1F452 { background-position: -500px -520px; }
+.emoji-1F453 { background-position: -520px -520px; }
+.emoji-1F454 { background-position: -540px 0; }
+.emoji-1F455 { background-position: -540px -20px; }
+.emoji-1F456 { background-position: -540px -40px; }
+.emoji-1F457 { background-position: -540px -60px; }
+.emoji-1F458 { background-position: -540px -80px; }
+.emoji-1F459 { background-position: -540px -100px; }
+.emoji-1F45A { background-position: -540px -120px; }
+.emoji-1F45B { background-position: -540px -140px; }
+.emoji-1F45C { background-position: -540px -160px; }
+.emoji-1F45D { background-position: -540px -180px; }
+.emoji-1F45E { background-position: -540px -200px; }
+.emoji-1F45F { background-position: -540px -220px; }
+.emoji-1F460 { background-position: -540px -240px; }
+.emoji-1F461 { background-position: -540px -260px; }
+.emoji-1F462 { background-position: -540px -280px; }
+.emoji-1F463 { background-position: -540px -300px; }
+.emoji-1F464 { background-position: -540px -320px; }
+.emoji-1F465 { background-position: -540px -340px; }
+.emoji-1F466 { background-position: -540px -360px; }
+.emoji-1F466-1F3FB { background-position: -540px -380px; }
+.emoji-1F466-1F3FC { background-position: -540px -400px; }
+.emoji-1F466-1F3FD { background-position: -540px -420px; }
+.emoji-1F466-1F3FE { background-position: -540px -440px; }
+.emoji-1F466-1F3FF { background-position: -540px -460px; }
+.emoji-1F467 { background-position: -540px -480px; }
+.emoji-1F467-1F3FB { background-position: -540px -500px; }
+.emoji-1F467-1F3FC { background-position: -540px -520px; }
+.emoji-1F467-1F3FD { background-position: 0 -540px; }
+.emoji-1F467-1F3FE { background-position: -20px -540px; }
+.emoji-1F467-1F3FF { background-position: -40px -540px; }
+.emoji-1F468 { background-position: -60px -540px; }
+.emoji-1F468-1F3FB { background-position: -80px -540px; }
+.emoji-1F468-1F3FC { background-position: -100px -540px; }
+.emoji-1F468-1F3FD { background-position: -120px -540px; }
+.emoji-1F468-1F3FE { background-position: -140px -540px; }
+.emoji-1F468-1F3FF { background-position: -160px -540px; }
+.emoji-1F468-1F468-1F466 { background-position: -180px -540px; }
+.emoji-1F468-1F468-1F466-1F466 { background-position: -200px -540px; }
+.emoji-1F468-1F468-1F467 { background-position: -220px -540px; }
+.emoji-1F468-1F468-1F467-1F466 { background-position: -240px -540px; }
+.emoji-1F468-1F468-1F467-1F467 { background-position: -260px -540px; }
+.emoji-1F468-1F469-1F466-1F466 { background-position: -280px -540px; }
+.emoji-1F468-1F469-1F467 { background-position: -300px -540px; }
+.emoji-1F468-1F469-1F467-1F466 { background-position: -320px -540px; }
+.emoji-1F468-1F469-1F467-1F467 { background-position: -340px -540px; }
+.emoji-1F468-2764-1F468 { background-position: -360px -540px; }
+.emoji-1F468-2764-1F48B-1F468 { background-position: -380px -540px; }
+.emoji-1F469 { background-position: -400px -540px; }
+.emoji-1F469-1F3FB { background-position: -420px -540px; }
+.emoji-1F469-1F3FC { background-position: -440px -540px; }
+.emoji-1F469-1F3FD { background-position: -460px -540px; }
+.emoji-1F469-1F3FE { background-position: -480px -540px; }
+.emoji-1F469-1F3FF { background-position: -500px -540px; }
+.emoji-1F469-1F469-1F466 { background-position: -520px -540px; }
+.emoji-1F469-1F469-1F466-1F466 { background-position: -540px -540px; }
+.emoji-1F469-1F469-1F467 { background-position: -560px 0; }
+.emoji-1F469-1F469-1F467-1F466 { background-position: -560px -20px; }
+.emoji-1F469-1F469-1F467-1F467 { background-position: -560px -40px; }
+.emoji-1F469-2764-1F469 { background-position: -560px -60px; }
+.emoji-1F469-2764-1F48B-1F469 { background-position: -560px -80px; }
+.emoji-1F46A { background-position: -560px -100px; }
+.emoji-1F46B { background-position: -560px -120px; }
+.emoji-1F46C { background-position: -560px -140px; }
+.emoji-1F46D { background-position: -560px -160px; }
+.emoji-1F46E { background-position: -560px -180px; }
+.emoji-1F46E-1F3FB { background-position: -560px -200px; }
+.emoji-1F46E-1F3FC { background-position: -560px -220px; }
+.emoji-1F46E-1F3FD { background-position: -560px -240px; }
+.emoji-1F46E-1F3FE { background-position: -560px -260px; }
+.emoji-1F46E-1F3FF { background-position: -560px -280px; }
+.emoji-1F46F { background-position: -560px -300px; }
+.emoji-1F470 { background-position: -560px -320px; }
+.emoji-1F470-1F3FB { background-position: -560px -340px; }
+.emoji-1F470-1F3FC { background-position: -560px -360px; }
+.emoji-1F470-1F3FD { background-position: -560px -380px; }
+.emoji-1F470-1F3FE { background-position: -560px -400px; }
+.emoji-1F470-1F3FF { background-position: -560px -420px; }
+.emoji-1F471 { background-position: -560px -440px; }
+.emoji-1F471-1F3FB { background-position: -560px -460px; }
+.emoji-1F471-1F3FC { background-position: -560px -480px; }
+.emoji-1F471-1F3FD { background-position: -560px -500px; }
+.emoji-1F471-1F3FE { background-position: -560px -520px; }
+.emoji-1F471-1F3FF { background-position: -560px -540px; }
+.emoji-1F472 { background-position: 0 -560px; }
+.emoji-1F472-1F3FB { background-position: -20px -560px; }
+.emoji-1F472-1F3FC { background-position: -40px -560px; }
+.emoji-1F472-1F3FD { background-position: -60px -560px; }
+.emoji-1F472-1F3FE { background-position: -80px -560px; }
+.emoji-1F472-1F3FF { background-position: -100px -560px; }
+.emoji-1F473 { background-position: -120px -560px; }
+.emoji-1F473-1F3FB { background-position: -140px -560px; }
+.emoji-1F473-1F3FC { background-position: -160px -560px; }
+.emoji-1F473-1F3FD { background-position: -180px -560px; }
+.emoji-1F473-1F3FE { background-position: -200px -560px; }
+.emoji-1F473-1F3FF { background-position: -220px -560px; }
+.emoji-1F474 { background-position: -240px -560px; }
+.emoji-1F474-1F3FB { background-position: -260px -560px; }
+.emoji-1F474-1F3FC { background-position: -280px -560px; }
+.emoji-1F474-1F3FD { background-position: -300px -560px; }
+.emoji-1F474-1F3FE { background-position: -320px -560px; }
+.emoji-1F474-1F3FF { background-position: -340px -560px; }
+.emoji-1F475 { background-position: -360px -560px; }
+.emoji-1F475-1F3FB { background-position: -380px -560px; }
+.emoji-1F475-1F3FC { background-position: -400px -560px; }
+.emoji-1F475-1F3FD { background-position: -420px -560px; }
+.emoji-1F475-1F3FE { background-position: -440px -560px; }
+.emoji-1F475-1F3FF { background-position: -460px -560px; }
+.emoji-1F476 { background-position: -480px -560px; }
+.emoji-1F476-1F3FB { background-position: -500px -560px; }
+.emoji-1F476-1F3FC { background-position: -520px -560px; }
+.emoji-1F476-1F3FD { background-position: -540px -560px; }
+.emoji-1F476-1F3FE { background-position: -560px -560px; }
+.emoji-1F476-1F3FF { background-position: -580px 0; }
+.emoji-1F477 { background-position: -580px -20px; }
+.emoji-1F477-1F3FB { background-position: -580px -40px; }
+.emoji-1F477-1F3FC { background-position: -580px -60px; }
+.emoji-1F477-1F3FD { background-position: -580px -80px; }
+.emoji-1F477-1F3FE { background-position: -580px -100px; }
+.emoji-1F477-1F3FF { background-position: -580px -120px; }
+.emoji-1F478 { background-position: -580px -140px; }
+.emoji-1F478-1F3FB { background-position: -580px -160px; }
+.emoji-1F478-1F3FC { background-position: -580px -180px; }
+.emoji-1F478-1F3FD { background-position: -580px -200px; }
+.emoji-1F478-1F3FE { background-position: -580px -220px; }
+.emoji-1F478-1F3FF { background-position: -580px -240px; }
+.emoji-1F479 { background-position: -580px -260px; }
+.emoji-1F47A { background-position: -580px -280px; }
+.emoji-1F47B { background-position: -580px -300px; }
+.emoji-1F47C { background-position: -580px -320px; }
+.emoji-1F47C-1F3FB { background-position: -580px -340px; }
+.emoji-1F47C-1F3FC { background-position: -580px -360px; }
+.emoji-1F47C-1F3FD { background-position: -580px -380px; }
+.emoji-1F47C-1F3FE { background-position: -580px -400px; }
+.emoji-1F47C-1F3FF { background-position: -580px -420px; }
+.emoji-1F47D { background-position: -580px -440px; }
+.emoji-1F47E { background-position: -580px -460px; }
+.emoji-1F47F { background-position: -580px -480px; }
+.emoji-1F480 { background-position: -580px -500px; }
+.emoji-1F481 { background-position: -580px -520px; }
+.emoji-1F481-1F3FB { background-position: -580px -540px; }
+.emoji-1F481-1F3FC { background-position: -580px -560px; }
+.emoji-1F481-1F3FD { background-position: 0 -580px; }
+.emoji-1F481-1F3FE { background-position: -20px -580px; }
+.emoji-1F481-1F3FF { background-position: -40px -580px; }
+.emoji-1F482 { background-position: -60px -580px; }
+.emoji-1F482-1F3FB { background-position: -80px -580px; }
+.emoji-1F482-1F3FC { background-position: -100px -580px; }
+.emoji-1F482-1F3FD { background-position: -120px -580px; }
+.emoji-1F482-1F3FE { background-position: -140px -580px; }
+.emoji-1F482-1F3FF { background-position: -160px -580px; }
+.emoji-1F483 { background-position: -180px -580px; }
+.emoji-1F483-1F3FB { background-position: -200px -580px; }
+.emoji-1F483-1F3FC { background-position: -220px -580px; }
+.emoji-1F483-1F3FD { background-position: -240px -580px; }
+.emoji-1F483-1F3FE { background-position: -260px -580px; }
+.emoji-1F483-1F3FF { background-position: -280px -580px; }
+.emoji-1F484 { background-position: -300px -580px; }
+.emoji-1F485 { background-position: -320px -580px; }
+.emoji-1F485-1F3FB { background-position: -340px -580px; }
+.emoji-1F485-1F3FC { background-position: -360px -580px; }
+.emoji-1F485-1F3FD { background-position: -380px -580px; }
+.emoji-1F485-1F3FE { background-position: -400px -580px; }
+.emoji-1F485-1F3FF { background-position: -420px -580px; }
+.emoji-1F486 { background-position: -440px -580px; }
+.emoji-1F486-1F3FB { background-position: -460px -580px; }
+.emoji-1F486-1F3FC { background-position: -480px -580px; }
+.emoji-1F486-1F3FD { background-position: -500px -580px; }
+.emoji-1F486-1F3FE { background-position: -520px -580px; }
+.emoji-1F486-1F3FF { background-position: -540px -580px; }
+.emoji-1F487 { background-position: -560px -580px; }
+.emoji-1F487-1F3FB { background-position: -580px -580px; }
+.emoji-1F487-1F3FC { background-position: -600px 0; }
+.emoji-1F487-1F3FD { background-position: -600px -20px; }
+.emoji-1F487-1F3FE { background-position: -600px -40px; }
+.emoji-1F487-1F3FF { background-position: -600px -60px; }
+.emoji-1F488 { background-position: -600px -80px; }
+.emoji-1F489 { background-position: -600px -100px; }
+.emoji-1F48A { background-position: -600px -120px; }
+.emoji-1F48B { background-position: -600px -140px; }
+.emoji-1F48C { background-position: -600px -160px; }
+.emoji-1F48D { background-position: -600px -180px; }
+.emoji-1F48E { background-position: -600px -200px; }
+.emoji-1F48F { background-position: -600px -220px; }
+.emoji-1F490 { background-position: -600px -240px; }
+.emoji-1F491 { background-position: -600px -260px; }
+.emoji-1F492 { background-position: -600px -280px; }
+.emoji-1F493 { background-position: -600px -300px; }
+.emoji-1F494 { background-position: -600px -320px; }
+.emoji-1F495 { background-position: -600px -340px; }
+.emoji-1F496 { background-position: -600px -360px; }
+.emoji-1F497 { background-position: -600px -380px; }
+.emoji-1F498 { background-position: -600px -400px; }
+.emoji-1F499 { background-position: -600px -420px; }
+.emoji-1F49A { background-position: -600px -440px; }
+.emoji-1F49B { background-position: -600px -460px; }
+.emoji-1F49C { background-position: -600px -480px; }
+.emoji-1F49D { background-position: -600px -500px; }
+.emoji-1F49E { background-position: -600px -520px; }
+.emoji-1F49F { background-position: -600px -540px; }
+.emoji-1F4A0 { background-position: -600px -560px; }
+.emoji-1F4A1 { background-position: -600px -580px; }
+.emoji-1F4A2 { background-position: 0 -600px; }
+.emoji-1F4A3 { background-position: -20px -600px; }
+.emoji-1F4A4 { background-position: -40px -600px; }
+.emoji-1F4A5 { background-position: -60px -600px; }
+.emoji-1F4A6 { background-position: -80px -600px; }
+.emoji-1F4A7 { background-position: -100px -600px; }
+.emoji-1F4A8 { background-position: -120px -600px; }
+.emoji-1F4A9 { background-position: -140px -600px; }
+.emoji-1F4AA { background-position: -160px -600px; }
+.emoji-1F4AA-1F3FB { background-position: -180px -600px; }
+.emoji-1F4AA-1F3FC { background-position: -200px -600px; }
+.emoji-1F4AA-1F3FD { background-position: -220px -600px; }
+.emoji-1F4AA-1F3FE { background-position: -240px -600px; }
+.emoji-1F4AA-1F3FF { background-position: -260px -600px; }
+.emoji-1F4AB { background-position: -280px -600px; }
+.emoji-1F4AC { background-position: -300px -600px; }
+.emoji-1F4AD { background-position: -320px -600px; }
+.emoji-1F4AE { background-position: -340px -600px; }
+.emoji-1F4AF { background-position: -360px -600px; }
+.emoji-1F4B0 { background-position: -380px -600px; }
+.emoji-1F4B1 { background-position: -400px -600px; }
+.emoji-1F4B2 { background-position: -420px -600px; }
+.emoji-1F4B3 { background-position: -440px -600px; }
+.emoji-1F4B4 { background-position: -460px -600px; }
+.emoji-1F4B5 { background-position: -480px -600px; }
+.emoji-1F4B6 { background-position: -500px -600px; }
+.emoji-1F4B7 { background-position: -520px -600px; }
+.emoji-1F4B8 { background-position: -540px -600px; }
+.emoji-1F4B9 { background-position: -560px -600px; }
+.emoji-1F4BA { background-position: -580px -600px; }
+.emoji-1F4BB { background-position: -600px -600px; }
+.emoji-1F4BC { background-position: -620px 0; }
+.emoji-1F4BD { background-position: -620px -20px; }
+.emoji-1F4BE { background-position: -620px -40px; }
+.emoji-1F4BF { background-position: -620px -60px; }
+.emoji-1F4C0 { background-position: -620px -80px; }
+.emoji-1F4C1 { background-position: -620px -100px; }
+.emoji-1F4C2 { background-position: -620px -120px; }
+.emoji-1F4C3 { background-position: -620px -140px; }
+.emoji-1F4C4 { background-position: -620px -160px; }
+.emoji-1F4C5 { background-position: -620px -180px; }
+.emoji-1F4C6 { background-position: -620px -200px; }
+.emoji-1F4C7 { background-position: -620px -220px; }
+.emoji-1F4C8 { background-position: -620px -240px; }
+.emoji-1F4C9 { background-position: -620px -260px; }
+.emoji-1F4CA { background-position: -620px -280px; }
+.emoji-1F4CB { background-position: -620px -300px; }
+.emoji-1F4CC { background-position: -620px -320px; }
+.emoji-1F4CD { background-position: -620px -340px; }
+.emoji-1F4CE { background-position: -620px -360px; }
+.emoji-1F4CF { background-position: -620px -380px; }
+.emoji-1F4D0 { background-position: -620px -400px; }
+.emoji-1F4D1 { background-position: -620px -420px; }
+.emoji-1F4D2 { background-position: -620px -440px; }
+.emoji-1F4D3 { background-position: -620px -460px; }
+.emoji-1F4D4 { background-position: -620px -480px; }
+.emoji-1F4D5 { background-position: -620px -500px; }
+.emoji-1F4D6 { background-position: -620px -520px; }
+.emoji-1F4D7 { background-position: -620px -540px; }
+.emoji-1F4D8 { background-position: -620px -560px; }
+.emoji-1F4D9 { background-position: -620px -580px; }
+.emoji-1F4DA { background-position: -620px -600px; }
+.emoji-1F4DB { background-position: 0 -620px; }
+.emoji-1F4DC { background-position: -20px -620px; }
+.emoji-1F4DD { background-position: -40px -620px; }
+.emoji-1F4DE { background-position: -60px -620px; }
+.emoji-1F4DF { background-position: -80px -620px; }
+.emoji-1F4E0 { background-position: -100px -620px; }
+.emoji-1F4E1 { background-position: -120px -620px; }
+.emoji-1F4E2 { background-position: -140px -620px; }
+.emoji-1F4E3 { background-position: -160px -620px; }
+.emoji-1F4E4 { background-position: -180px -620px; }
+.emoji-1F4E5 { background-position: -200px -620px; }
+.emoji-1F4E6 { background-position: -220px -620px; }
+.emoji-1F4E7 { background-position: -240px -620px; }
+.emoji-1F4E8 { background-position: -260px -620px; }
+.emoji-1F4E9 { background-position: -280px -620px; }
+.emoji-1F4EA { background-position: -300px -620px; }
+.emoji-1F4EB { background-position: -320px -620px; }
+.emoji-1F4EC { background-position: -340px -620px; }
+.emoji-1F4ED { background-position: -360px -620px; }
+.emoji-1F4EE { background-position: -380px -620px; }
+.emoji-1F4EF { background-position: -400px -620px; }
+.emoji-1F4F0 { background-position: -420px -620px; }
+.emoji-1F4F1 { background-position: -440px -620px; }
+.emoji-1F4F2 { background-position: -460px -620px; }
+.emoji-1F4F3 { background-position: -480px -620px; }
+.emoji-1F4F4 { background-position: -500px -620px; }
+.emoji-1F4F5 { background-position: -520px -620px; }
+.emoji-1F4F6 { background-position: -540px -620px; }
+.emoji-1F4F7 { background-position: -560px -620px; }
+.emoji-1F4F8 { background-position: -580px -620px; }
+.emoji-1F4F9 { background-position: -600px -620px; }
+.emoji-1F4FA { background-position: -620px -620px; }
+.emoji-1F4FB { background-position: -640px 0; }
+.emoji-1F4FC { background-position: -640px -20px; }
+.emoji-1F4FD { background-position: -640px -40px; }
+.emoji-1F4FF { background-position: -640px -60px; }
+.emoji-1F500 { background-position: -640px -80px; }
+.emoji-1F501 { background-position: -640px -100px; }
+.emoji-1F502 { background-position: -640px -120px; }
+.emoji-1F503 { background-position: -640px -140px; }
+.emoji-1F504 { background-position: -640px -160px; }
+.emoji-1F505 { background-position: -640px -180px; }
+.emoji-1F506 { background-position: -640px -200px; }
+.emoji-1F507 { background-position: -640px -220px; }
+.emoji-1F508 { background-position: -640px -240px; }
+.emoji-1F509 { background-position: -640px -260px; }
+.emoji-1F50A { background-position: -640px -280px; }
+.emoji-1F50B { background-position: -640px -300px; }
+.emoji-1F50C { background-position: -640px -320px; }
+.emoji-1F50D { background-position: -640px -340px; }
+.emoji-1F50E { background-position: -640px -360px; }
+.emoji-1F50F { background-position: -640px -380px; }
+.emoji-1F510 { background-position: -640px -400px; }
+.emoji-1F511 { background-position: -640px -420px; }
+.emoji-1F512 { background-position: -640px -440px; }
+.emoji-1F513 { background-position: -640px -460px; }
+.emoji-1F514 { background-position: -640px -480px; }
+.emoji-1F515 { background-position: -640px -500px; }
+.emoji-1F516 { background-position: -640px -520px; }
+.emoji-1F517 { background-position: -640px -540px; }
+.emoji-1F518 { background-position: -640px -560px; }
+.emoji-1F519 { background-position: -640px -580px; }
+.emoji-1F51A { background-position: -640px -600px; }
+.emoji-1F51B { background-position: -640px -620px; }
+.emoji-1F51C { background-position: 0 -640px; }
+.emoji-1F51D { background-position: -20px -640px; }
+.emoji-1F51E { background-position: -40px -640px; }
+.emoji-1F51F { background-position: -60px -640px; }
+.emoji-1F520 { background-position: -80px -640px; }
+.emoji-1F521 { background-position: -100px -640px; }
+.emoji-1F522 { background-position: -120px -640px; }
+.emoji-1F523 { background-position: -140px -640px; }
+.emoji-1F524 { background-position: -160px -640px; }
+.emoji-1F525 { background-position: -180px -640px; }
+.emoji-1F526 { background-position: -200px -640px; }
+.emoji-1F527 { background-position: -220px -640px; }
+.emoji-1F528 { background-position: -240px -640px; }
+.emoji-1F529 { background-position: -260px -640px; }
+.emoji-1F52A { background-position: -280px -640px; }
+.emoji-1F52B { background-position: -300px -640px; }
+.emoji-1F52C { background-position: -320px -640px; }
+.emoji-1F52D { background-position: -340px -640px; }
+.emoji-1F52E { background-position: -360px -640px; }
+.emoji-1F52F { background-position: -380px -640px; }
+.emoji-1F530 { background-position: -400px -640px; }
+.emoji-1F531 { background-position: -420px -640px; }
+.emoji-1F532 { background-position: -440px -640px; }
+.emoji-1F533 { background-position: -460px -640px; }
+.emoji-1F534 { background-position: -480px -640px; }
+.emoji-1F535 { background-position: -500px -640px; }
+.emoji-1F536 { background-position: -520px -640px; }
+.emoji-1F537 { background-position: -540px -640px; }
+.emoji-1F538 { background-position: -560px -640px; }
+.emoji-1F539 { background-position: -580px -640px; }
+.emoji-1F53A { background-position: -600px -640px; }
+.emoji-1F53B { background-position: -620px -640px; }
+.emoji-1F53C { background-position: -640px -640px; }
+.emoji-1F53D { background-position: -660px 0; }
+.emoji-1F549 { background-position: -660px -20px; }
+.emoji-1F54A { background-position: -660px -40px; }
+.emoji-1F54B { background-position: -660px -60px; }
+.emoji-1F54C { background-position: -660px -80px; }
+.emoji-1F54D { background-position: -660px -100px; }
+.emoji-1F54E { background-position: -660px -120px; }
+.emoji-1F550 { background-position: -660px -140px; }
+.emoji-1F551 { background-position: -660px -160px; }
+.emoji-1F552 { background-position: -660px -180px; }
+.emoji-1F553 { background-position: -660px -200px; }
+.emoji-1F554 { background-position: -660px -220px; }
+.emoji-1F555 { background-position: -660px -240px; }
+.emoji-1F556 { background-position: -660px -260px; }
+.emoji-1F557 { background-position: -660px -280px; }
+.emoji-1F558 { background-position: -660px -300px; }
+.emoji-1F559 { background-position: -660px -320px; }
+.emoji-1F55A { background-position: -660px -340px; }
+.emoji-1F55B { background-position: -660px -360px; }
+.emoji-1F55C { background-position: -660px -380px; }
+.emoji-1F55D { background-position: -660px -400px; }
+.emoji-1F55E { background-position: -660px -420px; }
+.emoji-1F55F { background-position: -660px -440px; }
+.emoji-1F560 { background-position: -660px -460px; }
+.emoji-1F561 { background-position: -660px -480px; }
+.emoji-1F562 { background-position: -660px -500px; }
+.emoji-1F563 { background-position: -660px -520px; }
+.emoji-1F564 { background-position: -660px -540px; }
+.emoji-1F565 { background-position: -660px -560px; }
+.emoji-1F566 { background-position: -660px -580px; }
+.emoji-1F567 { background-position: -660px -600px; }
+.emoji-1F56F { background-position: -660px -620px; }
+.emoji-1F570 { background-position: -660px -640px; }
+.emoji-1F573 { background-position: 0 -660px; }
+.emoji-1F574 { background-position: -20px -660px; }
+.emoji-1F575 { background-position: -40px -660px; }
+.emoji-1F575-1F3FB { background-position: -60px -660px; }
+.emoji-1F575-1F3FC { background-position: -80px -660px; }
+.emoji-1F575-1F3FD { background-position: -100px -660px; }
+.emoji-1F575-1F3FE { background-position: -120px -660px; }
+.emoji-1F575-1F3FF { background-position: -140px -660px; }
+.emoji-1F576 { background-position: -160px -660px; }
+.emoji-1F577 { background-position: -180px -660px; }
+.emoji-1F578 { background-position: -200px -660px; }
+.emoji-1F579 { background-position: -220px -660px; }
+.emoji-1F57A { background-position: -240px -660px; }
+.emoji-1F57A-1F3FB { background-position: -260px -660px; }
+.emoji-1F57A-1F3FC { background-position: -280px -660px; }
+.emoji-1F57A-1F3FD { background-position: -300px -660px; }
+.emoji-1F57A-1F3FE { background-position: -320px -660px; }
+.emoji-1F57A-1F3FF { background-position: -340px -660px; }
+.emoji-1F587 { background-position: -360px -660px; }
+.emoji-1F58A { background-position: -380px -660px; }
+.emoji-1F58B { background-position: -400px -660px; }
+.emoji-1F58C { background-position: -420px -660px; }
+.emoji-1F58D { background-position: -440px -660px; }
+.emoji-1F590 { background-position: -460px -660px; }
+.emoji-1F590-1F3FB { background-position: -480px -660px; }
+.emoji-1F590-1F3FC { background-position: -500px -660px; }
+.emoji-1F590-1F3FD { background-position: -520px -660px; }
+.emoji-1F590-1F3FE { background-position: -540px -660px; }
+.emoji-1F590-1F3FF { background-position: -560px -660px; }
+.emoji-1F595 { background-position: -580px -660px; }
+.emoji-1F595-1F3FB { background-position: -600px -660px; }
+.emoji-1F595-1F3FC { background-position: -620px -660px; }
+.emoji-1F595-1F3FD { background-position: -640px -660px; }
+.emoji-1F595-1F3FE { background-position: -660px -660px; }
+.emoji-1F595-1F3FF { background-position: -680px 0; }
+.emoji-1F596 { background-position: -680px -20px; }
+.emoji-1F596-1F3FB { background-position: -680px -40px; }
+.emoji-1F596-1F3FC { background-position: -680px -60px; }
+.emoji-1F596-1F3FD { background-position: -680px -80px; }
+.emoji-1F596-1F3FE { background-position: -680px -100px; }
+.emoji-1F596-1F3FF { background-position: -680px -120px; }
+.emoji-1F5A4 { background-position: -680px -140px; }
+.emoji-1F5A5 { background-position: -680px -160px; }
+.emoji-1F5A8 { background-position: -680px -180px; }
+.emoji-1F5B1 { background-position: -680px -200px; }
+.emoji-1F5B2 { background-position: -680px -220px; }
+.emoji-1F5BC { background-position: -680px -240px; }
+.emoji-1F5C2 { background-position: -680px -260px; }
+.emoji-1F5C3 { background-position: -680px -280px; }
+.emoji-1F5C4 { background-position: -680px -300px; }
+.emoji-1F5D1 { background-position: -680px -320px; }
+.emoji-1F5D2 { background-position: -680px -340px; }
+.emoji-1F5D3 { background-position: -680px -360px; }
+.emoji-1F5DC { background-position: -680px -380px; }
+.emoji-1F5DD { background-position: -680px -400px; }
+.emoji-1F5DE { background-position: -680px -420px; }
+.emoji-1F5E1 { background-position: -680px -440px; }
+.emoji-1F5E3 { background-position: -680px -460px; }
+.emoji-1F5EF { background-position: -680px -480px; }
+.emoji-1F5F3 { background-position: -680px -500px; }
+.emoji-1F5FA { background-position: -680px -520px; }
+.emoji-1F5FB { background-position: -680px -540px; }
+.emoji-1F5FC { background-position: -680px -560px; }
+.emoji-1F5FD { background-position: -680px -580px; }
+.emoji-1F5FE { background-position: -680px -600px; }
+.emoji-1F5FF { background-position: -680px -620px; }
+.emoji-1F600 { background-position: -680px -640px; }
+.emoji-1F601 { background-position: -680px -660px; }
+.emoji-1F602 { background-position: 0 -680px; }
+.emoji-1F603 { background-position: -20px -680px; }
+.emoji-1F604 { background-position: -40px -680px; }
+.emoji-1F605 { background-position: -60px -680px; }
+.emoji-1F606 { background-position: -80px -680px; }
+.emoji-1F607 { background-position: -100px -680px; }
+.emoji-1F608 { background-position: -120px -680px; }
+.emoji-1F609 { background-position: -140px -680px; }
+.emoji-1F60A { background-position: -160px -680px; }
+.emoji-1F60B { background-position: -180px -680px; }
+.emoji-1F60C { background-position: -200px -680px; }
+.emoji-1F60D { background-position: -220px -680px; }
+.emoji-1F60E { background-position: -240px -680px; }
+.emoji-1F60F { background-position: -260px -680px; }
+.emoji-1F610 { background-position: -280px -680px; }
+.emoji-1F611 { background-position: -300px -680px; }
+.emoji-1F612 { background-position: -320px -680px; }
+.emoji-1F613 { background-position: -340px -680px; }
+.emoji-1F614 { background-position: -360px -680px; }
+.emoji-1F615 { background-position: -380px -680px; }
+.emoji-1F616 { background-position: -400px -680px; }
+.emoji-1F617 { background-position: -420px -680px; }
+.emoji-1F618 { background-position: -440px -680px; }
+.emoji-1F619 { background-position: -460px -680px; }
+.emoji-1F61A { background-position: -480px -680px; }
+.emoji-1F61B { background-position: -500px -680px; }
+.emoji-1F61C { background-position: -520px -680px; }
+.emoji-1F61D { background-position: -540px -680px; }
+.emoji-1F61E { background-position: -560px -680px; }
+.emoji-1F61F { background-position: -580px -680px; }
+.emoji-1F620 { background-position: -600px -680px; }
+.emoji-1F621 { background-position: -620px -680px; }
+.emoji-1F622 { background-position: -640px -680px; }
+.emoji-1F623 { background-position: -660px -680px; }
+.emoji-1F624 { background-position: -680px -680px; }
+.emoji-1F625 { background-position: -700px 0; }
+.emoji-1F626 { background-position: -700px -20px; }
+.emoji-1F627 { background-position: -700px -40px; }
+.emoji-1F628 { background-position: -700px -60px; }
+.emoji-1F629 { background-position: -700px -80px; }
+.emoji-1F62A { background-position: -700px -100px; }
+.emoji-1F62B { background-position: -700px -120px; }
+.emoji-1F62C { background-position: -700px -140px; }
+.emoji-1F62D { background-position: -700px -160px; }
+.emoji-1F62E { background-position: -700px -180px; }
+.emoji-1F62F { background-position: -700px -200px; }
+.emoji-1F630 { background-position: -700px -220px; }
+.emoji-1F631 { background-position: -700px -240px; }
+.emoji-1F632 { background-position: -700px -260px; }
+.emoji-1F633 { background-position: -700px -280px; }
+.emoji-1F634 { background-position: -700px -300px; }
+.emoji-1F635 { background-position: -700px -320px; }
+.emoji-1F636 { background-position: -700px -340px; }
+.emoji-1F637 { background-position: -700px -360px; }
+.emoji-1F638 { background-position: -700px -380px; }
+.emoji-1F639 { background-position: -700px -400px; }
+.emoji-1F63A { background-position: -700px -420px; }
+.emoji-1F63B { background-position: -700px -440px; }
+.emoji-1F63C { background-position: -700px -460px; }
+.emoji-1F63D { background-position: -700px -480px; }
+.emoji-1F63E { background-position: -700px -500px; }
+.emoji-1F63F { background-position: -700px -520px; }
+.emoji-1F640 { background-position: -700px -540px; }
+.emoji-1F641 { background-position: -700px -560px; }
+.emoji-1F642 { background-position: -700px -580px; }
+.emoji-1F643 { background-position: -700px -600px; }
+.emoji-1F644 { background-position: -700px -620px; }
+.emoji-1F645 { background-position: -700px -640px; }
+.emoji-1F645-1F3FB { background-position: -700px -660px; }
+.emoji-1F645-1F3FC { background-position: -700px -680px; }
+.emoji-1F645-1F3FD { background-position: 0 -700px; }
+.emoji-1F645-1F3FE { background-position: -20px -700px; }
+.emoji-1F645-1F3FF { background-position: -40px -700px; }
+.emoji-1F646 { background-position: -60px -700px; }
+.emoji-1F646-1F3FB { background-position: -80px -700px; }
+.emoji-1F646-1F3FC { background-position: -100px -700px; }
+.emoji-1F646-1F3FD { background-position: -120px -700px; }
+.emoji-1F646-1F3FE { background-position: -140px -700px; }
+.emoji-1F646-1F3FF { background-position: -160px -700px; }
+.emoji-1F647 { background-position: -180px -700px; }
+.emoji-1F647-1F3FB { background-position: -200px -700px; }
+.emoji-1F647-1F3FC { background-position: -220px -700px; }
+.emoji-1F647-1F3FD { background-position: -240px -700px; }
+.emoji-1F647-1F3FE { background-position: -260px -700px; }
+.emoji-1F647-1F3FF { background-position: -280px -700px; }
+.emoji-1F648 { background-position: -300px -700px; }
+.emoji-1F649 { background-position: -320px -700px; }
+.emoji-1F64A { background-position: -340px -700px; }
+.emoji-1F64B { background-position: -360px -700px; }
+.emoji-1F64B-1F3FB { background-position: -380px -700px; }
+.emoji-1F64B-1F3FC { background-position: -400px -700px; }
+.emoji-1F64B-1F3FD { background-position: -420px -700px; }
+.emoji-1F64B-1F3FE { background-position: -440px -700px; }
+.emoji-1F64B-1F3FF { background-position: -460px -700px; }
+.emoji-1F64C { background-position: -480px -700px; }
+.emoji-1F64C-1F3FB { background-position: -500px -700px; }
+.emoji-1F64C-1F3FC { background-position: -520px -700px; }
+.emoji-1F64C-1F3FD { background-position: -540px -700px; }
+.emoji-1F64C-1F3FE { background-position: -560px -700px; }
+.emoji-1F64C-1F3FF { background-position: -580px -700px; }
+.emoji-1F64D { background-position: -600px -700px; }
+.emoji-1F64D-1F3FB { background-position: -620px -700px; }
+.emoji-1F64D-1F3FC { background-position: -640px -700px; }
+.emoji-1F64D-1F3FD { background-position: -660px -700px; }
+.emoji-1F64D-1F3FE { background-position: -680px -700px; }
+.emoji-1F64D-1F3FF { background-position: -700px -700px; }
+.emoji-1F64E { background-position: -720px 0; }
+.emoji-1F64E-1F3FB { background-position: -720px -20px; }
+.emoji-1F64E-1F3FC { background-position: -720px -40px; }
+.emoji-1F64E-1F3FD { background-position: -720px -60px; }
+.emoji-1F64E-1F3FE { background-position: -720px -80px; }
+.emoji-1F64E-1F3FF { background-position: -720px -100px; }
+.emoji-1F64F { background-position: -720px -120px; }
+.emoji-1F64F-1F3FB { background-position: -720px -140px; }
+.emoji-1F64F-1F3FC { background-position: -720px -160px; }
+.emoji-1F64F-1F3FD { background-position: -720px -180px; }
+.emoji-1F64F-1F3FE { background-position: -720px -200px; }
+.emoji-1F64F-1F3FF { background-position: -720px -220px; }
+.emoji-1F680 { background-position: -720px -240px; }
+.emoji-1F681 { background-position: -720px -260px; }
+.emoji-1F682 { background-position: -720px -280px; }
+.emoji-1F683 { background-position: -720px -300px; }
+.emoji-1F684 { background-position: -720px -320px; }
+.emoji-1F685 { background-position: -720px -340px; }
+.emoji-1F686 { background-position: -720px -360px; }
+.emoji-1F687 { background-position: -720px -380px; }
+.emoji-1F688 { background-position: -720px -400px; }
+.emoji-1F689 { background-position: -720px -420px; }
+.emoji-1F68A { background-position: -720px -440px; }
+.emoji-1F68B { background-position: -720px -460px; }
+.emoji-1F68C { background-position: -720px -480px; }
+.emoji-1F68D { background-position: -720px -500px; }
+.emoji-1F68E { background-position: -720px -520px; }
+.emoji-1F68F { background-position: -720px -540px; }
+.emoji-1F690 { background-position: -720px -560px; }
+.emoji-1F691 { background-position: -720px -580px; }
+.emoji-1F692 { background-position: -720px -600px; }
+.emoji-1F693 { background-position: -720px -620px; }
+.emoji-1F694 { background-position: -720px -640px; }
+.emoji-1F695 { background-position: -720px -660px; }
+.emoji-1F696 { background-position: -720px -680px; }
+.emoji-1F697 { background-position: -720px -700px; }
+.emoji-1F698 { background-position: 0 -720px; }
+.emoji-1F699 { background-position: -20px -720px; }
+.emoji-1F69A { background-position: -40px -720px; }
+.emoji-1F69B { background-position: -60px -720px; }
+.emoji-1F69C { background-position: -80px -720px; }
+.emoji-1F69D { background-position: -100px -720px; }
+.emoji-1F69E { background-position: -120px -720px; }
+.emoji-1F69F { background-position: -140px -720px; }
+.emoji-1F6A0 { background-position: -160px -720px; }
+.emoji-1F6A1 { background-position: -180px -720px; }
+.emoji-1F6A2 { background-position: -200px -720px; }
+.emoji-1F6A3 { background-position: -220px -720px; }
+.emoji-1F6A3-1F3FB { background-position: -240px -720px; }
+.emoji-1F6A3-1F3FC { background-position: -260px -720px; }
+.emoji-1F6A3-1F3FD { background-position: -280px -720px; }
+.emoji-1F6A3-1F3FE { background-position: -300px -720px; }
+.emoji-1F6A3-1F3FF { background-position: -320px -720px; }
+.emoji-1F6A4 { background-position: -340px -720px; }
+.emoji-1F6A5 { background-position: -360px -720px; }
+.emoji-1F6A6 { background-position: -380px -720px; }
+.emoji-1F6A7 { background-position: -400px -720px; }
+.emoji-1F6A8 { background-position: -420px -720px; }
+.emoji-1F6A9 { background-position: -440px -720px; }
+.emoji-1F6AA { background-position: -460px -720px; }
+.emoji-1F6AB { background-position: -480px -720px; }
+.emoji-1F6AC { background-position: -500px -720px; }
+.emoji-1F6AD { background-position: -520px -720px; }
+.emoji-1F6AE { background-position: -540px -720px; }
+.emoji-1F6AF { background-position: -560px -720px; }
+.emoji-1F6B0 { background-position: -580px -720px; }
+.emoji-1F6B1 { background-position: -600px -720px; }
+.emoji-1F6B2 { background-position: -620px -720px; }
+.emoji-1F6B3 { background-position: -640px -720px; }
+.emoji-1F6B4 { background-position: -660px -720px; }
+.emoji-1F6B4-1F3FB { background-position: -680px -720px; }
+.emoji-1F6B4-1F3FC { background-position: -700px -720px; }
+.emoji-1F6B4-1F3FD { background-position: -720px -720px; }
+.emoji-1F6B4-1F3FE { background-position: -740px 0; }
+.emoji-1F6B4-1F3FF { background-position: -740px -20px; }
+.emoji-1F6B5 { background-position: -740px -40px; }
+.emoji-1F6B5-1F3FB { background-position: -740px -60px; }
+.emoji-1F6B5-1F3FC { background-position: -740px -80px; }
+.emoji-1F6B5-1F3FD { background-position: -740px -100px; }
+.emoji-1F6B5-1F3FE { background-position: -740px -120px; }
+.emoji-1F6B5-1F3FF { background-position: -740px -140px; }
+.emoji-1F6B6 { background-position: -740px -160px; }
+.emoji-1F6B6-1F3FB { background-position: -740px -180px; }
+.emoji-1F6B6-1F3FC { background-position: -740px -200px; }
+.emoji-1F6B6-1F3FD { background-position: -740px -220px; }
+.emoji-1F6B6-1F3FE { background-position: -740px -240px; }
+.emoji-1F6B6-1F3FF { background-position: -740px -260px; }
+.emoji-1F6B7 { background-position: -740px -280px; }
+.emoji-1F6B8 { background-position: -740px -300px; }
+.emoji-1F6B9 { background-position: -740px -320px; }
+.emoji-1F6BA { background-position: -740px -340px; }
+.emoji-1F6BB { background-position: -740px -360px; }
+.emoji-1F6BC { background-position: -740px -380px; }
+.emoji-1F6BD { background-position: -740px -400px; }
+.emoji-1F6BE { background-position: -740px -420px; }
+.emoji-1F6BF { background-position: -740px -440px; }
+.emoji-1F6C0 { background-position: -740px -460px; }
+.emoji-1F6C0-1F3FB { background-position: -740px -480px; }
+.emoji-1F6C0-1F3FC { background-position: -740px -500px; }
+.emoji-1F6C0-1F3FD { background-position: -740px -520px; }
+.emoji-1F6C0-1F3FE { background-position: -740px -540px; }
+.emoji-1F6C0-1F3FF { background-position: -740px -560px; }
+.emoji-1F6C1 { background-position: -740px -580px; }
+.emoji-1F6C2 { background-position: -740px -600px; }
+.emoji-1F6C3 { background-position: -740px -620px; }
+.emoji-1F6C4 { background-position: -740px -640px; }
+.emoji-1F6C5 { background-position: -740px -660px; }
+.emoji-1F6CB { background-position: -740px -680px; }
+.emoji-1F6CC { background-position: -740px -700px; }
+.emoji-1F6CD { background-position: -740px -720px; }
+.emoji-1F6CE { background-position: 0 -740px; }
+.emoji-1F6CF { background-position: -20px -740px; }
+.emoji-1F6D0 { background-position: -40px -740px; }
+.emoji-1F6D1 { background-position: -60px -740px; }
+.emoji-1F6D2 { background-position: -80px -740px; }
+.emoji-1F6E0 { background-position: -100px -740px; }
+.emoji-1F6E1 { background-position: -120px -740px; }
+.emoji-1F6E2 { background-position: -140px -740px; }
+.emoji-1F6E3 { background-position: -160px -740px; }
+.emoji-1F6E4 { background-position: -180px -740px; }
+.emoji-1F6E5 { background-position: -200px -740px; }
+.emoji-1F6E9 { background-position: -220px -740px; }
+.emoji-1F6EB { background-position: -240px -740px; }
+.emoji-1F6EC { background-position: -260px -740px; }
+.emoji-1F6F0 { background-position: -280px -740px; }
+.emoji-1F6F3 { background-position: -300px -740px; }
+.emoji-1F6F4 { background-position: -320px -740px; }
+.emoji-1F6F5 { background-position: -340px -740px; }
+.emoji-1F6F6 { background-position: -360px -740px; }
+.emoji-1F910 { background-position: -380px -740px; }
+.emoji-1F911 { background-position: -400px -740px; }
+.emoji-1F912 { background-position: -420px -740px; }
+.emoji-1F913 { background-position: -440px -740px; }
+.emoji-1F914 { background-position: -460px -740px; }
+.emoji-1F915 { background-position: -480px -740px; }
+.emoji-1F916 { background-position: -500px -740px; }
+.emoji-1F917 { background-position: -520px -740px; }
+.emoji-1F918 { background-position: -540px -740px; }
+.emoji-1F918-1F3FB { background-position: -560px -740px; }
+.emoji-1F918-1F3FC { background-position: -580px -740px; }
+.emoji-1F918-1F3FD { background-position: -600px -740px; }
+.emoji-1F918-1F3FE { background-position: -620px -740px; }
+.emoji-1F918-1F3FF { background-position: -640px -740px; }
+.emoji-1F919 { background-position: -660px -740px; }
+.emoji-1F919-1F3FB { background-position: -680px -740px; }
+.emoji-1F919-1F3FC { background-position: -700px -740px; }
+.emoji-1F919-1F3FD { background-position: -720px -740px; }
+.emoji-1F919-1F3FE { background-position: -740px -740px; }
+.emoji-1F919-1F3FF { background-position: -760px 0; }
+.emoji-1F91A { background-position: -760px -20px; }
+.emoji-1F91A-1F3FB { background-position: -760px -40px; }
+.emoji-1F91A-1F3FC { background-position: -760px -60px; }
+.emoji-1F91A-1F3FD { background-position: -760px -80px; }
+.emoji-1F91A-1F3FE { background-position: -760px -100px; }
+.emoji-1F91A-1F3FF { background-position: -760px -120px; }
+.emoji-1F91B { background-position: -760px -140px; }
+.emoji-1F91B-1F3FB { background-position: -760px -160px; }
+.emoji-1F91B-1F3FC { background-position: -760px -180px; }
+.emoji-1F91B-1F3FD { background-position: -760px -200px; }
+.emoji-1F91B-1F3FE { background-position: -760px -220px; }
+.emoji-1F91B-1F3FF { background-position: -760px -240px; }
+.emoji-1F91C { background-position: -760px -260px; }
+.emoji-1F91C-1F3FB { background-position: -760px -280px; }
+.emoji-1F91C-1F3FC { background-position: -760px -300px; }
+.emoji-1F91C-1F3FD { background-position: -760px -320px; }
+.emoji-1F91C-1F3FE { background-position: -760px -340px; }
+.emoji-1F91C-1F3FF { background-position: -760px -360px; }
+.emoji-1F91D { background-position: -760px -380px; }
+.emoji-1F91D-1F3FB { background-position: -760px -400px; }
+.emoji-1F91D-1F3FC { background-position: -760px -420px; }
+.emoji-1F91D-1F3FD { background-position: -760px -440px; }
+.emoji-1F91D-1F3FE { background-position: -760px -460px; }
+.emoji-1F91D-1F3FF { background-position: -760px -480px; }
+.emoji-1F91E { background-position: -760px -500px; }
+.emoji-1F91E-1F3FB { background-position: -760px -520px; }
+.emoji-1F91E-1F3FC { background-position: -760px -540px; }
+.emoji-1F91E-1F3FD { background-position: -760px -560px; }
+.emoji-1F91E-1F3FE { background-position: -760px -580px; }
+.emoji-1F91E-1F3FF { background-position: -760px -600px; }
+.emoji-1F920 { background-position: -760px -620px; }
+.emoji-1F921 { background-position: -760px -640px; }
+.emoji-1F922 { background-position: -760px -660px; }
+.emoji-1F923 { background-position: -760px -680px; }
+.emoji-1F924 { background-position: -760px -700px; }
+.emoji-1F925 { background-position: -760px -720px; }
+.emoji-1F926 { background-position: -760px -740px; }
+.emoji-1F926-1F3FB { background-position: 0 -760px; }
+.emoji-1F926-1F3FC { background-position: -20px -760px; }
+.emoji-1F926-1F3FD { background-position: -40px -760px; }
+.emoji-1F926-1F3FE { background-position: -60px -760px; }
+.emoji-1F926-1F3FF { background-position: -80px -760px; }
+.emoji-1F927 { background-position: -100px -760px; }
+.emoji-1F930 { background-position: -120px -760px; }
+.emoji-1F930-1F3FB { background-position: -140px -760px; }
+.emoji-1F930-1F3FC { background-position: -160px -760px; }
+.emoji-1F930-1F3FD { background-position: -180px -760px; }
+.emoji-1F930-1F3FE { background-position: -200px -760px; }
+.emoji-1F930-1F3FF { background-position: -220px -760px; }
+.emoji-1F933 { background-position: -240px -760px; }
+.emoji-1F933-1F3FB { background-position: -260px -760px; }
+.emoji-1F933-1F3FC { background-position: -280px -760px; }
+.emoji-1F933-1F3FD { background-position: -300px -760px; }
+.emoji-1F933-1F3FE { background-position: -320px -760px; }
+.emoji-1F933-1F3FF { background-position: -340px -760px; }
+.emoji-1F934 { background-position: -360px -760px; }
+.emoji-1F934-1F3FB { background-position: -380px -760px; }
+.emoji-1F934-1F3FC { background-position: -400px -760px; }
+.emoji-1F934-1F3FD { background-position: -420px -760px; }
+.emoji-1F934-1F3FE { background-position: -440px -760px; }
+.emoji-1F934-1F3FF { background-position: -460px -760px; }
+.emoji-1F935 { background-position: -480px -760px; }
+.emoji-1F935-1F3FB { background-position: -500px -760px; }
+.emoji-1F935-1F3FC { background-position: -520px -760px; }
+.emoji-1F935-1F3FD { background-position: -540px -760px; }
+.emoji-1F935-1F3FE { background-position: -560px -760px; }
+.emoji-1F935-1F3FF { background-position: -580px -760px; }
+.emoji-1F936 { background-position: -600px -760px; }
+.emoji-1F936-1F3FB { background-position: -620px -760px; }
+.emoji-1F936-1F3FC { background-position: -640px -760px; }
+.emoji-1F936-1F3FD { background-position: -660px -760px; }
+.emoji-1F936-1F3FE { background-position: -680px -760px; }
+.emoji-1F936-1F3FF { background-position: -700px -760px; }
+.emoji-1F937 { background-position: -720px -760px; }
+.emoji-1F937-1F3FB { background-position: -740px -760px; }
+.emoji-1F937-1F3FC { background-position: -760px -760px; }
+.emoji-1F937-1F3FD { background-position: -780px 0; }
+.emoji-1F937-1F3FE { background-position: -780px -20px; }
+.emoji-1F937-1F3FF { background-position: -780px -40px; }
+.emoji-1F938 { background-position: -780px -60px; }
+.emoji-1F938-1F3FB { background-position: -780px -80px; }
+.emoji-1F938-1F3FC { background-position: -780px -100px; }
+.emoji-1F938-1F3FD { background-position: -780px -120px; }
+.emoji-1F938-1F3FE { background-position: -780px -140px; }
+.emoji-1F938-1F3FF { background-position: -780px -160px; }
+.emoji-1F939 { background-position: -780px -180px; }
+.emoji-1F939-1F3FB { background-position: -780px -200px; }
+.emoji-1F939-1F3FC { background-position: -780px -220px; }
+.emoji-1F939-1F3FD { background-position: -780px -240px; }
+.emoji-1F939-1F3FE { background-position: -780px -260px; }
+.emoji-1F939-1F3FF { background-position: -780px -280px; }
+.emoji-1F93A { background-position: -780px -300px; }
+.emoji-1F93C { background-position: -780px -320px; }
+.emoji-1F93C-1F3FB { background-position: -780px -340px; }
+.emoji-1F93C-1F3FC { background-position: -780px -360px; }
+.emoji-1F93C-1F3FD { background-position: -780px -380px; }
+.emoji-1F93C-1F3FE { background-position: -780px -400px; }
+.emoji-1F93C-1F3FF { background-position: -780px -420px; }
+.emoji-1F93D { background-position: -780px -440px; }
+.emoji-1F93D-1F3FB { background-position: -780px -460px; }
+.emoji-1F93D-1F3FC { background-position: -780px -480px; }
+.emoji-1F93D-1F3FD { background-position: -780px -500px; }
+.emoji-1F93D-1F3FE { background-position: -780px -520px; }
+.emoji-1F93D-1F3FF { background-position: -780px -540px; }
+.emoji-1F93E { background-position: -780px -560px; }
+.emoji-1F93E-1F3FB { background-position: -780px -580px; }
+.emoji-1F93E-1F3FC { background-position: -780px -600px; }
+.emoji-1F93E-1F3FD { background-position: -780px -620px; }
+.emoji-1F93E-1F3FE { background-position: -780px -640px; }
+.emoji-1F93E-1F3FF { background-position: -780px -660px; }
+.emoji-1F940 { background-position: -780px -680px; }
+.emoji-1F941 { background-position: -780px -700px; }
+.emoji-1F942 { background-position: -780px -720px; }
+.emoji-1F943 { background-position: -780px -740px; }
+.emoji-1F944 { background-position: -780px -760px; }
+.emoji-1F945 { background-position: 0 -780px; }
+.emoji-1F947 { background-position: -20px -780px; }
+.emoji-1F948 { background-position: -40px -780px; }
+.emoji-1F949 { background-position: -60px -780px; }
+.emoji-1F94A { background-position: -80px -780px; }
+.emoji-1F94B { background-position: -100px -780px; }
+.emoji-1F950 { background-position: -120px -780px; }
+.emoji-1F951 { background-position: -140px -780px; }
+.emoji-1F952 { background-position: -160px -780px; }
+.emoji-1F953 { background-position: -180px -780px; }
+.emoji-1F954 { background-position: -200px -780px; }
+.emoji-1F955 { background-position: -220px -780px; }
+.emoji-1F956 { background-position: -240px -780px; }
+.emoji-1F957 { background-position: -260px -780px; }
+.emoji-1F958 { background-position: -280px -780px; }
+.emoji-1F959 { background-position: -300px -780px; }
+.emoji-1F95A { background-position: -320px -780px; }
+.emoji-1F95B { background-position: -340px -780px; }
+.emoji-1F95C { background-position: -360px -780px; }
+.emoji-1F95D { background-position: -380px -780px; }
+.emoji-1F95E { background-position: -400px -780px; }
+.emoji-1F980 { background-position: -420px -780px; }
+.emoji-1F981 { background-position: -440px -780px; }
+.emoji-1F982 { background-position: -460px -780px; }
+.emoji-1F983 { background-position: -480px -780px; }
+.emoji-1F984 { background-position: -500px -780px; }
+.emoji-1F985 { background-position: -520px -780px; }
+.emoji-1F986 { background-position: -540px -780px; }
+.emoji-1F987 { background-position: -560px -780px; }
+.emoji-1F988 { background-position: -580px -780px; }
+.emoji-1F989 { background-position: -600px -780px; }
+.emoji-1F98A { background-position: -620px -780px; }
+.emoji-1F98B { background-position: -640px -780px; }
+.emoji-1F98C { background-position: -660px -780px; }
+.emoji-1F98D { background-position: -680px -780px; }
+.emoji-1F98E { background-position: -700px -780px; }
+.emoji-1F98F { background-position: -720px -780px; }
+.emoji-1F990 { background-position: -740px -780px; }
+.emoji-1F991 { background-position: -760px -780px; }
+.emoji-1F9C0 { background-position: -780px -780px; }
+.emoji-203C { background-position: -800px 0; }
+.emoji-2049 { background-position: -800px -20px; }
+.emoji-2122 { background-position: -800px -40px; }
+.emoji-2139 { background-position: -800px -60px; }
+.emoji-2194 { background-position: -800px -80px; }
+.emoji-2195 { background-position: -800px -100px; }
+.emoji-2196 { background-position: -800px -120px; }
+.emoji-2197 { background-position: -800px -140px; }
+.emoji-2198 { background-position: -800px -160px; }
+.emoji-2199 { background-position: -800px -180px; }
+.emoji-21A9 { background-position: -800px -200px; }
+.emoji-21AA { background-position: -800px -220px; }
+.emoji-231A { background-position: -800px -240px; }
+.emoji-231B { background-position: -800px -260px; }
+.emoji-2328 { background-position: -800px -280px; }
+.emoji-23CF { background-position: -800px -300px; }
+.emoji-23E9 { background-position: -800px -320px; }
+.emoji-23EA { background-position: -800px -340px; }
+.emoji-23EB { background-position: -800px -360px; }
+.emoji-23EC { background-position: -800px -380px; }
+.emoji-23ED { background-position: -800px -400px; }
+.emoji-23EE { background-position: -800px -420px; }
+.emoji-23EF { background-position: -800px -440px; }
+.emoji-23F0 { background-position: -800px -460px; }
+.emoji-23F1 { background-position: -800px -480px; }
+.emoji-23F2 { background-position: -800px -500px; }
+.emoji-23F3 { background-position: -800px -520px; }
+.emoji-23F8 { background-position: -800px -540px; }
+.emoji-23F9 { background-position: -800px -560px; }
+.emoji-23FA { background-position: -800px -580px; }
+.emoji-24C2 { background-position: -800px -600px; }
+.emoji-25AA { background-position: -800px -620px; }
+.emoji-25AB { background-position: -800px -640px; }
+.emoji-25B6 { background-position: -800px -660px; }
+.emoji-25C0 { background-position: -800px -680px; }
+.emoji-25FB { background-position: -800px -700px; }
+.emoji-25FC { background-position: -800px -720px; }
+.emoji-25FD { background-position: -800px -740px; }
+.emoji-25FE { background-position: -800px -760px; }
+.emoji-2600 { background-position: -800px -780px; }
+.emoji-2601 { background-position: 0 -800px; }
+.emoji-2602 { background-position: -20px -800px; }
+.emoji-2603 { background-position: -40px -800px; }
+.emoji-2604 { background-position: -60px -800px; }
+.emoji-260E { background-position: -80px -800px; }
+.emoji-2611 { background-position: -100px -800px; }
+.emoji-2614 { background-position: -120px -800px; }
+.emoji-2615 { background-position: -140px -800px; }
+.emoji-2618 { background-position: -160px -800px; }
+.emoji-261D { background-position: -180px -800px; }
+.emoji-261D-1F3FB { background-position: -200px -800px; }
+.emoji-261D-1F3FC { background-position: -220px -800px; }
+.emoji-261D-1F3FD { background-position: -240px -800px; }
+.emoji-261D-1F3FE { background-position: -260px -800px; }
+.emoji-261D-1F3FF { background-position: -280px -800px; }
+.emoji-2620 { background-position: -300px -800px; }
+.emoji-2622 { background-position: -320px -800px; }
+.emoji-2623 { background-position: -340px -800px; }
+.emoji-2626 { background-position: -360px -800px; }
+.emoji-262A { background-position: -380px -800px; }
+.emoji-262E { background-position: -400px -800px; }
+.emoji-262F { background-position: -420px -800px; }
+.emoji-2638 { background-position: -440px -800px; }
+.emoji-2639 { background-position: -460px -800px; }
+.emoji-263A { background-position: -480px -800px; }
+.emoji-2648 { background-position: -500px -800px; }
+.emoji-2649 { background-position: -520px -800px; }
+.emoji-264A { background-position: -540px -800px; }
+.emoji-264B { background-position: -560px -800px; }
+.emoji-264C { background-position: -580px -800px; }
+.emoji-264D { background-position: -600px -800px; }
+.emoji-264E { background-position: -620px -800px; }
+.emoji-264F { background-position: -640px -800px; }
+.emoji-2650 { background-position: -660px -800px; }
+.emoji-2651 { background-position: -680px -800px; }
+.emoji-2652 { background-position: -700px -800px; }
+.emoji-2653 { background-position: -720px -800px; }
+.emoji-2660 { background-position: -740px -800px; }
+.emoji-2663 { background-position: -760px -800px; }
+.emoji-2665 { background-position: -780px -800px; }
+.emoji-2666 { background-position: -800px -800px; }
+.emoji-2668 { background-position: -820px 0; }
+.emoji-267B { background-position: -820px -20px; }
+.emoji-267F { background-position: -820px -40px; }
+.emoji-2692 { background-position: -820px -60px; }
+.emoji-2693 { background-position: -820px -80px; }
+.emoji-2694 { background-position: -820px -100px; }
+.emoji-2696 { background-position: -820px -120px; }
+.emoji-2697 { background-position: -820px -140px; }
+.emoji-2699 { background-position: -820px -160px; }
+.emoji-269B { background-position: -820px -180px; }
+.emoji-269C { background-position: -820px -200px; }
+.emoji-26A0 { background-position: -820px -220px; }
+.emoji-26A1 { background-position: -820px -240px; }
+.emoji-26AA { background-position: -820px -260px; }
+.emoji-26AB { background-position: -820px -280px; }
+.emoji-26B0 { background-position: -820px -300px; }
+.emoji-26B1 { background-position: -820px -320px; }
+.emoji-26BD { background-position: -820px -340px; }
+.emoji-26BE { background-position: -820px -360px; }
+.emoji-26C4 { background-position: -820px -380px; }
+.emoji-26C5 { background-position: -820px -400px; }
+.emoji-26C8 { background-position: -820px -420px; }
+.emoji-26CE { background-position: -820px -440px; }
+.emoji-26CF { background-position: -820px -460px; }
+.emoji-26D1 { background-position: -820px -480px; }
+.emoji-26D3 { background-position: -820px -500px; }
+.emoji-26D4 { background-position: -820px -520px; }
+.emoji-26E9 { background-position: -820px -540px; }
+.emoji-26EA { background-position: -820px -560px; }
+.emoji-26F0 { background-position: -820px -580px; }
+.emoji-26F1 { background-position: -820px -600px; }
+.emoji-26F2 { background-position: -820px -620px; }
+.emoji-26F3 { background-position: -820px -640px; }
+.emoji-26F4 { background-position: -820px -660px; }
+.emoji-26F5 { background-position: -820px -680px; }
+.emoji-26F7 { background-position: -820px -700px; }
+.emoji-26F8 { background-position: -820px -720px; }
+.emoji-26F9 { background-position: -820px -740px; }
+.emoji-26F9-1F3FB { background-position: -820px -760px; }
+.emoji-26F9-1F3FC { background-position: -820px -780px; }
+.emoji-26F9-1F3FD { background-position: -820px -800px; }
+.emoji-26F9-1F3FE { background-position: 0 -820px; }
+.emoji-26F9-1F3FF { background-position: -20px -820px; }
+.emoji-26FA { background-position: -40px -820px; }
+.emoji-26FD { background-position: -60px -820px; }
+.emoji-2702 { background-position: -80px -820px; }
+.emoji-2705 { background-position: -100px -820px; }
+.emoji-2708 { background-position: -120px -820px; }
+.emoji-2709 { background-position: -140px -820px; }
+.emoji-270A { background-position: -160px -820px; }
+.emoji-270A-1F3FB { background-position: -180px -820px; }
+.emoji-270A-1F3FC { background-position: -200px -820px; }
+.emoji-270A-1F3FD { background-position: -220px -820px; }
+.emoji-270A-1F3FE { background-position: -240px -820px; }
+.emoji-270A-1F3FF { background-position: -260px -820px; }
+.emoji-270B { background-position: -280px -820px; }
+.emoji-270B-1F3FB { background-position: -300px -820px; }
+.emoji-270B-1F3FC { background-position: -320px -820px; }
+.emoji-270B-1F3FD { background-position: -340px -820px; }
+.emoji-270B-1F3FE { background-position: -360px -820px; }
+.emoji-270B-1F3FF { background-position: -380px -820px; }
+.emoji-270C { background-position: -400px -820px; }
+.emoji-270C-1F3FB { background-position: -420px -820px; }
+.emoji-270C-1F3FC { background-position: -440px -820px; }
+.emoji-270C-1F3FD { background-position: -460px -820px; }
+.emoji-270C-1F3FE { background-position: -480px -820px; }
+.emoji-270C-1F3FF { background-position: -500px -820px; }
+.emoji-270D { background-position: -520px -820px; }
+.emoji-270D-1F3FB { background-position: -540px -820px; }
+.emoji-270D-1F3FC { background-position: -560px -820px; }
+.emoji-270D-1F3FD { background-position: -580px -820px; }
+.emoji-270D-1F3FE { background-position: -600px -820px; }
+.emoji-270D-1F3FF { background-position: -620px -820px; }
+.emoji-270F { background-position: -640px -820px; }
+.emoji-2712 { background-position: -660px -820px; }
+.emoji-2714 { background-position: -680px -820px; }
+.emoji-2716 { background-position: -700px -820px; }
+.emoji-271D { background-position: -720px -820px; }
+.emoji-2721 { background-position: -740px -820px; }
+.emoji-2728 { background-position: -760px -820px; }
+.emoji-2733 { background-position: -780px -820px; }
+.emoji-2734 { background-position: -800px -820px; }
+.emoji-2744 { background-position: -820px -820px; }
+.emoji-2747 { background-position: -840px 0; }
+.emoji-274C { background-position: -840px -20px; }
+.emoji-274E { background-position: -840px -40px; }
+.emoji-2753 { background-position: -840px -60px; }
+.emoji-2754 { background-position: -840px -80px; }
+.emoji-2755 { background-position: -840px -100px; }
+.emoji-2757 { background-position: -840px -120px; }
+.emoji-2763 { background-position: -840px -140px; }
+.emoji-2764 { background-position: -840px -160px; }
+.emoji-2795 { background-position: -840px -180px; }
+.emoji-2796 { background-position: -840px -200px; }
+.emoji-2797 { background-position: -840px -220px; }
+.emoji-27A1 { background-position: -840px -240px; }
+.emoji-27B0 { background-position: -840px -260px; }
+.emoji-27BF { background-position: -840px -280px; }
+.emoji-2934 { background-position: -840px -300px; }
+.emoji-2935 { background-position: -840px -320px; }
+.emoji-2B05 { background-position: -840px -340px; }
+.emoji-2B06 { background-position: -840px -360px; }
+.emoji-2B07 { background-position: -840px -380px; }
+.emoji-2B1B { background-position: -840px -400px; }
+.emoji-2B1C { background-position: -840px -420px; }
+.emoji-2B50 { background-position: -840px -440px; }
+.emoji-2B55 { background-position: -840px -460px; }
+.emoji-3030 { background-position: -840px -480px; }
+.emoji-303D { background-position: -840px -500px; }
+.emoji-3297 { background-position: -840px -520px; }
+.emoji-3299 { background-position: -840px -540px; }
 
 .emoji-icon {
   background-image: image-url('emoji.png');
@@ -1731,6 +1804,6 @@
          only screen and (min-resolution: 192dpi),
          only screen and (min-resolution: 2dppx) {
     background-image: image-url('emoji@2x.png');
-    background-size: 840px 820px;
+    background-size: 860px 840px;
   }
 }
diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss
index a2145956eb5..5c336bb1c7e 100644
--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -176,3 +176,11 @@
     }
   }
 }
+
+// hide event scope (namespace + project) where it is not necessary
+.project-activity {
+  .event-scope {
+    display: none;
+  }
+}
+
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 542fa244689..7a50bc9c832 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -122,7 +122,8 @@
 
     button {
       float: right;
-      padding: 3px 5px;
+      padding: 1px 5px;
+      background-color: $gray-light;
     }
   }
 
@@ -268,7 +269,7 @@
   .issuable-header-btn {
     background: $gray-normal;
     border: 1px solid $border-gray-normal;
-    
+
     &:hover {
       background: $gray-dark;
       border: 1px solid $border-gray-dark;
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss
index 501b2d61d53..dfe1e3075da 100644
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -63,7 +63,7 @@ form.edit-issue {
 .merge-request,
 .issue {
   &.today {
-    background: #f8feef;
+    background: #f3fff2;
     border-color: #e1e8d5;
   }
 
@@ -78,6 +78,14 @@ form.edit-issue {
   }
 }
 
+.merge-request-ci-status {
+  svg {
+    margin-right: 4px;
+    position: relative;
+    top: 1px;
+  }
+}
+
 @media (max-width: $screen-xs-max) {
   .issue-btn-group {
     width: 100%;
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index dba9a7ab3ee..0a661e529f0 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -60,14 +60,25 @@
   .ci_widget {
     border-bottom: 1px solid #eef0f2;
 
-    i {
+    svg {
       margin-right: 4px;
+      position: relative;
+      top: 1px;
+      overflow: visible;
     }
 
     &.ci-success {
       color: $gl-success;
     }
 
+    &.ci-success_with_warnings {
+      color: $gl-success;
+
+      i {
+        color: $gl-warning;
+      }
+    }
+
     &.ci-skipped {
       background-color: #eee;
       color: #888;
@@ -196,6 +207,21 @@
 
     .merge-request-title {
       margin-bottom: 2px;
+
+      .ci-status-link {
+
+        svg {
+          height: 16px;
+          width: 16px;
+          position: relative;
+          top: 3px;
+        }
+
+        &:hover,
+        &:focus {
+          text-decoration: none;
+        }
+      }
     }
   }
 
@@ -270,7 +296,7 @@
 
     .item-title {
       @media (min-width: $screen-sm-min) {
-        width: 49%;
+        width: 45%;
       }
     }
 
@@ -324,10 +350,6 @@
 .issuable-form-select-holder {
   display: inline-block;
   width: 250px;
-
-  .dropdown-menu-toggle {
-    width: 100%;
-  }
 }
 
 .table-holder {
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index ac8c02b59dc..a2b5437e503 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -91,34 +91,11 @@ ul.notes {
         // Reset ul style types since we're nested inside a ul already
         @include bulleted-list;
 
-        // On diffs code should wrap nicely and not overflow
-        code {
-          white-space: pre-wrap;
-        }
-
         ul.task-list {
           ul:not(.task-list) {
             padding-left: 1.3em;
           }
         }
-
-        hr {
-          // Darken 'whitesmoke' a bit to make it more visible in note bodies
-          border-color: darken(#f5f5f5, 8%);
-          margin: 10px 0;
-        }
-
-        code {
-          word-break: keep-all;
-        }
-
-        // Border around images in issue and MR comments.
-        img:not(.emoji) {
-          border: 1px solid $table-border-gray;
-          padding: 5px;
-          margin: 5px 0;
-          max-height: calc(100vh - 100px);
-        }
       }
     }
 
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 08da4e290dc..c58e2ffe7f5 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -1,7 +1,7 @@
 .pipelines {
   .stage {
-    max-width: 80px;
-    width: 80px;
+    max-width: 90px;
+    width: 90px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
@@ -29,14 +29,27 @@
   }
 }
 
+.pipeline-holder {
+  width: 100%;
+  overflow: auto;
+}
+
 .table.builds {
-  min-width: 1100px;
+  min-width: 1200px;
+
+  &.pipeline {
+    min-width: 650px;
+  }
 
   tr {
     th {
-      padding: 16px;
+      padding: 16px 8px;
       border: none;
     }
+
+    td {
+      padding: 10px 8px;
+    }
   }
 
   tbody {
@@ -45,6 +58,14 @@
 
   .commit-link {
 
+    .ci-status {
+
+      svg {
+        top: 1px;
+        margin-right: 0;
+      }
+    }
+
     a:hover {
       text-decoration: none;
     }
@@ -53,9 +74,8 @@
   .branch-commit {
 
     .branch-name {
-      margin-left: 8px;
       font-weight: bold;
-      max-width: 180px;
+      max-width: 150px;
       overflow: hidden;
       display: inline-block;
       white-space: nowrap;
@@ -64,10 +84,15 @@
     }
 
     svg {
-      margin: 0 6px;
       height: 14px;
-      width: auto;
+      width: 14px;
       vertical-align: middle;
+      fill: $table-text-gray;
+    }
+
+    .fa {
+      font-size: 12px;
+      color: $table-text-gray;
     }
 
     .commit-id {
@@ -77,7 +102,7 @@
 
     .commit-title {
       margin-top: 4px;
-      max-width: 320px;
+      max-width: 300px;
       overflow: hidden;
       white-space: nowrap;
       text-overflow: ellipsis;
@@ -100,6 +125,36 @@
     }
   }
 
+  .icon-container {
+    display: inline-block;
+    text-align: right;
+    width: 20px;
+
+    .fa {
+      position: relative;
+      right: 3px;
+    }
+
+    svg {
+      position: relative;
+      right: 1px;
+    }
+  }
+
+  .stage-cell {
+
+    svg {
+      height: 18px;
+      width: 18px;
+      vertical-align: middle;
+      overflow: visible;
+    }
+
+    .light {
+      width: 3px;
+    }
+  }
+
   .duration,
   .finished-at {
     color: $table-text-gray;
@@ -107,21 +162,19 @@
 
     .fa {
       font-size: 12px;
+      margin-right: 4px;
     }
 
     svg {
+      width: 12px;
       height: 12px;
-      width: auto;
       vertical-align: middle;
-    }
-
-    .fa,
-    svg {
-      margin-right: 5px;
+      margin-right: 4px;
     }
   }
 
   .pipeline-actions {
+    min-width: 140px;
 
     .btn {
       margin: 0;
@@ -129,6 +182,8 @@
     }
 
     .cancel-retry-btns {
+      vertical-align: middle;
+
       .btn:not(:first-child) {
         margin-left: 8px;
       }
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index ea9f7cf0540..cc3aef5199e 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -129,6 +129,17 @@
       color: $layout-link-gray;
     }
 
+    svg {
+
+      path {
+        fill: $layout-link-gray;
+      }
+
+      use {
+        stroke: $layout-link-gray;
+      }
+    }
+
     .fa-caret-down {
       margin-left: 3px;
     }
@@ -322,18 +333,53 @@ a.deploy-project-label {
 }
 
 .fork-namespaces {
-  .fork-thumbnail {
-    text-align: center;
-    margin-bottom: $gl-padding;
-
-    .caption {
-      padding: $gl-padding 0;
-      min-height: 30px;
-    }
+  .row {
+    -webkit-flex-wrap: wrap;
+    display: -webkit-flex;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+
+    .fork-thumbnail {
+      @include border-radius($border-radius-base);
+      background-color: $white-light;
+      border: 1px solid $border-white-light;
+      height: 202px;
+      margin: $gl-padding;
+      text-align: center;
+      width: 169px;
+      &:hover, &.forked {
+        background-color: $row-hover;
+        border-color: $row-hover-border;
+      }
+      .no-avatar {
+        width: 100px;
+        height: 100px;
+        background-color: $gray-light;
+        border: 1px solid $gray-dark;
+        margin: 0 auto;
+        @include border-radius(50%);
+        i {
+          font-size: 100px;
+          color: $gray-dark;
+        }
+      }
+      a {
+        display: block;
+        width: 100%;
+        height: 100%;
+        padding-top: $gl-padding;
+        color: $gl-gray;
+        .caption {
+          min-height: 30px;
+          padding: $gl-padding 0;
+        }
+      }
 
-    img {
-      @include border-radius(50%);
-      max-width: 100px;
+      img {
+        @include border-radius(50%);
+        max-width: 100px;
+      }
     }
   }
 }
@@ -486,6 +532,11 @@ pre.light-well {
       > span {
         margin-left: 10px;
       }
+
+      svg {
+        position: relative;
+        top: 2px;
+      }
     }
   }
 
diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss
index c6b053150be..587f2d9f3c1 100644
--- a/app/assets/stylesheets/pages/status.scss
+++ b/app/assets/stylesheets/pages/status.scss
@@ -15,7 +15,8 @@
       border-color: $gl-danger;
     }
 
-    &.ci-success {
+    &.ci-success,
+    &.ci-success_with_warnings {
       color: $gl-success;
       border-color: $gl-success;
     }
@@ -41,6 +42,15 @@
       color: $blue-normal;
       border-color: $blue-normal;
     }
+
+    svg {
+      height: 13px;
+      width: 13px;
+      position: relative;
+      top: 1px;
+      margin: 0 3px;
+      overflow: visible;
+    }
   }
 
   .ci-status-icon-success {
@@ -49,9 +59,12 @@
   .ci-status-icon-failed {
     color: $gl-danger;
   }
-  .ci-status-icon-pending {
+
+  .ci-status-icon-pending,
+  .ci-status-icon-success_with_warning {
     color: $gl-warning;
   }
+  
   .ci-status-icon-running {
     color: $blue-normal;
   }
@@ -62,3 +75,11 @@
     color: $gl-gray;
   }
 }
+
+.visible-xs-inline {
+  .ci-status-link {
+    position: relative;
+    top: 2px;
+    left: 5px;
+  }
+}
diff --git a/app/assets/stylesheets/pages/tags.scss b/app/assets/stylesheets/pages/tags.scss
new file mode 100644
index 00000000000..24ebd3e7cfa
--- /dev/null
+++ b/app/assets/stylesheets/pages/tags.scss
@@ -0,0 +1,7 @@
+.tag-buttons {
+  line-height: 40px;
+
+  .btn:not(.dropdown-toggle) {
+    margin-left: 10px;
+  }
+}
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index 42a20e9775f..390977297fb 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -19,7 +19,7 @@
       border-top: 1px solid $table-border-gray;
 
       td, th {
-        line-height: 23px;
+        line-height: 21px;
       }
 
       &:hover {
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index 23ba83aba0e..9e1dc15de84 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -64,6 +64,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
     params[:application_setting][:disabled_oauth_sign_in_sources] =
       AuthHelper.button_based_providers.map(&:to_s) -
       Array(enabled_oauth_sign_in_sources)
+    params.delete(:domain_blacklist_raw) if params[:domain_blacklist_file]
 
     params.require(:application_setting).permit(
       :default_projects_limit,
@@ -83,7 +84,10 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       :default_project_visibility,
       :default_snippet_visibility,
       :default_group_visibility,
-      :restricted_signup_domains_raw,
+      :domain_whitelist_raw,
+      :domain_blacklist_enabled,
+      :domain_blacklist_raw,
+      :domain_blacklist_file,
       :version_check_enabled,
       :admin_notification_email,
       :user_oauth_applications,
diff --git a/app/controllers/admin/builds_controller.rb b/app/controllers/admin/builds_controller.rb
index 0db91eaaf2e..88f3c0e2fd4 100644
--- a/app/controllers/admin/builds_controller.rb
+++ b/app/controllers/admin/builds_controller.rb
@@ -5,8 +5,10 @@ class Admin::BuildsController < Admin::ApplicationController
     @builds = @all_builds.order('created_at DESC')
     @builds =
       case @scope
+      when 'pending'
+        @builds.pending.reverse_order
       when 'running'
-        @builds.running_or_pending.reverse_order
+        @builds.running.reverse_order
       when 'finished'
         @builds.finished
       else
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 94b5aaa71d0..f3a88a8e6c8 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -60,6 +60,6 @@ class Admin::GroupsController < Admin::ApplicationController
   end
 
   def group_params
-    params.require(:group).permit(:name, :description, :path, :avatar, :visibility_level)
+    params.require(:group).permit(:name, :description, :path, :avatar, :visibility_level, :request_access_enabled)
   end
 end
diff --git a/app/controllers/admin/services_controller.rb b/app/controllers/admin/services_controller.rb
index 46133588332..7c37f3155da 100644
--- a/app/controllers/admin/services_controller.rb
+++ b/app/controllers/admin/services_controller.rb
@@ -1,4 +1,6 @@
 class Admin::ServicesController < Admin::ApplicationController
+  include ServiceParams
+
   before_action :service, only: [:edit, :update]
 
   def index
@@ -13,7 +15,7 @@ class Admin::ServicesController < Admin::ApplicationController
   end
 
   def update
-    if service.update_attributes(application_services_params[:service])
+    if service.update_attributes(service_params[:service])
       redirect_to admin_application_settings_services_path,
         notice: 'Application settings saved successfully'
     else
@@ -37,15 +39,4 @@ class Admin::ServicesController < Admin::ApplicationController
   def service
     @service ||= Service.where(id: params[:id], template: true).first
   end
-
-  def application_services_params
-    application_services_params = params.permit(:id,
-      service: Projects::ServicesController::ALLOWED_PARAMS)
-    if application_services_params[:service].is_a?(Hash)
-      Projects::ServicesController::FILTER_BLANK_PARAMS.each do |param|
-        application_services_params[:service].delete(param) if application_services_params[:service][param].blank? 
-      end
-    end
-    application_services_params
-  end
 end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9cc31620d9f..a1004d9bcea 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -344,10 +344,6 @@ class ApplicationController < ActionController::Base
     session[:skip_tfa] && session[:skip_tfa] > Time.current
   end
 
-  def browser_supports_u2f?
-    browser.chrome? && browser.version.to_i >= 41 && !browser.device.mobile?
-  end
-
   def redirect_to_home_page_url?
     # If user is not signed-in and tries to access root_path - redirect him to landing page
     # Don't redirect to the default URL to prevent endless redirections
diff --git a/app/controllers/concerns/authenticates_with_two_factor.rb b/app/controllers/concerns/authenticates_with_two_factor.rb
index 998b8adc411..ba07cea569c 100644
--- a/app/controllers/concerns/authenticates_with_two_factor.rb
+++ b/app/controllers/concerns/authenticates_with_two_factor.rb
@@ -57,7 +57,7 @@ module AuthenticatesWithTwoFactor
 
   # Authenticate using the response from a U2F (universal 2nd factor) device
   def authenticate_with_two_factor_via_u2f(user)
-    if U2fRegistration.authenticate(user, u2f_app_id, user_params[:device_response], session[:challenges])
+    if U2fRegistration.authenticate(user, u2f_app_id, user_params[:device_response], session[:challenge])
       # Remove any lingering user data from login
       session.delete(:otp_user_id)
       session.delete(:challenges)
@@ -77,11 +77,9 @@ module AuthenticatesWithTwoFactor
 
     if key_handles.present?
       sign_requests = u2f.authentication_requests(key_handles)
-      challenges = sign_requests.map(&:challenge)
-      session[:challenges] = challenges
-      gon.push(u2f: { challenges: challenges, app_id: u2f_app_id,
-                      sign_requests: sign_requests,
-                      browser_supports_u2f: browser_supports_u2f? })
+      session[:challenge] ||= u2f.challenge
+      gon.push(u2f: { challenge: session[:challenge], app_id: u2f_app_id,
+                      sign_requests: sign_requests })
     end
   end
 end
diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb
index dacb5679dd3..f2b8f297bc2 100644
--- a/app/controllers/concerns/creates_commit.rb
+++ b/app/controllers/concerns/creates_commit.rb
@@ -7,7 +7,8 @@ module CreatesCommit
     commit_params = @commit_params.merge(
       source_project: @project,
       source_branch: @ref,
-      target_branch: @target_branch
+      target_branch: @target_branch,
+      previous_path: @previous_path
     )
 
     result = service.new(@tree_edit_project, current_user, commit_params).execute
diff --git a/app/controllers/concerns/diff_for_path.rb b/app/controllers/concerns/diff_for_path.rb
index e09b8789eb2..026d8b2e1e0 100644
--- a/app/controllers/concerns/diff_for_path.rb
+++ b/app/controllers/concerns/diff_for_path.rb
@@ -10,7 +10,6 @@ module DiffForPath
 
     diff_commit = commit_for_diff(diff_file)
     blob = diff_file.blob(diff_commit)
-    @expand_all_diffs = true
 
     locals = {
       diff_file: diff_file,
diff --git a/app/controllers/concerns/service_params.rb b/app/controllers/concerns/service_params.rb
new file mode 100644
index 00000000000..471d15af913
--- /dev/null
+++ b/app/controllers/concerns/service_params.rb
@@ -0,0 +1,35 @@
+module ServiceParams
+  extend ActiveSupport::Concern
+
+  ALLOWED_PARAMS = [:title, :token, :type, :active, :api_key, :api_url, :api_version, :subdomain,
+                    :room, :recipients, :project_url, :webhook,
+                    :user_key, :device, :priority, :sound, :bamboo_url, :username, :password,
+                    :build_key, :server, :teamcity_url, :drone_url, :build_type,
+                    :description, :issues_url, :new_issue_url, :restrict_to_branch, :channel,
+                    :colorize_messages, :channels,
+                    :push_events, :issues_events, :merge_requests_events, :tag_push_events,
+                    :note_events, :build_events, :wiki_page_events,
+                    :notify_only_broken_builds, :add_pusher,
+                    :send_from_committer_email, :disable_diffs, :external_wiki_url,
+                    :notify, :color,
+                    :server_host, :server_port, :default_irc_uri, :enable_ssl_verification,
+                    :jira_issue_transition_id]
+
+  # Parameters to ignore if no value is specified
+  FILTER_BLANK_PARAMS = [:password]
+
+  def service_params
+    dynamic_params = []
+    dynamic_params.concat(@service.event_channel_names)
+
+    service_params = params.permit(:id, service: ALLOWED_PARAMS + dynamic_params)
+
+    if service_params[:service].is_a?(Hash)
+      FILTER_BLANK_PARAMS.each do |param|
+        service_params[:service].delete(param) if service_params[:service][param].blank?
+      end
+    end
+
+    service_params
+  end
+end
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index a04bf7df722..6780a6d4d87 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -121,7 +121,7 @@ class GroupsController < Groups::ApplicationController
   end
 
   def group_params
-    params.require(:group).permit(:name, :description, :path, :avatar, :public, :visibility_level, :share_with_group_lock)
+    params.require(:group).permit(:name, :description, :path, :avatar, :public, :visibility_level, :share_with_group_lock, :request_access_enabled)
   end
 
   def load_events
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb
index d3dd98c8a4e..f7b44099b78 100644
--- a/app/controllers/help_controller.rb
+++ b/app/controllers/help_controller.rb
@@ -30,7 +30,7 @@ class HelpController < ApplicationController
       end
 
       # Allow access to images in the doc folder
-      format.any(:png, :gif, :jpeg) do
+      format.any(:png, :gif, :jpeg, :mp4) do
         # Note: We are purposefully NOT using `Rails.root.join`
         path = File.join(Rails.root, 'doc', "#{@path}.#{params[:format]}")
 
diff --git a/app/controllers/profiles/two_factor_auths_controller.rb b/app/controllers/profiles/two_factor_auths_controller.rb
index 6a358fdcc05..e37e9e136db 100644
--- a/app/controllers/profiles/two_factor_auths_controller.rb
+++ b/app/controllers/profiles/two_factor_auths_controller.rb
@@ -100,7 +100,6 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
 
     gon.push(u2f: { challenges: session[:challenges], app_id: u2f_app_id,
                     register_requests: registration_requests,
-                    sign_requests: sign_requests,
-                    browser_supports_u2f: browser_supports_u2f? })
+                    sign_requests: sign_requests })
   end
 end
diff --git a/app/controllers/projects/badges_controller.rb b/app/controllers/projects/badges_controller.rb
index 824aa41db51..a9f482c8787 100644
--- a/app/controllers/projects/badges_controller.rb
+++ b/app/controllers/projects/badges_controller.rb
@@ -3,11 +3,6 @@ class Projects::BadgesController < Projects::ApplicationController
   before_action :authorize_admin_project!, only: [:index]
   before_action :no_cache_headers, except: [:index]
 
-  def index
-    @ref = params[:ref] || @project.default_branch || 'master'
-    @build_badge = Gitlab::Badge::Build.new(@project, @ref)
-  end
-
   def build
     badge = Gitlab::Badge::Build.new(project, params[:ref])
 
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index 5356fdf010d..eda3727a28d 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -38,6 +38,12 @@ class Projects::BlobController < Projects::ApplicationController
   end
 
   def update
+    if params[:file_path].present?
+      @previous_path = @path
+      @path = params[:file_path]
+      @commit_params[:file_path] = @path
+    end
+
     after_edit_path =
       if from_merge_request && @target_branch == @ref
         diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) +
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index dd9508da049..6126acccaab 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -6,8 +6,7 @@ class Projects::BranchesController < Projects::ApplicationController
   before_action :authorize_push_code!, only: [:new, :create, :destroy]
 
   def index
-    @sort = params[:sort] || 'name'
-    @branches = @repository.branches_sorted_by(@sort)
+    @branches = BranchesFinder.new(@repository, params).execute
     @branches = Kaminari.paginate_array(@branches).page(params[:page])
 
     @max_commits = @branches.reduce(0) do |memo, branch|
diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb
index ef3051d7519..553b62741a5 100644
--- a/app/controllers/projects/builds_controller.rb
+++ b/app/controllers/projects/builds_controller.rb
@@ -1,6 +1,6 @@
 class Projects::BuildsController < Projects::ApplicationController
   before_action :build, except: [:index, :cancel_all]
-  before_action :authorize_read_build!, except: [:cancel, :cancel_all, :retry]
+  before_action :authorize_read_build!, except: [:cancel, :cancel_all, :retry, :play]
   before_action :authorize_update_build!, except: [:index, :show, :status, :raw]
   layout 'project'
 
@@ -10,8 +10,10 @@ class Projects::BuildsController < Projects::ApplicationController
     @builds = @all_builds.order('created_at DESC')
     @builds =
       case @scope
+      when 'pending'
+        @builds.pending.reverse_order
       when 'running'
-        @builds.running_or_pending.reverse_order
+        @builds.running.reverse_order
       when 'finished'
         @builds.finished
       else
@@ -47,14 +49,19 @@ class Projects::BuildsController < Projects::ApplicationController
   end
 
   def retry
-    unless @build.retryable?
-      return render_404
-    end
+    return render_404 unless @build.retryable?
 
     build = Ci::Build.retry(@build, current_user)
     redirect_to build_path(build)
   end
 
+  def play
+    return render_404 unless @build.playable?
+
+    build = @build.play(current_user)
+    redirect_to build_path(build)
+  end
+
   def cancel
     @build.cancel
     redirect_to build_path(@build)
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 727e84b40a1..7ae034f9398 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -115,11 +115,11 @@ class Projects::CommitController < Projects::ApplicationController
   end
 
   def define_note_vars
-    @grouped_diff_notes = commit.notes.grouped_diff_notes
+    @grouped_diff_discussions = commit.notes.grouped_diff_discussions
     @notes = commit.notes.non_diff_notes.fresh
 
     Banzai::NoteRenderer.render(
-      @grouped_diff_notes.values.flatten + @notes,
+      @grouped_diff_discussions.values.flat_map(&:notes) + @notes,
       @project,
       current_user,
     )
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb
index 5f3ee71444d..8c004724f02 100644
--- a/app/controllers/projects/compare_controller.rb
+++ b/app/controllers/projects/compare_controller.rb
@@ -15,6 +15,7 @@ class Projects::CompareController < Projects::ApplicationController
   end
 
   def show
+    apply_diff_view_cookie!
   end
 
   def diff_for_path
@@ -53,7 +54,7 @@ class Projects::CompareController < Projects::ApplicationController
       )
 
       @diff_notes_disabled = true
-      @grouped_diff_notes = {}
+      @grouped_diff_discussions = {}
     end
   end
 
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index f7ada5cfee4..fa663c9bda4 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -119,10 +119,6 @@ class Projects::IssuesController < Projects::ApplicationController
         render json: @issue.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } })
       end
     end
-
-  rescue ActiveRecord::StaleObjectError
-    @conflict = true
-    render :edit
   end
 
   def referenced_merge_requests
@@ -220,7 +216,7 @@ class Projects::IssuesController < Projects::ApplicationController
   def issue_params
     params.require(:issue).permit(
       :title, :assignee_id, :position, :description, :confidential,
-      :milestone_id, :due_date, :state_event, :task_num, :lock_version, label_ids: []
+      :milestone_id, :due_date, :state_event, :task_num, label_ids: []
     )
   end
 
@@ -230,6 +226,7 @@ class Projects::IssuesController < Projects::ApplicationController
       :assignee_id,
       :milestone_id,
       :state_event,
+      :subscription_event,
       label_ids: [],
       add_label_ids: [],
       remove_label_ids: []
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 2deb7959700..594a61464b9 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -97,7 +97,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     else
       build_merge_request
       @diff_notes_disabled = true
-      @grouped_diff_notes = {}
+      @grouped_diff_discussions = {}
     end
 
     define_commit_vars
@@ -196,9 +196,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     else
       render "edit"
     end
-  rescue ActiveRecord::StaleObjectError
-    @conflict = true
-    render :edit
   end
 
   def remove_wip
@@ -289,6 +286,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
       status = pipeline.status
       coverage = pipeline.try(:coverage)
 
+      status = "success_with_warnings" if pipeline.success? && pipeline.has_warnings?
+
       status ||= "preparing"
     else
       ci_service = @merge_request.source_project.ci_service
@@ -379,7 +378,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
     # This is not executed lazily
     @notes = Banzai::NoteRenderer.render(
-      @discussions.flatten,
+      @discussions.flat_map(&:notes),
       @project,
       current_user,
       @path,
@@ -405,10 +404,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     }
 
     @use_legacy_diff_notes = !@merge_request.support_new_diff_notes?
-    @grouped_diff_notes = @merge_request.notes.grouped_diff_notes
+    @grouped_diff_discussions = @merge_request.notes.grouped_diff_discussions
 
     Banzai::NoteRenderer.render(
-      @grouped_diff_notes.values.flatten,
+      @grouped_diff_discussions.values.flat_map(&:notes),
       @project,
       current_user,
       @path,
@@ -427,7 +426,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
       :title, :assignee_id, :source_project_id, :source_branch,
       :target_project_id, :target_branch, :milestone_id,
       :state_event, :description, :task_num, :force_remove_source_branch,
-      :lock_version, label_ids: []
+      label_ids: []
     )
   end
 
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index 3eacdbbd067..766b7e9cf22 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -73,7 +73,7 @@ class Projects::NotesController < Projects::ApplicationController
   end
   alias_method :awardable, :note
 
-  def note_to_html(note)
+  def note_html(note)
     render_to_string(
       "projects/notes/_note",
       layout: false,
@@ -82,20 +82,20 @@ class Projects::NotesController < Projects::ApplicationController
     )
   end
 
-  def note_to_discussion_html(note)
-    return unless note.diff_note?
+  def diff_discussion_html(discussion)
+    return unless discussion.diff_discussion?
 
     if params[:view] == 'parallel'
-      template = "projects/notes/_diff_notes_with_reply_parallel"
+      template = "discussions/_parallel_diff_discussion"
       locals =
         if params[:line_type] == 'old'
-          { notes_left: [note], notes_right: [] }
+          { discussion_left: discussion, discussion_right: nil }
         else
-          { notes_left: [], notes_right: [note] }
+          { discussion_left: nil, discussion_right: discussion }
         end
     else
-      template = "projects/notes/_diff_notes_with_reply"
-      locals = { notes: [note] }
+      template = "discussions/_diff_discussion"
+      locals = { discussion: discussion }
     end
 
     render_to_string(
@@ -106,14 +106,14 @@ class Projects::NotesController < Projects::ApplicationController
     )
   end
 
-  def note_to_discussion_with_diff_html(note)
-    return unless note.diff_note?
+  def discussion_html(discussion)
+    return unless discussion.diff_discussion?
 
     render_to_string(
-      "projects/notes/_discussion",
+      "discussions/_discussion",
       layout: false,
       formats: [:html],
-      locals: { discussion_notes: [note] }
+      locals: { discussion: discussion }
     )
   end
 
@@ -132,26 +132,33 @@ class Projects::NotesController < Projects::ApplicationController
         valid: true,
         id: note.id,
         discussion_id: note.discussion_id,
-        html: note_to_html(note),
+        html: note_html(note),
         award: false,
-        note: note.note,
-        discussion_html: note_to_discussion_html(note),
-        discussion_with_diff_html: note_to_discussion_with_diff_html(note)
+        note: note.note
       }
 
-      # The discussion_id is used to add the comment to the correct discussion
-      # element on the merge request page. Among other things, the discussion_id
-      # contains the sha of head commit of the merge request.
-      # When new commits are pushed into the merge request after the initial
-      # load of the merge request page, the discussion elements will still have
-      # the old discussion_ids, with the old head commit sha. The new comment,
-      # however, will have the new discussion_id with the new commit sha.
-      # To ensure that these new comments will still end up in the correct
-      # discussion element, we also send the original discussion_id, with the
-      # old commit sha, along, and fall back on this value when no discussion
-      # element with the new discussion_id could be found.
-      if note.new_diff_note? && note.position != note.original_position
-        attrs[:original_discussion_id] = note.original_discussion_id
+      if note.diff_note?
+        discussion = Discussion.new([note])
+
+        attrs.merge!(
+          diff_discussion_html: diff_discussion_html(discussion),
+          discussion_html: discussion_html(discussion)
+        )
+
+        # The discussion_id is used to add the comment to the correct discussion
+        # element on the merge request page. Among other things, the discussion_id
+        # contains the sha of head commit of the merge request.
+        # When new commits are pushed into the merge request after the initial
+        # load of the merge request page, the discussion elements will still have
+        # the old discussion_ids, with the old head commit sha. The new comment,
+        # however, will have the new discussion_id with the new commit sha.
+        # To ensure that these new comments will still end up in the correct
+        # discussion element, we also send the original discussion_id, with the
+        # old commit sha, along, and fall back on this value when no discussion
+        # element with the new discussion_id could be found.
+        if note.new_diff_note? && note.position != note.original_position
+          attrs[:original_discussion_id] = note.original_discussion_id
+        end
       end
 
       attrs
diff --git a/app/controllers/projects/pipelines_settings_controller.rb b/app/controllers/projects/pipelines_settings_controller.rb
new file mode 100644
index 00000000000..85ba706e5cd
--- /dev/null
+++ b/app/controllers/projects/pipelines_settings_controller.rb
@@ -0,0 +1,30 @@
+class Projects::PipelinesSettingsController < Projects::ApplicationController
+  before_action :authorize_admin_pipeline!
+
+  def show
+    @ref = params[:ref] || @project.default_branch || 'master'
+    @build_badge = Gitlab::Badge::Build.new(@project, @ref)
+  end
+
+  def update
+    if @project.update_attributes(update_params)
+      flash[:notice] = "CI/CD Pipelines settings for '#{@project.name}' were successfully updated."
+      redirect_to namespace_project_pipelines_settings_path(@project.namespace, @project)
+    else
+      render 'index'
+    end
+  end
+
+  private
+
+  def create_params
+    params.require(:pipeline).permit(:ref)
+  end
+
+  def update_params
+    params.require(:project).permit(
+      :runners_token, :builds_enabled, :build_allow_git_fetch, :build_timeout_in_minutes, :build_coverage_regex,
+      :public_builds
+    )
+  end
+end
diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb
index 80dad758afa..10dca47fded 100644
--- a/app/controllers/projects/protected_branches_controller.rb
+++ b/app/controllers/projects/protected_branches_controller.rb
@@ -50,6 +50,6 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
   end
 
   def protected_branch_params
-    params.require(:protected_branch).permit(:name, :developers_can_push)
+    params.require(:protected_branch).permit(:name, :developers_can_push, :developers_can_merge)
   end
 end
diff --git a/app/controllers/projects/refs_controller.rb b/app/controllers/projects/refs_controller.rb
index d79f16e6a5a..3602b3d5e58 100644
--- a/app/controllers/projects/refs_controller.rb
+++ b/app/controllers/projects/refs_controller.rb
@@ -25,7 +25,7 @@ class Projects::RefsController < Projects::ApplicationController
           when "graphs_commits"
             commits_namespace_project_graph_path(@project.namespace, @project, @id)
           when "badges"
-            namespace_project_badges_path(@project.namespace, @project, ref: @id)
+            namespace_project_pipelines_settings_path(@project.namespace, @project, ref: @id)
           else
             namespace_project_commits_path(@project.namespace, @project, @id)
           end
diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index 739681f4085..6a227d85f6f 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -1,20 +1,5 @@
 class Projects::ServicesController < Projects::ApplicationController
-  ALLOWED_PARAMS = [:title, :token, :type, :active, :api_key, :api_url, :api_version, :subdomain,
-                    :room, :recipients, :project_url, :webhook,
-                    :user_key, :device, :priority, :sound, :bamboo_url, :username, :password,
-                    :build_key, :server, :teamcity_url, :drone_url, :build_type,
-                    :description, :issues_url, :new_issue_url, :restrict_to_branch, :channel,
-                    :colorize_messages, :channels,
-                    :push_events, :issues_events, :merge_requests_events, :tag_push_events,
-                    :note_events, :build_events, :wiki_page_events,
-                    :notify_only_broken_builds, :add_pusher,
-                    :send_from_committer_email, :disable_diffs, :external_wiki_url,
-                    :notify, :color,
-                    :server_host, :server_port, :default_irc_uri, :enable_ssl_verification,
-                    :jira_issue_transition_id]
-
-  # Parameters to ignore if no value is specified
-  FILTER_BLANK_PARAMS = [:password]
+  include ServiceParams
 
   # Authorize
   before_action :authorize_admin_project!
@@ -33,7 +18,7 @@ class Projects::ServicesController < Projects::ApplicationController
   end
 
   def update
-    if @service.update_attributes(service_params)
+    if @service.update_attributes(service_params[:service])
       redirect_to(
         edit_namespace_project_service_path(@project.namespace, @project,
                                             @service.to_param, notice:
@@ -45,8 +30,9 @@ class Projects::ServicesController < Projects::ApplicationController
   end
 
   def test
-    data = Gitlab::PushDataBuilder.build_sample(project, current_user)
+    data = @service.test_data(project, current_user)
     outcome = @service.test(data)
+
     if outcome[:success]
       message = { notice: 'We sent a request to the provided URL' }
     else
@@ -63,12 +49,4 @@ class Projects::ServicesController < Projects::ApplicationController
   def service
     @service ||= @project.services.find { |service| service.to_param == params[:id] }
   end
-
-  def service_params
-    service_params = params.require(:service).permit(ALLOWED_PARAMS)
-    FILTER_BLANK_PARAMS.each do |param|
-      service_params.delete(param) if service_params[param].blank?
-    end
-    service_params
-  end
 end
diff --git a/app/controllers/projects/uploads_controller.rb b/app/controllers/projects/uploads_controller.rb
index caed064dfbc..e617be8f9fb 100644
--- a/app/controllers/projects/uploads_controller.rb
+++ b/app/controllers/projects/uploads_controller.rb
@@ -1,6 +1,6 @@
 class Projects::UploadsController < Projects::ApplicationController
   skip_before_action :reject_blocked!, :project,
-    :repository, if: -> { action_name == 'show' && image? }
+    :repository, if: -> { action_name == 'show' && image_or_video? }
 
   before_action :authorize_upload_file!, only: [:create]
 
@@ -24,7 +24,7 @@ class Projects::UploadsController < Projects::ApplicationController
   def show
     return render_404 if uploader.nil? || !uploader.file.exists?
 
-    disposition = uploader.image? ? 'inline' : 'attachment'
+    disposition = uploader.image_or_video? ? 'inline' : 'attachment'
     send_file uploader.file.path, disposition: disposition
   end
 
@@ -49,7 +49,7 @@ class Projects::UploadsController < Projects::ApplicationController
     @uploader
   end
 
-  def image?
-    uploader && uploader.file.exists? && uploader.image?
+  def image_or_video?
+    uploader && uploader.file.exists? && uploader.image_or_video?
   end
 end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 1803aa8eab4..ec7a2e63b9a 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -5,7 +5,7 @@ class ProjectsController < Projects::ApplicationController
   before_action :project, except: [:new, :create]
   before_action :repository, except: [:new, :create]
   before_action :assign_ref_vars, only: [:show], if: :repo_exists?
-  before_action :tree, only: [:show], if: :project_view_files?
+  before_action :tree, only: [:show], if: [:repo_exists?, :project_view_files?]
 
   # Authorize
   before_action :authorize_admin_project!, only: [:edit, :update, :housekeeping, :download_export, :export, :remove_export, :generate_new_export]
@@ -296,7 +296,7 @@ class ProjectsController < Projects::ApplicationController
       :issues_tracker_id, :default_branch,
       :wiki_enabled, :visibility_level, :import_url, :last_activity_at, :namespace_id, :avatar,
       :builds_enabled, :build_allow_git_fetch, :build_timeout_in_minutes, :build_coverage_regex,
-      :public_builds, :only_allow_merge_if_build_succeeds
+      :public_builds, :only_allow_merge_if_build_succeeds, :request_access_enabled
     )
   end
 
diff --git a/app/finders/branches_finder.rb b/app/finders/branches_finder.rb
new file mode 100644
index 00000000000..533076585c0
--- /dev/null
+++ b/app/finders/branches_finder.rb
@@ -0,0 +1,31 @@
+class BranchesFinder
+  def initialize(repository, params)
+    @repository = repository
+    @params = params
+  end
+
+  def execute
+    branches = @repository.branches_sorted_by(sort)
+    filter_by_name(branches)
+  end
+
+  private
+
+  attr_reader :repository, :params
+
+  def search
+    @params[:search].presence
+  end
+
+  def sort
+    @params[:sort].presence || 'name'
+  end
+
+  def filter_by_name(branches)
+    if search
+      branches.select { |branch| branch.name.include?(search) }
+    else
+      branches
+    end
+  end
+end
diff --git a/app/helpers/avatars_helper.rb b/app/helpers/avatars_helper.rb
new file mode 100644
index 00000000000..6ff40c6b461
--- /dev/null
+++ b/app/helpers/avatars_helper.rb
@@ -0,0 +1,30 @@
+module AvatarsHelper
+
+  def author_avatar(commit_or_event, options = {})
+    user_avatar(options.merge({
+      user: commit_or_event.author,
+      user_name: commit_or_event.author_name,
+      user_email: commit_or_event.author_email,
+    }))
+  end
+
+  private
+
+  def user_avatar(options = {})
+    avatar_size = options[:size] || 16
+    user_name = options[:user].try(:name) || options[:user_name]
+    avatar = image_tag(
+      avatar_icon(options[:user] || options[:user_email], avatar_size),
+      class: "avatar has-tooltip hidden-xs s#{avatar_size}",
+      alt: "#{user_name}'s avatar",
+      title: user_name
+    )
+
+    if options[:user]
+      link_to(avatar, user_path(options[:user]))
+    elsif options[:user_email]
+      mail_to(options[:user_email], avatar)
+    end
+  end
+
+end
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index 428a42266d0..abe115d8c68 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -1,10 +1,7 @@
 module BlobHelper
-  def highlighter(blob_name, blob_content, repository: nil, nowrap: false)
-    Gitlab::Highlight.new(blob_name, blob_content, nowrap: nowrap, repository: repository)
-  end
-
-  def highlight(blob_name, blob_content, repository: nil, nowrap: false, plain: false)
-    Gitlab::Highlight.highlight(blob_name, blob_content, nowrap: nowrap, plain: plain, repository: repository)
+  def highlight(blob_name, blob_content, repository: nil, plain: false)
+    highlighted = Gitlab::Highlight.highlight(blob_name, blob_content, plain: plain, repository: repository)
+    raw %(<pre class="code highlight"><code>#{highlighted}</code></pre>)
   end
 
   def no_highlight_files
diff --git a/app/helpers/branches_helper.rb b/app/helpers/branches_helper.rb
index 601df5c18df..3fc85dc6b2b 100644
--- a/app/helpers/branches_helper.rb
+++ b/app/helpers/branches_helper.rb
@@ -9,10 +9,21 @@ module BranchesHelper
     end
   end
 
+  def filter_branches_path(options = {})
+    exist_opts = {
+      search: params[:search],
+      sort: params[:sort]
+    }
+
+    options = exist_opts.merge(options)
+
+    namespace_project_branches_path(@project.namespace, @project, @id, options)
+  end
+
   def can_push_branch?(project, branch_name)
     return false unless project.repository.branch_exists?(branch_name)
 
-    ::Gitlab::GitAccess.new(current_user, project, 'web').can_push_to_branch?(branch_name)
+    ::Gitlab::UserAccess.new(current_user, project: project).can_push_to_branch?(branch_name)
   end
 
   def project_branches
diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb
index e6c99c9959e..ea2f5f9281a 100644
--- a/app/helpers/ci_status_helper.rb
+++ b/app/helpers/ci_status_helper.rb
@@ -15,8 +15,11 @@ module CiStatusHelper
   end
 
   def ci_label_for_status(status)
-    if status == 'success'
+    case status
+    when 'success'
       'passed'
+    when 'success_with_warnings'
+      'passed with warnings'
     else
       status
     end
@@ -26,24 +29,26 @@ module CiStatusHelper
     icon_name =
       case status
       when 'success'
-        'check'
+        'icon_status_success'
+      when 'success_with_warnings'
+        'icon_status_warning'
       when 'failed'
-        'close'
+        'icon_status_failed'
       when 'pending'
-        'clock-o'
+        'icon_status_pending'
       when 'running'
-        'spinner'
+        'icon_status_running'
       else
-        'circle'
+        'icon_status_cancel'
       end
 
-    icon(icon_name + ' fw')
+    custom_icon(icon_name)
   end
 
-  def render_commit_status(commit, tooltip_placement: 'auto left', cssclass: '')
+  def render_commit_status(commit, tooltip_placement: 'auto left')
     project = commit.project
     path = builds_namespace_project_commit_path(project.namespace, project, commit)
-    render_status_with_link('commit', commit.status, path, tooltip_placement, cssclass: cssclass)
+    render_status_with_link('commit', commit.status, path, tooltip_placement)
   end
 
   def render_pipeline_status(pipeline, tooltip_placement: 'auto left')
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index 474041eccbb..f497626e21a 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 module CommitsHelper
   # Returns a link to the commit author. If the author has a matching user and
   # is a member of the current @project it will link to the team member page.
@@ -16,16 +15,6 @@ module CommitsHelper
     commit_person_link(commit, options.merge(source: :committer))
   end
 
-  def commit_author_avatar(commit, options = {})
-    options = options.merge(source: :author)
-    user = commit.send(options[:source])
-
-    source_email = clean(commit.send "#{options[:source]}_email".to_sym)
-    person_email = user.try(:email) || source_email
-
-    image_tag(avatar_icon(person_email, options[:size]), class: "avatar #{"s#{options[:size]}" if options[:size]} hidden-xs", width: options[:size], alt: "")
-  end
-
   def image_diff_class(diff)
     if diff.deleted_file
       "deleted"
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb
index adab901700c..4c031942793 100644
--- a/app/helpers/diff_helper.rb
+++ b/app/helpers/diff_helper.rb
@@ -9,7 +9,7 @@ module DiffHelper
   end
 
   def expand_all_diffs?
-    @expand_all_diffs || params[:expand_all_diffs].present?
+    params[:expand_all_diffs].present?
   end
 
   def diff_view
@@ -23,13 +23,14 @@ module DiffHelper
   end
 
   def diff_options
-    default_options = Commit.max_diff_options
+    options = { ignore_whitespace_change: hide_whitespace?, no_collapse: expand_all_diffs? }
 
     if action_name == 'diff_for_path'
-      default_options[:paths] = params.values_at(:old_path, :new_path)
+      options[:no_collapse] = true
+      options[:paths] = params.values_at(:old_path, :new_path)
     end
 
-    default_options.merge(ignore_whitespace_change: hide_whitespace?)
+    Commit.max_diff_options.merge(options)
   end
 
   def safe_diff_files(diffs, diff_refs: nil, repository: nil)
@@ -53,18 +54,20 @@ module DiffHelper
     end
   end
 
-  def organize_comments(left, right)
-    notes_left = notes_right = nil
+  def parallel_diff_discussions(left, right, diff_file)
+    discussion_left = discussion_right = nil
 
-    unless left[:type].nil? && right[:type] == 'new'
-      notes_left = @grouped_diff_notes[left[:line_code]]
+    if left && (left.unchanged? || left.removed?)
+      line_code = diff_file.line_code(left)
+      discussion_left = @grouped_diff_discussions[line_code]
     end
 
-    unless left[:type].nil? && right[:type].nil?
-      notes_right = @grouped_diff_notes[right[:line_code]]
+    if right && right.added?
+      line_code = diff_file.line_code(right)
+      discussion_right = @grouped_diff_discussions[line_code]
     end
 
-    [notes_left, notes_right]
+    [discussion_left, discussion_right]
   end
 
   def inline_diff_btn
diff --git a/app/helpers/external_wiki_helper.rb b/app/helpers/external_wiki_helper.rb
index 1f3401f2906..defd87d6bbe 100644
--- a/app/helpers/external_wiki_helper.rb
+++ b/app/helpers/external_wiki_helper.rb
@@ -1,8 +1,7 @@
 module ExternalWikiHelper
   def get_project_wiki_path(project)
-    external_wiki_service = project.services.
-      find { |service| service.to_param == 'external_wiki' }
-    if external_wiki_service.present? && external_wiki_service.active?
+    external_wiki_service = project.external_wiki
+    if external_wiki_service
       external_wiki_service.properties['external_wiki_url']
     else
       namespace_project_wiki_path(project.namespace, project, :home)
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index a3a8c7d5ff9..47d174361db 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -9,7 +9,7 @@ module IssuablesHelper
 
   def multi_label_name(current_labels, default_label)
     # current_labels may be a string from before
-    if current_labels.is_a?(Array) && current_labels.any?
+    if current_labels.is_a?(Array)
       if current_labels.count > 1
         "#{current_labels[0]} +#{current_labels.count - 1} more"
       else
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index 98143dcee9b..0f60dd828ab 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -1,9 +1,4 @@
 module NotesHelper
-  # Helps to distinguish e.g. commit notes in mr notes list
-  def note_for_main_target?(note)
-    @noteable.class.name == note.noteable_type && !note.diff_note?
-  end
-
   def note_target_fields(note)
     if note.noteable
       hidden_field_tag(:target_type, note.noteable.class.name.underscore) +
@@ -44,8 +39,8 @@ module NotesHelper
     # If we didn't, diff notes that would show for the same line on the changes
     # tab, would show in different discussions on the discussion tab.
     use_legacy_diff_note ||= begin
-      line_diff_notes = @grouped_diff_notes[line_code]
-      line_diff_notes && line_diff_notes.any?(&:legacy_diff_note?)
+      discussion = @grouped_diff_discussions[line_code]
+      discussion && discussion.legacy_diff_discussion?
     end
 
     data = {
@@ -81,22 +76,10 @@ module NotesHelper
     data
   end
 
-  def link_to_reply_discussion(note, line_type = nil)
+  def link_to_reply_discussion(discussion, line_type = nil)
     return unless current_user
 
-    data = {
-      noteable_type: note.noteable_type,
-      noteable_id:   note.noteable_id,
-      commit_id:     note.commit_id,
-      discussion_id: note.discussion_id,
-      line_type:     line_type
-    }
-
-    if note.diff_note?
-      data[:note_type] = note.type
-
-      data.merge!(note.diff_attributes)
-    end
+    data = discussion.reply_attributes.merge(line_type: line_type)
 
     content_tag(:div, class: "discussion-reply-holder") do
       button_tag 'Reply...', class: 'btn btn-text-field js-discussion-reply-button',
@@ -114,13 +97,13 @@ module NotesHelper
     @max_access_by_user_id[full_key]
   end
 
-  def diff_note_path(note)
-    return unless note.diff_note?
+  def discussion_diff_path(discussion)
+    return unless discussion.diff_discussion?
 
-    if note.for_merge_request? && note.active?
-      diffs_namespace_project_merge_request_path(note.project.namespace, note.project, note.noteable, anchor: note.line_code)
-    elsif note.for_commit?
-      namespace_project_commit_path(note.project.namespace, note.project, note.noteable, anchor: note.line_code)
+    if discussion.for_merge_request? && discussion.active?
+      diffs_namespace_project_merge_request_path(discussion.project.namespace, discussion.project, discussion.noteable, anchor: discussion.line_code)
+    elsif discussion.for_commit?
+      namespace_project_commit_path(discussion.project.namespace, discussion.project, discussion.noteable, anchor: discussion.line_code)
     end
   end
 end
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index fcb2703e837..a2bba139c17 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -112,7 +112,8 @@ module SearchHelper
       search: params[:search],
       project_id: params[:project_id],
       group_id: params[:group_id],
-      scope: params[:scope]
+      scope: params[:scope],
+      repository_ref: params[:repository_ref]
     }
 
     options = exist_opts.merge(options)
diff --git a/app/helpers/services_helper.rb b/app/helpers/services_helper.rb
new file mode 100644
index 00000000000..2dd0bf5d71e
--- /dev/null
+++ b/app/helpers/services_helper.rb
@@ -0,0 +1,25 @@
+module ServicesHelper
+  def service_event_description(event)
+    case event
+    when "push"
+      "Event will be triggered by a push to the repository"
+    when "tag_push"
+      "Event will be triggered when a new tag is pushed to the repository"
+    when "note"
+      "Event will be triggered when someone adds a comment"
+    when "issue"
+      "Event will be triggered when an issue is created/updated/merged"
+    when "merge_request"
+      "Event will be triggered when a merge request is created/updated/merged"
+    when "build"
+      "Event will be triggered when a build status changes"
+    when "wiki_page"
+      "Event will be triggered when a wiki page is created/updated"
+    end
+  end
+
+  def service_event_field_name(event)
+    event = event.pluralize if %w[merge_request issue].include?(event)
+    "#{event}_events"
+  end
+end
diff --git a/app/helpers/time_helper.rb b/app/helpers/time_helper.rb
index 8cb82c2d5cc..790001222f1 100644
--- a/app/helpers/time_helper.rb
+++ b/app/helpers/time_helper.rb
@@ -1,15 +1,6 @@
 module TimeHelper
-  def duration_in_words(finished_at, started_at)
-    if finished_at && started_at
-      interval_in_seconds = finished_at.to_i - started_at.to_i
-    elsif started_at
-      interval_in_seconds = Time.now.to_i - started_at.to_i
-    end
-
-    time_interval_in_words(interval_in_seconds)
-  end
-
   def time_interval_in_words(interval_in_seconds)
+    interval_in_seconds = interval_in_seconds.to_i
     minutes = interval_in_seconds / 60
     seconds = interval_in_seconds - minutes * 60
 
@@ -25,9 +16,19 @@ module TimeHelper
   end
 
   def duration_in_numbers(finished_at, started_at)
-    diff_in_seconds = finished_at.to_i - started_at.to_i
-    time_format = diff_in_seconds < 1.hour ? "%M:%S" : "%H:%M:%S"
+    interval = interval_in_seconds(started_at, finished_at)
+    time_format = interval < 1.hour ? "%M:%S" : "%H:%M:%S"
 
-    Time.at(diff_in_seconds).utc.strftime(time_format)
+    Time.at(interval).utc.strftime(time_format)
+  end
+
+  private
+
+  def interval_in_seconds(started_at, finished_at = nil)
+    if started_at && finished_at
+      finished_at.to_i - started_at.to_i
+    elsif started_at
+      Time.now.to_i - started_at.to_i
+    end
   end
 end
diff --git a/app/helpers/u2f_helper.rb b/app/helpers/u2f_helper.rb
new file mode 100644
index 00000000000..143b4ca6b51
--- /dev/null
+++ b/app/helpers/u2f_helper.rb
@@ -0,0 +1,5 @@
+module U2fHelper
+  def inject_u2f_api?
+    browser.chrome? && browser.version.to_i >= 41 && !browser.device.mobile?
+  end
+end
diff --git a/app/mailers/emails/builds.rb b/app/mailers/emails/builds.rb
index 2f86d1be576..3853af6201a 100644
--- a/app/mailers/emails/builds.rb
+++ b/app/mailers/emails/builds.rb
@@ -6,6 +6,7 @@ module Emails
 
       add_project_headers
       add_build_headers('failed')
+
       mail(to: to, subject: subject("Build failed for #{@project.name}", @build.short_sha))
     end
 
diff --git a/app/models/ability.rb b/app/models/ability.rb
index eeb0ceba081..f33c8d61d3f 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -172,7 +172,7 @@ class Ability
           rules << :read_build if project.public_builds?
 
           unless owner || project.team.member?(user) || project_group_member?(project, user)
-            rules << :request_access
+            rules << :request_access if project.request_access_enabled
           end
         end
 
@@ -204,7 +204,8 @@ class Ability
         :download_code,
         :fork_project,
         :read_commit_status,
-        :read_pipeline
+        :read_pipeline,
+        :read_container_image
       ]
     end
 
@@ -372,7 +373,7 @@ class Ability
       end
 
       if group.public? || (group.internal? && !user.external?)
-        rules << :request_access unless group.users.include?(user)
+        rules << :request_access if group.request_access_enabled && group.users.exclude?(user)
       end
 
       rules.flatten
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index c6f77cc055f..8c19d9dc9c8 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -4,12 +4,20 @@ class ApplicationSetting < ActiveRecord::Base
   add_authentication_token_field :health_check_access_token
 
   CACHE_KEY = 'application_setting.last'
+  DOMAIN_LIST_SEPARATOR = %r{\s*[,;]\s*     # comma or semicolon, optionally surrounded by whitespace
+                            |               # or
+                            \s              # any whitespace character
+                            |               # or
+                            [\r\n]          # any number of newline characters
+                          }x
 
   serialize :restricted_visibility_levels
   serialize :import_sources
   serialize :disabled_oauth_sign_in_sources, Array
-  serialize :restricted_signup_domains, Array
-  attr_accessor :restricted_signup_domains_raw
+  serialize :domain_whitelist, Array
+  serialize :domain_blacklist, Array
+
+  attr_accessor :domain_whitelist_raw, :domain_blacklist_raw
 
   validates :session_expire_delay,
             presence: true,
@@ -62,6 +70,10 @@ class ApplicationSetting < ActiveRecord::Base
   validates :enabled_git_access_protocol,
             inclusion: { in: %w(ssh http), allow_blank: true, allow_nil: true }
 
+  validates :domain_blacklist,
+            presence: { message: 'Domain blacklist cannot be empty if Blacklist is enabled.' },
+            if: :domain_blacklist_enabled?
+
   validates_each :restricted_visibility_levels do |record, attr, value|
     unless value.nil?
       value.each do |level|
@@ -129,7 +141,7 @@ class ApplicationSetting < ActiveRecord::Base
       session_expire_delay: Settings.gitlab['session_expire_delay'],
       default_project_visibility: Settings.gitlab.default_projects_features['visibility_level'],
       default_snippet_visibility: Settings.gitlab.default_projects_features['visibility_level'],
-      restricted_signup_domains: Settings.gitlab['restricted_signup_domains'],
+      domain_whitelist: Settings.gitlab['domain_whitelist'],
       import_sources: %w[github bitbucket gitlab gitorious google_code fogbugz git gitlab_project],
       shared_runners_enabled: Settings.gitlab_ci['shared_runners_enabled'],
       max_artifacts_size: Settings.artifacts['max_size'],
@@ -150,20 +162,30 @@ class ApplicationSetting < ActiveRecord::Base
     ActiveRecord::Base.connection.column_exists?(:application_settings, :home_page_url)
   end
 
-  def restricted_signup_domains_raw
-    self.restricted_signup_domains.join("\n") unless self.restricted_signup_domains.nil?
+  def domain_whitelist_raw
+    self.domain_whitelist.join("\n") unless self.domain_whitelist.nil?
+  end
+
+  def domain_blacklist_raw
+    self.domain_blacklist.join("\n") unless self.domain_blacklist.nil?
+  end
+
+  def domain_whitelist_raw=(values)
+    self.domain_whitelist = []
+    self.domain_whitelist = values.split(DOMAIN_LIST_SEPARATOR)
+    self.domain_whitelist.reject! { |d| d.empty? }
+    self.domain_whitelist
+  end
+
+  def domain_blacklist_raw=(values)
+    self.domain_blacklist = []
+    self.domain_blacklist = values.split(DOMAIN_LIST_SEPARATOR)
+    self.domain_blacklist.reject! { |d| d.empty? }
+    self.domain_blacklist
   end
 
-  def restricted_signup_domains_raw=(values)
-    self.restricted_signup_domains = []
-    self.restricted_signup_domains = values.split(
-      /\s*[,;]\s*     # comma or semicolon, optionally surrounded by whitespace
-      |               # or
-      \s              # any whitespace character
-      |               # or
-      [\r\n]          # any number of newline characters
-      /x)
-    self.restricted_signup_domains.reject! { |d| d.empty? }
+  def domain_blacklist_file=(file)
+    self.domain_blacklist_raw = file.read
   end
 
   def runners_registration_token
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 788f27ea0ac..aac78d75f57 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -5,15 +5,17 @@ module Ci
     belongs_to :erased_by, class_name: 'User'
 
     serialize :options
+    serialize :yaml_variables
 
     validates :coverage, numericality: true, allow_blank: true
     validates_presence_of :ref
 
     scope :unstarted, ->() { where(runner_id: nil) }
     scope :ignore_failures, ->() { where(allow_failure: false) }
-    scope :with_artifacts, ->() { where.not(artifacts_file: nil) }
+    scope :with_artifacts, ->() { where.not(artifacts_file: [nil, '']) }
     scope :with_expired_artifacts, ->() { with_artifacts.where('artifacts_expire_at < ?', Time.now) }
     scope :last_month, ->() { where('created_at > ?', Date.today - 1.month) }
+    scope :manual_actions, ->() { where(when: :manual) }
 
     mount_uploader :artifacts_file, ArtifactUploader
     mount_uploader :artifacts_metadata, ArtifactUploader
@@ -52,7 +54,10 @@ module Ci
         new_build.stage = build.stage
         new_build.stage_idx = build.stage_idx
         new_build.trigger_request = build.trigger_request
+        new_build.yaml_variables = build.yaml_variables
+        new_build.when = build.when
         new_build.user = user
+        new_build.environment = build.environment
         new_build.save
         MergeRequests::AddTodoWhenBuildFailsService.new(build.project, nil).close(new_build)
         new_build
@@ -87,6 +92,29 @@ module Ci
       end
     end
 
+    def manual?
+      self.when == 'manual'
+    end
+
+    def other_actions
+      pipeline.manual_actions.where.not(name: name)
+    end
+
+    def playable?
+      project.builds_enabled? && commands.present? && manual?
+    end
+
+    def play(current_user = nil)
+      # Try to queue a current build
+      if self.queue
+        self.update(user: current_user)
+        self
+      else
+        # Otherwise we need to create a duplicate
+        Ci::Build.retry(self, current_user)
+      end
+    end
+
     def retryable?
       project.builds_enabled? && commands.present? && complete?
     end
@@ -117,7 +145,15 @@ module Ci
     end
 
     def variables
-      predefined_variables + yaml_variables + project_variables + trigger_variables
+      variables = predefined_variables
+      variables += project.predefined_variables
+      variables += pipeline.predefined_variables
+      variables += runner.predefined_variables if runner
+      variables += project.container_registry_variables
+      variables += yaml_variables
+      variables += project.secret_variables
+      variables += trigger_request.user_variables if trigger_request
+      variables
     end
 
     def merge_request
@@ -376,6 +412,14 @@ module Ci
       self.update(artifacts_expire_at: nil)
     end
 
+    def when
+      read_attribute(:when) || build_attributes_from_config[:when] || 'on_success'
+    end
+
+    def yaml_variables
+      read_attribute(:yaml_variables) || build_attributes_from_config[:yaml_variables] || []
+    end
+
     private
 
     def update_artifacts_size
@@ -394,53 +438,30 @@ module Ci
       self.update(erased_by: user, erased_at: Time.now, artifacts_expire_at: nil)
     end
 
-    def yaml_variables
-      global_yaml_variables + job_yaml_variables
-    end
-
-    def global_yaml_variables
-      if pipeline.config_processor
-        pipeline.config_processor.global_variables.map do |key, value|
-          { key: key, value: value, public: true }
-        end
-      else
-        []
-      end
-    end
-
-    def job_yaml_variables
-      if pipeline.config_processor
-        pipeline.config_processor.job_variables(name).map do |key, value|
-          { key: key, value: value, public: true }
-        end
-      else
-        []
-      end
-    end
-
-    def project_variables
-      project.variables.map do |variable|
-        { key: variable.key, value: variable.value, public: false }
-      end
-    end
-
-    def trigger_variables
-      if trigger_request && trigger_request.variables
-        trigger_request.variables.map do |key, value|
-          { key: key, value: value, public: false }
-        end
-      else
-        []
-      end
-    end
-
     def predefined_variables
-      variables = []
-      variables << { key: :CI_BUILD_TAG, value: ref, public: true } if tag?
-      variables << { key: :CI_BUILD_NAME, value: name, public: true }
-      variables << { key: :CI_BUILD_STAGE, value: stage, public: true }
-      variables << { key: :CI_BUILD_TRIGGERED, value: 'true', public: true } if trigger_request
+      variables = [
+        { key: 'CI', value: 'true', public: true },
+        { key: 'GITLAB_CI', value: 'true', public: true },
+        { key: 'CI_BUILD_ID', value: id.to_s, public: true },
+        { key: 'CI_BUILD_TOKEN', value: token, public: false },
+        { key: 'CI_BUILD_REF', value: sha, public: true },
+        { key: 'CI_BUILD_BEFORE_SHA', value: before_sha, public: true },
+        { key: 'CI_BUILD_REF_NAME', value: ref, public: true },
+        { key: 'CI_BUILD_NAME', value: name, public: true },
+        { key: 'CI_BUILD_STAGE', value: stage, public: true },
+        { key: 'CI_SERVER_NAME', value: 'GitLab', public: true },
+        { key: 'CI_SERVER_VERSION', value: Gitlab::VERSION, public: true },
+        { key: 'CI_SERVER_REVISION', value: Gitlab::REVISION, public: true }
+      ]
+      variables << { key: 'CI_BUILD_TAG', value: ref, public: true } if tag?
+      variables << { key: 'CI_BUILD_TRIGGERED', value: 'true', public: true } if trigger_request
       variables
     end
+
+    def build_attributes_from_config
+      return {} unless pipeline.config_processor
+      
+      pipeline.config_processor.build_attributes(name)
+    end
   end
 end
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index fa4071e2482..bce6a992af6 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -6,6 +6,8 @@ module Ci
     self.table_name = 'ci_commits'
 
     belongs_to :project, class_name: '::Project', foreign_key: :gl_project_id
+    belongs_to :user
+
     has_many :statuses, class_name: 'CommitStatus', foreign_key: :commit_id
     has_many :builds, class_name: 'Ci::Build', foreign_key: :commit_id
     has_many :trigger_requests, dependent: :destroy, class_name: 'Ci::TriggerRequest', foreign_key: :commit_id
@@ -18,6 +20,11 @@ module Ci
     after_touch :update_state
     after_save :keep_around_commits
 
+    # ref can't be HEAD or SHA, can only be branch/tag name
+    scope :latest_successful_for, ->(ref = default_branch) do
+      where(ref: ref).success.order(id: :desc).limit(1)
+    end
+
     def self.truncate_sha(sha)
       sha[0...8]
     end
@@ -49,6 +56,10 @@ module Ci
       commit.try(:message)
     end
 
+    def git_commit_title
+      commit.try(:title)
+    end
+
     def short_sha
       Ci::Pipeline.truncate_sha(sha)
     end
@@ -63,6 +74,10 @@ module Ci
       !tag?
     end
 
+    def manual_actions
+      builds.latest.manual_actions
+    end
+
     def retryable?
       builds.latest.any? do |build|
         build.failed? && build.retryable?
@@ -136,6 +151,10 @@ module Ci
       end
     end
 
+    def has_warnings?
+      builds.latest.ignored.any?
+    end
+
     def config_processor
       return nil unless ci_yaml_file
       return @config_processor if defined?(@config_processor)
@@ -188,6 +207,12 @@ module Ci
       Note.for_commit_id(sha)
     end
 
+    def predefined_variables
+      [
+        { key: 'CI_PIPELINE_ID', value: id.to_s, public: true }
+      ]
+    end
+
     private
 
     def build_builds_for_stages(stages, user, status, trigger_request)
@@ -196,8 +221,9 @@ module Ci
       # build builds only for the first stage that has builds available.
       #
       stages.any? do |stage|
-        CreateBuildsService.new(self)
-          .execute(stage, user, status, trigger_request).present?
+        CreateBuildsService.new(self).
+          execute(stage, user, status, trigger_request).
+          any?(&:active?)
       end
     end
 
@@ -215,6 +241,8 @@ module Ci
     end
 
     def keep_around_commits
+      return unless project
+
       project.repository.keep_around(self.sha)
       project.repository.keep_around(self.before_sha)
     end
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index b64ec79ec2b..49f05f881a2 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -114,6 +114,14 @@ module Ci
       tag_list.any?
     end
 
+    def predefined_variables
+      [
+        { key: 'CI_RUNNER_ID', value: id.to_s, public: true },
+        { key: 'CI_RUNNER_DESCRIPTION', value: description, public: true },
+        { key: 'CI_RUNNER_TAGS', value: tag_list.to_s, public: true }
+      ]
+    end
+
     private
 
     def tag_constraints
diff --git a/app/models/ci/trigger_request.rb b/app/models/ci/trigger_request.rb
index fcf2b6dc5e2..fc674871743 100644
--- a/app/models/ci/trigger_request.rb
+++ b/app/models/ci/trigger_request.rb
@@ -7,5 +7,13 @@ module Ci
     has_many :builds, class_name: 'Ci::Build'
 
     serialize :variables
+
+    def user_variables
+      return [] unless variables
+
+      variables.map do |key, value|
+        { key: key, value: value, public: false }
+      end
+    end
   end
 end
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index e437e3417a8..2d185c28809 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -16,12 +16,20 @@ class CommitStatus < ActiveRecord::Base
 
   alias_attribute :author, :user
 
-  scope :latest, -> { where(id: unscope(:select).select('max(id)').group(:name, :commit_id)) }
+  scope :latest, -> do
+    max_id = unscope(:select).select("max(#{quoted_table_name}.id)")
+
+    where(id: max_id.group(:name, :commit_id))
+  end
   scope :retried, -> { where.not(id: latest) }
   scope :ordered, -> { order(:name) }
   scope :ignored, -> { where(allow_failure: true, status: [:failed, :canceled]) }
 
   state_machine :status, initial: :pending do
+    event :queue do
+      transition skipped: :pending
+    end
+
     event :run do
       transition pending: :running
     end
diff --git a/app/models/concerns/awardable.rb b/app/models/concerns/awardable.rb
index 06beff177b1..800a16ab246 100644
--- a/app/models/concerns/awardable.rb
+++ b/app/models/concerns/awardable.rb
@@ -65,8 +65,7 @@ module Awardable
 
   def create_award_emoji(name, current_user)
     return unless emoji_awardable?
-
-    award_emoji.create(name: name, user: current_user)
+    award_emoji.create(name: normalize_name(name), user: current_user)
   end
 
   def remove_award_emoji(name, current_user)
@@ -80,4 +79,10 @@ module Awardable
       create_award_emoji(emoji_name, current_user)
     end
   end
+
+  private
+
+  def normalize_name(name)
+    Gitlab::AwardEmoji.normalize_emoji_name(name)
+  end
 end
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index fb49bd7dd64..acb6f5a2998 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -87,12 +87,6 @@ module Issuable
       User.find(assignee_id_was).update_cache_counts if assignee_id_was
       assignee.update_cache_counts if assignee
     end
-
-    # We want to use optimistic lock for cases when only title or description are involved
-    # http://api.rubyonrails.org/classes/ActiveRecord/Locking/Optimistic.html
-    def locking_enabled?
-      title_changed? || description_changed?
-    end
   end
 
   module ClassMethods
diff --git a/app/models/concerns/mentionable.rb b/app/models/concerns/mentionable.rb
index 8cac47246db..ec9e0f1b1d0 100644
--- a/app/models/concerns/mentionable.rb
+++ b/app/models/concerns/mentionable.rb
@@ -14,14 +14,14 @@ module Mentionable
       attr = attr.to_s
       mentionable_attrs << [attr, options]
     end
+  end
 
+  included do
     # Accessor for attributes marked mentionable.
-    def mentionable_attrs
-      @mentionable_attrs ||= []
+    cattr_accessor :mentionable_attrs, instance_accessor: false do
+      []
     end
-  end
 
-  included do
     if self < Participable
       participant -> (user, ext) { all_references(user, extractor: ext) }
     end
diff --git a/app/models/concerns/note_on_diff.rb b/app/models/concerns/note_on_diff.rb
index 2785fbb21c9..4be6a2f621b 100644
--- a/app/models/concerns/note_on_diff.rb
+++ b/app/models/concerns/note_on_diff.rb
@@ -1,12 +1,6 @@
 module NoteOnDiff
   extend ActiveSupport::Concern
 
-  NUMBER_OF_TRUNCATED_DIFF_LINES = 16
-
-  included do
-    delegate :blob, :highlighted_diff_lines, to: :diff_file, allow_nil: true
-  end
-
   def diff_note?
     true
   end
@@ -30,23 +24,4 @@ module NoteOnDiff
   def can_be_award_emoji?
     false
   end
-
-  # Returns an array of at most 16 highlighted lines above a diff note
-  def truncated_diff_lines
-    prev_lines = []
-
-    highlighted_diff_lines.each do |line|
-      if line.meta?
-        prev_lines.clear
-      else
-        prev_lines << line
-
-        break if for_line?(line)
-
-        prev_lines.shift if prev_lines.length >= NUMBER_OF_TRUNCATED_DIFF_LINES
-      end
-    end
-
-    prev_lines
-  end
 end
diff --git a/app/models/concerns/participable.rb b/app/models/concerns/participable.rb
index 9822844357d..70740c76e43 100644
--- a/app/models/concerns/participable.rb
+++ b/app/models/concerns/participable.rb
@@ -41,9 +41,12 @@ module Participable
     def participant(attr)
       participant_attrs << attr
     end
+  end
 
-    def participant_attrs
-      @participant_attrs ||= []
+  included do
+    # Accessor for participant attributes.
+    cattr_accessor :participant_attrs, instance_accessor: false do
+      []
     end
   end
 
diff --git a/app/models/concerns/statuseable.rb b/app/models/concerns/statuseable.rb
index 3ef91caad47..44c6b30f278 100644
--- a/app/models/concerns/statuseable.rb
+++ b/app/models/concerns/statuseable.rb
@@ -16,10 +16,10 @@ module Statuseable
 
       deduce_status = "(CASE
         WHEN (#{builds})=0 THEN NULL
-        WHEN (#{builds})=(#{success})+(#{ignored}) THEN 'success'
-        WHEN (#{builds})=(#{pending}) THEN 'pending'
-        WHEN (#{builds})=(#{canceled})+(#{success})+(#{ignored}) THEN 'canceled'
         WHEN (#{builds})=(#{skipped}) THEN 'skipped'
+        WHEN (#{builds})=(#{success})+(#{ignored})+(#{skipped}) THEN 'success'
+        WHEN (#{builds})=(#{pending})+(#{skipped}) THEN 'pending'
+        WHEN (#{builds})=(#{canceled})+(#{success})+(#{ignored})+(#{skipped}) THEN 'canceled'
         WHEN (#{running})+(#{pending})>0 THEN 'running'
         ELSE 'failed'
       END)"
diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index 520026c18dd..1a7cd60817e 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -32,4 +32,8 @@ class Deployment < ActiveRecord::Base
   def keep_around_commit
     project.repository.keep_around(self.sha)
   end
+
+  def manual_actions
+    deployable.try(:other_actions)
+  end
 end
diff --git a/app/models/discussion.rb b/app/models/discussion.rb
new file mode 100644
index 00000000000..74facfd1c9c
--- /dev/null
+++ b/app/models/discussion.rb
@@ -0,0 +1,91 @@
+class Discussion
+  NUMBER_OF_TRUNCATED_DIFF_LINES = 16
+
+  attr_reader :first_note, :notes
+
+  delegate  :created_at,
+            :project,
+            :author,
+
+            :noteable,
+            :for_commit?,
+            :for_merge_request?,
+
+            :line_code,
+            :diff_file,
+            :for_line?,
+            :active?,
+
+            to: :first_note
+
+  delegate :blob, :highlighted_diff_lines, to: :diff_file, allow_nil: true
+
+  def self.for_notes(notes)
+    notes.group_by(&:discussion_id).values.map { |notes| new(notes) }
+  end
+
+  def self.for_diff_notes(notes)
+    notes.group_by(&:line_code).values.map { |notes| new(notes) }
+  end
+
+  def initialize(notes)
+    @first_note = notes.first
+    @notes = notes
+  end
+
+  def id
+    first_note.discussion_id
+  end
+
+  def diff_discussion?
+    first_note.diff_note?
+  end
+
+  def legacy_diff_discussion?
+    notes.any?(&:legacy_diff_note?)
+  end
+
+  def for_target?(target)
+    self.noteable == target && !diff_discussion?
+  end
+
+  def expanded?
+    !diff_discussion? || active?
+  end
+
+  def reply_attributes
+    data = {
+      noteable_type: first_note.noteable_type,
+      noteable_id:   first_note.noteable_id,
+      commit_id:     first_note.commit_id,
+      discussion_id: self.id,
+    }
+
+    if diff_discussion?
+      data[:note_type] = first_note.type
+
+      data.merge!(first_note.diff_attributes)
+    end
+
+    data
+  end
+
+  # Returns an array of at most 16 highlighted lines above a diff note
+  def truncated_diff_lines
+    prev_lines = []
+
+    highlighted_diff_lines.each do |line|
+      if line.meta?
+        prev_lines.clear
+      else
+        prev_lines << line
+
+        break if for_line?(line)
+
+        prev_lines.shift if prev_lines.length >= NUMBER_OF_TRUNCATED_DIFF_LINES
+      end
+    end
+
+    prev_lines
+  end
+end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 60abd47409e..60af8c15340 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -52,10 +52,50 @@ class Issue < ActiveRecord::Base
     attributes
   end
 
+  class << self
+    private
+
+    # Returns the project that the current scope belongs to if any, nil otherwise.
+    #
+    # Examples:
+    # - my_project.issues.without_due_date.owner_project => my_project
+    # - Issue.all.owner_project => nil
+    def owner_project
+      # No owner if we're not being called from an association
+      return unless all.respond_to?(:proxy_association)
+
+      owner = all.proxy_association.owner
+
+      # Check if the association is or belongs to a project
+      if owner.is_a?(Project)
+        owner
+      else
+        begin
+          owner.association(:project).target
+        rescue ActiveRecord::AssociationNotFoundError
+          nil
+        end
+      end
+    end
+  end
+
   def self.visible_to_user(user)
     return where('issues.confidential IS NULL OR issues.confidential IS FALSE') if user.blank?
     return all if user.admin?
 
+    # Check if we are scoped to a specific project's issues
+    if owner_project
+      if owner_project.authorized_for_user?(user, Gitlab::Access::REPORTER)
+        # If the project is authorized for the user, they can see all issues in the project
+        return all
+      else
+        # else only non confidential and authored/assigned to them
+        return where('issues.confidential IS NULL OR issues.confidential IS FALSE
+          OR issues.author_id = :user_id OR issues.assignee_id = :user_id',
+          user_id: user.id)
+      end
+    end
+
     where('
       issues.confidential IS NULL
       OR issues.confidential IS FALSE
diff --git a/app/models/legacy_diff_note.rb b/app/models/legacy_diff_note.rb
index 790dfd4d480..04a651d50ab 100644
--- a/app/models/legacy_diff_note.rb
+++ b/app/models/legacy_diff_note.rb
@@ -38,7 +38,7 @@ class LegacyDiffNote < Note
   end
 
   def diff_line
-    @diff_line ||= diff_file.line_for_line_code(self.line_code)
+    @diff_line ||= diff_file.line_for_line_code(self.line_code) if diff_file
   end
 
   def for_line?(line)
@@ -55,7 +55,7 @@ class LegacyDiffNote < Note
   def active?
     return @active if defined?(@active)
     return true if for_commit?
-    return true unless self.diff
+    return true unless diff_line
     return false unless noteable
 
     noteable_diff = find_noteable_diff
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 157901378d3..471e32f3b60 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -552,7 +552,13 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def can_be_merged_by?(user)
-    ::Gitlab::GitAccess.new(user, project, 'web').can_push_to_branch?(target_branch)
+    access = ::Gitlab::UserAccess.new(user, project: project)
+    access.can_push_to_branch?(target_branch) || access.can_merge_to_branch?(target_branch)
+  end
+
+  def can_be_merged_via_command_line_by?(user)
+    access = ::Gitlab::UserAccess.new(user, project: project)
+    access.can_push_to_branch?(target_branch)
   end
 
   def mergeable_ci_state?
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index feaba925bad..3f520c8f3ff 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -1,6 +1,7 @@
 class MergeRequestDiff < ActiveRecord::Base
   include Sortable
   include Importable
+  include EncodingHelper
 
   # Prevent store of diff if commits amount more then 500
   COMMITS_SAFE_SIZE = 100
@@ -211,6 +212,14 @@ class MergeRequestDiff < ActiveRecord::Base
     branch_base_commit.try(:sha)
   end
 
+  def utf8_st_diffs
+    st_diffs.map do |diff|
+      diff.each do |k, v|
+        diff[k] = encode_utf8(v) if v.respond_to?(:encoding)
+      end
+    end
+  end
+
   #
   # #save or #update_attributes providing changes on serialized attributes do a lot of
   # serialization and deserialization calls resulting in bad performance.
diff --git a/app/models/note.rb b/app/models/note.rb
index 8dca2ef09a8..b6b2ac6aa42 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -69,7 +69,7 @@ class Note < ActiveRecord::Base
              project: [:project_members, { group: [:group_members] }])
   end
 
-  before_validation :clear_blank_line_code!
+  before_validation :nullify_blank_type, :nullify_blank_line_code
   after_save :keep_around_commit
 
   class << self
@@ -82,11 +82,12 @@ class Note < ActiveRecord::Base
     end
 
     def discussions
-      all.group_by(&:discussion_id).values
+      Discussion.for_notes(all)
     end
 
-    def grouped_diff_notes
-      diff_notes.select(&:active?).sort_by(&:created_at).group_by(&:line_code)
+    def grouped_diff_discussions
+      notes = diff_notes.fresh.select(&:active?)
+      Discussion.for_diff_notes(notes).map { |d| [d.line_code, d] }.to_h
     end
 
     # Searches for notes matching the given query.
@@ -216,10 +217,6 @@ class Note < ActiveRecord::Base
     !system?
   end
 
-  def clear_blank_line_code!
-    self.line_code = nil if self.line_code.blank?
-  end
-
   def can_be_award_emoji?
     noteable.is_a?(Awardable)
   end
@@ -229,8 +226,7 @@ class Note < ActiveRecord::Base
   end
 
   def award_emoji_name
-    original_name = note.match(Banzai::Filter::EmojiFilter.emoji_pattern)[1]
-    Gitlab::AwardEmoji.normalize_emoji_name(original_name)
+    note.match(Banzai::Filter::EmojiFilter.emoji_pattern)[1]
   end
 
   private
@@ -238,4 +234,12 @@ class Note < ActiveRecord::Base
   def keep_around_commit
     project.repository.keep_around(self.commit_id)
   end
+
+  def nullify_blank_type
+    self.type = nil if self.type.blank?
+  end
+
+  def nullify_blank_line_code
+    self.line_code = nil if self.line_code.blank?
+  end
 end
diff --git a/app/models/project.rb b/app/models/project.rb
index c2d285fdf22..08200bd22bb 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -162,7 +162,7 @@ class Project < ActiveRecord::Base
   validates :namespace, presence: true
   validates_uniqueness_of :name, scope: :namespace_id
   validates_uniqueness_of :path, scope: :namespace_id
-  validates :import_url, addressable_url: true, if: :import_url
+  validates :import_url, addressable_url: true, if: :external_import?
   validates :star_count, numericality: { greater_than_or_equal_to: 0 }
   validate :check_limit, on: :create
   validate :avatar_type,
@@ -429,6 +429,17 @@ class Project < ActiveRecord::Base
     repository.commit(ref)
   end
 
+  # ref can't be HEAD, can only be branch/tag name or SHA
+  def latest_successful_builds_for(ref = default_branch)
+    latest_pipeline = pipelines.latest_successful_for(ref).first
+
+    if latest_pipeline
+      latest_pipeline.builds.latest.with_artifacts
+    else
+      builds.none
+    end
+  end
+
   def merge_base_commit(first_commit_id, second_commit_id)
     sha = repository.merge_base(first_commit_id, second_commit_id)
     repository.commit(sha) if sha
@@ -482,7 +493,7 @@ class Project < ActiveRecord::Base
   end
 
   def create_or_update_import_data(data: nil, credentials: nil)
-    return unless valid_import_url?
+    return unless import_url.present? && valid_import_url?
 
     project_import_data = import_data || build_import_data
     if data
@@ -657,6 +668,22 @@ class Project < ActiveRecord::Base
     update_column(:has_external_issue_tracker, services.external_issue_trackers.any?)
   end
 
+  def external_wiki
+    if has_external_wiki.nil?
+      cache_has_external_wiki # Populate
+    end
+
+    if has_external_wiki
+      @external_wiki ||= services.external_wikis.first
+    else
+      nil
+    end
+  end
+
+  def cache_has_external_wiki
+    update_column(:has_external_wiki, services.external_wikis.any?)
+  end
+
   def build_missing_services
     services_templates = Service.where(template: true)
 
@@ -845,6 +872,10 @@ class Project < ActiveRecord::Base
     protected_branches.matching(branch_name).any?(&:developers_can_push)
   end
 
+  def developers_can_merge_to_protected_branch?(branch_name)
+    protected_branches.matching(branch_name).any?(&:developers_can_merge)
+  end
+
   def forked?
     !(forked_project_link.nil? || forked_project_link.forked_from_project.nil?)
   end
@@ -858,9 +889,13 @@ class Project < ActiveRecord::Base
     old_path_with_namespace = File.join(namespace_dir, path_was)
     new_path_with_namespace = File.join(namespace_dir, path)
 
+    Rails.logger.error "Attempting to rename #{old_path_with_namespace} -> #{new_path_with_namespace}"
+
     expire_caches_before_rename(old_path_with_namespace)
 
     if has_container_registry_tags?
+      Rails.logger.error "Project #{old_path_with_namespace} cannot be renamed because container registry tags are present"
+
       # we currently doesn't support renaming repository if it contains tags in container registry
       raise Exception.new('Project cannot be renamed, because tags are present in its container registry')
     end
@@ -879,17 +914,22 @@ class Project < ActiveRecord::Base
         SystemHooksService.new.execute_hooks_for(self, :rename)
 
         @repository = nil
-      rescue
+      rescue => e
+        Rails.logger.error "Exception renaming #{old_path_with_namespace} -> #{new_path_with_namespace}: #{e}"
         # Returning false does not rollback after_* transaction but gives
         # us information about failing some of tasks
         false
       end
     else
+      Rails.logger.error "Repository could not be renamed: #{old_path_with_namespace} -> #{new_path_with_namespace}"
+
       # if we cannot move namespace directory we should rollback
       # db changes in order to prevent out of sync between db and fs
       raise Exception.new('repository cannot be renamed')
     end
 
+    Gitlab::AppLogger.info "Project was renamed: #{old_path_with_namespace} -> #{new_path_with_namespace}"
+
     Gitlab::UploadsTransfer.new.rename_project(path_was, path, namespace.path)
   end
 
@@ -1045,8 +1085,8 @@ class Project < ActiveRecord::Base
     pipelines.order(id: :desc).find_by(sha: sha, ref: ref)
   end
 
-  def ensure_pipeline(sha, ref)
-    pipeline(sha, ref) || pipelines.create(sha: sha, ref: ref)
+  def ensure_pipeline(sha, ref, current_user = nil)
+    pipeline(sha, ref) || pipelines.create(sha: sha, ref: ref, user: current_user)
   end
 
   def enable_ci
@@ -1167,4 +1207,74 @@ class Project < ActiveRecord::Base
   def ensure_dir_exist
     gitlab_shell.add_namespace(repository_storage_path, namespace.path)
   end
+
+  def predefined_variables
+    [
+      { key: 'CI_PROJECT_ID', value: id.to_s, public: true },
+      { key: 'CI_PROJECT_NAME', value: path, public: true },
+      { key: 'CI_PROJECT_PATH', value: path_with_namespace, public: true },
+      { key: 'CI_PROJECT_NAMESPACE', value: namespace.path, public: true },
+      { key: 'CI_PROJECT_URL', value: web_url, public: true }
+    ]
+  end
+
+  def container_registry_variables
+    return [] unless Gitlab.config.registry.enabled
+
+    variables = [
+      { key: 'CI_REGISTRY', value: Gitlab.config.registry.host_port, public: true }
+    ]
+
+    if container_registry_enabled?
+      variables << { key: 'CI_REGISTRY_IMAGE', value: container_registry_repository_url, public: true }
+    end
+
+    variables
+  end
+
+  def secret_variables
+    variables.map do |variable|
+      { key: variable.key, value: variable.value, public: false }
+    end
+  end
+
+  # Checks if `user` is authorized for this project, with at least the
+  # `min_access_level` (if given).
+  #
+  # If you change the logic of this method, please also update `User#authorized_projects`
+  def authorized_for_user?(user, min_access_level = nil)
+    return false unless user
+
+    return true if personal? && namespace_id == user.namespace_id
+
+    authorized_for_user_by_group?(user, min_access_level) ||
+      authorized_for_user_by_members?(user, min_access_level) ||
+      authorized_for_user_by_shared_projects?(user, min_access_level)
+  end
+
+  private
+
+  def authorized_for_user_by_group?(user, min_access_level)
+    member = user.group_members.find_by(source_id: group)
+
+    member && (!min_access_level || member.access_level >= min_access_level)
+  end
+
+  def authorized_for_user_by_members?(user, min_access_level)
+    member = members.find_by(user_id: user)
+
+    member && (!min_access_level || member.access_level >= min_access_level)
+  end
+
+  def authorized_for_user_by_shared_projects?(user, min_access_level)
+    shared_projects = user.group_members.joins(group: :shared_projects).
+      where(project_group_links: { project_id: self })
+
+    if min_access_level
+      members_scope = { access_level: Gitlab::Access.values.select { |access| access >= min_access_level } }
+      shared_projects = shared_projects.where(members: members_scope)
+    end
+
+    shared_projects.any?
+  end
 end
diff --git a/app/models/project_services/builds_email_service.rb b/app/models/project_services/builds_email_service.rb
index 54da4d74fc5..5e166471077 100644
--- a/app/models/project_services/builds_email_service.rb
+++ b/app/models/project_services/builds_email_service.rb
@@ -42,6 +42,19 @@ class BuildsEmailService < Service
     end
   end
 
+  def can_test?
+    project.builds.count > 0
+  end
+
+  def disabled_title
+    "Please setup a build on your repository."
+  end
+
+  def test_data(project = nil, user = nil)
+    build = project.builds.last
+    Gitlab::BuildDataBuilder.build(build)
+  end
+
   def fields
     [
       { type: 'textarea', name: 'recipients', placeholder: 'Emails separated by comma' },
@@ -50,6 +63,20 @@ class BuildsEmailService < Service
     ]
   end
 
+  def test(data)
+    begin
+      # bypass build status verification when testing
+      data[:build_status] = "failed"
+      data[:build_allow_failure] = false
+
+      result = execute(data)
+    rescue StandardError => error
+      return { success: false, result: error }
+    end
+
+    { success: true, result: result }
+  end
+
   def should_build_be_notified?(data)
     case data[:build_status]
     when 'success'
diff --git a/app/models/project_services/slack_service.rb b/app/models/project_services/slack_service.rb
index cf9e4d5a8b6..abbc780dc1a 100644
--- a/app/models/project_services/slack_service.rb
+++ b/app/models/project_services/slack_service.rb
@@ -4,6 +4,9 @@ class SlackService < Service
   validates :webhook, presence: true, url: true, if: :activated?
 
   def initialize_properties
+    # Custom serialized properties initialization
+    self.supported_events.each { |event| self.class.prop_accessor(event_channel_name(event)) }
+
     if properties.nil?
       self.properties = {}
       self.notify_only_broken_builds = true
@@ -29,13 +32,15 @@ class SlackService < Service
   end
 
   def fields
-    [
-      { type: 'text', name: 'webhook',
-        placeholder: 'https://hooks.slack.com/services/...' },
-      { type: 'text', name: 'username', placeholder: 'username' },
-      { type: 'text', name: 'channel', placeholder: '#channel' },
-      { type: 'checkbox', name: 'notify_only_broken_builds' },
-    ]
+    default_fields =
+      [
+        { type: 'text', name: 'webhook',   placeholder: 'https://hooks.slack.com/services/...' },
+        { type: 'text', name: 'username', placeholder: 'username' },
+        { type: 'text', name: 'channel', placeholder: "#general" },
+        { type: 'checkbox', name: 'notify_only_broken_builds' },
+      ]
+
+    default_fields + build_event_channels
   end
 
   def supported_events
@@ -74,7 +79,10 @@ class SlackService < Service
       end
 
     opt = {}
-    opt[:channel] = channel if channel
+
+    event_channel = get_channel_field(object_kind) || channel
+
+    opt[:channel] = event_channel if event_channel
     opt[:username] = username if username
 
     if message
@@ -83,8 +91,35 @@ class SlackService < Service
     end
   end
 
+  def event_channel_names
+    supported_events.map { |event| event_channel_name(event) }
+  end
+
+  def event_field(event)
+    fields.find { |field| field[:name] == event_channel_name(event) }
+  end
+
+  def global_fields
+    fields.reject { |field| field[:name].end_with?('channel') }
+  end
+
   private
 
+  def get_channel_field(event)
+    field_name = event_channel_name(event)
+    self.public_send(field_name)
+  end
+
+  def build_event_channels
+    supported_events.reduce([]) do |channels, event|
+      channels << { type: 'text', name: event_channel_name(event), placeholder: "#general" }
+    end
+  end
+
+  def event_channel_name(event)
+    "#{event}_channel"
+  end
+
   def project_name
     project.name_with_namespace.gsub(/\s/, '')
   end
diff --git a/app/models/project_team.rb b/app/models/project_team.rb
index 0b700930641..9d312a53790 100644
--- a/app/models/project_team.rb
+++ b/app/models/project_team.rb
@@ -173,7 +173,7 @@ class ProjectTeam
     invited_members = []
 
     if project.invited_groups.any? && project.allowed_to_share_with_group?
-      project.project_group_links.each do |group_link|
+      project.project_group_links.includes(group: [:group_members]).each do |group_link|
         invited_group = group_link.group
         im = invited_group.members
 
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 5b670cb4b8f..e9d5f4c91f8 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -11,16 +11,6 @@ class Repository
 
   attr_accessor :path_with_namespace, :project
 
-  def self.clean_old_archives
-    Gitlab::Metrics.measure(:clean_old_archives) do
-      repository_downloads_path = Gitlab.config.gitlab.repository_downloads_path
-
-      return unless File.directory?(repository_downloads_path)
-
-      Gitlab::Popen.popen(%W(find #{repository_downloads_path} -not -path #{repository_downloads_path} -mmin +120 -delete))
-    end
-  end
-
   def initialize(path_with_namespace, project)
     @path_with_namespace = path_with_namespace
     @project = project
@@ -216,11 +206,20 @@ class Repository
 
     return if kept_around?(sha)
 
-    rugged.references.create(keep_around_ref_name(sha), sha)
+    # This will still fail if the file is corrupted (e.g. 0 bytes)
+    begin
+      rugged.references.create(keep_around_ref_name(sha), sha, force: true)
+    rescue Rugged::ReferenceError => ex
+      Rails.logger.error "Unable to create keep-around reference for repository #{path}: #{ex}"
+    end
   end
 
   def kept_around?(sha)
-    ref_exists?(keep_around_ref_name(sha))
+    begin
+      ref_exists?(keep_around_ref_name(sha))
+    rescue Rugged::ReferenceError
+      false
+    end
   end
 
   def tag_names
@@ -392,6 +391,11 @@ class Repository
 
     expire_cache if exists?
 
+    # expire cache that don't depend on repository data (when expiring)
+    expire_tags_cache
+    expire_tag_count_cache
+    expire_branches_cache
+    expire_branch_count_cache
     expire_root_ref_cache
     expire_emptiness_caches
     expire_exists_cache
@@ -606,6 +610,8 @@ class Repository
   # Remove archives older than 2 hours
   def branches_sorted_by(value)
     case value
+    when 'name'
+      branches.sort_by(&:name)
     when 'recently_updated'
       branches.sort do |a, b|
         commit(b.target).committed_date <=> commit(a.target).committed_date
@@ -704,6 +710,7 @@ class Repository
       options[:commit] = {
         message: message,
         branch: ref,
+        update_ref: false,
       }
 
       raw_repository.mkdir(path, options)
@@ -719,6 +726,7 @@ class Repository
       options[:commit] = {
         message: message,
         branch: ref,
+        update_ref: false,
       }
 
       options[:file] = {
@@ -731,6 +739,33 @@ class Repository
     end
   end
 
+  def update_file(user, path, content, branch:, previous_path:, message:)
+    commit_with_hooks(user, branch) do |ref|
+      committer = user_to_committer(user)
+      options = {}
+      options[:committer] = committer
+      options[:author] = committer
+      options[:commit] = {
+        message: message,
+        branch: ref,
+        update_ref: false
+      }
+
+      options[:file] = {
+        content: content,
+        path: path,
+        update: true
+      }
+
+      if previous_path
+        options[:file][:previous_path] = previous_path
+        Gitlab::Git::Blob.rename(raw_repository, options)
+      else
+        Gitlab::Git::Blob.commit(raw_repository, options)
+      end
+    end
+  end
+
   def remove_file(user, path, message, branch)
     commit_with_hooks(user, branch) do |ref|
       committer = user_to_committer(user)
@@ -739,7 +774,8 @@ class Repository
       options[:author] = committer
       options[:commit] = {
         message: message,
-        branch: ref
+        branch: ref,
+        update_ref: false,
       }
 
       options[:file] = {
@@ -769,9 +805,9 @@ class Repository
     end
   end
 
-  def merge(user, source_sha, target_branch, options = {})
-    our_commit = rugged.branches[target_branch].target
-    their_commit = rugged.lookup(source_sha)
+  def merge(user, merge_request, options = {})
+    our_commit = rugged.branches[merge_request.target_branch].target
+    their_commit = rugged.lookup(merge_request.diff_head_sha)
 
     raise "Invalid merge target" if our_commit.nil?
     raise "Invalid merge source" if their_commit.nil?
@@ -779,14 +815,15 @@ class Repository
     merge_index = rugged.merge_commits(our_commit, their_commit)
     return false if merge_index.conflicts?
 
-    commit_with_hooks(user, target_branch) do |ref|
+    commit_with_hooks(user, merge_request.target_branch) do
       actual_options = options.merge(
         parents: [our_commit, their_commit],
         tree: merge_index.write_tree(rugged),
-        update_ref: ref
       )
 
-      Rugged::Commit.create(rugged, actual_options)
+      commit_id = Rugged::Commit.create(rugged, actual_options)
+      merge_request.update(in_progress_merge_commit_sha: commit_id)
+      commit_id
     end
   end
 
@@ -796,15 +833,14 @@ class Repository
 
     return false unless revert_tree_id
 
-    commit_with_hooks(user, base_branch) do |ref|
+    commit_with_hooks(user, base_branch) do
       committer = user_to_committer(user)
       source_sha = Rugged::Commit.create(rugged,
         message: commit.revert_message,
         author: committer,
         committer: committer,
         tree: revert_tree_id,
-        parents: [rugged.lookup(source_sha)],
-        update_ref: ref)
+        parents: [rugged.lookup(source_sha)])
     end
   end
 
@@ -814,7 +850,7 @@ class Repository
 
     return false unless cherry_pick_tree_id
 
-    commit_with_hooks(user, base_branch) do |ref|
+    commit_with_hooks(user, base_branch) do
       committer = user_to_committer(user)
       source_sha = Rugged::Commit.create(rugged,
         message: commit.message,
@@ -825,8 +861,7 @@ class Repository
         },
         committer: committer,
         tree: cherry_pick_tree_id,
-        parents: [rugged.lookup(source_sha)],
-        update_ref: ref)
+        parents: [rugged.lookup(source_sha)])
     end
   end
 
@@ -927,20 +962,6 @@ class Repository
     Gitlab::Popen.popen(args, path_to_repo)
   end
 
-  def with_tmp_ref(oldrev = nil)
-    random_string = SecureRandom.hex
-    tmp_ref = "refs/tmp/#{random_string}/head"
-
-    if oldrev && !Gitlab::Git.blank_ref?(oldrev)
-      rugged.references.create(tmp_ref, oldrev)
-    end
-
-    # Make commit in tmp ref
-    yield(tmp_ref)
-  ensure
-    rugged.references.delete(tmp_ref) rescue nil
-  end
-
   def commit_with_hooks(current_user, branch)
     update_autocrlf_option
 
@@ -953,33 +974,31 @@ class Repository
       oldrev = target_branch.target
     end
 
-    with_tmp_ref(oldrev) do |tmp_ref|
-      # Make commit in tmp ref
-      newrev = yield(tmp_ref)
+    # Make commit
+    newrev = yield(ref)
 
-      unless newrev
-        raise CommitError.new('Failed to create commit')
-      end
+    unless newrev
+      raise CommitError.new('Failed to create commit')
+    end
+
+    GitHooksService.new.execute(current_user, path_to_repo, oldrev, newrev, ref) do
+      if was_empty || !target_branch
+        # Create branch
+        rugged.references.create(ref, newrev)
+      else
+        # Update head
+        current_head = find_branch(branch).target
 
-      GitHooksService.new.execute(current_user, path_to_repo, oldrev, newrev, ref) do
-        if was_empty || !target_branch
-          # Create branch
-          rugged.references.create(ref, newrev)
+        # Make sure target branch was not changed during pre-receive hook
+        if current_head == oldrev
+          rugged.references.update(ref, newrev)
         else
-          # Update head
-          current_head = find_branch(branch).target
-
-          # Make sure target branch was not changed during pre-receive hook
-          if current_head == oldrev
-            rugged.references.update(ref, newrev)
-          else
-            raise CommitError.new('Commit was rejected because branch received new push')
-          end
+          raise CommitError.new('Commit was rejected because branch received new push')
         end
       end
-
-      newrev
     end
+
+    newrev
   end
 
   def ls_files(ref)
@@ -1014,7 +1033,7 @@ class Repository
   private
 
   def cache
-    @cache ||= RepositoryCache.new(path_with_namespace)
+    @cache ||= RepositoryCache.new(path_with_namespace, @project.id)
   end
 
   def head_exists?
diff --git a/app/models/service.rb b/app/models/service.rb
index d7a32c28267..40cd9b861f0 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -17,6 +17,7 @@ class Service < ActiveRecord::Base
 
   after_commit :reset_updated_properties
   after_commit :cache_project_has_external_issue_tracker
+  after_commit :cache_project_has_external_wiki
 
   belongs_to :project, inverse_of: :services
   has_one :service_hook
@@ -25,6 +26,7 @@ class Service < ActiveRecord::Base
 
   scope :visible, -> { where.not(type: ['GitlabIssueTrackerService', 'GitlabCiService']) }
   scope :issue_trackers, -> { where(category: 'issue_tracker') }
+  scope :external_wikis, -> { where(type: 'ExternalWikiService').active }
   scope :active, -> { where(active: true) }
   scope :without_defaults, -> { where(default: false) }
 
@@ -76,6 +78,22 @@ class Service < ActiveRecord::Base
     []
   end
 
+  def test_data(project, user)
+    Gitlab::PushDataBuilder.build_sample(project, user)
+  end
+
+  def event_channel_names
+    []
+  end
+
+  def event_field(event)
+    nil
+  end
+
+  def global_fields
+    fields
+  end
+
   def supported_events
     %w(push tag_push issue merge_request wiki_page)
   end
@@ -94,6 +112,11 @@ class Service < ActiveRecord::Base
     !project.empty_repo?
   end
 
+  # reason why service cannot be tested
+  def disabled_title
+    "Please setup a project repository."
+  end
+
   # Provide convenient accessor methods
   # for each serialized property.
   # Also keep track of updated properties in a similar way as ActiveModel::Dirty
@@ -203,4 +226,10 @@ class Service < ActiveRecord::Base
       project.cache_has_external_issue_tracker
     end
   end
+
+  def cache_project_has_external_wiki
+    if project && !project.destroyed?
+      project.cache_has_external_wiki
+    end
+  end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 7a72c202150..db747434959 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -85,6 +85,7 @@ class User < ActiveRecord::Base
   has_one  :abuse_report,             dependent: :destroy
   has_many :spam_logs,                dependent: :destroy
   has_many :builds,                   dependent: :nullify, class_name: 'Ci::Build'
+  has_many :pipelines,                dependent: :nullify, class_name: 'Ci::Pipeline'
   has_many :todos,                    dependent: :destroy
   has_many :notification_settings,    dependent: :destroy
   has_many :award_emoji,              dependent: :destroy
@@ -110,7 +111,7 @@ class User < ActiveRecord::Base
   validates :avatar, file_size: { maximum: 200.kilobytes.to_i }
 
   before_validation :generate_password, on: :create
-  before_validation :restricted_signup_domains, on: :create
+  before_validation :signup_domain_valid?, on: :create
   before_validation :sanitize_attrs
   before_validation :set_notification_email, if: ->(user) { user.email_changed? }
   before_validation :set_public_email, if: ->(user) { user.public_email_changed? }
@@ -411,6 +412,8 @@ class User < ActiveRecord::Base
   end
 
   # Returns projects user is authorized to access.
+  #
+  # If you change the logic of this method, please also update `Project#authorized_for_user`
   def authorized_projects(min_access_level = nil)
     Project.where("projects.id IN (#{projects_union(min_access_level).to_sql})")
   end
@@ -759,29 +762,6 @@ class User < ActiveRecord::Base
     Project.where(id: events)
   end
 
-  def restricted_signup_domains
-    email_domains = current_application_settings.restricted_signup_domains
-
-    unless email_domains.blank?
-      match_found = email_domains.any? do |domain|
-        escaped = Regexp.escape(domain).gsub('\*', '.*?')
-        regexp = Regexp.new "^#{escaped}$", Regexp::IGNORECASE
-        email_domain = Mail::Address.new(self.email).domain
-        email_domain =~ regexp
-      end
-
-      unless match_found
-        self.errors.add :email,
-                        'is not whitelisted. ' +
-                        'Email domains valid for registration are: ' +
-                        email_domains.join(', ')
-        return false
-      end
-    end
-
-    true
-  end
-
   def can_be_removed?
     !solo_owned_groups.present?
   end
@@ -853,7 +833,7 @@ class User < ActiveRecord::Base
                  groups.joins(:shared_projects).select(:project_id)]
 
     if min_access_level
-      scope = { access_level: Gitlab::Access.values.select { |access| access >= min_access_level } }
+      scope = { access_level: Gitlab::Access.all_values.select { |access| access >= min_access_level } }
       relations = [relations.shift] + relations.map { |relation| relation.where(members: scope) }
     end
 
@@ -880,4 +860,40 @@ class User < ActiveRecord::Base
     self.can_create_group   = false
     self.projects_limit     = 0
   end
+
+  def signup_domain_valid?
+    valid = true
+    error = nil
+
+    if current_application_settings.domain_blacklist_enabled?
+      blocked_domains = current_application_settings.domain_blacklist
+      if domain_matches?(blocked_domains, self.email)
+        error = 'is not from an allowed domain.'
+        valid = false
+      end
+    end
+
+    allowed_domains = current_application_settings.domain_whitelist
+    unless allowed_domains.blank?
+      if domain_matches?(allowed_domains, self.email)
+        valid = true
+      else
+        error = "is not whitelisted. Email domains valid for registration are: #{allowed_domains.join(', ')}"
+        valid = false
+      end
+    end
+
+    self.errors.add(:email, error) unless valid
+
+    valid
+  end
+
+  def domain_matches?(email_domains, email)
+    signup_domain = Mail::Address.new(email).domain
+    email_domains.any? do |domain|
+      escaped = Regexp.escape(domain).gsub('\*', '.*?')
+      regexp = Regexp.new "^#{escaped}$", Regexp::IGNORECASE
+      signup_domain =~ regexp
+    end
+  end
 end
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 3d5fd9d3ee9..c3de278f5b7 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -44,7 +44,11 @@ class WikiPage
 
   # The escaped URL path of this page.
   def slug
-    @attributes[:slug]
+    if @attributes[:slug].present?
+      @attributes[:slug]
+    else
+      wiki.wiki.preview_page(title, '', format).url_path
+    end
   end
 
   alias_method :to_param, :slug
diff --git a/app/services/ci/create_builds_service.rb b/app/services/ci/create_builds_service.rb
index 2dcb052d274..4946f7076fd 100644
--- a/app/services/ci/create_builds_service.rb
+++ b/app/services/ci/create_builds_service.rb
@@ -15,7 +15,7 @@ module Ci
           status == 'success'
         when 'on_failure'
           status == 'failed'
-        when 'always'
+        when 'always', 'manual'
           %w(success failed).include?(status)
         end
       end
@@ -36,7 +36,9 @@ module Ci
                            :allow_failure,
                            :stage,
                            :stage_idx,
-                           :environment)
+                           :environment,
+                           :when,
+                           :yaml_variables)
 
         build_attrs.merge!(pipeline: @pipeline,
                            ref: @pipeline.ref,
@@ -45,6 +47,10 @@ module Ci
                            user: user,
                            project: @pipeline.project)
 
+        # TODO: The proper implementation for this is in
+        # https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5295
+        build_attrs[:status] = 'skipped' if build_attrs[:when] == 'manual'
+
         ##
         # We do not persist new builds here.
         # Those will be persisted when @pipeline is saved.
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb
index b1ee6874190..be91bf0db85 100644
--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -2,6 +2,7 @@ module Ci
   class CreatePipelineService < BaseService
     def execute
       pipeline = project.pipelines.new(params)
+      pipeline.user = current_user
 
       unless ref_names.include?(params[:ref])
         pipeline.errors.add(:base, 'Reference not found')
diff --git a/app/services/commits/change_service.rb b/app/services/commits/change_service.rb
index c578097376a..ed73d8cb8c2 100644
--- a/app/services/commits/change_service.rb
+++ b/app/services/commits/change_service.rb
@@ -23,7 +23,7 @@ module Commits
     private
 
     def check_push_permissions
-      allowed = ::Gitlab::GitAccess.new(current_user, project, 'web').can_push_to_branch?(@target_branch)
+      allowed = ::Gitlab::UserAccess.new(current_user, project: project).can_push_to_branch?(@target_branch)
 
       unless allowed
         raise ValidationError.new('You are not allowed to push into this branch')
@@ -31,7 +31,7 @@ module Commits
 
       true
     end
-    
+
     def create_target_branch(new_branch)
       # Temporary branch exists and contains the change commit
       return success if repository.find_branch(new_branch)
diff --git a/app/services/create_branch_service.rb b/app/services/create_branch_service.rb
index d874582d54f..757fc35a78f 100644
--- a/app/services/create_branch_service.rb
+++ b/app/services/create_branch_service.rb
@@ -15,21 +15,19 @@ class CreateBranchService < BaseService
       return error('Branch already exists')
     end
 
-    new_branch = nil
-
-    if source_project != @project
-      repository.with_tmp_ref do |tmp_ref|
-        repository.fetch_ref(
-          source_project.repository.path_to_repo,
-          "refs/heads/#{ref}",
-          tmp_ref
-        )
-
-        new_branch = repository.add_branch(current_user, branch_name, tmp_ref)
-      end
-    else
-      new_branch = repository.add_branch(current_user, branch_name, ref)
-    end
+    new_branch = if source_project != @project
+                   repository.fetch_ref(
+                     source_project.repository.path_to_repo,
+                     "refs/heads/#{ref}",
+                     "refs/heads/#{branch_name}"
+                   )
+
+                   repository.after_create_branch
+
+                   repository.find_branch(branch_name)
+                 else
+                   repository.add_branch(current_user, branch_name, ref)
+                 end
 
     if new_branch
       success(new_branch)
diff --git a/app/services/create_commit_builds_service.rb b/app/services/create_commit_builds_service.rb
index f947e8f452e..0b66b854dea 100644
--- a/app/services/create_commit_builds_service.rb
+++ b/app/services/create_commit_builds_service.rb
@@ -14,7 +14,13 @@ class CreateCommitBuildsService
       return false
     end
 
-    @pipeline = Ci::Pipeline.new(project: project, sha: sha, ref: ref, before_sha: before_sha, tag: tag)
+    @pipeline = Ci::Pipeline.new(
+      project: project,
+      sha: sha,
+      ref: ref,
+      before_sha: before_sha,
+      tag: tag,
+      user: user)
 
     ##
     # Skip creating pipeline if no gitlab-ci.yml is found
diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb
index 37c5e321b39..c4a206f785e 100644
--- a/app/services/files/base_service.rb
+++ b/app/services/files/base_service.rb
@@ -9,12 +9,14 @@ module Files
 
       @commit_message = params[:commit_message]
       @file_path      = params[:file_path]
+      @previous_path  = params[:previous_path]
       @file_content   = if params[:file_content_encoding] == 'base64'
                           Base64.decode64(params[:file_content])
                         else
                           params[:file_content]
                         end
 
+      # Validate parameters
       validate
 
       # Create new branch if it different from source_branch
@@ -42,7 +44,7 @@ module Files
     end
 
     def validate
-      allowed = ::Gitlab::GitAccess.new(current_user, project, 'web').can_push_to_branch?(@target_branch)
+      allowed = ::Gitlab::UserAccess.new(current_user, project: project).can_push_to_branch?(@target_branch)
 
       unless allowed
         raise_error("You are not allowed to push into this branch")
diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb
index 1960dc7d949..8d2b5083179 100644
--- a/app/services/files/update_service.rb
+++ b/app/services/files/update_service.rb
@@ -3,7 +3,10 @@ require_relative "base_service"
 module Files
   class UpdateService < Files::BaseService
     def commit
-      repository.commit_file(current_user, @file_path, @file_content, @commit_message, @target_branch, true)
+      repository.update_file(current_user, @file_path, @file_content,
+                             branch: @target_branch,
+                             previous_path: @previous_path,
+                             message: @commit_message)
     end
   end
 end
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index a886f35981f..e02b50ff9a2 100644
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -89,7 +89,8 @@ class GitPushService < BaseService
     # Set protection on the default branch if configured
     if current_application_settings.default_branch_protection != PROTECTION_NONE
       developers_can_push = current_application_settings.default_branch_protection == PROTECTION_DEV_CAN_PUSH ? true : false
-      @project.protected_branches.create({ name: @project.default_branch, developers_can_push: developers_can_push })
+      developers_can_merge = current_application_settings.default_branch_protection == PROTECTION_DEV_CAN_MERGE ? true : false
+      @project.protected_branches.create({ name: @project.default_branch, developers_can_push: developers_can_push, developers_can_merge: developers_can_merge })
     end
   end
 
diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb
index e3dc569152c..2d96efe1042 100644
--- a/app/services/issuable_base_service.rb
+++ b/app/services/issuable_base_service.rb
@@ -101,6 +101,7 @@ class IssuableBaseService < BaseService
 
   def update(issuable)
     change_state(issuable)
+    change_subscription(issuable)
     filter_params
     old_labels = issuable.labels.to_a
 
@@ -124,6 +125,15 @@ class IssuableBaseService < BaseService
     end
   end
 
+  def change_subscription(issuable)
+    case params.delete(:subscription_event)
+    when 'subscribe'
+      issuable.subscribe(current_user)
+    when 'unsubscribe'
+      issuable.unsubscribe(current_user)
+    end
+  end
+
   def has_changes?(issuable, old_labels: [])
     valid_attrs = [:title, :description, :assignee_id, :milestone_id, :target_branch]
 
diff --git a/app/services/issues/bulk_update_service.rb b/app/services/issues/bulk_update_service.rb
index cd08c3a0cb9..7e19a73f71a 100644
--- a/app/services/issues/bulk_update_service.rb
+++ b/app/services/issues/bulk_update_service.rb
@@ -4,7 +4,7 @@ module Issues
       issues_ids   = params.delete(:issues_ids).split(",")
       issue_params = params
 
-      %i(state_event milestone_id assignee_id add_label_ids remove_label_ids).each do |key|
+      %i(state_event milestone_id assignee_id add_label_ids remove_label_ids subscription_event).each do |key|
         issue_params.delete(key) unless issue_params[key].present?
       end
 
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb
index f1b1d90c457..0dac0614141 100644
--- a/app/services/merge_requests/merge_service.rb
+++ b/app/services/merge_requests/merge_service.rb
@@ -34,7 +34,7 @@ module MergeRequests
         committer: committer
       }
 
-      commit_id = repository.merge(current_user, merge_request.diff_head_sha, merge_request.target_branch, options)
+      commit_id = repository.merge(current_user, merge_request, options)
       merge_request.update(merge_commit_sha: commit_id)
     rescue GitHooksService::PreReceiveError => e
       merge_request.update(merge_error: e.message)
@@ -43,6 +43,8 @@ module MergeRequests
       merge_request.update(merge_error: "Something went wrong during merge")
       Rails.logger.error(e.message)
       false
+    ensure
+      merge_request.update(in_progress_merge_commit_sha: nil)
     end
 
     def after_merge
diff --git a/app/services/merge_requests/refresh_service.rb b/app/services/merge_requests/refresh_service.rb
index b11ecd97a57..1daf6bbf553 100644
--- a/app/services/merge_requests/refresh_service.rb
+++ b/app/services/merge_requests/refresh_service.rb
@@ -48,7 +48,7 @@ module MergeRequests
     end
 
     def force_push?
-      Gitlab::ForcePushCheck.force_push?(@project, @oldrev, @newrev)
+      Gitlab::Checks::ForcePush.force_push?(@project, @oldrev, @newrev)
     end
 
     # Refresh merge request diff if we push to source or target branch of merge request
diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index 02fca5c0ea3..18971bd0be3 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -8,7 +8,6 @@ module Notes
       if note.award_emoji?
         noteable = note.noteable
         todo_service.new_award_emoji(noteable, current_user)
-
         return noteable.create_award_emoji(note.award_emoji_name, current_user)
       end
 
diff --git a/app/services/projects/import_export/export_service.rb b/app/services/projects/import_export/export_service.rb
index 6afc048576d..06252c7b625 100644
--- a/app/services/projects/import_export/export_service.rb
+++ b/app/services/projects/import_export/export_service.rb
@@ -9,8 +9,8 @@ module Projects
       private
 
       def save_all
-        if [version_saver, project_tree_saver, uploads_saver, repo_saver, wiki_repo_saver].all?(&:save)
-          Gitlab::ImportExport::Saver.save(shared: @shared)
+        if [version_saver, avatar_saver, project_tree_saver, uploads_saver, repo_saver, wiki_repo_saver].all?(&:save)
+          Gitlab::ImportExport::Saver.save(project: project, shared: @shared)
           notify_success
         else
           cleanup_and_notify
@@ -21,6 +21,10 @@ module Projects
         Gitlab::ImportExport::VersionSaver.new(shared: @shared)
       end
 
+      def avatar_saver
+        Gitlab::ImportExport::AvatarSaver.new(project: project, shared: @shared)
+      end
+
       def project_tree_saver
         Gitlab::ImportExport::ProjectTreeSaver.new(project: project, shared: @shared)
       end
diff --git a/app/services/repository_archive_clean_up_service.rb b/app/services/repository_archive_clean_up_service.rb
new file mode 100644
index 00000000000..0b56b09738d
--- /dev/null
+++ b/app/services/repository_archive_clean_up_service.rb
@@ -0,0 +1,33 @@
+class RepositoryArchiveCleanUpService
+  LAST_MODIFIED_TIME_IN_MINUTES = 120
+
+  def initialize(mmin = LAST_MODIFIED_TIME_IN_MINUTES)
+    @mmin = mmin
+    @path = Gitlab.config.gitlab.repository_downloads_path
+  end
+
+  def execute
+    Gitlab::Metrics.measure(:repository_archive_clean_up) do
+      return unless File.directory?(path)
+
+      clean_up_old_archives
+      clean_up_empty_directories
+    end
+  end
+
+  private
+
+  attr_reader :mmin, :path
+
+  def clean_up_old_archives
+    run(%W(find #{path} -not -path #{path} -type f \( -name \*.tar -o -name \*.bz2 -o -name \*.tar.gz -o -name \*.zip \) -maxdepth 2 -mmin +#{mmin} -delete))
+  end
+
+  def clean_up_empty_directories
+    run(%W(find #{path} -not -path #{path} -type d -empty -name \*.git -maxdepth 1 -delete))
+  end
+
+  def run(cmd)
+    Gitlab::Popen.popen(cmd)
+  end
+end
diff --git a/app/services/todo_service.rb b/app/services/todo_service.rb
index 6bb0a72d30e..6b48d68cccb 100644
--- a/app/services/todo_service.rb
+++ b/app/services/todo_service.rb
@@ -194,7 +194,7 @@ class TodoService
   end
 
   def create_assignment_todo(issuable, author)
-    if issuable.assignee && issuable.assignee != author
+    if issuable.assignee
       attributes = attributes_for_todo(issuable.project, issuable, author, Todo::ASSIGNED)
       create_todos(issuable.assignee, attributes)
     end
@@ -239,7 +239,6 @@ class TodoService
   def filter_mentioned_users(project, target, author)
     mentioned_users = target.mentioned_users(author)
     mentioned_users = reject_users_without_access(mentioned_users, project, target)
-    mentioned_users.delete(author)
     mentioned_users.uniq
   end
 
diff --git a/app/uploaders/artifact_uploader.rb b/app/uploaders/artifact_uploader.rb
index 1cd93263c9f..b6c52ddac7a 100644
--- a/app/uploaders/artifact_uploader.rb
+++ b/app/uploaders/artifact_uploader.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 class ArtifactUploader < CarrierWave::Uploader::Base
   storage :file
 
diff --git a/app/uploaders/attachment_uploader.rb b/app/uploaders/attachment_uploader.rb
index a65a896e41e..fb3b5dfecd0 100644
--- a/app/uploaders/attachment_uploader.rb
+++ b/app/uploaders/attachment_uploader.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class AttachmentUploader < CarrierWave::Uploader::Base
   include UploaderHelper
 
diff --git a/app/uploaders/avatar_uploader.rb b/app/uploaders/avatar_uploader.rb
index 6135c3ad96f..71ff14a3f20 100644
--- a/app/uploaders/avatar_uploader.rb
+++ b/app/uploaders/avatar_uploader.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class AvatarUploader < CarrierWave::Uploader::Base
   include UploaderHelper
 
@@ -14,4 +12,8 @@ class AvatarUploader < CarrierWave::Uploader::Base
   def reset_events_cache(file)
     model.reset_events_cache if model.is_a?(User)
   end
+
+  def exists?
+    model.avatar.file && model.avatar.file.exists?
+  end
 end
diff --git a/app/uploaders/file_uploader.rb b/app/uploaders/file_uploader.rb
index 1af9e9b0edb..3ac6030c21c 100644
--- a/app/uploaders/file_uploader.rb
+++ b/app/uploaders/file_uploader.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 class FileUploader < CarrierWave::Uploader::Base
   include UploaderHelper
   MARKDOWN_PATTERN = %r{\!?\[.*?\]\(/uploads/(?<secret>[0-9a-f]{32})/(?<file>.*?)\)}
@@ -33,16 +32,15 @@ class FileUploader < CarrierWave::Uploader::Base
   end
 
   def to_h
-    filename = image? ? self.file.basename : self.file.filename
+    filename = image_or_video? ? self.file.basename : self.file.filename
     escaped_filename = filename.gsub("]", "\\]")
 
     markdown = "[#{escaped_filename}](#{self.secure_url})"
-    markdown.prepend("!") if image?
+    markdown.prepend("!") if image_or_video?
 
     {
       alt:      filename,
       url:      self.secure_url,
-      is_image: image?,
       markdown: markdown
     }
   end
diff --git a/app/uploaders/lfs_object_uploader.rb b/app/uploaders/lfs_object_uploader.rb
index 046a1d641a9..4f356dd663e 100644
--- a/app/uploaders/lfs_object_uploader.rb
+++ b/app/uploaders/lfs_object_uploader.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class LfsObjectUploader < CarrierWave::Uploader::Base
   storage :file
 
diff --git a/app/uploaders/uploader_helper.rb b/app/uploaders/uploader_helper.rb
index 5ef440f3367..b10ad71d052 100644
--- a/app/uploaders/uploader_helper.rb
+++ b/app/uploaders/uploader_helper.rb
@@ -1,16 +1,37 @@
 # Extra methods for uploader
 module UploaderHelper
+  IMAGE_EXT = %w[png jpg jpeg gif bmp tiff]
+  # We recommend using the .mp4 format over .mov. Videos in .mov format can
+  # still be used but you really need to make sure they are served with the
+  # proper MIME type video/mp4 and not video/quicktime or your videos won't play
+  # on IE >= 9.
+  # http://archive.sublimevideo.info/20150912/docs.sublimevideo.net/troubleshooting.html
+  VIDEO_EXT = %w[mp4 m4v mov webm ogv]
+
   def image?
-    img_ext = %w(png jpg jpeg gif bmp tiff)
-    if file.respond_to?(:extension)
-      img_ext.include?(file.extension.downcase)
-    else
-      # Not all CarrierWave storages respond to :extension
-      ext = file.path.split('.').last.downcase
-      img_ext.include?(ext)
-    end
-  rescue
-    false
+    extension_match?(IMAGE_EXT)
+  end
+
+  def video?
+    extension_match?(VIDEO_EXT)
+  end
+
+  def image_or_video?
+    image? || video?
+  end
+
+  def extension_match?(extensions)
+    return false unless file
+
+    extension =
+      if file.respond_to?(:extension)
+        file.extension
+      else
+        # Not all CarrierWave storages respond to :extension
+        File.extname(file.path).delete('.')
+      end
+
+    extensions.include?(extension.downcase)
   end
 
   def file_storage?
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 538d8176ce7..23b52d08df7 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -109,7 +109,7 @@
             Newly registered users will by default be external
 
   %fieldset
-    %legend Sign-in Restrictions
+    %legend Sign-up Restrictions
     .form-group
       .col-sm-offset-2.col-sm-10
         .checkbox
@@ -123,6 +123,49 @@
             = f.check_box :send_user_confirmation_email
             Send confirmation email on sign-up
     .form-group
+      = f.label :domain_whitelist, 'Whitelisted domains for sign-ups', class: 'control-label col-sm-2'
+      .col-sm-10
+        = f.text_area :domain_whitelist_raw, placeholder: 'domain.com', class: 'form-control', rows: 8
+        .help-block ONLY users with e-mail addresses that match these domain(s) will be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com
+    .form-group
+      = f.label :domain_blacklist_enabled, 'Domain Blacklist', class: 'control-label col-sm-2'
+      .col-sm-10
+        .checkbox
+          = f.label :domain_blacklist_enabled do
+            = f.check_box :domain_blacklist_enabled
+            Enable domain blacklist for sign ups
+    .form-group
+      .col-sm-offset-2.col-sm-10
+        .radio
+          = label_tag :blacklist_type_file do
+            = radio_button_tag :blacklist_type, :file
+            .option-title
+              Upload blacklist file
+        .radio
+          = label_tag :blacklist_type_raw do
+            = radio_button_tag :blacklist_type, :raw, @application_setting.domain_blacklist.present? || @application_setting.domain_blacklist.blank?
+            .option-title
+              Enter blacklist manually
+    .form-group.blacklist-file
+      = f.label :domain_blacklist_file, 'Blacklist file', class: 'control-label col-sm-2'
+      .col-sm-10
+        = f.file_field :domain_blacklist_file, class: 'form-control', accept: '.txt,.conf'
+        .help-block Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines or commas for multiple entries.
+    .form-group.blacklist-raw
+      = f.label :domain_blacklist, 'Blacklisted domains for sign-ups', class: 'control-label col-sm-2'
+      .col-sm-10
+        = f.text_area :domain_blacklist_raw, placeholder: 'domain.com', class: 'form-control', rows: 8
+        .help-block Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com
+
+    .form-group
+      = f.label :after_sign_up_text, class: 'control-label col-sm-2'
+      .col-sm-10
+        = f.text_area :after_sign_up_text, class: 'form-control', rows: 4
+        .help-block Markdown enabled
+
+  %fieldset
+    %legend Sign-in Restrictions
+    .form-group
       .col-sm-offset-2.col-sm-10
         .checkbox
           = f.label :signin_enabled do
@@ -148,11 +191,6 @@
         = f.number_field :two_factor_grace_period, min: 0, class: 'form-control', placeholder: '0'
         .help-block Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication
     .form-group
-      = f.label :restricted_signup_domains, 'Restricted domains for sign-ups', class: 'control-label col-sm-2'
-      .col-sm-10
-        = f.text_area :restricted_signup_domains_raw, placeholder: 'domain.com', class: 'form-control'
-        .help-block Only users with e-mail addresses that match these domain(s) will be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com
-    .form-group
       = f.label :home_page_url, 'Home page URL', class: 'control-label col-sm-2'
       .col-sm-10
         = f.text_field :home_page_url, class: 'form-control', placeholder: 'http://company.example.com', :'aria-describedby' => 'home_help_block'
@@ -168,11 +206,6 @@
         = f.text_area :sign_in_text, class: 'form-control', rows: 4
         .help-block Markdown enabled
     .form-group
-      = f.label :after_sign_up_text, class: 'control-label col-sm-2'
-      .col-sm-10
-        = f.text_area :after_sign_up_text, class: 'form-control', rows: 4
-        .help-block Markdown enabled
-    .form-group
       = f.label :help_page_text, class: 'control-label col-sm-2'
       .col-sm-10
         = f.text_area :help_page_text, class: 'form-control', rows: 4
@@ -352,4 +385,4 @@
 
 
   .form-actions
-    = f.submit 'Save', class: 'btn btn-save'
+    = f.submit 'Save', class: 'btn btn-save'
\ No newline at end of file
diff --git a/app/views/admin/builds/index.html.haml b/app/views/admin/builds/index.html.haml
index 9ea3cca0ecb..3d77634d8fa 100644
--- a/app/views/admin/builds/index.html.haml
+++ b/app/views/admin/builds/index.html.haml
@@ -10,15 +10,20 @@
           All
           %span.badge.js-totalbuilds-count= @all_builds.count(:id)
 
+      %li{class: ('active' if @scope == 'pending')}
+        = link_to admin_builds_path(scope: :pending) do
+          Pending
+          %span.badge= number_with_delimiter(@all_builds.pending.count(:id))
+
       %li{class: ('active' if @scope == 'running')}
         = link_to admin_builds_path(scope: :running) do
           Running
-          %span.badge.js-running-count= number_with_delimiter(@all_builds.running_or_pending.count(:id))
+          %span.badge= number_with_delimiter(@all_builds.running.count(:id))
 
       %li{class: ('active' if @scope == 'finished')}
         = link_to admin_builds_path(scope: :finished) do
           Finished
-          %span.badge.js-running-count= number_with_delimiter(@all_builds.finished.count(:id))
+          %span.badge= number_with_delimiter(@all_builds.finished.count(:id))
 
     .nav-controls
       - if @all_builds.running_or_pending.any?
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index a2ac407c159..452fc25ab07 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -80,6 +80,10 @@
           %span.pull-right
             = Gitlab::Shell.new.version
         %p
+          GitLab Workhorse
+          %span.pull-right
+            = Gitlab::Workhorse.version
+        %p
           GitLab API
           %span.pull-right
             = API::API::version
diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml
index 0cc405401cf..5f7fdfdb011 100644
--- a/app/views/admin/groups/_form.html.haml
+++ b/app/views/admin/groups/_form.html.haml
@@ -9,6 +9,10 @@
 
   = render 'shared/visibility_level', f: f, visibility_level: @group.visibility_level, can_change_visibility_level: can_change_group_visibility_level?(@group), form_model: @group
 
+  .form-group
+    .col-sm-offset-2.col-sm-10
+      = render 'shared/allow_request_access', form: f
+
   - if @group.new_record?
     .form-group
       .col-sm-offset-2.col-sm-10
diff --git a/app/views/devise/sessions/two_factor.html.haml b/app/views/devise/sessions/two_factor.html.haml
index a373f61bd3c..4debd3d608f 100644
--- a/app/views/devise/sessions/two_factor.html.haml
+++ b/app/views/devise/sessions/two_factor.html.haml
@@ -1,3 +1,7 @@
+- if inject_u2f_api?
+  - content_for :page_specific_javascripts do
+    = page_specific_javascript_tag('u2f.js')
+
 %div
   .login-box
     .login-heading
diff --git a/app/views/discussions/_diff_discussion.html.haml b/app/views/discussions/_diff_discussion.html.haml
new file mode 100644
index 00000000000..fa1ad9efa73
--- /dev/null
+++ b/app/views/discussions/_diff_discussion.html.haml
@@ -0,0 +1,6 @@
+%tr.notes_holder
+  %td.notes_line{ colspan: 2 }
+  %td.notes_content
+    %ul.notes{ data: { discussion_id: discussion.id } }
+      = render partial: "projects/notes/note", collection: discussion.notes, as: :note
+    = link_to_reply_discussion(discussion)
diff --git a/app/views/discussions/_diff_with_notes.html.haml b/app/views/discussions/_diff_with_notes.html.haml
new file mode 100644
index 00000000000..02b159ffd45
--- /dev/null
+++ b/app/views/discussions/_diff_with_notes.html.haml
@@ -0,0 +1,14 @@
+- diff_file = discussion.diff_file
+- blob = discussion.blob
+
+.diff-file.file-holder
+  .file-title
+    = render "projects/diffs/file_header", diff_file: diff_file, blob: blob, diff_commit: diff_file.content_commit, project: discussion.project, url: discussion_diff_path(discussion)
+
+  .diff-content.code.js-syntax-highlight
+    %table
+      - discussion.truncated_diff_lines.each do |line|
+        = render "projects/diffs/line", line: line, diff_file: diff_file, plain: true
+
+        - if discussion.for_line?(line)
+          = render "discussions/diff_discussion", discussion: discussion
diff --git a/app/views/discussions/_discussion.html.haml b/app/views/discussions/_discussion.html.haml
new file mode 100644
index 00000000000..49702e048aa
--- /dev/null
+++ b/app/views/discussions/_discussion.html.haml
@@ -0,0 +1,45 @@
+- expanded = discussion.expanded?
+%li.note.note-discussion.timeline-entry
+  .timeline-entry-inner
+    .timeline-icon
+      = link_to user_path(discussion.author) do
+        = image_tag avatar_icon(discussion.author), class: "avatar s40"
+    .timeline-content
+      .discussion.js-toggle-container{ class: discussion.id }
+        .discussion-header
+          = link_to_member(@project, discussion.author, avatar: false)
+
+          .inline.discussion-headline-light
+            = discussion.author.to_reference
+            started a discussion on
+
+            - if discussion.for_commit?
+              - commit = discussion.noteable
+              - if commit
+                commit
+                = link_to commit.short_id, namespace_project_commit_path(discussion.project.namespace, discussion.project, discussion.noteable, anchor: discussion.line_code), class: 'monospace'
+              - else
+                a deleted commit
+            - else
+              - if discussion.active?
+                = link_to diffs_namespace_project_merge_request_path(discussion.project.namespace, discussion.project, discussion.noteable, anchor: discussion.line_code) do
+                  the diff
+              - else
+                an outdated diff
+
+            = time_ago_with_tooltip(discussion.created_at, placement: "bottom", html_class: "note-created-ago")
+
+          .discussion-actions
+            = link_to "#", class: "note-action-button discussion-toggle-button js-toggle-button" do
+              - if expanded
+                = icon("chevron-up")
+              - else
+                = icon("chevron-down")
+
+              Toggle discussion
+
+        .discussion-body.js-toggle-content{ class: ("hide" unless expanded) }
+          - if discussion.diff_discussion? && discussion.diff_file
+            = render "discussions/diff_with_notes", discussion: discussion
+          - else
+            = render "discussions/notes", discussion: discussion
diff --git a/app/views/discussions/_notes.html.haml b/app/views/discussions/_notes.html.haml
new file mode 100644
index 00000000000..a2642b839f6
--- /dev/null
+++ b/app/views/discussions/_notes.html.haml
@@ -0,0 +1,5 @@
+.panel.panel-default
+  .notes{ data: { discussion_id: discussion.id } }
+    %ul.notes.timeline
+      = render partial: "projects/notes/note", collection: discussion.notes, as: :note
+  = link_to_reply_discussion(discussion)
diff --git a/app/views/discussions/_parallel_diff_discussion.html.haml b/app/views/discussions/_parallel_diff_discussion.html.haml
new file mode 100644
index 00000000000..a798c438ea0
--- /dev/null
+++ b/app/views/discussions/_parallel_diff_discussion.html.haml
@@ -0,0 +1,22 @@
+%tr.notes_holder
+  - if discussion_left
+    %td.notes_line.old
+    %td.notes_content.parallel.old
+      %ul.notes{ data: { discussion_id: discussion_left.id } }
+        = render partial: "projects/notes/note", collection: discussion_left.notes, as: :note
+
+      = link_to_reply_discussion(discussion_left, 'old')
+  - else
+    %td.notes_line.old= ""
+    %td.notes_content.parallel.old= ""
+
+  - if discussion_right
+    %td.notes_line.new
+    %td.notes_content.parallel.new
+      %ul.notes{ data: { discussion_id: discussion_right.id } }
+        = render partial: "projects/notes/note", collection: discussion_right.notes, as: :note
+
+      = link_to_reply_discussion(discussion_right, 'new')
+  - else
+    %td.notes_line.new= ""
+    %td.notes_content.parallel.new= ""
diff --git a/app/views/emojis/index.html.haml b/app/views/emojis/index.html.haml
index 8b38b4c2bd4..790d90ad3ee 100644
--- a/app/views/emojis/index.html.haml
+++ b/app/views/emojis/index.html.haml
@@ -1,5 +1,5 @@
 .emoji-menu
-  = text_field_tag :emoji_search, "", class: "emoji-search search-input form-control", placeholder: "Seach emojis"
+  = text_field_tag :emoji_search, "", class: "emoji-search search-input form-control", placeholder: "Search emoji"
   .emoji-menu-content
     - Gitlab::AwardEmoji.emoji_by_category.each do |category, emojis|
       %h5.emoji-menu-title
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml
index e4629bae0e6..5c318cd3b8b 100644
--- a/app/views/events/_event.html.haml
+++ b/app/views/events/_event.html.haml
@@ -4,11 +4,7 @@
       #{time_ago_with_tooltip(event.created_at)}
 
     = cache [event, current_application_settings, "v2.2"] do
-      - if event.author
-        = link_to user_path(event.author) do
-          = image_tag avatar_icon(event.author_email, 40), class: "avatar s40", alt:''
-      - else
-        = image_tag avatar_icon(event.author_email, 40), class: "avatar s40", alt:''
+      = author_avatar(event, size: 40)
 
       - if event.created_project?
         = render "events/event/created_project", event: event
diff --git a/app/views/events/_event_scope.html.haml b/app/views/events/_event_scope.html.haml
new file mode 100644
index 00000000000..8f7da7d8c4f
--- /dev/null
+++ b/app/views/events/_event_scope.html.haml
@@ -0,0 +1,7 @@
+%span.event-scope
+  = event_preposition(event)
+  - if event.project
+    = link_to_project event.project
+  - else
+    = event.project_name
+
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml
index 2e2403347c1..bba6e0d2c20 100644
--- a/app/views/events/event/_common.html.haml
+++ b/app/views/events/event/_common.html.haml
@@ -1,6 +1,6 @@
 .event-title
   %span.author_name= link_to_author event
-  %span.event_label{class: event.action_name}
+  %span{class: event.action_name}
   - if event.target
     = event.action_name
     %strong
@@ -10,12 +10,7 @@
   - else
     = event_action_name(event)
 
-  = event_preposition(event)
-
-  - if event.project
-    = link_to_project event.project
-  - else
-    = event.project_name
+  = render "events/event_scope", event: event
 
 - if event.target.respond_to?(:title)
   .event-body
diff --git a/app/views/events/event/_created_project.html.haml b/app/views/events/event/_created_project.html.haml
index 5a2a469ba62..aba64dd17d0 100644
--- a/app/views/events/event/_created_project.html.haml
+++ b/app/views/events/event/_created_project.html.haml
@@ -1,6 +1,6 @@
 .event-title
   %span.author_name= link_to_author event
-  %span.event_label{class: event.action_name}
+  %span{class: event.action_name}
     = event_action_name(event)
 
   - if event.project
diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml
index 830fec0b4ab..f08c96df309 100644
--- a/app/views/events/event/_note.html.haml
+++ b/app/views/events/event/_note.html.haml
@@ -1,14 +1,9 @@
 .event-title
   %span.author_name= link_to_author event
-  %span.event_label
-    = event.action_name
-    = event_note_title_html(event)
-    at
+  = event.action_name
+  = event_note_title_html(event)
 
-  - if event.project
-    = link_to_project event.project
-  - else
-    = event.project_name
+  = render "events/event_scope", event: event
 
 .event-body
   .event-note
diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml
index ea54ef226ec..44fff49d99c 100644
--- a/app/views/events/event/_push.html.haml
+++ b/app/views/events/event/_push.html.haml
@@ -2,14 +2,14 @@
 
 .event-title
   %span.author_name= link_to_author event
-  %span.event_label.pushed #{event.action_name} #{event.ref_type}
+  %span.pushed #{event.action_name} #{event.ref_type}
   - if event.rm_ref?
     %strong= event.ref_name
   - else
     %strong
       = link_to event.ref_name, namespace_project_commits_path(project.namespace, project, event.ref_name), title: h(event.target_title)
-  at
-  = link_to_project project
+
+  = render "events/event_scope", event: event
 
 - if event.push_with_commits?
   .event-body
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index 92cd4c553d0..decb89b2fd6 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -22,6 +22,10 @@
       = render 'shared/visibility_level', f: f, visibility_level: @group.visibility_level, can_change_visibility_level: can_change_group_visibility_level?(@group), form_model: @group
 
       .form-group
+        .col-sm-offset-2.col-sm-10
+          = render 'shared/allow_request_access', form: f
+
+      .form-group
         %hr
         = f.label :share_with_group_lock, class: 'control-label' do
           Share with group lock
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index eddeae98bc4..53ed4fa991d 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -6,7 +6,7 @@
 
 .cover-block.groups-cover-block
   %div{ class: container_class }
-    = image_tag group_icon(@group), class: "avatar group-avatar s70"
+    = image_tag group_icon(@group), class: "avatar group-avatar s70 avatar-tile"
     .group-info
       .cover-title
         %h1
diff --git a/app/views/layouts/_init_auto_complete.html.haml b/app/views/layouts/_init_auto_complete.html.haml
index 12e7ed0e792..351100f3523 100644
--- a/app/views/layouts/_init_auto_complete.html.haml
+++ b/app/views/layouts/_init_auto_complete.html.haml
@@ -1,7 +1,7 @@
 - project = @target_project || @project
+- noteable_class = @noteable.class if @noteable.present?
 
-- if @noteable
-  :javascript
-    GitLab.GfmAutoComplete.dataSource = "#{autocomplete_sources_namespace_project_path(project.namespace, project, type: @noteable.class, type_id: params[:id])}"
-    GitLab.GfmAutoComplete.cachedData = undefined;
-    GitLab.GfmAutoComplete.setup();
+:javascript
+  GitLab.GfmAutoComplete.dataSource = "#{autocomplete_sources_namespace_project_path(project.namespace, project, type: noteable_class, type_id: params[:id])}"
+  GitLab.GfmAutoComplete.cachedData = undefined;
+  GitLab.GfmAutoComplete.setup();
diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml
index 245b9c3b4d4..f7580f00159 100644
--- a/app/views/layouts/_search.html.haml
+++ b/app/views/layouts/_search.html.haml
@@ -44,7 +44,7 @@
           name: "#{j(@project.name)}"
         };
 
-    - if @group and @group.path
+    - if @group && @group.persisted? && @group.path
       :javascript
         gl.groupOptions = gl.groupOptions || {};
         gl.groupOptions["#{j(@group.path)}"] = {
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index 21668698814..3a14751ea8e 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -30,7 +30,7 @@
       %span
         Merge Requests
         %span.count= number_with_delimiter(current_user.assigned_merge_requests.opened.count)
-  = nav_link(controller: :snippets) do
+  = nav_link(controller: 'dashboard/snippets') do
     = link_to dashboard_snippets_path, title: 'Snippets' do
       %span
         Snippets
diff --git a/app/views/layouts/nav/_explore.html.haml b/app/views/layouts/nav/_explore.html.haml
index 3b40006a0cc..e5bda7b3a6f 100644
--- a/app/views/layouts/nav/_explore.html.haml
+++ b/app/views/layouts/nav/_explore.html.haml
@@ -1,21 +1,17 @@
 %ul.nav.nav-sidebar
   = nav_link(path: ['dashboard#show', 'root#show', 'projects#trending', 'projects#starred', 'projects#index'], html_options: {class: 'home'}) do
     = link_to explore_root_path, title: 'Projects' do
-      = icon('bookmark fw')
       %span
         Projects
   = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
     = link_to explore_groups_path, title: 'Groups' do
-      = icon('group fw')
       %span
         Groups
   = nav_link(controller: :snippets) do
     = link_to explore_snippets_path, title: 'Snippets' do
-      = icon('clipboard fw')
       %span
         Snippets
   = nav_link(controller: :help) do
     = link_to help_path, title: 'Help' do
-      = icon('question-circle fw')
       %span
         Help
diff --git a/app/views/layouts/nav/_project_settings.html.haml b/app/views/layouts/nav/_project_settings.html.haml
index 51a54b4f262..52a5bdc1a1b 100644
--- a/app/views/layouts/nav/_project_settings.html.haml
+++ b/app/views/layouts/nav/_project_settings.html.haml
@@ -39,7 +39,7 @@
       = link_to namespace_project_triggers_path(@project.namespace, @project), title: 'Triggers' do
         %span
           Triggers
-    = nav_link(controller: :badges) do
-      = link_to namespace_project_badges_path(@project.namespace, @project), title: 'Badges' do
+    = nav_link(controller: :pipelines_settings) do
+      = link_to namespace_project_pipelines_settings_path(@project.namespace, @project), title: 'CI/CD Pipelines' do
         %span
-          Badges
+          CI/CD Pipelines
diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml
index 2049b204956..ee9c0366f2b 100644
--- a/app/views/layouts/project.html.haml
+++ b/app/views/layouts/project.html.haml
@@ -6,7 +6,7 @@
 - content_for :scripts_body_top do
   - project = @target_project || @project
   - if @project_wiki && @page
-    - markdown_preview_path = namespace_project_wiki_markdown_preview_path(project.namespace, project, params[:id])
+    - markdown_preview_path = namespace_project_wiki_markdown_preview_path(project.namespace, project, @page.slug)
   - else
     - markdown_preview_path = markdown_preview_namespace_project_path(project.namespace, project)
   - if current_user
diff --git a/app/views/notify/note_merge_request_email.html.haml b/app/views/notify/note_merge_request_email.html.haml
index 35c4b862bb7..ea7e3d199fd 100644
--- a/app/views/notify/note_merge_request_email.html.haml
+++ b/app/views/notify/note_merge_request_email.html.haml
@@ -1,4 +1,4 @@
-- if @note.diff_note?
+- if @note.diff_note? && @note.diff_file
   %p.details
     New comment on diff for
     = link_to @note.diff_file.file_path, @target_url
diff --git a/app/views/profiles/_head.html.haml b/app/views/profiles/_head.html.haml
index 003884a5bd9..943ebdaeffe 100644
--- a/app/views/profiles/_head.html.haml
+++ b/app/views/profiles/_head.html.haml
@@ -1,3 +1,3 @@
 - content_for :page_specific_javascripts do
   = page_specific_javascript_tag('lib/cropper.js')
-  = page_specific_javascript_tag('profile/application.js')
+  = page_specific_javascript_tag('profile/profile_bundle.js')
diff --git a/app/views/profiles/two_factor_auths/show.html.haml b/app/views/profiles/two_factor_auths/show.html.haml
index 8780da1dec4..366f1fed35b 100644
--- a/app/views/profiles/two_factor_auths/show.html.haml
+++ b/app/views/profiles/two_factor_auths/show.html.haml
@@ -2,6 +2,10 @@
 - header_title "Two-Factor Authentication", profile_two_factor_auth_path
 = render 'profiles/head'
 
+- if inject_u2f_api?
+  - content_for :page_specific_javascripts do
+    = page_specific_javascript_tag('u2f.js')
+
 .row.prepend-top-default
   .col-lg-3
     %h4.prepend-top-0
diff --git a/app/views/projects/_activity.html.haml b/app/views/projects/_activity.html.haml
index 48b0dd6b121..ac50ce83f6a 100644
--- a/app/views/projects/_activity.html.haml
+++ b/app/views/projects/_activity.html.haml
@@ -5,7 +5,8 @@
         %i.fa.fa-rss
 
   = render 'shared/event_filter'
-.content_list{:"data-href" => activity_project_path(@project)}
+
+.content_list.project-activity{:"data-href" => activity_project_path(@project)}
 = spinner
 
 :javascript
diff --git a/app/views/projects/_builds_settings.html.haml b/app/views/projects/_builds_settings.html.haml
deleted file mode 100644
index fff30f11d82..00000000000
--- a/app/views/projects/_builds_settings.html.haml
+++ /dev/null
@@ -1,65 +0,0 @@
-%fieldset.builds-feature
-  %h5.prepend-top-0
-    Builds
-  - unless @repository.gitlab_ci_yml
-    .form-group
-      %p Builds need to be configured before you can begin using Continuous Integration.
-      = link_to 'Get started with Builds', help_page_path('ci/quick_start/README'), class: 'btn btn-info'
-  .form-group
-    %p Get recent application code using the following command:
-    .radio
-      = f.label :build_allow_git_fetch_false do
-        = f.radio_button :build_allow_git_fetch, 'false'
-        %strong git clone
-        %br
-        %span.descr Slower but makes sure you have a clean dir before every build
-    .radio
-      = f.label :build_allow_git_fetch_true do
-        = f.radio_button :build_allow_git_fetch, 'true'
-        %strong git fetch
-        %br
-        %span.descr Faster
-
-  .form-group
-    = f.label :build_timeout_in_minutes, 'Timeout', class: 'label-light'
-    = f.number_field :build_timeout_in_minutes, class: 'form-control', min: '0'
-    %p.help-block per build in minutes
-  .form-group
-    = f.label :build_coverage_regex, "Test coverage parsing", class: 'label-light'
-    .input-group
-      %span.input-group-addon /
-      = f.text_field :build_coverage_regex, class: 'form-control', placeholder: '\(\d+.\d+\%\) covered'
-      %span.input-group-addon /
-    %p.help-block
-      We will use this regular expression to find test coverage output in build trace.
-      Leave blank if you want to disable this feature
-    .bs-callout.bs-callout-info
-      %p Below are examples of regex for existing tools:
-      %ul
-        %li
-          Simplecov (Ruby) -
-          %code \(\d+.\d+\%\) covered
-        %li
-          pytest-cov (Python) -
-          %code \d+\%\s*$
-        %li
-          phpunit --coverage-text --colors=never (PHP) -
-          %code ^\s*Lines:\s*\d+.\d+\%
-        %li
-          gcovr (C/C++) -
-          %code ^TOTAL.*\s+(\d+\%)$
-        %li
-          tap --coverage-report=text-summary (Node.js) -
-          %code ^Statements\s*:\s*([^%]+)
-
-  .form-group
-    .checkbox
-      = f.label :public_builds do
-        = f.check_box :public_builds
-        %strong Public builds
-      .help-block Allow everyone to access builds for Public and Internal projects
-
-  .form-group.append-bottom-0
-    = f.label :runners_token, "Runners token", class: 'label-light'
-    = f.text_field :runners_token, class: "form-control", placeholder: 'xEeFCaDAB89'
-    %p.help-block The secure token used to checkout project.
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index cf11723dc8e..51f74f3b7ce 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -1,7 +1,7 @@
 - empty_repo = @project.empty_repo?
 .project-home-panel.text-center{ class: ("empty-project" if empty_repo) }
   %div{ class: container_class }
-    = project_icon(@project, alt: @project.name, class: 'project-avatar avatar s70')
+    = project_icon(@project, alt: @project.name, class: 'project-avatar avatar s70 avatar-tile')
     %h1.project-title
       = @project.name
       %span.visibility-icon.has-tooltip{data: { container: 'body' }, title: visibility_icon_description(@project)}
diff --git a/app/views/projects/badges/index.html.haml b/app/views/projects/badges/index.html.haml
deleted file mode 100644
index ac80951dd4f..00000000000
--- a/app/views/projects/badges/index.html.haml
+++ /dev/null
@@ -1,23 +0,0 @@
-- page_title 'Badges'
-- badges_path = namespace_project_badges_path(@project.namespace, @project)
-
-.prepend-top-10
-  .panel.panel-default
-    .panel-heading
-      %b Builds badge &middot;
-      = @build_badge.to_html
-      .pull-right
-        = render 'shared/ref_switcher', destination: 'badges', align_right: true
-    .panel-body
-      .row
-        .col-md-2.text-center
-          Markdown
-        .col-md-10.code.js-syntax-highlight
-          = highlight('.md', @build_badge.to_markdown)
-      .row
-        %hr
-      .row
-        .col-md-2.text-center
-          HTML
-        .col-md-10.code.js-syntax-highlight
-          = highlight('.html', @build_badge.to_html)
diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml
index 29c7d45074a..ff379bafb26 100644
--- a/app/views/projects/blob/_editor.html.haml
+++ b/app/views/projects/blob/_editor.html.haml
@@ -4,7 +4,9 @@
       = icon('code-fork')
       = ref
     %span.editor-file-name
-      = @path
+      - if current_action?(:edit) || current_action?(:update)
+        = text_field_tag 'file_path', (params[:file_path] || @path),
+                                      class: 'form-control new-file-path'
 
     - if current_action?(:new) || current_action?(:create)
       %span.editor-file-name
diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml
index 77b405f1f39..6f806e3ce53 100644
--- a/app/views/projects/branches/index.html.haml
+++ b/app/views/projects/branches/index.html.haml
@@ -9,26 +9,30 @@
 
     - if can? current_user, :push_code, @project
       .nav-controls
-        = link_to new_namespace_project_branch_path(@project.namespace, @project), class: 'btn btn-create' do
-          New branch
+        = form_tag(filter_branches_path, method: :get) do
+          = search_field_tag :search, params[:search], { placeholder: 'Filter by branch name', id: 'branch-search', class: 'form-control search-text-input input-short', spellcheck: false }
         .dropdown.inline
           %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
             %span.light
-            - if @sort.present?
-              = @sort.humanize
+            - if params[:sort].present?
+              = params[:sort].humanize
             - else
               Name
             %b.caret
           %ul.dropdown-menu.dropdown-menu-align-right
             %li
-              = link_to namespace_project_branches_path(sort: nil) do
-                Name
-              = link_to namespace_project_branches_path(sort: 'recently_updated') do
+              = link_to filter_branches_path(sort: nil) do
+                = sort_title_name
+              = link_to filter_branches_path(sort: 'recently_updated') do
                 = sort_title_recently_updated
-              = link_to namespace_project_branches_path(sort: 'last_updated') do
+              = link_to filter_branches_path(sort: 'last_updated') do
                 = sort_title_oldest_updated
+        = link_to new_namespace_project_branch_path(@project.namespace, @project), class: 'btn btn-create' do
+          New branch
   - if @branches.any?
     %ul.content-list.all-branches
       - @branches.each do |branch|
         = render "projects/branches/branch", branch: branch
     = paginate @branches, theme: 'gitlab'
+  - else
+    .nothing-here-block No branches to show
diff --git a/app/views/projects/builds/_sidebar.html.haml b/app/views/projects/builds/_sidebar.html.haml
index cab21f0cf19..dc57b49f27a 100644
--- a/app/views/projects/builds/_sidebar.html.haml
+++ b/app/views/projects/builds/_sidebar.html.haml
@@ -49,7 +49,7 @@
     - if @build.duration
       %p.build-detail-row
         %span.build-light-text Duration:
-        #{duration_in_words(@build.finished_at, @build.started_at)}
+        = time_interval_in_words(@build.duration)
     - if @build.finished_at
       %p.build-detail-row
         %span.build-light-text Finished:
@@ -94,9 +94,9 @@
 
   .block
     .title
-      Commit message
+      Commit title
     %p.build-light-text.append-bottom-0
-      #{@build.pipeline.git_commit_message}
+      #{@build.pipeline.git_commit_title}
 
   - if @build.tags.any?
     .block
diff --git a/app/views/projects/builds/index.html.haml b/app/views/projects/builds/index.html.haml
index 85c31dfd918..2af625f69cd 100644
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
@@ -11,17 +11,22 @@
           %span.badge.js-totalbuilds-count
             = number_with_delimiter(@all_builds.count(:id))
 
+      %li{class: ('active' if @scope == 'pending')}
+        = link_to project_builds_path(@project, scope: :pending) do
+          Pending
+          %span.badge
+            = number_with_delimiter(@all_builds.pending.count(:id))
 
       %li{class: ('active' if @scope == 'running')}
         = link_to project_builds_path(@project, scope: :running) do
           Running
-          %span.badge.js-running-count
-            = number_with_delimiter(@all_builds.running_or_pending.count(:id))
+          %span.badge
+            = number_with_delimiter(@all_builds.running.count(:id))
 
       %li{class: ('active' if @scope == 'finished')}
         = link_to project_builds_path(@project, scope: :finished) do
           Finished
-          %span.badge.js-running-count
+          %span.badge
             = number_with_delimiter(@all_builds.finished.count(:id))
 
     .nav-controls
diff --git a/app/views/projects/buttons/_fork.html.haml b/app/views/projects/buttons/_fork.html.haml
index a9eaed4c5f6..d78888e9fe4 100644
--- a/app/views/projects/buttons/_fork.html.haml
+++ b/app/views/projects/buttons/_fork.html.haml
@@ -2,17 +2,13 @@
   - if current_user && can?(current_user, :fork_project, @project)
     - if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2
       = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork', class: 'btn has-tooltip' do
-        = icon('code-fork fw')
+        = custom_icon('icon_fork')
         Fork
-      %div.count-with-arrow
-        %span.arrow
-        %span.count
-          = @project.forks_count
     - else
       = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project", class: 'btn has-tooltip' do
-        = icon('code-fork fw')
+        = custom_icon('icon_fork')
         Fork
-      %div.count-with-arrow
-        %span.arrow
-        = link_to namespace_project_forks_path(@project.namespace, @project), class: "count" do
-          = @project.forks_count
+    %div.count-with-arrow
+      %span.arrow
+      = link_to namespace_project_forks_path(@project.namespace, @project), class: "count" do
+        = @project.forks_count
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index e1b42b2cfa5..a9fb3c58431 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -14,16 +14,19 @@
         %span ##{build.id}
 
       - if build.stuck?
-        = icon('warning', class: 'text-warning has-tooltip', title: 'Build is stuck. Check runners.')
+        .icon-container
+          = icon('warning', class: 'text-warning has-tooltip', title: 'Build is stuck. Check runners.')
       - if defined?(retried) && retried
-        = icon('warning', class: 'text-warning has-tooltip', title: 'Build was retried.')
+        .icon-container
+          = icon('warning', class: 'text-warning has-tooltip', title: 'Build was retried.')
 
       - if defined?(ref) && ref
         - if build.ref
           = link_to build.ref, namespace_project_commits_path(build.project.namespace, build.project, build.ref), class: "monospace branch-name"
         - else
           .light none
-        = custom_icon("icon_commit")
+        .icon-container
+          = custom_icon("icon_commit")
 
       - if defined?(commit_sha) && commit_sha
         = link_to build.short_sha, namespace_project_commit_path(build.project.namespace, build.project, build.sha), class: "commit-id monospace"
@@ -39,6 +42,8 @@
           %span.label.label-danger allowed to fail
         - if defined?(retried) && retried
           %span.label.label-warning retried
+        - if build.manual?
+          %span.label.label-info manual
 
 
   - if defined?(runner) && runner
@@ -79,6 +84,10 @@
         - if build.active?
           = link_to cancel_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Cancel', class: 'btn btn-build' do
             = icon('remove', class: 'cred')
-        - elsif defined?(allow_retry) && allow_retry && build.retryable?
-          = link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry', class: 'btn btn-build' do
-            = icon('repeat')
+        - elsif defined?(allow_retry) && allow_retry
+          - if build.retryable?
+            = link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry', class: 'btn btn-build' do
+              = icon('repeat')
+          - elsif build.playable?
+            = link_to play_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Play', class: 'btn btn-build' do
+              = icon('play')
diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml
index b53a8633937..2f7d54f0bdd 100644
--- a/app/views/projects/ci/pipelines/_pipeline.html.haml
+++ b/app/views/projects/ci/pipelines/_pipeline.html.haml
@@ -10,12 +10,13 @@
       = link_to namespace_project_pipeline_path(@project.namespace, @project, pipeline.id) do
         %span ##{pipeline.id}
       - if pipeline.ref
+        .icon-container
+          = pipeline.tag? ? icon('tag') : icon('code-fork')
         = link_to pipeline.ref, namespace_project_commits_path(@project.namespace, @project, pipeline.ref), class: "monospace branch-name"
-        = custom_icon("icon_commit")
+        .icon-container
+          = custom_icon("icon_commit")
       = link_to pipeline.short_sha, namespace_project_commit_path(@project.namespace, @project, pipeline.sha), class: "commit-id monospace"
-      - if pipeline.tag?
-        %span.label.label-primary tag
-      - elsif pipeline.latest?
+      - if pipeline.latest?
         %span.label.label-success.has-tooltip{ title: 'Latest build for this branch' } latest
       - if pipeline.triggered?
         %span.label.label-primary triggered
@@ -26,15 +27,15 @@
 
       %p.commit-title
         - if commit = pipeline.commit
-          = commit_author_avatar(commit, size: 20)
+          = author_avatar(commit, size: 20)
           = link_to_gfm truncate(commit.title, length: 60), namespace_project_commit_path(@project.namespace, @project, commit.id), class: "commit-row-message"
         - else
           Cant find HEAD commit for this branch
 
 
-    - stages_status = pipeline.statuses.stages_status
+    - stages_status = pipeline.statuses.latest.stages_status
     - stages.each do |stage|
-      %td
+      %td.stage-cell
         - status = stages_status[stage]
         - tooltip = "#{stage.titleize}: #{status || 'not found'}"
         - if status
@@ -57,30 +58,34 @@
   %td.pipeline-actions
     .controls.hidden-xs.pull-right
       - artifacts = pipeline.builds.latest.select { |b| b.artifacts? }
-      - if artifacts.present?
+      - actions = pipeline.manual_actions
+      - if artifacts.present? || actions.any?
         .btn-group.inline
-          .btn-group
-            %a.dropdown-toggle.btn.btn-default{type: 'button', 'data-toggle' => 'dropdown'}
-              = icon("play")
-              %b.caret
-            %ul.dropdown-menu.dropdown-menu-align-right
-              %li
-                = link_to '#' do
-                  = icon("play")
-                  %span Deploy to production
-          .btn-group
-            %a.dropdown-toggle.btn.btn-default.build-artifacts{type: 'button', 'data-toggle' => 'dropdown'}
-              = icon("download")
-              %b.caret
-            %ul.dropdown-menu.dropdown-menu-align-right
-              - artifacts.each do |build|
-                %li
-                  = link_to download_namespace_project_build_artifacts_path(@project.namespace, @project, build), rel: 'nofollow' do
-                    = icon("download")
-                    %span Download '#{build.name}' artifacts
+          - if actions.any?
+            .btn-group
+              %a.dropdown-toggle.btn.btn-default{type: 'button', 'data-toggle' => 'dropdown'}
+                = icon("play")
+                %b.caret
+              %ul.dropdown-menu.dropdown-menu-align-right
+                - actions.each do |build|
+                  %li
+                    = link_to play_namespace_project_build_path(@project.namespace, @project, build), method: :post, rel: 'nofollow' do
+                      = icon("play")
+                      %span= build.name.humanize
+          - if artifacts.present?
+            .btn-group
+              %a.dropdown-toggle.btn.btn-default.build-artifacts{type: 'button', 'data-toggle' => 'dropdown'}
+                = icon("download")
+                %b.caret
+              %ul.dropdown-menu.dropdown-menu-align-right
+                - artifacts.each do |build|
+                  %li
+                    = link_to download_namespace_project_build_artifacts_path(@project.namespace, @project, build), rel: 'nofollow' do
+                      = icon("download")
+                      %span Download '#{build.name}' artifacts
 
       - if can?(current_user, :update_pipeline, @project)
-        .cancel-retry-btns
+        .cancel-retry-btns.inline
           - if pipeline.retryable?
             = link_to retry_namespace_project_pipeline_path(@project.namespace, @project, pipeline.id), class: 'btn has-tooltip', title: "Retry", method: :post do
               = icon("repeat")
diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml
index 41fd5459429..540689f4a61 100644
--- a/app/views/projects/commit/_pipeline.html.haml
+++ b/app/views/projects/commit/_pipeline.html.haml
@@ -35,8 +35,8 @@
   .bs-callout.bs-callout-warning
     \.gitlab-ci.yml not found in this commit
 
-.table-holder
-  %table.table.builds
+.table-holder.pipeline-holder
+  %table.table.builds.pipeline
     %thead
       %tr
         %th Status
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml
index c8c7b858baa..fd888f41b1e 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -9,7 +9,8 @@
 
 = cache(cache_key) do
   %li.commit.js-toggle-container{ id: "commit-#{commit.short_id}" }
-    = commit_author_avatar(commit, size: 36)
+    = author_avatar(commit, size: 36)
+
     .commit-info-block
       .commit-row-title
         %span.item-title
@@ -18,13 +19,14 @@
             &middot;
             = commit.short_id
           - if commit.status
-            = render_commit_status(commit, cssclass: 'visible-xs-inline')
+            .visible-xs-inline
+              = render_commit_status(commit)
           - if commit.description?
             %a.text-expander.hidden-xs.js-toggle-button ...
 
         .commit-actions.hidden-xs
           - if commit.status
-            = render_commit_status(commit, cssclass: 'btn btn-transparent')
+            = render_commit_status(commit)
           = clipboard_button(clipboard_text: commit.id)
           = link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit-short-id btn btn-transparent"
           = link_to_browse_code(project, commit)
diff --git a/app/views/projects/deployments/_actions.haml b/app/views/projects/deployments/_actions.haml
new file mode 100644
index 00000000000..f70dba224fa
--- /dev/null
+++ b/app/views/projects/deployments/_actions.haml
@@ -0,0 +1,22 @@
+- if can?(current_user, :create_deployment, deployment) && deployment.deployable
+  .pull-right
+    - actions = deployment.manual_actions
+    - if actions.present?
+      .btn-group.inline
+        .btn-group
+          %a.dropdown-toggle.btn.btn-default{type: 'button', 'data-toggle' => 'dropdown'}
+            = icon("play")
+            %b.caret
+          %ul.dropdown-menu.dropdown-menu-align-right
+            - actions.each do |action|
+              %li
+                = link_to [:play, @project.namespace.becomes(Namespace), @project, action], method: :post, rel: 'nofollow' do
+                  = icon("play")
+                  %span= action.name.humanize
+
+    - if local_assigns.fetch(:allow_rollback, false)
+      = link_to [:retry, @project.namespace.becomes(Namespace), @project, deployment.deployable], method: :post, class: 'btn btn-build' do
+        - if deployment.last?
+          Re-deploy
+        - else
+          Rollback
diff --git a/app/views/projects/deployments/_deployment.html.haml b/app/views/projects/deployments/_deployment.html.haml
index d08dd92f1f6..baf02f1e6a0 100644
--- a/app/views/projects/deployments/_deployment.html.haml
+++ b/app/views/projects/deployments/_deployment.html.haml
@@ -7,17 +7,11 @@
 
   %td
     - if deployment.deployable
-      = link_to namespace_project_build_path(@project.namespace, @project, deployment.deployable) do
+      = link_to [@project.namespace.becomes(Namespace), @project, deployment.deployable] do
         = "#{deployment.deployable.name} (##{deployment.deployable.id})"
 
   %td
     #{time_ago_with_tooltip(deployment.created_at)}
 
   %td
-    - if can?(current_user, :create_deployment, deployment) && deployment.deployable
-      .pull-right
-        = link_to retry_namespace_project_build_path(@project.namespace, @project, deployment.deployable), method: :post, class: 'btn btn-build' do
-          - if deployment.last?
-            Retry
-          - else
-            Rollback
+    = render 'projects/deployments/actions', deployment: deployment, allow_rollback: true
diff --git a/app/views/projects/diffs/_content.html.haml b/app/views/projects/diffs/_content.html.haml
index 0c0424edffd..a1b071f130c 100644
--- a/app/views/projects/diffs/_content.html.haml
+++ b/app/views/projects/diffs/_content.html.haml
@@ -8,12 +8,12 @@
   - elsif blob_text_viewable?(blob)
     - if !project.repository.diffable?(blob)
       .nothing-here-block This diff was suppressed by a .gitattributes entry.
+    - elsif diff_file.collapsed?
+      - url = url_for(params.merge(action: :diff_for_path, old_path: diff_file.old_path, new_path: diff_file.new_path))
+      .nothing-here-block.diff-collapsed{data: { diff_for_path: url } }
+        This diff is collapsed. Click to expand it.
     - elsif diff_file.diff_lines.length > 0
-      - if diff_file.collapsed_by_default? && !expand_all_diffs?
-        - url = url_for(params.merge(action: :diff_for_path, old_path: diff_file.old_path, new_path: diff_file.new_path))
-        .nothing-here-block.diff-collapsed{data: { diff_for_path: url } }
-          This diff is collapsed. Click to expand it.
-      - elsif diff_view == 'parallel'
+      - if diff_view == 'parallel'
         = render "projects/diffs/parallel_view", diff_file: diff_file, project: project, blob: blob
       - else
         = render "projects/diffs/text_file", diff_file: diff_file
diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml
index 20aaab5accf..8ae433b4823 100644
--- a/app/views/projects/diffs/_diffs.html.haml
+++ b/app/views/projects/diffs/_diffs.html.haml
@@ -6,7 +6,7 @@
 
 .content-block.oneline-block.files-changed
   .inline-parallel-buttons
-    - unless expand_all_diffs?
+    - if !expand_all_diffs? && diff_files.any? { |diff_file| diff_file.collapsed? }
       = link_to 'Expand all', url_for(params.merge(expand_all_diffs: 1, format: 'html')), class: 'btn btn-default'
     - if show_whitespace_toggle
       - if current_controller?(:commit)
diff --git a/app/views/projects/diffs/_match_line_parallel.html.haml b/app/views/projects/diffs/_match_line_parallel.html.haml
deleted file mode 100644
index b9c0d9dcdfd..00000000000
--- a/app/views/projects/diffs/_match_line_parallel.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-%td.old_line.diff-line-num.empty-cell
-%td.line_content.parallel.match= line
-%td.new_line.diff-line-num.empty-cell
-%td.line_content.parallel.match= line
diff --git a/app/views/projects/diffs/_parallel_view.html.haml b/app/views/projects/diffs/_parallel_view.html.haml
index d208fcee10b..7f30faa20d8 100644
--- a/app/views/projects/diffs/_parallel_view.html.haml
+++ b/app/views/projects/diffs/_parallel_view.html.haml
@@ -5,32 +5,35 @@
       - left = line[:left]
       - right = line[:right]
       %tr.line_holder.parallel
-        - if left[:type] == 'match'
-          = render "projects/diffs/match_line_parallel", { line: left[:text] }
-        - elsif left[:type] == 'nonewline'
-          %td.old_line.diff-line-num.empty-cell
-          %td.line_content.parallel.match= left[:text]
-          %td.new_line.diff-line-num.empty-cell
-          %td.line_content.parallel.match= left[:text]
+        - if left
+          - if left.meta?
+            %td.old_line.diff-line-num.empty-cell
+            %td.line_content.parallel.match= left.text
+          - else
+            - left_line_code = diff_file.line_code(left)
+            - left_position = diff_file.position(left)
+            %td.old_line.diff-line-num{id: left_line_code, class: left.type, data: { linenumber: left.old_pos }}
+              %a{href: "##{left_line_code}" }= raw(left.old_pos)
+            %td.line_content.parallel.noteable_line{class: left.type, data: diff_view_line_data(left_line_code, left_position, 'old')}= diff_line_content(left.text)
         - else
-          %td.old_line.diff-line-num{id: left[:line_code], class: [left[:type], ('empty-cell' unless left[:number])], data: { linenumber: left[:number] }}
-            %a{href: "##{left[:line_code]}" }= raw(left[:number])
-          %td.line_content.parallel.noteable_line{class: [left[:type], ('empty-cell' if left[:text].empty?)], data: diff_view_line_data(left[:line_code], left[:position], 'old')}= diff_line_content(left[:text])
+          %td.old_line.diff-line-num.empty-cell
+          %td.line_content.parallel
 
-          - if right[:type] == 'new'
-            - new_line_type = 'new'
-            - new_line_code = right[:line_code]
-            - new_position = right[:position]
+        - if right
+          - if right.meta?
+            %td.old_line.diff-line-num.empty-cell
+            %td.line_content.parallel.match= left.text
           - else
-            - new_line_type = nil
-            - new_line_code = left[:line_code]
-            - new_position = left[:position]
-
-          %td.new_line.diff-line-num{id: new_line_code, class: [new_line_type, ('empty-cell' unless right[:number])], data: { linenumber: right[:number] }}
-            %a{href: "##{new_line_code}" }= raw(right[:number])
-          %td.line_content.parallel.noteable_line{class: [new_line_type, ('empty-cell' if right[:text].empty?)], data: diff_view_line_data(new_line_code, new_position, 'new')}= diff_line_content(right[:text])
+            - right_line_code = diff_file.line_code(right)
+            - right_position = diff_file.position(right)
+            %td.new_line.diff-line-num{id: right_line_code, class: right.type, data: { linenumber: right.new_pos }}
+              %a{href: "##{right_line_code}" }= raw(right.new_pos)
+            %td.line_content.parallel.noteable_line{class: right.type, data: diff_view_line_data(right_line_code, right_position, 'new')}= diff_line_content(right.text)
+        - else
+          %td.old_line.diff-line-num.empty-cell
+          %td.line_content.parallel
 
       - unless @diff_notes_disabled
-        - notes_left, notes_right = organize_comments(left, right)
-        - if notes_left.present? || notes_right.present?
-          = render "projects/notes/diff_notes_with_reply_parallel", notes_left: notes_left, notes_right: notes_right
+        - discussion_left, discussion_right = parallel_diff_discussions(left, right, diff_file)
+        - if discussion_left || discussion_right
+          = render "discussions/parallel_diff_discussion", discussion_left: discussion_left, discussion_right: discussion_right
diff --git a/app/views/projects/diffs/_text_file.html.haml b/app/views/projects/diffs/_text_file.html.haml
index 196f8122db3..5970b9abf2b 100644
--- a/app/views/projects/diffs/_text_file.html.haml
+++ b/app/views/projects/diffs/_text_file.html.haml
@@ -11,9 +11,9 @@
 
     - unless @diff_notes_disabled
       - line_code = diff_file.line_code(line)
-      - diff_notes = @grouped_diff_notes[line_code] if line_code
-      - if diff_notes
-        = render "projects/notes/diff_notes_with_reply", notes: diff_notes
+      - discussion = @grouped_diff_discussions[line_code] if line_code
+      - if discussion
+        = render "discussions/diff_discussion", discussion: discussion
 
   - if last_line > 0
     = render "projects/diffs/match_line", { line: "",
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 57af167180b..921155e970b 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -32,6 +32,10 @@
               %strong
                 = visibility_level_label(@project.visibility_level)
               .light= visibility_level_description(@project.visibility_level, @project)
+
+        .form-group
+          = render 'shared/allow_request_access', form: f
+
         .form-group
           = f.label :tag_list, "Tags", class: 'label-light'
           = f.text_field :tag_list, value: @project.tag_list.to_s, maxlength: 2000, class: "form-control"
@@ -86,8 +90,6 @@
         %hr
         = render 'merge_request_settings', f: f
         %hr
-        = render 'builds_settings', f: f
-        %hr
         %fieldset.features.append-bottom-default
           %h5.prepend-top-0
             Project avatar
diff --git a/app/views/projects/environments/_environment.html.haml b/app/views/projects/environments/_environment.html.haml
index eafa246d05f..e2453395602 100644
--- a/app/views/projects/environments/_environment.html.haml
+++ b/app/views/projects/environments/_environment.html.haml
@@ -15,3 +15,6 @@
   %td
     - if last_deployment
       #{time_ago_with_tooltip(last_deployment.created_at)}
+
+  %td
+    = render 'projects/deployments/actions', deployment: last_deployment
diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml
index 303d7c23d01..a6dd34653ab 100644
--- a/app/views/projects/environments/index.html.haml
+++ b/app/views/projects/environments/index.html.haml
@@ -28,4 +28,5 @@
           %th Environment
           %th Last deployment
           %th Date
+          %th
         = render @environments
diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml
index b17aba2431f..b8b1ce52a91 100644
--- a/app/views/projects/environments/show.html.haml
+++ b/app/views/projects/environments/show.html.haml
@@ -5,7 +5,7 @@
 %div{ class: container_class }
   .top-area
     .col-md-9
-      %h3.page-title= @environment.name.titleize
+      %h3.page-title= @environment.name.capitalize
 
     .col-md-3
       .nav-controls
diff --git a/app/views/projects/forks/index.html.haml b/app/views/projects/forks/index.html.haml
index dbe9ddfde2f..a1d79bdabda 100644
--- a/app/views/projects/forks/index.html.haml
+++ b/app/views/projects/forks/index.html.haml
@@ -31,11 +31,11 @@
     - if current_user && can?(current_user, :fork_project, @project)
       - if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2
         = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork', class: 'btn btn-new' do
-          = icon('code-fork fw')
+          = custom_icon('icon_fork')
           Fork
       - else
         = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project", class: 'btn btn-new' do
-          = icon('code-fork fw')
+          = custom_icon('icon_fork')
           Fork
 
 
diff --git a/app/views/projects/forks/new.html.haml b/app/views/projects/forks/new.html.haml
index 73a7fc0e1ac..5242bc72b71 100644
--- a/app/views/projects/forks/new.html.haml
+++ b/app/views/projects/forks/new.html.haml
@@ -1,45 +1,54 @@
 - page_title "Fork project"
-- if @namespaces.present?
-  %h3.page-title Fork project
-  %p.lead
-    Click to fork the project to a user or group
-  %hr
 
-  .fork-namespaces
-    - @namespaces.in_groups_of(6, false) do |group|
-      .row
-        - group.each do |namespace|
-          .col-md-2.col-sm-3
-            - if fork = namespace.find_fork_of(@project)
-              .fork-thumbnail
-                = link_to project_path(fork), title: "Visit project fork", class: 'has-tooltip' do
-                  = image_tag namespace_icon(namespace, 100)
-                  .caption
-                    %strong
-                      = namespace.human_name
-                    %div.text-primary
-                      Already forked
-
-            - else
-              .fork-thumbnail
-                = link_to namespace_project_forks_path(@project.namespace, @project, namespace_key: namespace.id), title: "Fork here", method: "POST", class: 'has-tooltip' do
-                  = image_tag namespace_icon(namespace, 100)
-                  .caption
-                    %strong
-                      = namespace.human_name
-
-    %p.light
-      Fork is a copy of a project repository.
+.row.prepend-top-default
+  .col-lg-3
+    %h4.prepend-top-0
+      Fork project
+    %p
+      A fork is a copy of a project.
       %br
-      Forking a repository allows you to do changes without affecting the original project.
-- else
-  %h3 No available namespaces to fork the project
-  %p.slead
-    You must have permission to create a project in a namespace before forking.
+      Forking a repository allows you to make changes without affecting the original project.
+  .col-lg-9
+    .fork-namespaces
+      - if @namespaces.present?
+        %label.label-light
+          %span
+            Click to fork the project to a user or group
+          - @namespaces.in_groups_of(6, false) do |group|
+            .row
+              - group.each do |namespace|
+                - avatar = namespace_icon(namespace, 100)
+                - if fork = namespace.find_fork_of(@project)
+                  .fork-thumbnail.forked
+                    = link_to project_path(fork) do
+                      - if /no_((\w*)_)*avatar/.match(avatar)
+                        .no-avatar
+                          = icon 'question'
+                      - else
+                        = image_tag avatar
+                      .caption
+                        = namespace.human_name
+                - else
+                  .fork-thumbnail
+                    = link_to namespace_project_forks_path(@project.namespace, @project, namespace_key: namespace.id), method: "POST" do
+                      - if /no_((\w*)_)*avatar/.match(avatar)
+                        .no-avatar
+                          = icon 'question'
+                      - else
+                        = image_tag avatar
+                      .caption
+                        = namespace.human_name
+      - else
+        %label.label-light
+          %span
+            No available namespaces to fork the project.
+            %br
+            %small
+              You must have permission to create a project in a namespace before forking.
 
-.save-project-loader.hide
-  .center
-    %h2
-      %i.fa.fa-spinner.fa-spin
-      Forking repository
-    %p Please wait a moment, this page will automatically refresh when ready.
+    .save-project-loader.hide
+      .center
+        %h2
+          %i.fa.fa-spinner.fa-spin
+          Forking repository
+        %p Please wait a moment, this page will automatically refresh when ready.
diff --git a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
index 542827b2f15..331dc1fcc29 100644
--- a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
+++ b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
@@ -51,7 +51,7 @@
   %td.duration
     - if generic_commit_status.duration
       = icon("clock-o")
-      #{duration_in_words(generic_commit_status.finished_at, generic_commit_status.started_at)}
+      = time_interval_in_words(generic_commit_status.duration)
 
   %td.timestamp
     - if generic_commit_status.finished_at
diff --git a/app/views/projects/graphs/_head.html.haml b/app/views/projects/graphs/_head.html.haml
index ca347406dfe..45e51389c00 100644
--- a/app/views/projects/graphs/_head.html.haml
+++ b/app/views/projects/graphs/_head.html.haml
@@ -3,7 +3,7 @@
 
     - content_for :page_specific_javascripts do
       = page_specific_javascript_tag('lib/chart.js')
-      = page_specific_javascript_tag('graphs/application.js')
+      = page_specific_javascript_tag('graphs/graphs_bundle.js')
     = nav_link(action: :show) do
       = link_to 'Contributors', namespace_project_graph_path
     = nav_link(action: :commits) do
diff --git a/app/views/projects/issues/_new_branch.html.haml b/app/views/projects/issues/_new_branch.html.haml
index e93b7e0d66d..24749699c6d 100644
--- a/app/views/projects/issues/_new_branch.html.haml
+++ b/app/views/projects/issues/_new_branch.html.haml
@@ -2,7 +2,7 @@
   .pull-right
     #new-branch{'data-path' => can_create_branch_namespace_project_issue_path(@project.namespace, @project, @issue)}
       = link_to namespace_project_branches_path(@project.namespace, @project, branch_name: @issue.to_branch_name, issue_iid: @issue.iid),
-        method: :post, class: 'btn has-tooltip', title: @issue.to_branch_name, disabled: 'disabled' do
+        method: :post, class: 'btn btn-new btn-inverted has-tooltip', title: @issue.to_branch_name, disabled: 'disabled' do
         .checking
           = icon('spinner spin')
           Checking branches
diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml
index 489c632ae22..6ef640bb654 100644
--- a/app/views/projects/merge_requests/widget/_heading.html.haml
+++ b/app/views/projects/merge_requests/widget/_heading.html.haml
@@ -1,6 +1,6 @@
 - if @pipeline
   .mr-widget-heading
-    - %w[success skipped canceled failed running pending].each do |status|
+    - %w[success success_with_warnings skipped canceled failed running pending].each do |status|
       .ci_widget{ class: "ci-#{status}", style: ("display:none" unless @pipeline.status == status) }
         = ci_icon_for_status(status)
         %span
diff --git a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml
index 06ab0a3fa00..f000cc38a65 100644
--- a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml
@@ -4,7 +4,7 @@
 
 %p
   Please resolve these conflicts or
-  - if @merge_request.can_be_merged_by?(current_user)
+  - if @merge_request.can_be_merged_via_command_line_by?(current_user)
     #{link_to "merge this request manually", "#modal_merge_info", class: "how_to_merge_link vlink", "data-toggle" => "modal"}.
   - else
     ask someone with write access to this repository to merge this request manually.
diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml
index 091af4df4a1..b2ece44d966 100644
--- a/app/views/projects/network/show.html.haml
+++ b/app/views/projects/network/show.html.haml
@@ -1,7 +1,7 @@
 - page_title "Network", @ref
 - content_for :page_specific_javascripts do
   = page_specific_javascript_tag('lib/raphael.js')
-  = page_specific_javascript_tag('network/application.js')
+  = page_specific_javascript_tag('network/network_bundle.js')
 = render "projects/commits/head"
 = render "head"
 %div{ class: container_class }
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index c72d0140bb9..facdfcc9447 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -89,9 +89,9 @@
                     = link_to "#", class: 'btn js-toggle-button import_git' do
                       %i.fa.fa-git
                       %span Repo by URL
-                %div
+                %div{ class: 'import_gitlab_project' }
                   - if gitlab_project_import_enabled?
-                    = link_to new_import_gitlab_project_path, class: 'btn import_gitlab_project project-submit' do
+                    = link_to new_import_gitlab_project_path, class: 'btn btn_import_gitlab_project project-submit' do
                       %i.fa.fa-gitlab
                       %span GitLab export
 
@@ -130,29 +130,29 @@
     $(".modal").hide();
   });
 
-  $('.import_gitlab_project').bind('click', function() {
-    var _href = $("a.import_gitlab_project").attr("href");
-    $(".import_gitlab_project").attr("href", _href + '?namespace_id=' + $("#project_namespace_id").val() + '&path=' + $("#project_path").val());
+  $('.btn_import_gitlab_project').bind('click', function() {
+    var _href = $("a.btn_import_gitlab_project").attr("href");
+    $(".btn_import_gitlab_project").attr("href", _href + '?namespace_id=' + $("#project_namespace_id").val() + '&path=' + $("#project_path").val());
   });
 
-  $('.import_gitlab_project').attr('disabled',true)
-  $('.import_gitlab_project').attr('title', 'Project path required.');
+  $('.btn_import_gitlab_project').attr('disabled',true)
+  $('.import_gitlab_project').attr('title', 'Project path and name required.');
 
   $('.import_gitlab_project').click(function( event ) {
-    if($('.import_gitlab_project').attr('disabled')) {
+    if($('.btn_import_gitlab_project').attr('disabled')) {
       event.preventDefault();
-      new Flash("Please enter a path for the project to be imported to.");
+      new Flash("Please enter path and name for the project to be imported to.");
     }
   });
 
   $('#project_path').keyup(function(){
     if($(this).val().length !=0) {
-      $('.import_gitlab_project').attr('disabled', false);
+      $('.btn_import_gitlab_project').attr('disabled', false);
       $('.import_gitlab_project').attr('title','');
       $(".flash-container").html("")
     } else {
-      $('.import_gitlab_project').attr('disabled',true);
-      $('.import_gitlab_project').attr('title', 'Project path required.');
+      $('.btn_import_gitlab_project').attr('disabled',true);
+      $('.import_gitlab_project').attr('title', 'Project path and name required.');
     }
   });
 
diff --git a/app/views/projects/notes/_diff_notes_with_reply.html.haml b/app/views/projects/notes/_diff_notes_with_reply.html.haml
deleted file mode 100644
index ec6c4938efc..00000000000
--- a/app/views/projects/notes/_diff_notes_with_reply.html.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-- note = notes.first
-%tr.notes_holder
-  %td.notes_line{ colspan: 2 }
-  %td.notes_content
-    %ul.notes{ data: { discussion_id: note.discussion_id } }
-      = render partial: "projects/notes/note", collection: notes, as: :note
-    = link_to_reply_discussion(note)
diff --git a/app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml b/app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml
deleted file mode 100644
index e50a4f86d03..00000000000
--- a/app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml
+++ /dev/null
@@ -1,25 +0,0 @@
-- note_left = notes_left.present? ? notes_left.first : nil
-- note_right = notes_right.present? ? notes_right.first : nil
-
-%tr.notes_holder
-  - if note_left
-    %td.notes_line.old
-    %td.notes_content.parallel.old
-      %ul.notes{ data: { discussion_id: note_left.discussion_id } }
-        = render partial: "projects/notes/note", collection: notes_left, as: :note
-
-      = link_to_reply_discussion(note_left, 'old')
-  - else
-    %td.notes_line.old= ""
-    %td.notes_content.parallel.old= ""
-
-  - if note_right
-    %td.notes_line.new
-    %td.notes_content.parallel.new
-      %ul.notes{ data: { discussion_id: note_right.discussion_id } }
-        = render partial: "projects/notes/note", collection: notes_right, as: :note
-
-      = link_to_reply_discussion(note_right, 'new')
-  - else
-    %td.notes_line.new= ""
-    %td.notes_content.parallel.new= ""
diff --git a/app/views/projects/notes/_discussion.html.haml b/app/views/projects/notes/_discussion.html.haml
deleted file mode 100644
index 7869d6413d8..00000000000
--- a/app/views/projects/notes/_discussion.html.haml
+++ /dev/null
@@ -1,46 +0,0 @@
-- note = discussion_notes.first
-- expanded = !note.diff_note? || note.active?
-%li.note.note-discussion.timeline-entry
-  .timeline-entry-inner
-    .timeline-icon
-      = link_to user_path(note.author) do
-        = image_tag avatar_icon(note.author), class: "avatar s40"
-    .timeline-content
-      .discussion.js-toggle-container{ class: note.discussion_id }
-        .discussion-header
-          = link_to_member(@project, note.author, avatar: false)
-
-          .inline.discussion-headline-light
-            = note.author.to_reference
-            started a discussion on
-
-            - if note.for_commit?
-              - commit = note.noteable
-              - if commit
-                commit
-                = link_to commit.short_id, namespace_project_commit_path(note.project.namespace, note.project, note.noteable, anchor: note.line_code), class: 'monospace'
-              - else
-                a deleted commit
-            - else
-              - if note.active?
-                = link_to diffs_namespace_project_merge_request_path(note.project.namespace, note.project, note.noteable, anchor: note.line_code) do
-                  the diff
-              - else
-                an outdated diff
-
-            = time_ago_with_tooltip(note.created_at, placement: "bottom", html_class: "note-created-ago")
-
-          .discussion-actions
-            = link_to "#", class: "note-action-button discussion-toggle-button js-toggle-button" do
-              - if expanded
-                = icon("chevron-up")
-              - else
-                = icon("chevron-down")
-
-              Toggle discussion
-
-        .discussion-body.js-toggle-content{ class: ("hide" unless expanded) }
-          - if note.diff_note?
-            = render "projects/notes/discussions/diff_with_notes", discussion_notes: discussion_notes
-          - else
-            = render "projects/notes/discussions/notes", discussion_notes: discussion_notes
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index af0046886fb..71da8ac9d7c 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -30,7 +30,7 @@
             = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button hidden-xs js-note-delete danger' do
               = icon('trash-o')
       .note-body{class: note_editable ? 'js-task-list-container' : ''}
-        .note-text
+        .note-text.md
           = preserve do
             = note.note_html
           = edited_time_ago_with_tooltip(note, placement: 'bottom', html_class: 'note_edited_ago', include_author: true)
diff --git a/app/views/projects/notes/_notes.html.haml b/app/views/projects/notes/_notes.html.haml
index ebf7e8a9cb3..022578bd6db 100644
--- a/app/views/projects/notes/_notes.html.haml
+++ b/app/views/projects/notes/_notes.html.haml
@@ -1,10 +1,8 @@
 - if @discussions.present?
-  - @discussions.each do |discussion_notes|
-    - note = discussion_notes.first
-    - if note_for_main_target?(note)
-      = render partial: "projects/notes/note", object: note, as: :note
+  - @discussions.each do |discussion|
+    - if discussion.for_target?(@noteable)
+      = render partial: "projects/notes/note", object: discussion.first_note, as: :note
     - else
-      = render 'projects/notes/discussion', discussion_notes: discussion_notes
+      = render 'discussions/discussion', discussion: discussion
 - else
-  - @notes.each do |note|
-    = render partial: "projects/notes/note", object: note, as: :note
+  = render partial: "projects/notes/note", collection: @notes, as: :note
diff --git a/app/views/projects/notes/_notes_with_form.html.haml b/app/views/projects/notes/_notes_with_form.html.haml
index 56d302fab82..74538a9723e 100644
--- a/app/views/projects/notes/_notes_with_form.html.haml
+++ b/app/views/projects/notes/_notes_with_form.html.haml
@@ -14,9 +14,9 @@
       .disabled-comment.text-center
         .disabled-comment-text.inline
           Please
-          = link_to "register",new_user_session_path
+          = link_to "register", new_session_path(:user, redirect_to_referer: 'yes')
           or
-          = link_to "login",new_user_session_path
+          = link_to "login", new_session_path(:user, redirect_to_referer: 'yes')
           to post a comment
 
 :javascript
diff --git a/app/views/projects/notes/discussions/_diff_with_notes.html.haml b/app/views/projects/notes/discussions/_diff_with_notes.html.haml
deleted file mode 100644
index 4a69b8f8840..00000000000
--- a/app/views/projects/notes/discussions/_diff_with_notes.html.haml
+++ /dev/null
@@ -1,17 +0,0 @@
-- note = discussion_notes.first
-- diff_file = note.diff_file
-- return unless diff_file
-
-- blob = note.blob
-
-.diff-file.file-holder
-  .file-title
-    = render "projects/diffs/file_header", diff_file: diff_file, blob: blob, diff_commit: diff_file.content_commit, project: note.project, url: diff_note_path(note)
-
-  .diff-content.code.js-syntax-highlight
-    %table
-      - note.truncated_diff_lines.each do |line|
-        = render "projects/diffs/line", line: line, diff_file: diff_file, plain: true
-
-        - if note.for_line?(line)
-          = render "projects/notes/diff_notes_with_reply", notes: discussion_notes
diff --git a/app/views/projects/notes/discussions/_notes.html.haml b/app/views/projects/notes/discussions/_notes.html.haml
deleted file mode 100644
index a785149549d..00000000000
--- a/app/views/projects/notes/discussions/_notes.html.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-- note = discussion_notes.first
-.panel.panel-default
-  .notes{ data: { discussion_id: note.discussion_id } }
-    %ul.notes.timeline
-      = render partial: "projects/notes/note", collection: discussion_notes, as: :note
-  = link_to_reply_discussion(note)
diff --git a/app/views/projects/pipelines_settings/show.html.haml b/app/views/projects/pipelines_settings/show.html.haml
new file mode 100644
index 00000000000..228bad36ebd
--- /dev/null
+++ b/app/views/projects/pipelines_settings/show.html.haml
@@ -0,0 +1,103 @@
+- page_title "CI/CD Pipelines"
+
+.row.prepend-top-default
+  .col-lg-3.profile-settings-sidebar
+    %h4.prepend-top-0
+      = page_title
+  .col-lg-9
+    %h5.prepend-top-0
+      Pipelines
+    = form_for @project, url: namespace_project_pipelines_settings_path(@project.namespace.becomes(Namespace), @project), remote: true, authenticity_token: true do |f|
+      %fieldset.builds-feature
+        - unless @repository.gitlab_ci_yml
+          .form-group
+            %p Pipelines need to be configured before you can begin using Continuous Integration.
+            = link_to 'Get started with CI/CD Pipelines', help_page_path('ci/quick_start/README'), class: 'btn btn-info'
+        .form-group
+          %p Get recent application code using the following command:
+          .radio
+            = f.label :build_allow_git_fetch_false do
+              = f.radio_button :build_allow_git_fetch, 'false'
+              %strong git clone
+              %br
+              %span.descr Slower but makes sure you have a clean dir before every build
+          .radio
+            = f.label :build_allow_git_fetch_true do
+              = f.radio_button :build_allow_git_fetch, 'true'
+              %strong git fetch
+              %br
+              %span.descr Faster
+
+        .form-group
+          = f.label :build_timeout_in_minutes, 'Timeout', class: 'label-light'
+          = f.number_field :build_timeout_in_minutes, class: 'form-control', min: '0'
+          %p.help-block per build in minutes
+        .form-group
+          = f.label :build_coverage_regex, "Test coverage parsing", class: 'label-light'
+          .input-group
+            %span.input-group-addon /
+            = f.text_field :build_coverage_regex, class: 'form-control', placeholder: '\(\d+.\d+\%\) covered'
+            %span.input-group-addon /
+          %p.help-block
+            We will use this regular expression to find test coverage output in build trace.
+            Leave blank if you want to disable this feature
+          .bs-callout.bs-callout-info
+            %p Below are examples of regex for existing tools:
+            %ul
+              %li
+                Simplecov (Ruby) -
+                %code \(\d+.\d+\%\) covered
+              %li
+                pytest-cov (Python) -
+                %code \d+\%\s*$
+              %li
+                phpunit --coverage-text --colors=never (PHP) -
+                %code ^\s*Lines:\s*\d+.\d+\%
+              %li
+                gcovr (C/C++) -
+                %code ^TOTAL.*\s+(\d+\%)$
+              %li
+                tap --coverage-report=text-summary (Node.js) -
+                %code ^Statements\s*:\s*([^%]+)
+
+        .form-group
+          .checkbox
+            = f.label :public_builds do
+              = f.check_box :public_builds
+              %strong Public pipelines
+            .help-block Allow everyone to access pipelines for Public and Internal projects
+
+        .form-group.append-bottom-default
+          = f.label :runners_token, "Runners token", class: 'label-light'
+          = f.text_field :runners_token, class: "form-control", placeholder: 'xEeFCaDAB89'
+          %p.help-block The secure token used to checkout project.
+
+        = f.submit 'Save changes', class: "btn btn-save"
+
+%hr
+
+.row.prepend-top-default
+  .col-lg-3.profile-settings-sidebar
+    %h4.prepend-top-0
+      Builds Badge
+  .col-lg-9
+    .prepend-top-10
+      .panel.panel-default
+        .panel-heading
+          %b Builds badge &middot;
+          = @build_badge.to_html
+          .pull-right
+            = render 'shared/ref_switcher', destination: 'badges', align_right: true
+        .panel-body
+          .row
+            .col-md-2.text-center
+              Markdown
+            .col-md-10.code.js-syntax-highlight
+              = highlight('.md', @build_badge.to_markdown)
+          .row
+            %hr
+          .row
+            .col-md-2.text-center
+              HTML
+            .col-md-10.code.js-syntax-highlight
+              = highlight('.html', @build_badge.to_html)
diff --git a/app/views/projects/protected_branches/_branches_list.html.haml b/app/views/projects/protected_branches/_branches_list.html.haml
index 97cb1a9052b..720d67dff7c 100644
--- a/app/views/projects/protected_branches/_branches_list.html.haml
+++ b/app/views/projects/protected_branches/_branches_list.html.haml
@@ -8,6 +8,7 @@
   .table-responsive
     %table.table.protected-branches-list
       %colgroup
+        %col{ width: "20%" }
         %col{ width: "30%" }
         %col{ width: "25%" }
         %col{ width: "25%" }
@@ -18,6 +19,7 @@
           %th Protected Branch
           %th Commit
           %th Developers Can Push
+          %th Developers Can Merge
           - if can_admin_project
             %th
       %tbody
diff --git a/app/views/projects/protected_branches/_protected_branch.html.haml b/app/views/projects/protected_branches/_protected_branch.html.haml
index 474aec3a97c..7fda7f96047 100644
--- a/app/views/projects/protected_branches/_protected_branch.html.haml
+++ b/app/views/projects/protected_branches/_protected_branch.html.haml
@@ -16,6 +16,8 @@
         (branch was removed from repository)
   %td
     = check_box_tag("developers_can_push", protected_branch.id, protected_branch.developers_can_push, data: { url: url })
+  %td
+    = check_box_tag("developers_can_merge", protected_branch.id, protected_branch.developers_can_merge, data: { url: url })
   - if can_admin_project
     %td
       = link_to 'Unprotect', [@project.namespace.becomes(Namespace), @project, protected_branch], data: { confirm: 'Branch will be writable for developers. Are you sure?' }, method: :delete, class: "btn btn-warning btn-sm pull-right"
diff --git a/app/views/projects/protected_branches/index.html.haml b/app/views/projects/protected_branches/index.html.haml
index 883d3e3af1e..950df740bbc 100644
--- a/app/views/projects/protected_branches/index.html.haml
+++ b/app/views/projects/protected_branches/index.html.haml
@@ -6,12 +6,13 @@
       = page_title
     %p Keep stable branches secure and force developers to use merge requests.
     %p.prepend-top-20
-      Protected branches are designed to:
+      By default, protected branches are designed to:
       %ul
-        %li prevent pushes from everybody except #{link_to "masters", help_page_path("user/permissions"), class: "vlink"}
-        %li prevent anyone from force pushing to the branch
-        %li prevent anyone from deleting the branch
-      %p.append-bottom-0 Read more about #{link_to "project permissions", help_page_path("user/permissions"), class: "underlined-link"}
+        %li prevent their creation, if not already created, from everybody except Masters
+        %li prevent pushes from everybody except Masters
+        %li prevent <strong>anyone</strong> from force pushing to the branch
+        %li prevent <strong>anyone</strong> from deleting the branch
+      %p.append-bottom-0 Read more about #{link_to "protected branches", help_page_path("user/project/protected_branches"), class: "underlined-link"} and #{link_to "project permissions", help_page_path("user/permissions"), class: "underlined-link"}.
   .col-lg-9
     %h5.prepend-top-0
       Protect a branch
@@ -23,7 +24,7 @@
           = f.label :name, "Branch", class: "label-light"
           = render partial: "dropdown", locals: { f: f }
           %p.help-block
-            = link_to "Wildcards", help_page_path('workflow/protected_branches', anchor: "wildcard-protected-branches")
+            = link_to "Wildcards", help_page_path('user/project/protected_branches', anchor: "wildcard-protected-branches")
             such as
             %code *-stable
             or
@@ -36,6 +37,14 @@
             = f.label :developers_can_push, "Developers can push", class: "label-light append-bottom-0"
             %p.light.append-bottom-0
               Allow developers to push to this branch
+
+        .form-group
+          = f.check_box :developers_can_merge, class: "pull-left"
+          .prepend-left-20
+            = f.label :developers_can_merge, "Developers can merge", class: "label-light append-bottom-0"
+            %p.light.append-bottom-0
+              Allow developers to accept merge requests to this branch
         = f.submit "Protect", class: "btn-create btn protect-branch-btn", disabled: true
+
     %hr
     = render "branches_list"
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index 1f13ea28b4e..752fbc21a11 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -8,9 +8,10 @@
   .col-lg-9
     = form_for(@service, as: :service, url: namespace_project_service_path(@project.namespace, @project, @service.to_param), method: :put, html: { class: 'form-horizontal' }) do |form|
       = render 'shared/service_settings', form: form
+
       = form.submit 'Save changes', class: 'btn btn-save'
       &nbsp;
       - if @service.valid? && @service.activated?
         - disabled = @service.can_test? ? '':'disabled'
-        = link_to 'Test settings', test_namespace_project_service_path(@project.namespace, @project, @service.to_param), class: "btn #{disabled}"
+        = link_to 'Test settings', test_namespace_project_service_path(@project.namespace, @project, @service), class: "btn #{disabled}", title: @service.disabled_title
       = link_to "Cancel", namespace_project_services_path(@project.namespace, @project), class: "btn btn-cancel"
diff --git a/app/views/projects/tags/show.html.haml b/app/views/projects/tags/show.html.haml
index b7d7d5c5382..395d7af6cbb 100644
--- a/app/views/projects/tags/show.html.haml
+++ b/app/views/projects/tags/show.html.haml
@@ -1,36 +1,39 @@
+- @no_container = true
 - page_title @tag.name, "Tags"
 = render "projects/commits/head"
 
-.row-content-block
-  .pull-right
-    - if can?(current_user, :push_code, @project)
-      = link_to edit_namespace_project_tag_release_path(@project.namespace, @project, @tag.name), class: 'btn-grouped btn has-tooltip', title: 'Edit release notes' do
-        = icon("pencil")
-    = link_to namespace_project_tree_path(@project.namespace, @project, @tag.name), class: 'btn btn-grouped has-tooltip', title: 'Browse files' do
-      = icon('files-o')
-    = link_to namespace_project_commits_path(@project.namespace, @project, @tag.name), class: 'btn btn-grouped has-tooltip', title: 'Browse commits' do
-      = icon('history')
-    - if can? current_user, :download_code, @project
-      = render 'projects/tags/download', ref: @tag.name, project: @project
-    - if can?(current_user, :admin_project, @project)
-      .pull-right
-        = link_to namespace_project_tag_path(@project.namespace, @project, @tag.name), class: 'btn btn-remove remove-row grouped has-tooltip', title: "Delete tag", method: :delete, data: { confirm: "Deleting the '#{@tag.name}' tag cannot be undone. Are you sure?" } do
-          %i.fa.fa-trash-o
-  .title
-    %span.item-title= @tag.name
-  - if @commit
-    = render 'projects/branches/commit', commit: @commit, project: @project
-  - else
-    Cant find HEAD commit for this tag
-  - if @tag.message.present?
-    %pre.body
-      = strip_gpg_signature(@tag.message)
+%div{ class: container_class }
+  .sub-header-block
+    .pull-right.tag-buttons
+      - if can?(current_user, :push_code, @project)
+        = link_to edit_namespace_project_tag_release_path(@project.namespace, @project, @tag.name), class: 'btn has-tooltip', title: 'Edit release notes' do
+          = icon("pencil")
+      = link_to namespace_project_tree_path(@project.namespace, @project, @tag.name), class: 'btn has-tooltip', title: 'Browse files' do
+        = icon('files-o')
+      = link_to namespace_project_commits_path(@project.namespace, @project, @tag.name), class: 'btn has-tooltip', title: 'Browse commits' do
+        = icon('history')
+      - if can? current_user, :download_code, @project
+        = render 'projects/tags/download', ref: @tag.name, project: @project
+      - if can?(current_user, :admin_project, @project)
+        .pull-right
+          = link_to namespace_project_tag_path(@project.namespace, @project, @tag.name), class: 'btn btn-remove remove-row grouped has-tooltip', title: "Delete tag", method: :delete, data: { confirm: "Deleting the '#{@tag.name}' tag cannot be undone. Are you sure?" } do
+            %i.fa.fa-trash-o
+    .tag-info.append-bottom-10
+      .title
+        %span.item-title= @tag.name
+      - if @commit
+        = render 'projects/branches/commit', commit: @commit, project: @project
+      - else
+        Cant find HEAD commit for this tag
+    - if @tag.message.present?
+      %pre.body
+        = strip_gpg_signature(@tag.message)
 
-.append-bottom-default.prepend-top-default
-  - if @release.description.present?
-    .description
-      .wiki
-        = preserve do
-          = markdown @release.description
-  - else
-    This tag has no release notes.
+  .append-bottom-default.prepend-top-default
+    - if @release.description.present?
+      .description
+        .wiki
+          = preserve do
+            = markdown @release.description
+    - else
+      This tag has no release notes.
diff --git a/app/views/shared/_allow_request_access.html.haml b/app/views/shared/_allow_request_access.html.haml
new file mode 100644
index 00000000000..53a99a736c0
--- /dev/null
+++ b/app/views/shared/_allow_request_access.html.haml
@@ -0,0 +1,6 @@
+.checkbox
+  = form.label :request_access_enabled do
+    = form.check_box :request_access_enabled
+    %strong Allow users to request access
+    %br
+    %span.descr Allow users to request access if visibility is public or internal.
diff --git a/app/views/shared/_service_settings.html.haml b/app/views/shared/_service_settings.html.haml
index 4eaf7c2a025..5254d265918 100644
--- a/app/views/shared/_service_settings.html.haml
+++ b/app/views/shared/_service_settings.html.haml
@@ -10,69 +10,28 @@
   .col-sm-10
     = form.check_box :active
 
-- if @service.supported_events.length > 1
-  .form-group
-    = form.label :url, "Trigger", class: 'control-label'
-    .col-sm-10
-      - if @service.supported_events.include?("push")
-        %div
-          = form.check_box :push_events, class: 'pull-left'
-          .prepend-left-20
-            = form.label :push_events, class: 'list-label' do
-              %strong Push events
-            %p.light
-              This url will be triggered by a push to the repository
-      - if @service.supported_events.include?("tag_push")
-        %div
-          = form.check_box :tag_push_events, class: 'pull-left'
-          .prepend-left-20
-            = form.label :tag_push_events, class: 'list-label' do
-              %strong Tag push events
-            %p.light
-              This url will be triggered when a new tag is pushed to the repository
-      - if @service.supported_events.include?("note")
-        %div
-          = form.check_box :note_events, class: 'pull-left'
-          .prepend-left-20
-            = form.label :note_events, class: 'list-label' do
-              %strong Comments
-            %p.light
-              This url will be triggered when someone adds a comment
-      - if @service.supported_events.include?("issue")
-        %div
-          = form.check_box :issues_events, class: 'pull-left'
-          .prepend-left-20
-            = form.label :issues_events, class: 'list-label' do
-              %strong Issues events
-            %p.light
-              This url will be triggered when an issue is created/updated/merged
-      - if @service.supported_events.include?("merge_request")
-        %div
-          = form.check_box :merge_requests_events, class: 'pull-left'
-          .prepend-left-20
-            = form.label :merge_requests_events, class: 'list-label' do
-              %strong Merge Request events
-            %p.light
-              This url will be triggered when a merge request is created/updated/merged
-      - if @service.supported_events.include?("build")
-        %div
-          = form.check_box :build_events, class: 'pull-left'
-          .prepend-left-20
-            = form.label :build_events, class: 'list-label' do
-              %strong Build events
-            %p.light
-              This url will be triggered when a build status changes
-      - if @service.supported_events.include?("wiki_page")
-        %div
-          = form.check_box :wiki_page_events, class: 'pull-left'
-          .prepend-left-20
-            = form.label :wiki_page_events, class: 'list-label' do
-              %strong Wiki Page events
-            %p.light
-              This url will be triggered when a wiki page is created/updated
+.form-group
+  = form.label :url, "Trigger", class: 'control-label'
+
+  .col-sm-10
+    - @service.supported_events.each do |event|
+      %div
+        = form.check_box service_event_field_name(event), class: 'pull-left'
+        .prepend-left-20
+          = form.label service_event_field_name(event), class: 'list-label' do
+            %strong
+              = event.humanize
+
+      - field = @service.event_field(event)
+
+      - if field
+        %p
+          = form.text_field field[:name], class: "form-control", placeholder: field[:placeholder]
 
+      %p.light
+        = service_event_description(event)
 
-- @service.fields.each do |field|
+- @service.global_fields.each do |field|
   - type = field[:type]
 
   - if type == 'fieldset'
diff --git a/app/views/shared/icons/_icon_fork.svg b/app/views/shared/icons/_icon_fork.svg
new file mode 100644
index 00000000000..a21f8f3a951
--- /dev/null
+++ b/app/views/shared/icons/_icon_fork.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
+  <path fill="#7E7E7E" fill-rule="evenodd" d="M22,29.5351288 L22,22.7193602 C26.1888699,21.5098039 29.3985457,16.802989 29.3985457,16.802989 C29.740988,16.3567547 30,15.5559546 30,15.0081969 L30,10.4648712 C31.1956027,9.77325238 32,8.48056471 32,7 C32,4.790861 30.209139,3 28,3 C25.790861,3 24,4.790861 24,7 C24,8.48056471 24.8043973,9.77325238 26,10.4648712 L26,14.7083871 C26,14.8784435 25.9055559,15.0987329 25.7890533,15.2104147 C25.7890533,15.2104147 24.5373893,16.4126202 23.9488702,16.9515733 C22.5015398,18.2770075 21.1191354,19 20.090554,19 C19.0477772,19 17.6172728,18.2608988 16.1128852,16.9142923 C15.5030182,16.3683886 14.3672121,15.3403307 14.3672121,15.3403307 C14.1659605,15.1583364 14.0000086,14.7846305 14.0000192,14.5088473 C14.0000192,14.5088473 14.0000932,12.7539451 14.0001308,10.4647956 C15.1956614,9.77315812 16,8.48051074 16,7 C16,4.790861 14.209139,3 12,3 C9.790861,3 8,4.790861 8,7 C8,8.48056471 8.80439726,9.77325238 10,10.4648712 L10,15.0081969 C10,15.5446944 10.2736352,16.3534183 10.6111812,16.7893819 C10.6111812,16.7893819 13.8599776,21.3779363 18,22.6668724 L18,29.5351288 C16.8043973,30.2267476 16,31.5194353 16,33 C16,35.209139 17.790861,37 20,37 C22.209139,37 24,35.209139 24,33 C24,31.5194353 23.1956027,30.2267476 22,29.5351288 Z M14,7 C14,5.8954305 13.1045695,5 12,5 C10.8954305,5 10,5.8954305 10,7 C10,8.1045695 10.8954305,9 12,9 C13.1045695,9 14,8.1045695 14,7 Z M30,7 C30,5.8954305 29.1045695,5 28,5 C26.8954305,5 26,5.8954305 26,7 C26,8.1045695 26.8954305,9 28,9 C29.1045695,9 30,8.1045695 30,7 Z M22,33 C22,31.8954305 21.1045695,31 20,31 C18.8954305,31 18,31.8954305 18,33 C18,34.1045695 18.8954305,35 20,35 C21.1045695,35 22,34.1045695 22,33 Z"/>
+</svg>
diff --git a/app/views/shared/icons/_icon_status_cancel.svg b/app/views/shared/icons/_icon_status_cancel.svg
new file mode 100644
index 00000000000..6a0bc1490c4
--- /dev/null
+++ b/app/views/shared/icons/_icon_status_cancel.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs>
+    <circle id="a" cx="7" cy="7" r="7"/>
+    <mask id="b" width="14" height="14" x="0" y="0" fill="white">
+      <use xlink:href="#a"/>
+    </mask>
+  </defs>
+  <g fill="none" fill-rule="evenodd">
+    <use stroke="#5C5C5C" stroke-width="2" mask="url(#b)" xlink:href="#a"/>
+    <rect width="10" height="1" x="2" y="6.5" fill="#5C5C5C" transform="rotate(45 7 7)" rx=".3"/>
+  </g>
+</svg>
diff --git a/app/views/shared/icons/_icon_status_failed.svg b/app/views/shared/icons/_icon_status_failed.svg
new file mode 100644
index 00000000000..c41ca18cae7
--- /dev/null
+++ b/app/views/shared/icons/_icon_status_failed.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs>
+    <circle id="a" cx="7" cy="7" r="7"/>
+    <mask id="b" width="14" height="14" x="0" y="0" fill="white">
+      <use xlink:href="#a"/>
+    </mask>
+  </defs>
+  <g fill="none" fill-rule="evenodd">
+    <use stroke="#D22852" stroke-width="2" mask="url(#b)" xlink:href="#a"/>
+    <path fill="#D22852" d="M7.5,6.5 L7.5,4.30578971 C7.5,4.12531853 7.36809219,4 7.20537567,4 L6.79462433,4 C6.63904572,4 6.5,4.13690672 6.5,4.30578971 L6.5,6.5 L4.30578971,6.5 C4.12531853,6.5 4,6.63190781 4,6.79462433 L4,7.20537567 C4,7.36095428 4.13690672,7.5 4.30578971,7.5 L6.5,7.5 L6.5,9.69421029 C6.5,9.87468147 6.63190781,10 6.79462433,10 L7.20537567,10 C7.36095428,10 7.5,9.86309328 7.5,9.69421029 L7.5,7.5 L9.69421029,7.5 C9.87468147,7.5 10,7.36809219 10,7.20537567 L10,6.79462433 C10,6.63904572 9.86309328,6.5 9.69421029,6.5 L7.5,6.5 Z" transform="rotate(45 7 7)"/>
+  </g>
+</svg>
diff --git a/app/views/shared/icons/_icon_status_pending.svg b/app/views/shared/icons/_icon_status_pending.svg
new file mode 100644
index 00000000000..035cd8b4ccc
--- /dev/null
+++ b/app/views/shared/icons/_icon_status_pending.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs>
+    <circle id="a" cx="7" cy="7" r="7"/>
+    <mask id="b" width="14" height="14" x="0" y="0" fill="white">
+      <use xlink:href="#a"/>
+    </mask>
+  </defs>
+  <g fill="none" fill-rule="evenodd">
+    <use stroke="#E75E40" stroke-width="2" mask="url(#b)" xlink:href="#a"/>
+    <rect width="1" height="4" x="5" y="5" fill="#E75E40" rx=".3"/>
+    <rect width="1" height="4" x="8" y="5" fill="#E75E40" rx=".3"/>
+  </g>
+</svg>
diff --git a/app/views/shared/icons/_icon_status_running.svg b/app/views/shared/icons/_icon_status_running.svg
new file mode 100644
index 00000000000..a48b3a25099
--- /dev/null
+++ b/app/views/shared/icons/_icon_status_running.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs>
+    <circle id="a" cx="7" cy="7" r="7"/>
+    <mask id="b" width="14" height="14" x="0" y="0" fill="white">
+      <use xlink:href="#a"/>
+    </mask>
+  </defs>
+  <g fill="none" fill-rule="evenodd">
+    <use stroke="#2D9FD8" stroke-width="2" mask="url(#b)" xlink:href="#a"/>
+    <path fill="#2D9FD8" d="M7,3.00800862 C9.09023405,3.13960661 10.7448145,4.87657932 10.7448145,7 C10.7448145,9.209139 8.95395346,11 6.74481446,11 C5.4560962,11 4.30972054,10.3905589 3.57817301,9.44416214 L7,7 L7,3.00800862 Z"/>
+  </g>
+</svg>
diff --git a/app/views/shared/icons/_icon_status_success.svg b/app/views/shared/icons/_icon_status_success.svg
new file mode 100644
index 00000000000..260eab013a3
--- /dev/null
+++ b/app/views/shared/icons/_icon_status_success.svg
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs>
+    <circle id="a" cx="7" cy="7" r="7"/>
+    <mask id="b" width="14" height="14" x="0" y="0" fill="white">
+      <use xlink:href="#a"/>
+    </mask>
+  </defs>
+  <g fill="none" fill-rule="evenodd">
+    <use stroke="#31AF64" stroke-width="2" mask="url(#b)" xlink:href="#a"/>
+    <g fill="#31AF64" transform="rotate(45 -.13 10.953)">
+      <rect width="1" height="5" x="2" rx=".3"/>
+      <rect width="3" height="1" y="4" rx=".3"/>
+    </g>
+  </g>
+</svg>
diff --git a/app/views/shared/icons/_icon_status_warning.svg b/app/views/shared/icons/_icon_status_warning.svg
new file mode 100644
index 00000000000..d47e7a1c93f
--- /dev/null
+++ b/app/views/shared/icons/_icon_status_warning.svg
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs>
+    <circle id="a" cx="7" cy="7" r="7"/>
+    <mask id="b" width="14" height="14" x="0" y="0" fill="white">
+      <use xlink:href="#a"/>
+    </mask>
+  </defs>
+  <g fill="none" fill-rule="evenodd">
+    <g fill="#FF8A24" transform="translate(6 3)">
+      <rect width="2" height="5" rx=".5"/>
+      <rect width="2" height="2" y="6" rx=".5"/>
+    </g>
+    <use stroke="#FF8A24" stroke-width="2" mask="url(#b)" xlink:href="#a"/>
+  </g>
+</svg>
diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml
index d5199bd86dd..0b7fa8c7d06 100644
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
@@ -21,10 +21,10 @@
             placeholder: "Search assignee", data: { any_user: "Any Assignee", first_user: (current_user.username if current_user), null_user: true, current_user: true, project_id: (@project.id if @project), selected: params[:assignee_id], field_name: "assignee_id", default_label: "Assignee" } })
 
         .filter-item.inline.milestone-filter
-          = render "shared/issuable/milestone_dropdown", selected: params[:milestone_title], name: :milestone_title, show_any: true, show_upcoming: true
+          = render "shared/issuable/milestone_dropdown"
 
         .filter-item.inline.labels-filter
-          = render "shared/issuable/label_dropdown", selected: params[:label_name], data_options: { field_name: "label_name[]" }
+          = render "shared/issuable/label_dropdown"
 
         .pull-right
           = render 'shared/sort_dropdown'
@@ -44,9 +44,15 @@
               placeholder: "Search authors", data: { first_user: (current_user.username if current_user), null_user: true, current_user: true, project_id: @project.id, field_name: "update[assignee_id]" } })
           .filter-item.inline
             = dropdown_tag("Milestone", options: { title: "Assign milestone", toggle_class: 'js-milestone-select js-extra-options js-filter-submit js-filter-bulk-update', filter: true, dropdown_class: "dropdown-menu-selectable dropdown-menu-milestone", placeholder: "Search milestones", data: { show_no: true, field_name: "update[milestone_id]", project_id: @project.id, milestones: namespace_project_milestones_path(@project.namespace, @project, :json), use_id: true } })
-
           .filter-item.inline.labels-filter
             = render "shared/issuable/label_dropdown", classes: ['js-filter-bulk-update', 'js-multiselect'], show_create: false, show_footer: false, extra_options: false, filter_submit: false, show_footer: false, data_options: { persist_when_hide: "true", field_name: "update[label_ids][]", show_no: false, show_any: false, use_id: true }
+          .filter-item.inline
+            = dropdown_tag("Subscription", options: { toggle_class: "js-subscription-event", title: "Change subscription", dropdown_class: "dropdown-menu-selectable", data: { field_name: "update[subscription_event]" } } ) do
+              %ul
+                %li
+                  %a{href: "#", data: {id: "subscribe"}} Subscribe
+                %li
+                  %a{href: "#", data: {id: "unsubscribe"}} Unsubscribe
 
           = hidden_field_tag 'update[issues_ids]', []
           = hidden_field_tag :state_event, params[:state_event]
@@ -63,6 +69,7 @@
   new LabelsSelect();
   new MilestoneSelect();
   new IssueStatusSelect();
+  new SubscriptionSelect();
   $('form.filter-form').on('submit', function (event) {
     event.preventDefault();
     Turbolinks.visit(this.action + '&' + $(this).serialize());
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 07b39c233b1..c30bdb0ae91 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -1,12 +1,5 @@
 = form_errors(issuable)
 
-- if @conflict
-  .alert.alert-danger
-    Someone edited the #{issuable.class.model_name.human.downcase} the same time you did.
-    Please check out
-    = link_to "the #{issuable.class.model_name.human.downcase}", polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), target: "_blank"
-    and make sure your changes will not unintentionally remove theirs
-
 .form-group
   = f.label :title, class: 'control-label'
   .col-sm-10
@@ -59,24 +52,38 @@
         = f.label :assignee_id, "Assignee", class: "control-label #{"col-lg-4" if has_due_date}"
         .col-sm-10{ class: ("col-lg-8" if has_due_date) }
           .issuable-form-select-holder
-            - project = @target_project || @project
-            - if issuable.assignee_id
-              = hidden_field_tag("#{issuable.class.model_name.param_key}[assignee_id]", issuable.assignee_id)
-            = dropdown_tag(user_dropdown_label(issuable.assignee_id, "Assignee"), options: { toggle_class: "js-user-search js-issuable-form-dropdown js-assignee-search", title: "Filter by assignee", filter: true, dropdown_class: "dropdown-menu-user dropdown-menu-selectable dropdown-menu-assignee js-filter-submit",
-              placeholder: "Search assignee", data: { first_user: (current_user.username if current_user), null_user: true, current_user: true, project_id: (project.id if project), selected: issuable.assignee_id, field_name: "#{issuable.class.model_name.param_key}[assignee_id]", default_label: "Assignee" } })
+            = users_select_tag("#{issuable.class.model_name.param_key}[assignee_id]",
+                placeholder: 'Select assignee', class: 'custom-form-control', null_user: true,
+                selected: issuable.assignee_id, project: @target_project || @project,
+                first_user: true, current_user: true, include_blank: true)
+          %div
+            = link_to 'Assign to me', '#', class: 'assign-to-me-link prepend-top-5 inline'
       .form-group.issue-milestone
         = f.label :milestone_id, "Milestone", class: "control-label #{"col-lg-4" if has_due_date}"
         .col-sm-10{ class: ("col-lg-8" if has_due_date) }
-          .issuable-form-select-holder
-            = render "shared/issuable/milestone_dropdown", selected: issuable.milestone_id, name: "#{issuable.class.model_name.param_key}[milestone_id]", show_any: false, show_upcoming: false
+          - if milestone_options(issuable).present?
+            .issuable-form-select-holder
+              = f.select(:milestone_id, milestone_options(issuable),
+                { include_blank: true }, { class: 'select2', data: { placeholder: 'Select milestone' } })
+          - else
+            .prepend-top-10
+            %span.light No open milestones available.
+          - if can? current_user, :admin_milestone, issuable.project
+            %div
+              = link_to 'Create new milestone', new_namespace_project_milestone_path(issuable.project.namespace, issuable.project), target: :blank, class: "prepend-top-5 inline"
       .form-group
         - has_labels = issuable.project.labels.any?
-        - selected_labels = issuable.label_ids.any? ? issuable.label_ids : nil
-        - label_dropdown_toggle = issuable.labels.map { |label| label.title }
         = f.label :label_ids, "Labels", class: "control-label #{"col-lg-4" if has_due_date}"
         .col-sm-10{ class: "#{"col-lg-8" if has_due_date} #{'issuable-form-padding-top' if !has_labels}" }
-          .issuable-form-select-holder
-            = render "shared/issuable/label_dropdown", classes: ["js-issuable-form-dropdown"], selected: selected_labels, selected_toggle: label_dropdown_toggle, data_options: { field_name: "#{issuable.class.model_name.param_key}[label_ids][]", show_any: "false" }
+          - if has_labels
+            .issuable-form-select-holder
+              = f.collection_select :label_ids, issuable.project.labels.all, :id, :name,
+                { selected: issuable.label_ids }, multiple: true, class: 'select2', data: { placeholder: "Select labels" }
+          - else
+            %span.light No labels yet.
+          - if can? current_user, :admin_label, issuable.project
+            %div
+              = link_to 'Create new label', new_namespace_project_label_path(issuable.project.namespace, issuable.project), target: :blank, class: "prepend-top-5 inline"
     - if has_due_date
       .col-lg-6
         .form-group
@@ -142,5 +149,3 @@
         = link_to 'Delete', polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), data: { confirm: "#{issuable.class.name.titleize} will be removed! Are you sure?" },
                                                                                                   method: :delete, class: 'btn btn-danger btn-grouped'
       = link_to 'Cancel', polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), class: 'btn btn-grouped btn-cancel'
-
-= f.hidden_field :lock_version
diff --git a/app/views/shared/issuable/_label_dropdown.html.haml b/app/views/shared/issuable/_label_dropdown.html.haml
index bcbe133ce62..d34d28f6736 100644
--- a/app/views/shared/issuable/_label_dropdown.html.haml
+++ b/app/views/shared/issuable/_label_dropdown.html.haml
@@ -4,21 +4,19 @@
 - show_footer = local_assigns.fetch(:show_footer, true)
 - data_options = local_assigns.fetch(:data_options, {})
 - classes = local_assigns.fetch(:classes, [])
-- selected = local_assigns.fetch(:selected, nil)
-- selected_toggle = local_assigns.fetch(:selected_toggle, nil)
-- dropdown_data = {toggle: 'dropdown', field_name: "label_name[]", show_no: "true", show_any: "true", selected: selected, project_id: @project.try(:id), labels: labels_filter_path, default_label: "Label"}
+- dropdown_data = {toggle: 'dropdown', field_name: 'label_name[]', show_no: "true", show_any: "true", selected: params[:label_name], project_id: @project.try(:id), labels: labels_filter_path, default_label: "Label"}
 - dropdown_data.merge!(data_options)
 - classes << 'js-extra-options' if extra_options
 - classes << 'js-filter-submit' if filter_submit
 
-- if selected.present?
-  - if selected.respond_to?('any?')
-    - selected.each do |label|
-      = hidden_field_tag data_options[:field_name], label, id: nil
+- if params[:label_name].present?
+  - if params[:label_name].respond_to?('any?')
+    - params[:label_name].each do |label|
+      = hidden_field_tag "label_name[]", label, id: nil
 .dropdown
   %button.dropdown-menu-toggle.js-label-select.js-multiselect{class: classes.join(' '), type: "button", data: dropdown_data}
     %span.dropdown-toggle-text
-      = h(multi_label_name(selected_toggle || selected, "Label"))
+      = h(multi_label_name(params[:label_name], "Label"))
     = icon('chevron-down')
   .dropdown-menu.dropdown-select.dropdown-menu-paging.dropdown-menu-labels.dropdown-menu-selectable
     = render partial: "shared/issuable/label_page_default", locals: { title: "Filter by label", show_footer: show_footer, show_create: show_create }
diff --git a/app/views/shared/issuable/_label_page_default.html.haml b/app/views/shared/issuable/_label_page_default.html.haml
index 0acb8253139..4e280c371ac 100644
--- a/app/views/shared/issuable/_label_page_default.html.haml
+++ b/app/views/shared/issuable/_label_page_default.html.haml
@@ -4,7 +4,7 @@
 - filter_placeholder = local_assigns.fetch(:filter_placeholder, 'Search labels')
 .dropdown-page-one
   = dropdown_title(title)
-  = dropdown_filter(filter_placeholder, search_id: "label-name")
+  = dropdown_filter(filter_placeholder)
   = dropdown_content
   - if @project && show_footer
     = dropdown_footer do
diff --git a/app/views/shared/issuable/_milestone_dropdown.html.haml b/app/views/shared/issuable/_milestone_dropdown.html.haml
index 9188ef72d52..2fcf40ece99 100644
--- a/app/views/shared/issuable/_milestone_dropdown.html.haml
+++ b/app/views/shared/issuable/_milestone_dropdown.html.haml
@@ -1,7 +1,7 @@
-- if selected.present?
-  = hidden_field_tag(name, selected)
-= dropdown_tag(milestone_dropdown_label(selected), options: { title: "Filter by milestone", toggle_class: 'js-milestone-select js-filter-submit', filter: true, dropdown_class: "dropdown-menu-selectable",
-  placeholder: "Search milestones", footer_content: @project.present?, data: { show_no: true, show_any: show_any, show_upcoming: show_upcoming, field_name: name, selected: selected, project_id: @project.try(:id), milestones: milestones_filter_dropdown_path, default_label: "Milestone" } }) do
+- if params[:milestone_title].present?
+  = hidden_field_tag(:milestone_title, params[:milestone_title])
+= dropdown_tag(milestone_dropdown_label(params[:milestone_title]), options: { title: "Filter by milestone", toggle_class: 'js-milestone-select js-filter-submit', filter: true, dropdown_class: "dropdown-menu-selectable",
+  placeholder: "Search milestones", footer_content: @project.present?, data: { show_no: true, show_any: true, show_upcoming: true, field_name: "milestone_title", selected: params[:milestone_title], project_id: @project.try(:id), milestones: milestones_filter_dropdown_path, default_label: "Milestone" } }) do
   - if @project
     %ul.dropdown-footer-list
       - if can? current_user, :admin_milestone, @project
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index e020a7d4d00..8e2fcbdfab8 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -156,7 +156,7 @@
 
       - project_ref = cross_project_reference(@project, issuable)
       .block.project-reference
-        .sidebar-collapsed-icon
+        .sidebar-collapsed-icon.dont-change-state
           = clipboard_button(clipboard_text: project_ref)
         .cross-project-reference.hide-collapsed
           %span
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index db2b4885861..c7f39868e71 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -2,7 +2,7 @@
 - page_description @user.bio
 - content_for :page_specific_javascripts do
   = page_specific_javascript_tag('lib/d3.js')
-  = page_specific_javascript_tag('users/application.js')
+  = page_specific_javascript_tag('users/users_bundle.js')
 - header_title     @user.name, user_path(@user)
 - @no_container = true
 
diff --git a/app/workers/emails_on_push_worker.rb b/app/workers/emails_on_push_worker.rb
index 8551288e2f2..0b6a01a3200 100644
--- a/app/workers/emails_on_push_worker.rb
+++ b/app/workers/emails_on_push_worker.rb
@@ -28,12 +28,12 @@ class EmailsOnPushWorker
         :push
       end
 
-    merge_base_sha = project.merge_base_commit(before_sha, after_sha).try(:sha)
-
     diff_refs = nil
     compare = nil
     reverse_compare = false
+
     if action == :push
+      merge_base_sha = project.merge_base_commit(before_sha, after_sha).try(:sha)
       compare = Gitlab::Git::Compare.new(project.repository.raw_repository, before_sha, after_sha)
 
       diff_refs = Gitlab::Diff::DiffRefs.new(
diff --git a/app/workers/project_export_worker.rb b/app/workers/project_export_worker.rb
index 39f6037e077..615311e63f5 100644
--- a/app/workers/project_export_worker.rb
+++ b/app/workers/project_export_worker.rb
@@ -1,7 +1,7 @@
 class ProjectExportWorker
   include Sidekiq::Worker
 
-  sidekiq_options queue: :gitlab_shell, retry: true
+  sidekiq_options queue: :gitlab_shell, retry: 3
 
   def perform(current_user_id, project_id)
     current_user = User.find(current_user_id)
diff --git a/app/workers/repository_archive_cache_worker.rb b/app/workers/repository_archive_cache_worker.rb
index 47c5a670ed4..a2e49c61f59 100644
--- a/app/workers/repository_archive_cache_worker.rb
+++ b/app/workers/repository_archive_cache_worker.rb
@@ -4,6 +4,6 @@ class RepositoryArchiveCacheWorker
   sidekiq_options queue: :default
 
   def perform
-    Repository.clean_old_archives
+    RepositoryArchiveCleanUpService.new.execute
   end
 end
diff --git a/config/application.rb b/config/application.rb
index 21e7cc7b6e8..06ebb14a5fe 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -76,17 +76,18 @@ module Gitlab
 
     # Enable the asset pipeline
     config.assets.enabled = true
-    config.assets.paths << Gemojione.index.images_path
+    config.assets.paths << Gemojione.images_path
     config.assets.precompile << "*.png"
     config.assets.precompile << "print.css"
     config.assets.precompile << "notify.css"
     config.assets.precompile << "mailers/*.css"
-    config.assets.precompile << "graphs/application.js"
-    config.assets.precompile << "users/application.js"
-    config.assets.precompile << "network/application.js"
-    config.assets.precompile << "profile/application.js"
+    config.assets.precompile << "graphs/graphs_bundle.js"
+    config.assets.precompile << "users/users_bundle.js"
+    config.assets.precompile << "network/network_bundle.js"
+    config.assets.precompile << "profile/profile_bundle.js"
     config.assets.precompile << "lib/utils/*.js"
     config.assets.precompile << "lib/*.js"
+    config.assets.precompile << "u2f.js"
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 325eca72862..1470a6e2550 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -106,8 +106,8 @@ production: &base
 
     ## Repository downloads directory
     # When a user clicks e.g. 'Download zip' on a project, a temporary zip file is created in the following directory.
-    # The default is 'tmp/repositories' relative to the root of the Rails app.
-    # repository_downloads_path: tmp/repositories
+    # The default is 'shared/cache/archive/' relative to the root of the Rails app.
+    # repository_downloads_path: shared/cache/archive/
 
   ## Reply by email
   # Allow users to comment on issues and merge requests by replying to notification emails.
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 51d93e8cde0..86f55210487 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -211,8 +211,7 @@ Settings.gitlab.default_projects_features['snippets']           = false if Setti
 Settings.gitlab.default_projects_features['builds']             = true if Settings.gitlab.default_projects_features['builds'].nil?
 Settings.gitlab.default_projects_features['container_registry'] = true if Settings.gitlab.default_projects_features['container_registry'].nil?
 Settings.gitlab.default_projects_features['visibility_level']   = Settings.send(:verify_constant, Gitlab::VisibilityLevel, Settings.gitlab.default_projects_features['visibility_level'], Gitlab::VisibilityLevel::PRIVATE)
-Settings.gitlab['repository_downloads_path'] = File.join(Settings.shared['path'], 'cache/archive') if Settings.gitlab['repository_downloads_path'].nil?
-Settings.gitlab['restricted_signup_domains'] ||= []
+Settings.gitlab['domain_whitelist'] ||= []
 Settings.gitlab['import_sources'] ||= %w[github bitbucket gitlab gitorious google_code fogbugz git gitlab_project]
 Settings.gitlab['trusted_proxies'] ||= []
 
@@ -316,6 +315,21 @@ Settings.repositories['storages'] ||= {}
 Settings.repositories.storages['default'] ||= Settings.gitlab_shell['repos_path'] || Settings.gitlab['user_home'] + '/repositories/'
 
 #
+# The repository_downloads_path is used to remove outdated repository
+# archives, if someone has it configured incorrectly, and it points
+# to the path where repositories are stored this can cause some
+# data-integrity issue. In this case, we sets it to the default
+# repository_downloads_path value.
+#
+repositories_storages_path     = Settings.repositories.storages.values
+repository_downloads_path      = Settings.gitlab['repository_downloads_path'].to_s.gsub(/\/$/, '')
+repository_downloads_full_path = File.expand_path(repository_downloads_path, Settings.gitlab['user_home'])
+
+if repository_downloads_path.blank? || repositories_storages_path.any? { |path| [repository_downloads_path, repository_downloads_full_path].include?(path.gsub(/\/$/, '')) }
+  Settings.gitlab['repository_downloads_path'] = File.join(Settings.shared['path'], 'cache/archive')
+end
+
+#
 # Backup
 #
 Settings['backup'] ||= Settingslogic.new({})
diff --git a/config/initializers/6_validations.rb b/config/initializers/6_validations.rb
index 3ba9e36c567..37746968675 100644
--- a/config/initializers/6_validations.rb
+++ b/config/initializers/6_validations.rb
@@ -3,22 +3,27 @@ def storage_name_valid?(name)
 end
 
 def find_parent_path(name, path)
+  parent = Pathname.new(path).realpath.parent
   Gitlab.config.repositories.storages.detect do |n, p|
-    name != n && path.chomp('/').start_with?(p.chomp('/'))
+    name != n && Pathname.new(p).realpath == parent
   end
 end
 
-def error(message)
+def storage_validation_error(message)
   raise "#{message}. Please fix this in your gitlab.yml before starting GitLab."
 end
 
-error('No repository storage path defined') if Gitlab.config.repositories.storages.empty?
+def validate_storages
+  storage_validation_error('No repository storage path defined') if Gitlab.config.repositories.storages.empty?
 
-Gitlab.config.repositories.storages.each do |name, path|
-  error("\"#{name}\" is not a valid storage name") unless storage_name_valid?(name)
+  Gitlab.config.repositories.storages.each do |name, path|
+    storage_validation_error("\"#{name}\" is not a valid storage name") unless storage_name_valid?(name)
 
-  parent_name, _parent_path = find_parent_path(name, path)
-  if parent_name
-    error("#{name} is a nested path of #{parent_name}. Nested paths are not supported for repository storages")
+    parent_name, _parent_path = find_parent_path(name, path)
+    if parent_name
+      storage_validation_error("#{name} is a nested path of #{parent_name}. Nested paths are not supported for repository storages")
+    end
   end
 end
+
+validate_storages unless Rails.env.test?
diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb
index c4266ab8ba5..f3cddac5b36 100644
--- a/config/initializers/metrics.rb
+++ b/config/initializers/metrics.rb
@@ -136,6 +136,13 @@ if Gitlab::Metrics.enabled?
     config.instrument_instance_methods(Rouge::Plugins::Redcarpet)
     config.instrument_instance_methods(Rouge::Formatters::HTMLGitlab)
 
+    [:XML, :HTML].each do |namespace|
+      namespace_mod = Nokogiri.const_get(namespace)
+
+      config.instrument_methods(namespace_mod)
+      config.instrument_methods(namespace_mod::Document)
+    end
+
     config.instrument_methods(Rinku)
   end
 
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index ca58ae92d1b..3e553120205 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -6,5 +6,9 @@
 
 Mime::Type.register_alias "text/plain", :diff
 Mime::Type.register_alias "text/plain", :patch
-Mime::Type.register_alias 'text/html',  :markdown
-Mime::Type.register_alias 'text/html',  :md
+Mime::Type.register_alias "text/html",  :markdown
+Mime::Type.register_alias "text/html",  :md
+
+Mime::Type.register "video/mp4",  :mp4, [], [:m4v, :mov]
+Mime::Type.register "video/webm", :webm
+Mime::Type.register "video/ogg",  :ogv
diff --git a/config/initializers/relative_naming_ci_namespace.rb b/config/initializers/relative_naming_ci_namespace.rb
new file mode 100644
index 00000000000..59abe1b9b91
--- /dev/null
+++ b/config/initializers/relative_naming_ci_namespace.rb
@@ -0,0 +1,16 @@
+# Description: https://coderwall.com/p/heed_q/rails-routing-and-namespaced-models
+#
+# This allows us to use CI ActiveRecord objects in all routes and use it:
+# - [project.namespace, project, build]
+#
+# instead of:
+# - namespace_project_build_path(project.namespace, project, build)
+#
+# Without that, Ci:: namespace is used for resolving routes:
+# - namespace_project_ci_build_path(project.namespace, project, build)
+
+module Ci
+  def self.use_relative_model_naming?
+    true
+  end
+end
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 593c14a289f..5e839327e7a 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -13,7 +13,15 @@ Sidekiq.configure_server do |config|
   # UGLY Hack to get nested hash from settingslogic
   cron_jobs = JSON.parse(Gitlab.config.cron_jobs.to_json)
   # UGLY hack: Settingslogic doesn't allow 'class' key
-  cron_jobs.each { |k, v| cron_jobs[k]['class'] = cron_jobs[k].delete('job_class') }
+  cron_jobs_required_keys = %w(job_class cron)
+  cron_jobs.each do |k, v|
+    if cron_jobs[k] && cron_jobs_required_keys.all? { |s| cron_jobs[k].key?(s) }
+      cron_jobs[k]['class'] = cron_jobs[k].delete('job_class')
+    else
+      cron_jobs.delete(k)
+      Rails.logger.error("Invalid cron_jobs config key: '#{k}'. Check your gitlab config file.")
+    end
+  end
   Sidekiq::Cron::Job.load_from_hash! cron_jobs
 
   # Database pool should be at least `sidekiq_concurrency` + 2
diff --git a/config/initializers/trusted_proxies.rb b/config/initializers/trusted_proxies.rb
index df4a933e22f..30770b71e24 100644
--- a/config/initializers/trusted_proxies.rb
+++ b/config/initializers/trusted_proxies.rb
@@ -11,6 +11,12 @@ module Rack
   end
 end
 
+gitlab_trusted_proxies = Array(Gitlab.config.gitlab.trusted_proxies).map do |proxy|
+  begin
+    IPAddr.new(proxy)
+  rescue IPAddr::InvalidAddressError
+  end
+end.compact
+
 Rails.application.config.action_dispatch.trusted_proxies = (
-  [ '127.0.0.1', '::1' ] + Array(Gitlab.config.gitlab.trusted_proxies)
-).map { |proxy| IPAddr.new(proxy) }
+  [ '127.0.0.1', '::1' ] + gitlab_trusted_proxies)
diff --git a/config/routes.rb b/config/routes.rb
index 3160fd767b8..21f3585bacd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -89,11 +89,10 @@ Rails.application.routes.draw do
   mount Grack::AuthSpawner, at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\/(info\/lfs|gitlab-lfs)/.match(request.path_info) }, via: [:get, :post, :put]
 
   # Help
-  
-  get 'help'                  => 'help#index'
-  get 'help/*path'            => 'help#show', as: :help_page
-  get 'help/shortcuts'
-  get 'help/ui' => 'help#ui'
+  get 'help'           => 'help#index'
+  get 'help/shortcuts' => 'help#shortcuts'
+  get 'help/ui'        => 'help#ui'
+  get 'help/*path'     => 'help#show', as: :help_page
 
   #
   # Global snippets
@@ -733,6 +732,10 @@ Rails.application.routes.draw do
         resources :triggers, only: [:index, :create, :destroy]
 
         resources :pipelines, only: [:index, :new, :create, :show] do
+          collection do
+            resource :pipelines_settings, path: 'settings', only: [:show, :update]
+          end
+
           member do
             post :cancel
             post :retry
@@ -750,6 +753,7 @@ Rails.application.routes.draw do
             get :status
             post :cancel
             post :retry
+            post :play
             post :erase
             get :trace
             get :raw
diff --git a/db/fixtures/development/14_builds.rb b/db/fixtures/development/14_builds.rb
index 51ff451eb4c..124704cb451 100644
--- a/db/fixtures/development/14_builds.rb
+++ b/db/fixtures/development/14_builds.rb
@@ -1,13 +1,34 @@
 class Gitlab::Seeder::Builds
+  STAGES = %w[build notify_build test notify_test deploy notify_deploy]
+  
   def initialize(project)
     @project = project
   end
 
   def seed!
-    ci_commits.each do |ci_commit|
+    pipelines.each do |pipeline|
       begin
-        build_create!(ci_commit, name: 'test build 1')
-        build_create!(ci_commit, status: 'success', name: 'test build 2')
+        build_create!(pipeline, name: 'build:linux', stage: 'build')
+        build_create!(pipeline, name: 'build:osx', stage: 'build')
+
+        build_create!(pipeline, name: 'slack post build', stage: 'notify_build')
+
+        build_create!(pipeline, name: 'rspec:linux', stage: 'test')
+        build_create!(pipeline, name: 'rspec:windows', stage: 'test')
+        build_create!(pipeline, name: 'rspec:windows', stage: 'test')
+        build_create!(pipeline, name: 'rspec:osx', stage: 'test')
+        build_create!(pipeline, name: 'spinach:linux', stage: 'test')
+        build_create!(pipeline, name: 'spinach:osx', stage: 'test')
+        build_create!(pipeline, name: 'cucumber:linux', stage: 'test')
+        build_create!(pipeline, name: 'cucumber:osx', stage: 'test')
+
+        build_create!(pipeline, name: 'slack post test', stage: 'notify_test')
+
+        build_create!(pipeline, name: 'staging', stage: 'deploy', environment: 'staging')
+        build_create!(pipeline, name: 'production', stage: 'deploy', environment: 'production', when: 'manual')
+
+        commit_status_create!(pipeline, name: 'jenkins')
+
         print '.'
       rescue ActiveRecord::RecordInvalid
         print 'F'
@@ -15,8 +36,8 @@ class Gitlab::Seeder::Builds
     end
   end
 
-  def ci_commits
-    commits = @project.repository.commits('master', nil, 5)
+  def pipelines
+    commits = @project.repository.commits('master', limit: 5)
     commits_sha = commits.map { |commit| commit.raw.id }
     commits_sha.map do |sha|
       @project.ensure_pipeline(sha, 'master')
@@ -25,11 +46,11 @@ class Gitlab::Seeder::Builds
     []
   end
 
-  def build_create!(ci_commit, opts = {})
-    attributes = build_attributes_for(ci_commit).merge(opts)
+  def build_create!(pipeline, opts = {})
+    attributes = build_attributes_for(pipeline, opts)
     build = Ci::Build.new(attributes)
 
-    if %w(success failed).include?(build.status)
+    if opts[:name].start_with?('build')
       artifacts_cache_file(artifacts_archive_path) do |file|
         build.artifacts_file = file
       end
@@ -40,19 +61,28 @@ class Gitlab::Seeder::Builds
     end
 
     build.save!
+    build.update(status: build_status)
 
     if %w(running success failed).include?(build.status)
       # We need to set build trace after saving a build (id required)
       build.trace = FFaker::Lorem.paragraphs(6).join("\n\n")
     end
   end
+  
+  def commit_status_create!(pipeline, opts = {})
+    attributes = commit_status_attributes_for(pipeline, opts)
+    GenericCommitStatus.create(attributes)
+  end
+  
+  def commit_status_attributes_for(pipeline, opts)
+    { name: 'test build', stage: 'test', stage_idx: stage_index(opts[:stage]),
+      ref: 'master', user: build_user, project: @project, pipeline: pipeline,
+      created_at: Time.now, updated_at: Time.now
+    }.merge(opts)
+  end
 
-  def build_attributes_for(ci_commit)
-    { name: 'test build', commands: "$ build command",
-      stage: 'test', stage_idx: 1, ref: 'master',
-      user_id: build_user, gl_project_id: @project.id,
-      status: build_status, commit_id: ci_commit.id,
-      created_at: Time.now, updated_at: Time.now }
+  def build_attributes_for(pipeline, opts)
+    commit_status_attributes_for(pipeline, opts).merge(commands: '$ build command')
   end
 
   def build_user
@@ -63,13 +93,16 @@ class Gitlab::Seeder::Builds
     Ci::Build::AVAILABLE_STATUSES.sample
   end
 
+  def stage_index(stage)
+    STAGES.index(stage) || 0
+  end
+
   def artifacts_archive_path
     Rails.root + 'spec/fixtures/ci_build_artifacts.zip'
   end
 
   def artifacts_metadata_path
     Rails.root + 'spec/fixtures/ci_build_artifacts_metadata.gz'
-
   end
 
   def artifacts_cache_file(file_path)
diff --git a/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb b/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb
index ac7eac0ea7c..611767ac7fe 100644
--- a/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb
+++ b/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb
@@ -7,7 +7,13 @@ class RemoveWrongImportUrlFromProjects < ActiveRecord::Migration
   class ProjectImportDataFake
     extend AttrEncrypted
     attr_accessor :credentials
-    attr_encrypted :credentials, key: Gitlab::Application.secrets.db_key_base, marshal: true, encode: true, :mode => :per_attribute_iv_and_salt
+    attr_encrypted :credentials,
+                   key: Gitlab::Application.secrets.db_key_base,
+                   marshal: true,
+                   encode: true,
+                   :mode => :per_attribute_iv_and_salt,
+                   insecure_mode: true,
+                   algorithm: 'aes-256-cbc'
   end
 
   def up
diff --git a/db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb b/db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb
new file mode 100644
index 00000000000..15ad8e8bcbb
--- /dev/null
+++ b/db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb
@@ -0,0 +1,9 @@
+class AddDevelopersCanMergeToProtectedBranches < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def change
+    add_column_with_default :protected_branches, :developers_can_merge, :boolean, default: false, allow_null: false
+  end
+end
diff --git a/db/migrate/20160629025435_add_column_in_progress_merge_commit_sha_to_merge_requests.rb b/db/migrate/20160629025435_add_column_in_progress_merge_commit_sha_to_merge_requests.rb
new file mode 100644
index 00000000000..7c5f76572ef
--- /dev/null
+++ b/db/migrate/20160629025435_add_column_in_progress_merge_commit_sha_to_merge_requests.rb
@@ -0,0 +1,8 @@
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddColumnInProgressMergeCommitShaToMergeRequests < ActiveRecord::Migration
+  def change
+    add_column :merge_requests, :in_progress_merge_commit_sha, :string
+  end
+end
diff --git a/db/migrate/20160707104333_add_lock_to_issuables.rb b/db/migrate/20160707104333_add_lock_to_issuables.rb
deleted file mode 100644
index cb516672800..00000000000
--- a/db/migrate/20160707104333_add_lock_to_issuables.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# See http://doc.gitlab.com/ce/development/migration_style_guide.html
-# for more information on how to write migrations for GitLab.
-
-class AddLockToIssuables < ActiveRecord::Migration
-  include Gitlab::Database::MigrationHelpers
-  disable_ddl_transaction!
-
-  def up
-    add_column_with_default :issues, :lock_version, :integer, default: 0
-    add_column_with_default :merge_requests, :lock_version, :integer, default: 0
-  end
-
-  def down
-    remove_column :issues, :lock_version
-    remove_column :merge_requests, :lock_version
-  end
-end
diff --git a/db/migrate/20160713205315_add_domain_blacklist_to_application_settings.rb b/db/migrate/20160713205315_add_domain_blacklist_to_application_settings.rb
new file mode 100644
index 00000000000..ecdd1bd7e5e
--- /dev/null
+++ b/db/migrate/20160713205315_add_domain_blacklist_to_application_settings.rb
@@ -0,0 +1,22 @@
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddDomainBlacklistToApplicationSettings < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  # When using the methods "add_concurrent_index" or "add_column_with_default"
+  # you must disable the use of transactions as these methods can not run in an
+  # existing transaction. When using "add_concurrent_index" make sure that this
+  # method is the _only_ method called in the migration, any other changes
+  # should go in a separate migration. This ensures that upon failure _only_ the
+  # index creation fails and can be retried or reverted easily.
+  #
+  # To disable transactions uncomment the following line and remove these
+  # comments:
+  # disable_ddl_transaction!
+
+  def change
+    add_column :application_settings, :domain_blacklist_enabled, :boolean, default: false
+    add_column :application_settings, :domain_blacklist, :text
+  end
+end
diff --git a/db/migrate/20160715132507_add_user_id_to_pipeline.rb b/db/migrate/20160715132507_add_user_id_to_pipeline.rb
new file mode 100644
index 00000000000..af0461c4daf
--- /dev/null
+++ b/db/migrate/20160715132507_add_user_id_to_pipeline.rb
@@ -0,0 +1,7 @@
+class AddUserIdToPipeline < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  def change
+    add_column :ci_commits, :user_id, :integer
+  end
+end
diff --git a/db/migrate/20160715134306_add_index_for_pipeline_user_id.rb b/db/migrate/20160715134306_add_index_for_pipeline_user_id.rb
new file mode 100644
index 00000000000..7c991c6d998
--- /dev/null
+++ b/db/migrate/20160715134306_add_index_for_pipeline_user_id.rb
@@ -0,0 +1,9 @@
+class AddIndexForPipelineUserId < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def change
+    add_concurrent_index :ci_commits, :user_id
+  end
+end
diff --git a/db/migrate/20160715154212_add_request_access_enabled_to_projects.rb b/db/migrate/20160715154212_add_request_access_enabled_to_projects.rb
new file mode 100644
index 00000000000..bf0131c6d76
--- /dev/null
+++ b/db/migrate/20160715154212_add_request_access_enabled_to_projects.rb
@@ -0,0 +1,12 @@
+class AddRequestAccessEnabledToProjects < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+  disable_ddl_transaction!
+
+  def up
+    add_column_with_default :projects, :request_access_enabled, :boolean, default: true
+  end
+
+  def down
+    remove_column :projects, :request_access_enabled
+  end
+end
diff --git a/db/migrate/20160715204316_add_request_access_enabled_to_groups.rb b/db/migrate/20160715204316_add_request_access_enabled_to_groups.rb
new file mode 100644
index 00000000000..e7b14cd3ee2
--- /dev/null
+++ b/db/migrate/20160715204316_add_request_access_enabled_to_groups.rb
@@ -0,0 +1,12 @@
+class AddRequestAccessEnabledToGroups < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+  disable_ddl_transaction!
+
+  def up
+    add_column_with_default :namespaces, :request_access_enabled, :boolean, default: true
+  end
+
+  def down
+    remove_column :namespaces, :request_access_enabled
+  end
+end
diff --git a/db/migrate/20160715230841_rename_application_settings_restricted_signup_domains.rb b/db/migrate/20160715230841_rename_application_settings_restricted_signup_domains.rb
new file mode 100644
index 00000000000..dd15704800a
--- /dev/null
+++ b/db/migrate/20160715230841_rename_application_settings_restricted_signup_domains.rb
@@ -0,0 +1,21 @@
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class RenameApplicationSettingsRestrictedSignupDomains < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  # When using the methods "add_concurrent_index" or "add_column_with_default"
+  # you must disable the use of transactions as these methods can not run in an
+  # existing transaction. When using "add_concurrent_index" make sure that this
+  # method is the _only_ method called in the migration, any other changes
+  # should go in a separate migration. This ensures that upon failure _only_ the
+  # index creation fails and can be retried or reverted easily.
+  #
+  # To disable transactions uncomment the following line and remove these
+  # comments:
+  # disable_ddl_transaction!
+
+  def change
+    rename_column :application_settings, :restricted_signup_domains, :domain_whitelist
+  end
+end
diff --git a/db/migrate/20160716115710_add_when_and_yaml_variables_to_ci_builds.rb b/db/migrate/20160716115710_add_when_and_yaml_variables_to_ci_builds.rb
new file mode 100644
index 00000000000..3e084023a65
--- /dev/null
+++ b/db/migrate/20160716115710_add_when_and_yaml_variables_to_ci_builds.rb
@@ -0,0 +1,8 @@
+class AddWhenAndYamlVariablesToCiBuilds < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  def change
+    add_column :ci_builds, :when, :string
+    add_column :ci_builds, :yaml_variables, :text
+  end
+end
diff --git a/db/migrate/20160718153603_add_has_external_wiki_to_projects.rb b/db/migrate/20160718153603_add_has_external_wiki_to_projects.rb
new file mode 100644
index 00000000000..55a3e954292
--- /dev/null
+++ b/db/migrate/20160718153603_add_has_external_wiki_to_projects.rb
@@ -0,0 +1,7 @@
+class AddHasExternalWikiToProjects < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  def change
+    add_column :projects, :has_external_wiki, :boolean
+  end
+end
diff --git a/db/migrate/20160721081015_drop_and_readd_has_external_wiki_in_projects.rb b/db/migrate/20160721081015_drop_and_readd_has_external_wiki_in_projects.rb
new file mode 100644
index 00000000000..1eb99feb40c
--- /dev/null
+++ b/db/migrate/20160721081015_drop_and_readd_has_external_wiki_in_projects.rb
@@ -0,0 +1,15 @@
+class DropAndReaddHasExternalWikiInProjects < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  # Set this constant to true if this migration requires downtime.
+  DOWNTIME = false
+
+  def up
+    update_column_in_batches(:projects, :has_external_wiki, nil) do |table, query|
+      query.where(table[:has_external_wiki].not_eq(nil))
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20160722221922_nullify_blank_type_on_notes.rb b/db/migrate/20160722221922_nullify_blank_type_on_notes.rb
new file mode 100644
index 00000000000..c4b78e8e15c
--- /dev/null
+++ b/db/migrate/20160722221922_nullify_blank_type_on_notes.rb
@@ -0,0 +1,9 @@
+class NullifyBlankTypeOnNotes < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    execute "UPDATE notes SET type = NULL WHERE type = ''"
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f24e47b85b2..b87f8108bb2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160712171823) do
+ActiveRecord::Schema.define(version: 20160721081015) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -49,7 +49,7 @@ ActiveRecord::Schema.define(version: 20160712171823) do
     t.integer  "max_attachment_size",                   default: 10,          null: false
     t.integer  "default_project_visibility"
     t.integer  "default_snippet_visibility"
-    t.text     "restricted_signup_domains"
+    t.text     "domain_whitelist"
     t.boolean  "user_oauth_applications",               default: true
     t.string   "after_sign_out_path"
     t.integer  "session_expire_delay",                  default: 10080,       null: false
@@ -70,11 +70,11 @@ ActiveRecord::Schema.define(version: 20160712171823) do
     t.string   "recaptcha_site_key"
     t.string   "recaptcha_private_key"
     t.integer  "metrics_port",                          default: 8089
+    t.boolean  "akismet_enabled",                       default: false
+    t.string   "akismet_api_key"
     t.integer  "metrics_sample_interval",               default: 15
     t.boolean  "sentry_enabled",                        default: false
     t.string   "sentry_dsn"
-    t.boolean  "akismet_enabled",                       default: false
-    t.string   "akismet_api_key"
     t.boolean  "email_author_in_body",                  default: false
     t.integer  "default_group_visibility"
     t.boolean  "repository_checks_enabled",             default: false
@@ -84,10 +84,12 @@ ActiveRecord::Schema.define(version: 20160712171823) do
     t.string   "health_check_access_token"
     t.boolean  "send_user_confirmation_email",          default: false
     t.integer  "container_registry_token_expire_delay", default: 5
+    t.boolean  "user_default_external",                 default: false,       null: false
     t.text     "after_sign_up_text"
     t.string   "repository_storage",                    default: "default"
     t.string   "enabled_git_access_protocol"
-    t.boolean  "user_default_external",                 default: false,       null: false
+    t.boolean  "domain_blacklist_enabled",              default: false
+    t.text     "domain_blacklist"
   end
 
   create_table "audit_events", force: :cascade do |t|
@@ -165,9 +167,11 @@ ActiveRecord::Schema.define(version: 20160712171823) do
     t.text     "artifacts_metadata"
     t.integer  "erased_by_id"
     t.datetime "erased_at"
-    t.datetime "artifacts_expire_at"
     t.string   "environment"
+    t.datetime "artifacts_expire_at"
     t.integer  "artifacts_size"
+    t.string   "when"
+    t.text     "yaml_variables"
   end
 
   add_index "ci_builds", ["commit_id", "stage_idx", "created_at"], name: "index_ci_builds_on_commit_id_and_stage_idx_and_created_at", using: :btree
@@ -199,6 +203,7 @@ ActiveRecord::Schema.define(version: 20160712171823) do
     t.datetime "started_at"
     t.datetime "finished_at"
     t.integer  "duration"
+    t.integer  "user_id"
   end
 
   add_index "ci_commits", ["gl_project_id", "sha"], name: "index_ci_commits_on_gl_project_id_and_sha", using: :btree
@@ -210,6 +215,7 @@ ActiveRecord::Schema.define(version: 20160712171823) do
   add_index "ci_commits", ["project_id"], name: "index_ci_commits_on_project_id", using: :btree
   add_index "ci_commits", ["sha"], name: "index_ci_commits_on_sha", using: :btree
   add_index "ci_commits", ["status"], name: "index_ci_commits_on_status", using: :btree
+  add_index "ci_commits", ["user_id"], name: "index_ci_commits_on_user_id", using: :btree
 
   create_table "ci_events", force: :cascade do |t|
     t.integer  "project_id"
@@ -481,11 +487,10 @@ ActiveRecord::Schema.define(version: 20160712171823) do
     t.string   "state"
     t.integer  "iid"
     t.integer  "updated_by_id"
-    t.integer  "moved_to_id"
     t.boolean  "confidential",  default: false
     t.datetime "deleted_at"
     t.date     "due_date"
-    t.integer  "lock_version",  default: 0,     null: false
+    t.integer  "moved_to_id"
   end
 
   add_index "issues", ["assignee_id"], name: "index_issues_on_assignee_id", using: :btree
@@ -602,9 +607,9 @@ ActiveRecord::Schema.define(version: 20160712171823) do
   add_index "merge_request_diffs", ["merge_request_id"], name: "index_merge_request_diffs_on_merge_request_id", unique: true, using: :btree
 
   create_table "merge_requests", force: :cascade do |t|
-    t.string   "target_branch",                             null: false
-    t.string   "source_branch",                             null: false
-    t.integer  "source_project_id",                         null: false
+    t.string   "target_branch",                                null: false
+    t.string   "source_branch",                                null: false
+    t.integer  "source_project_id",                            null: false
     t.integer  "author_id"
     t.integer  "assignee_id"
     t.string   "title"
@@ -613,19 +618,19 @@ ActiveRecord::Schema.define(version: 20160712171823) do
     t.integer  "milestone_id"
     t.string   "state"
     t.string   "merge_status"
-    t.integer  "target_project_id",                         null: false
+    t.integer  "target_project_id",                            null: false
     t.integer  "iid"
     t.text     "description"
-    t.integer  "position",                  default: 0
+    t.integer  "position",                     default: 0
     t.datetime "locked_at"
     t.integer  "updated_by_id"
     t.string   "merge_error"
     t.text     "merge_params"
-    t.boolean  "merge_when_build_succeeds", default: false, null: false
+    t.boolean  "merge_when_build_succeeds",    default: false, null: false
     t.integer  "merge_user_id"
     t.string   "merge_commit_sha"
     t.datetime "deleted_at"
-    t.integer  "lock_version",              default: 0,     null: false
+    t.string   "in_progress_merge_commit_sha"
   end
 
   add_index "merge_requests", ["assignee_id"], name: "index_merge_requests_on_assignee_id", using: :btree
@@ -662,16 +667,17 @@ ActiveRecord::Schema.define(version: 20160712171823) do
   add_index "milestones", ["title"], name: "index_milestones_on_title_trigram", using: :gin, opclasses: {"title"=>"gin_trgm_ops"}
 
   create_table "namespaces", force: :cascade do |t|
-    t.string   "name",                                  null: false
-    t.string   "path",                                  null: false
+    t.string   "name",                                   null: false
+    t.string   "path",                                   null: false
     t.integer  "owner_id"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "type"
-    t.string   "description",           default: "",    null: false
+    t.string   "description",            default: "",    null: false
     t.string   "avatar"
-    t.boolean  "share_with_group_lock", default: false
-    t.integer  "visibility_level",      default: 20,    null: false
+    t.boolean  "share_with_group_lock",  default: false
+    t.integer  "visibility_level",       default: 20,    null: false
+    t.boolean  "request_access_enabled", default: true,  null: false
   end
 
   add_index "namespaces", ["created_at", "id"], name: "index_namespaces_on_created_at_and_id", using: :btree
@@ -775,10 +781,10 @@ ActiveRecord::Schema.define(version: 20160712171823) do
     t.integer  "user_id",                    null: false
     t.string   "token",                      null: false
     t.string   "name",                       null: false
-    t.boolean  "revoked",    default: false
-    t.datetime "expires_at"
     t.datetime "created_at",                 null: false
     t.datetime "updated_at",                 null: false
+    t.boolean  "revoked",    default: false
+    t.datetime "expires_at"
   end
 
   add_index "personal_access_tokens", ["token"], name: "index_personal_access_tokens_on_token", unique: true, using: :btree
@@ -840,6 +846,8 @@ ActiveRecord::Schema.define(version: 20160712171823) do
     t.boolean  "only_allow_merge_if_build_succeeds", default: false,     null: false
     t.boolean  "has_external_issue_tracker"
     t.string   "repository_storage",                 default: "default", null: false
+    t.boolean  "has_external_wiki"
+    t.boolean  "request_access_enabled",             default: true,      null: false
   end
 
   add_index "projects", ["builds_enabled", "shared_runners_enabled"], name: "index_projects_on_builds_enabled_and_shared_runners_enabled", using: :btree
@@ -860,11 +868,12 @@ ActiveRecord::Schema.define(version: 20160712171823) do
   add_index "projects", ["visibility_level"], name: "index_projects_on_visibility_level", using: :btree
 
   create_table "protected_branches", force: :cascade do |t|
-    t.integer  "project_id",                          null: false
-    t.string   "name",                                null: false
+    t.integer  "project_id",                           null: false
+    t.string   "name",                                 null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "developers_can_push", default: false, null: false
+    t.boolean  "developers_can_push",  default: false, null: false
+    t.boolean  "developers_can_merge", default: false, null: false
   end
 
   add_index "protected_branches", ["project_id"], name: "index_protected_branches_on_project_id", using: :btree
@@ -898,9 +907,9 @@ ActiveRecord::Schema.define(version: 20160712171823) do
     t.string   "type"
     t.string   "title"
     t.integer  "project_id"
-    t.datetime "created_at",                               null: false
-    t.datetime "updated_at",                               null: false
-    t.boolean  "active",                                   null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "active",                default: false,    null: false
     t.text     "properties"
     t.boolean  "template",              default: false
     t.boolean  "push_events",           default: true
diff --git a/doc/README.md b/doc/README.md
index cc0b6e0c1e5..b5b377822e6 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -21,7 +21,7 @@
 
 ## Administrator documentation
 
-- [Access restrictions](administration/access_restrictions.md) Define which Git access protocols can be used to talk to GitLab
+- [Access restrictions](user/admin_area/settings/visibility_and_access_controls.md#enabled-git-access-protocols) Define which Git access protocols can be used to talk to GitLab
 - [Authentication/Authorization](administration/auth/README.md) Configure
   external authentication with LDAP, SAML, CAS and additional Omniauth providers.
 - [Custom Git hooks](administration/custom_hooks.md) Custom Git hooks (on the filesystem) for when webhooks aren't enough.
@@ -50,6 +50,7 @@
 - [Sidekiq Troubleshooting](administration/troubleshooting/sidekiq.md) Debug when Sidekiq appears hung and is not processing jobs.
 - [High Availability](administration/high_availability/README.md) Configure multiple servers for scaling or high availability.
 - [Container Registry](administration/container_registry.md) Configure Docker Registry with GitLab.
+- [Multiple mountpoints for the repositories storage](administration/repository_storages.md) Define multiple repository storage paths to distribute the storage load.
 
 ## Contributor documentation
 
diff --git a/doc/administration/img/access_restrictions.png b/doc/administration/img/access_restrictions.png
deleted file mode 100644
index 66fd9491e85..00000000000
--- a/doc/administration/img/access_restrictions.png
+++ /dev/null
diff --git a/doc/administration/img/repository_storages_admin_ui.png b/doc/administration/img/repository_storages_admin_ui.png
new file mode 100644
index 00000000000..599350bc098
--- /dev/null
+++ b/doc/administration/img/repository_storages_admin_ui.png
diff --git a/doc/administration/img/restricted_url.png b/doc/administration/img/restricted_url.png
deleted file mode 100644
index 0a677433dcf..00000000000
--- a/doc/administration/img/restricted_url.png
+++ /dev/null
diff --git a/doc/administration/repository_storages.md b/doc/administration/repository_storages.md
index 81bfe173151..55b054fc1a4 100644
--- a/doc/administration/repository_storages.md
+++ b/doc/administration/repository_storages.md
@@ -1,18 +1,99 @@
 # Repository storages
 
-GitLab allows you to define repository storage paths to enable distribution of
-storage load between several mount points.
-
-## For installations from source
+> [Introduced][ce-4578] in GitLab 8.10.
 
-Add your repository storage paths in your `gitlab.yml` under repositories -> storages, using key -> value pairs.
+GitLab allows you to define multiple repository storage paths to distribute the
+storage load between several mount points.
 
 >**Notes:**
+>
 - You must have at least one storage path called `default`.
-- In order for backups to work correctly the storage path must **not** be a
+- The paths are defined in key-value pairs. The key is an arbitrary name you
+  can pick to name the file path.
+- The target directories and any of its subpaths must not be a symlink.
+
+## Configure GitLab
+
+>**Warning:**
+In order for [backups] to work correctly, the storage path must **not** be a
 mount point and the GitLab user should have correct permissions for the parent
-directory of the path.
+directory of the path. In Omnibus GitLab this is taken care of automatically,
+but for source installations you should be extra careful.
+>
+The thing is that for compatibility reasons `gitlab.yml` has a different
+structure than Omnibus. In `gitlab.yml` you indicate the path for the
+repositories, for example `/home/git/repositories`, while in Omnibus you
+indicate `git_data_dirs`, which for the example above would be `/home/git`.
+Then, Omnibus will create a `repositories` directory under that path to use with
+`gitlab.yml`.
+>
+This little detail matters because while restoring a backup, the current
+contents of  `/home/git/repositories` [are moved to][raketask] `/home/git/repositories.old`,
+so if `/home/git/repositories` is the mount point, then `mv` would be moving
+things between mount points, and bad things could happen. Ideally,
+`/home/git` would be the mount point, so then things would be moving within the
+same mount point. This is guaranteed with Omnibus installations (because they
+don't specify the full repository path but the parent path), but not for source
+installations.
+
+---
+
+Now that you've read that big fat warning above, let's edit the configuration
+files and add the full paths of the alternative repository storage paths. In
+the example below, we add two more mountpoints that are named `nfs` and `cephfs`
+respectively.
+
+**For installations from source**
+
+1. Edit `gitlab.yml` and add the storage paths:
+
+    ```yaml
+    repositories:
+      # Paths where repositories can be stored. Give the canonicalized absolute pathname.
+      # NOTE: REPOS PATHS MUST NOT CONTAIN ANY SYMLINK!!!
+      storages: # You must have at least a 'default' storage path.
+        default: /home/git/repositories
+        nfs: /mnt/nfs/repositories
+        cephfs: /mnt/cephfs/repositories
+    ```
+
+1. [Restart GitLab] for the changes to take effect.
+
+>**Note:**
+The [`gitlab_shell: repos_path` entry][repospath] in `gitlab.yml` will be
+deprecated and replaced by `repositories: storages` in the future, so if you
+are upgrading from a version prior to 8.10, make sure to add the configuration
+as described in the step above. After you make the changes and confirm they are
+working, you can remove the `repos_path` line.
+
+---
+
+**For Omnibus installations**
+
+1. Edit `/etc/gitlab/gitlab.rb` by appending the rest of the paths to the
+   default one:
+
+    ```ruby
+    git_data_dirs({
+      "default" => "/var/opt/gitlab/git-data",
+      "nfs" => "/mnt/nfs/git-data",
+      "cephfs" => "/mnt/cephfs/git-data"
+    })
+    ```
+
+    Note that Omnibus stores the repositories in a `repositories` subdirectory
+    of the `git-data` directory.
+
+## Choose where new project repositories will be stored
+
+Once you set the multiple storage paths, you can choose where new projects will
+be stored via the **Application Settings** in the Admin area.
 
-## For omnibus installations
+![Choose repository storage path in Admin area](img/repository_storages_admin_ui.png)
 
-Follow the instructions at https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/settings/configuration.md#storing-git-data-in-an-alternative-directory
+[ce-4578]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4578
+[restart gitlab]: restart_gitlab.md#installations-from-source
+[reconfigure gitlab]: restart_gitlab.md#omnibus-gitlab-reconfigure
+[backups]: ../raketasks/backup_restore.md
+[raketask]: https://gitlab.com/gitlab-org/gitlab-ce/blob/033e5423a2594e08a7ebcd2379bd2331f4c39032/lib/backup/repository.rb#L54-56
+[repospath]: https://gitlab.com/gitlab-org/gitlab-ce/blob/8-9-stable/config/gitlab.yml.example#L457
diff --git a/doc/api/award_emoji.md b/doc/api/award_emoji.md
index b44f8cfd628..796b3680a75 100644
--- a/doc/api/award_emoji.md
+++ b/doc/api/award_emoji.md
@@ -67,9 +67,9 @@ Example Response:
 ]
 ```
 
-### Get single issue note
+### Get single award emoji
 
-Gets a single award emoji
+Gets a single award emoji from an issue or merge request.
 
 ```
 GET /projects/:id/issues/:issue_id/award_emoji/:award_id
diff --git a/doc/api/branches.md b/doc/api/branches.md
index abc4732c395..dbe8306c66f 100644
--- a/doc/api/branches.md
+++ b/doc/api/branches.md
@@ -23,6 +23,8 @@ Example response:
   {
     "name": "master",
     "protected": true,
+    "developers_can_push": false,
+    "developers_can_merge": false,
     "commit": {
       "author_email": "john@example.com",
       "author_name": "John Smith",
@@ -64,6 +66,8 @@ Example response:
 {
   "name": "master",
   "protected": true,
+  "developers_can_push": false,
+  "developers_can_merge": false,
   "commit": {
     "author_email": "john@example.com",
     "author_name": "John Smith",
@@ -91,13 +95,15 @@ PUT /projects/:id/repository/branches/:branch/protect
 ```
 
 ```bash
-curl -X PUT -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/5/repository/branches/master/protect
+curl -X PUT -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/5/repository/branches/master/protect?developers_can_push=true&developers_can_merge=true
 ```
 
 | Attribute | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `id` | integer | yes | The ID of a project |
 | `branch` | string | yes | The name of the branch |
+| `developers_can_push` | boolean | no | Flag if developers can push to the branch |
+| `developers_can_merge` | boolean | no | Flag if developers can merge to the branch |
 
 Example response:
 
@@ -117,7 +123,9 @@ Example response:
     ]
   },
   "name": "master",
-  "protected": true
+  "protected": true,
+  "developers_can_push": true,
+  "developers_can_merge": true
 }
 ```
 
@@ -158,7 +166,9 @@ Example response:
     ]
   },
   "name": "master",
-  "protected": false
+  "protected": false,
+  "developers_can_push": false,
+  "developers_can_merge": false
 }
 ```
 
@@ -196,7 +206,9 @@ Example response:
     ]
   },
   "name": "newbranch",
-  "protected": false
+  "protected": false,
+  "developers_can_push": false,
+  "developers_can_merge": false
 }
 ```
 
diff --git a/doc/api/builds.md b/doc/api/builds.md
index 2adea11247e..24d90e22a9b 100644
--- a/doc/api/builds.md
+++ b/doc/api/builds.md
@@ -283,6 +283,40 @@ Response:
 
 [ce-2893]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2893
 
+## Download the artifacts file
+
+> [Introduced][ce-5347] in GitLab 8.10.
+
+Download the artifacts file from the given reference name and job provided the
+build finished successfully.
+
+```
+GET /projects/:id/builds/artifacts/:ref_name/download?job=name
+```
+
+Parameters
+
+| Attribute   | Type    | Required | Description               |
+|-------------|---------|----------|-------------------------- |
+| `id`        | integer | yes      | The ID of a project       |
+| `ref_name`  | string  | yes      | The ref from a repository |
+| `job`       | string  | yes      | The name of the job       |
+
+Example request:
+
+```
+curl -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/builds/artifacts/master/download?job=test"
+```
+
+Example response:
+
+| Status    | Description                     |
+|-----------|---------------------------------|
+| 200       | Serves the artifacts file       |
+| 404       | Build not found or no artifacts |
+
+[ce-5347]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347
+
 ## Get a trace file
 
 Get a trace of a specific build of a project
@@ -409,7 +443,7 @@ POST /projects/:id/builds/:build_id/erase
 
 Parameters
 
-| Attribute   | Type    | required | Description         |
+| Attribute   | Type    | Required | Description         |
 |-------------|---------|----------|---------------------|
 | `id`        | integer | yes      | The ID of a project |
 | `build_id`  | integer | yes      | The ID of a build   |
@@ -459,7 +493,7 @@ POST /projects/:id/builds/:build_id/artifacts/keep
 
 Parameters
 
-| Attribute   | Type    | required | Description         |
+| Attribute   | Type    | Required | Description         |
 |-------------|---------|----------|---------------------|
 | `id`        | integer | yes      | The ID of a project |
 | `build_id`  | integer | yes      | The ID of a build   |
diff --git a/doc/api/deploy_key_multiple_projects.md b/doc/api/deploy_key_multiple_projects.md
index 3ad836f51b5..9280f0d68b6 100644
--- a/doc/api/deploy_key_multiple_projects.md
+++ b/doc/api/deploy_key_multiple_projects.md
@@ -24,6 +24,6 @@ With those IDs, add the same deploy key to all:
 ```
 for project_id in 321 456 987; do
     curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" -H "Content-Type: application/json" \
-    --data '{"title": "my key", "key": "ssh-rsa AAAA..."}' https://gitlab.example.com/api/v3/projects/${project_id}/keys
+    --data '{"title": "my key", "key": "ssh-rsa AAAA..."}' https://gitlab.example.com/api/v3/projects/${project_id}/deploy_keys
 done
 ```
diff --git a/doc/api/deploy_keys.md b/doc/api/deploy_keys.md
index 9da1fe22e61..4e620ccc81a 100644
--- a/doc/api/deploy_keys.md
+++ b/doc/api/deploy_keys.md
@@ -1,11 +1,42 @@
 # Deploy Keys
 
-## List deploy keys
+## List all deploy keys
+
+Get a list of all deploy keys across all projects.
+
+```
+GET /deploy_keys
+```
+
+```bash
+curl -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/deploy_keys"
+```
+
+Example response:
+
+```json
+[
+  {
+    "id": 1,
+    "title": "Public key",
+    "key": "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0=",
+    "created_at": "2013-10-02T10:12:29Z"
+  },
+  {
+    "id": 3,
+    "title": "Another Public key",
+    "key": "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0=",
+    "created_at": "2013-10-02T11:12:29Z"
+  }
+]
+```
+
+## List project deploy keys
 
 Get a list of a project's deploy keys.
 
 ```
-GET /projects/:id/keys
+GET /projects/:id/deploy_keys
 ```
 
 | Attribute | Type | Required | Description |
@@ -13,7 +44,7 @@ GET /projects/:id/keys
 | `id` | integer | yes | The ID of the project |
 
 ```bash
-curl -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/5/keys"
+curl -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/5/deploy_keys"
 ```
 
 Example response:
@@ -40,7 +71,7 @@ Example response:
 Get a single key.
 
 ```
-GET /projects/:id/keys/:key_id
+GET /projects/:id/deploy_keys/:key_id
 ```
 
 Parameters:
@@ -51,7 +82,7 @@ Parameters:
 | `key_id`  | integer | yes | The ID of the deploy key |
 
 ```bash
-curl -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/5/keys/11"
+curl -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/5/deploy_keys/11"
 ```
 
 Example response:
@@ -73,7 +104,7 @@ If the deploy key already exists in another project, it will be joined to curren
 project only if original one was is accessible by the same user.
 
 ```
-POST /projects/:id/keys
+POST /projects/:id/deploy_keys
 ```
 
 | Attribute | Type | Required | Description |
@@ -83,7 +114,7 @@ POST /projects/:id/keys
 | `key`   | string  | yes | New deploy key |
 
 ```bash
-curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" -H "Content-Type: application/json" --data '{"title": "My deploy key", "key": "ssh-rsa AAAA..."}' "https://gitlab.example.com/api/v3/projects/5/keys/"
+curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" -H "Content-Type: application/json" --data '{"title": "My deploy key", "key": "ssh-rsa AAAA..."}' "https://gitlab.example.com/api/v3/projects/5/deploy_keys/"
 ```
 
 Example response:
@@ -102,7 +133,7 @@ Example response:
 Delete a deploy key from a project
 
 ```
-DELETE /projects/:id/keys/:key_id
+DELETE /projects/:id/deploy_keys/:key_id
 ```
 
 | Attribute | Type | Required | Description |
@@ -111,7 +142,7 @@ DELETE /projects/:id/keys/:key_id
 | `key_id`  | integer | yes | The ID of the deploy key |
 
 ```bash
-curl -X DELETE -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/5/keys/13"
+curl -X DELETE -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/5/deploy_keys/13"
 ```
 
 Example response:
diff --git a/doc/api/issues.md b/doc/api/issues.md
index 3ced787b23e..419fb8f85d8 100644
--- a/doc/api/issues.md
+++ b/doc/api/issues.md
@@ -78,7 +78,8 @@ Example response:
       "iid" : 6,
       "labels" : [],
       "subscribed" : false,
-      "user_notes_count": 1
+      "user_notes_count": 1,
+      "due_date": "2016-07-22"
    }
 ]
 ```
@@ -154,7 +155,8 @@ Example response:
       "updated_at" : "2016-01-04T15:31:46.176Z",
       "created_at" : "2016-01-04T15:31:46.176Z",
       "subscribed" : false,
-      "user_notes_count": 1
+      "user_notes_count": 1,
+      "due_date": null
    }
 ]
 ```
@@ -232,7 +234,8 @@ Example response:
       "updated_at" : "2016-01-04T15:31:46.176Z",
       "created_at" : "2016-01-04T15:31:46.176Z",
       "subscribed" : false,
-      "user_notes_count": 1
+      "user_notes_count": 1,
+      "due_date": "2016-07-22"
    }
 ]
 ```
@@ -295,7 +298,8 @@ Example response:
    "updated_at" : "2016-01-04T15:31:46.176Z",
    "created_at" : "2016-01-04T15:31:46.176Z",
    "subscribed": false,
-   "user_notes_count": 1
+   "user_notes_count": 1,
+   "due_date": null
 }
 ```
 
@@ -320,6 +324,7 @@ POST /projects/:id/issues
 | `milestone_id`  | integer | no  | The ID of a milestone to assign issue |
 | `labels`        | string  | no  | Comma-separated label names for an issue  |
 | `created_at`    | string  | no  | Date time string, ISO 8601 formatted, e.g. `2016-03-11T03:45:40Z` |
+| `due_date`      | string  | no   | Date time string in the format YEAR-MONTH-DAY, e.g. `2016-03-11` |
 
 ```bash
 curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/4/issues?title=Issues%20with%20auth&labels=bug
@@ -351,7 +356,8 @@ Example response:
    "updated_at" : "2016-01-07T12:44:33.959Z",
    "milestone" : null,
    "subscribed" : true,
-   "user_notes_count": 0
+   "user_notes_count": 0,
+   "due_date": null
 }
 ```
 
@@ -379,6 +385,7 @@ PUT /projects/:id/issues/:issue_id
 | `labels`        | string  | no  | Comma-separated label names for an issue  |
 | `state_event`   | string  | no  | The state event of an issue. Set `close` to close the issue and `reopen` to reopen it |
 | `updated_at`    | string  | no  | Date time string, ISO 8601 formatted, e.g. `2016-03-11T03:45:40Z` |
+| `due_date`      | string  | no   | Date time string in the format YEAR-MONTH-DAY, e.g. `2016-03-11` |
 
 ```bash
 curl -X PUT -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/4/issues/85?state_event=close
@@ -410,7 +417,8 @@ Example response:
    "assignee" : null,
    "milestone" : null,
    "subscribed" : true,
-   "user_notes_count": 0
+   "user_notes_count": 0,
+   "due_date": "2016-07-22"
 }
 ```
 
@@ -487,7 +495,8 @@ Example response:
     "state": "active",
     "avatar_url": "http://www.gravatar.com/avatar/7a190fecbaa68212a4b68aeb6e3acd10?s=80&d=identicon",
     "web_url": "https://gitlab.example.com/u/solon.cremin"
-  }
+  },
+  "due_date": null
 }
 ```
 
@@ -541,7 +550,8 @@ Example response:
     "state": "active",
     "avatar_url": "http://www.gravatar.com/avatar/7a190fecbaa68212a4b68aeb6e3acd10?s=80&d=identicon",
     "web_url": "https://gitlab.example.com/u/solon.cremin"
-  }
+  },
+  "due_date": null
 }
 ```
 
@@ -596,7 +606,8 @@ Example response:
     "avatar_url": "http://www.gravatar.com/avatar/5224fd70153710e92fb8bcf79ac29d67?s=80&d=identicon",
     "web_url": "https://gitlab.example.com/u/orville"
   },
-  "subscribed": false
+  "subscribed": false,
+  "due_date": null
 }
 ```
 
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index a8c3b068d22..e00882e6d5d 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -276,6 +276,7 @@ Parameters:
 ```json
 {
   "id": 1,
+  "iid": 1,
   "target_branch": "master",
   "source_branch": "test1",
   "project_id": 3,
@@ -350,6 +351,7 @@ Parameters:
 ```json
 {
   "id": 1,
+  "iid": 1,
   "target_branch": "master",
   "project_id": 3,
   "title": "test1",
@@ -449,6 +451,7 @@ Parameters:
 ```json
 {
   "id": 1,
+  "iid": 1,
   "target_branch": "master",
   "source_branch": "test1",
   "project_id": 3,
@@ -517,6 +520,7 @@ Parameters:
 ```json
 {
   "id": 1,
+  "iid": 1,
   "target_branch": "master",
   "source_branch": "test1",
   "project_id": 3,
diff --git a/doc/api/projects.md b/doc/api/projects.md
index dceee7b4ea7..0ba0bffb4ac 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -850,7 +850,6 @@ Parameters:
 {
   "alt": "dk",
   "url": "/uploads/66dbcd21ec5d24ed6ea225176098d52b/dk.png",
-  "is_image": true,
   "markdown": "![dk](/uploads/66dbcd21ec5d24ed6ea225176098d52b/dk.png)"
 }
 ```
diff --git a/doc/api/settings.md b/doc/api/settings.md
index d9b68eaeadf..ea39b32561c 100644
--- a/doc/api/settings.md
+++ b/doc/api/settings.md
@@ -33,7 +33,9 @@ Example response:
    "session_expire_delay" : 10080,
    "home_page_url" : null,
    "default_snippet_visibility" : 0,
-   "restricted_signup_domains" : [],
+   "domain_whitelist" : [],
+   "domain_blacklist_enabled" : false,
+   "domain_blacklist" : [],
    "created_at" : "2016-01-04T15:44:55.176Z",
    "default_project_visibility" : 0,
    "gravatar_enabled" : true,
@@ -63,7 +65,9 @@ PUT /application/settings
 | `session_expire_delay` | integer | no | Session duration in minutes. GitLab restart is required to apply changes |
 | `default_project_visibility` | integer | no | What visibility level new projects receive. Can take `0` _(Private)_, `1` _(Internal)_ and `2` _(Public)_ as a parameter. Default is `0`.|
 | `default_snippet_visibility` | integer | no | What visibility level new snippets receive. Can take `0` _(Private)_, `1` _(Internal)_ and `2` _(Public)_ as a parameter. Default is `0`.|
-| `restricted_signup_domains` | array of strings | no | Force people to use only corporate emails for sign-up. Default is null, meaning there is no restriction. |
+| `domain_whitelist` | array of strings | no | Force people to use only corporate emails for sign-up. Default is null, meaning there is no restriction. |
+| `domain_blacklist_enabled` | boolean | no | Enable/disable the `domain_blacklist` |
+| `domain_blacklist` | array of strings | yes (if `domain_whitelist_enabled` is `true` | People trying to sign-up with emails from this domain will not be allowed to do so. |
 | `user_oauth_applications` | boolean | no | Allow users to register any application to use GitLab as an OAuth provider |
 | `after_sign_out_path` | string | no | Where to redirect users after logout |
 | `container_registry_token_expire_delay` | integer | no | Container Registry token duration in minutes |
@@ -93,7 +97,9 @@ Example response:
   "session_expire_delay": 10080,
   "default_project_visibility": 1,
   "default_snippet_visibility": 0,
-  "restricted_signup_domains": [],
+  "domain_whitelist": [],
+  "domain_blacklist_enabled" : false,
+  "domain_blacklist" : [],
   "user_oauth_applications": true,
   "after_sign_out_path": "",
   "container_registry_token_expire_delay": 5,
diff --git a/doc/api/todos.md b/doc/api/todos.md
index 23f6e35f2a4..937c71de386 100644
--- a/doc/api/todos.md
+++ b/doc/api/todos.md
@@ -277,8 +277,7 @@ Example Response:
 
 ## Mark all todos as done
 
-Marks all pending todos for the current user as done. All todos marked as done
-are returned in the response.
+Marks all pending todos for the current user as done. It returns the number of marked todos.
 
 ```
 DELETE /todos
@@ -291,154 +290,7 @@ curl -X DELETE -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.c
 Example Response:
 
 ```json
-[
-  {
-    "id": 102,
-    "project": {
-      "id": 2,
-      "name": "Gitlab Ce",
-      "name_with_namespace": "Gitlab Org / Gitlab Ce",
-      "path": "gitlab-ce",
-      "path_with_namespace": "gitlab-org/gitlab-ce"
-    },
-    "author": {
-      "name": "Administrator",
-      "username": "root",
-      "id": 1,
-      "state": "active",
-      "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
-      "web_url": "https://gitlab.example.com/u/root"
-    },
-    "action_name": "marked",
-    "target_type": "MergeRequest",
-    "target": {
-      "id": 34,
-      "iid": 7,
-      "project_id": 2,
-      "title": "Dolores in voluptatem tenetur praesentium omnis repellendus voluptatem quaerat.",
-      "description": "Et ea et omnis illum cupiditate. Dolor aspernatur tenetur ducimus facilis est nihil. Quo esse cupiditate molestiae illo corrupti qui quidem dolor.",
-      "state": "opened",
-      "created_at": "2016-06-17T07:49:24.419Z",
-      "updated_at": "2016-06-17T07:52:43.484Z",
-      "target_branch": "tutorials_git_tricks",
-      "source_branch": "DNSBL_docs",
-      "upvotes": 0,
-      "downvotes": 0,
-      "author": {
-        "name": "Maxie Medhurst",
-        "username": "craig_rutherford",
-        "id": 12,
-        "state": "active",
-        "avatar_url": "http://www.gravatar.com/avatar/a0d477b3ea21970ce6ffcbb817b0b435?s=80&d=identicon",
-        "web_url": "https://gitlab.example.com/u/craig_rutherford"
-      },
-      "assignee": {
-        "name": "Administrator",
-        "username": "root",
-        "id": 1,
-        "state": "active",
-        "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
-        "web_url": "https://gitlab.example.com/u/root"
-      },
-      "source_project_id": 2,
-      "target_project_id": 2,
-      "labels": [],
-      "work_in_progress": false,
-      "milestone": {
-        "id": 32,
-        "iid": 2,
-        "project_id": 2,
-        "title": "v1.0",
-        "description": "Assumenda placeat ea voluptatem voluptate qui.",
-        "state": "active",
-        "created_at": "2016-06-17T07:47:34.163Z",
-        "updated_at": "2016-06-17T07:47:34.163Z",
-        "due_date": null
-      },
-      "merge_when_build_succeeds": false,
-      "merge_status": "cannot_be_merged",
-      "subscribed": true,
-      "user_notes_count": 7
-    },
-    "target_url": "https://gitlab.example.com/gitlab-org/gitlab-ce/merge_requests/7",
-    "body": "Dolores in voluptatem tenetur praesentium omnis repellendus voluptatem quaerat.",
-    "state": "done",
-    "created_at": "2016-06-17T07:52:35.225Z"
-  },
-  {
-    "id": 98,
-    "project": {
-      "id": 2,
-      "name": "Gitlab Ce",
-      "name_with_namespace": "Gitlab Org / Gitlab Ce",
-      "path": "gitlab-ce",
-      "path_with_namespace": "gitlab-org/gitlab-ce"
-    },
-    "author": {
-      "name": "Maxie Medhurst",
-      "username": "craig_rutherford",
-      "id": 12,
-      "state": "active",
-      "avatar_url": "http://www.gravatar.com/avatar/a0d477b3ea21970ce6ffcbb817b0b435?s=80&d=identicon",
-      "web_url": "https://gitlab.example.com/u/craig_rutherford"
-    },
-    "action_name": "assigned",
-    "target_type": "MergeRequest",
-    "target": {
-      "id": 34,
-      "iid": 7,
-      "project_id": 2,
-      "title": "Dolores in voluptatem tenetur praesentium omnis repellendus voluptatem quaerat.",
-      "description": "Et ea et omnis illum cupiditate. Dolor aspernatur tenetur ducimus facilis est nihil. Quo esse cupiditate molestiae illo corrupti qui quidem dolor.",
-      "state": "opened",
-      "created_at": "2016-06-17T07:49:24.419Z",
-      "updated_at": "2016-06-17T07:52:43.484Z",
-      "target_branch": "tutorials_git_tricks",
-      "source_branch": "DNSBL_docs",
-      "upvotes": 0,
-      "downvotes": 0,
-      "author": {
-        "name": "Maxie Medhurst",
-        "username": "craig_rutherford",
-        "id": 12,
-        "state": "active",
-        "avatar_url": "http://www.gravatar.com/avatar/a0d477b3ea21970ce6ffcbb817b0b435?s=80&d=identicon",
-        "web_url": "https://gitlab.example.com/u/craig_rutherford"
-      },
-      "assignee": {
-        "name": "Administrator",
-        "username": "root",
-        "id": 1,
-        "state": "active",
-        "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
-        "web_url": "https://gitlab.example.com/u/root"
-      },
-      "source_project_id": 2,
-      "target_project_id": 2,
-      "labels": [],
-      "work_in_progress": false,
-      "milestone": {
-        "id": 32,
-        "iid": 2,
-        "project_id": 2,
-        "title": "v1.0",
-        "description": "Assumenda placeat ea voluptatem voluptate qui.",
-        "state": "active",
-        "created_at": "2016-06-17T07:47:34.163Z",
-        "updated_at": "2016-06-17T07:47:34.163Z",
-        "due_date": null
-      },
-      "merge_when_build_succeeds": false,
-      "merge_status": "cannot_be_merged",
-      "subscribed": true,
-      "user_notes_count": 7
-    },
-    "target_url": "https://gitlab.example.com/gitlab-org/gitlab-ce/merge_requests/7",
-    "body": "Dolores in voluptatem tenetur praesentium omnis repellendus voluptatem quaerat.",
-    "state": "done",
-    "created_at": "2016-06-17T07:49:24.624Z"
-  },
-]
+3
 ```
 
 [ce-3188]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3188
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md
index 137b080a8f7..4a7c21f811d 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -18,25 +18,35 @@ The `API_TOKEN` will take the Secure Variable value: `SECURE`.
 
 ### Predefined variables (Environment Variables)
 
-| Variable                | Runner | Description |
-|-------------------------|-----|--------|
-| **CI**                  | 0.4 | Mark that build is executed in CI environment |
-| **GITLAB_CI**           | all | Mark that build is executed in GitLab CI environment |
-| **CI_SERVER**           | all | Mark that build is executed in CI environment |
-| **CI_SERVER_NAME**      | all | CI server that is used to coordinate builds |
-| **CI_SERVER_VERSION**   | all | Not yet defined |
-| **CI_SERVER_REVISION**  | all | Not yet defined |
-| **CI_BUILD_REF**        | all | The commit revision for which project is built |
-| **CI_BUILD_TAG**        | 0.5 | The commit tag name. Present only when building tags. |
-| **CI_BUILD_NAME**       | 0.5 | The name of the build as defined in `.gitlab-ci.yml` |
-| **CI_BUILD_STAGE**      | 0.5 | The name of the stage as defined in `.gitlab-ci.yml` |
-| **CI_BUILD_REF_NAME**   | all | The branch or tag name for which project is built |
-| **CI_BUILD_ID**         | all | The unique id of the current build that GitLab CI uses internally |
-| **CI_BUILD_REPO**       | all | The URL to clone the Git repository |
-| **CI_BUILD_TRIGGERED**  | 0.5 | The flag to indicate that build was [triggered] |
-| **CI_BUILD_TOKEN**      | 1.2 | Token used for authenticating with the GitLab Container Registry |
-| **CI_PROJECT_ID**       | all | The unique id of the current project that GitLab CI uses internally |
-| **CI_PROJECT_DIR**      | all | The full path where the repository is cloned and where the build is ran |
+| Variable                | GitLab | Runner | Description |
+|-------------------------|--------|--------|-------------|
+| **CI**                  | all    | 0.4    | Mark that build is executed in CI environment |
+| **GITLAB_CI**           | all    | all    | Mark that build is executed in GitLab CI environment |
+| **CI_SERVER**           | all    | all    | Mark that build is executed in CI environment |
+| **CI_SERVER_NAME**      | all    | all    | The name of CI server that is used to coordinate builds |
+| **CI_SERVER_VERSION**   | all    | all    | GitLab version that is used to schedule builds |
+| **CI_SERVER_REVISION**  | all    | all    | GitLab revision that is used to schedule builds |
+| **CI_BUILD_ID**         | all    | all    | The unique id of the current build that GitLab CI uses internally |
+| **CI_BUILD_REF**        | all    | all    | The commit revision for which project is built |
+| **CI_BUILD_TAG**        | all    | 0.5    | The commit tag name. Present only when building tags. |
+| **CI_BUILD_NAME**       | all    | 0.5    | The name of the build as defined in `.gitlab-ci.yml` |
+| **CI_BUILD_STAGE**      | all    | 0.5    | The name of the stage as defined in `.gitlab-ci.yml` |
+| **CI_BUILD_REF_NAME**   | all    | all    | The branch or tag name for which project is built |
+| **CI_BUILD_REPO**       | all    | all    | The URL to clone the Git repository |
+| **CI_BUILD_TRIGGERED**  | all    | 0.5    | The flag to indicate that build was [triggered] |
+| **CI_BUILD_TOKEN**      | all    | 1.2    | Token used for authenticating with the GitLab Container Registry |
+| **CI_PIPELINE_ID**      | 8.10   | 0.5    | The unique id of the current pipeline that GitLab CI uses internally |
+| **CI_PROJECT_ID**       | all    | all    | The unique id of the current project that GitLab CI uses internally |
+| **CI_PROJECT_NAME**     | 8.10   | 0.5    | The project name that is currently being built |
+| **CI_PROJECT_NAMESPACE**| 8.10   | 0.5    | The project namespace (username or groupname) that is currently being built |
+| **CI_PROJECT_PATH**     | 8.10   | 0.5    | The namespace with project name |
+| **CI_PROJECT_URL**      | 8.10   | 0.5    | The HTTP address to access project |
+| **CI_PROJECT_DIR**      | all    | all    | The full path where the repository is cloned and where the build is run |
+| **CI_REGISTRY**         | 8.10   | 0.5    | If the Container Registry is enabled it returns the address of GitLab's Container Registry |
+| **CI_REGISTRY_IMAGE**   | 8.10   | 0.5    | If the Container Registry is enabled for the project it returnes the address of the registry tied to the specific project |
+| **CI_RUNNER_ID**        | 8.10   | 0.5    | The unique id of runner being used |
+| **CI_RUNNER_DESCRIPTION** | 8.10 | 0.5    | The description of the runner as saved in GitLab |
+| **CI_RUNNER_TAGS**      | 8.10   | 0.5    | The defined runner tags |
 
 **Some of the variables are only available when using runner with at least defined version.**
 
@@ -46,18 +56,28 @@ Example values:
 export CI_BUILD_ID="50"
 export CI_BUILD_REF="1ecfd275763eff1d6b4844ea3168962458c9f27a"
 export CI_BUILD_REF_NAME="master"
-export CI_BUILD_REPO="https://gitlab.com/gitlab-org/gitlab-ce.git"
+export CI_BUILD_REPO="https://gitab-ci-token:abcde-1234ABCD5678ef@gitlab.com/gitlab-org/gitlab-ce.git"
 export CI_BUILD_TAG="1.0.0"
 export CI_BUILD_NAME="spec:other"
 export CI_BUILD_STAGE="test"
 export CI_BUILD_TRIGGERED="true"
 export CI_BUILD_TOKEN="abcde-1234ABCD5678ef"
-export CI_PROJECT_DIR="/builds/gitlab-org/gitlab-ce"
+export CI_PIPELINE_ID="1000"
 export CI_PROJECT_ID="34"
+export CI_PROJECT_DIR="/builds/gitlab-org/gitlab-ce"
+export CI_PROJECT_NAME="gitlab-ce"
+export CI_PROJECT_NAMESPACE="gitlab-org"
+export CI_PROJECT_PATH="gitlab-org/gitlab-ce"
+export CI_PROJECT_URL="https://gitlab.com/gitlab-org/gitlab-ce"
+export CI_REGISTRY="registry.gitlab.com"
+export CI_REGISTRY_IMAGE="registry.gitlab.com/gitlab-org/gitlab-ce"
+export CI_RUNNER_ID="10"
+export CI_RUNNER_DESCRIPTION="my runner"
+export CI_RUNNER_TAGS="docker, linux"
 export CI_SERVER="yes"
-export CI_SERVER_NAME="GitLab CI"
-export CI_SERVER_REVISION=""
-export CI_SERVER_VERSION=""
+export CI_SERVER_NAME="GitLab"
+export CI_SERVER_REVISION="8.9.0"
+export CI_SERVER_VERSION="70606bf"
 ```
 
 ### YAML-defined variables
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 16a1461a7e4..ea3fff1596e 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -13,34 +13,36 @@ If you want a quick introduction to GitLab CI, follow our
 **Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
 
 - [.gitlab-ci.yml](#gitlab-ci-yml)
-  - [image and services](#image-and-services)
-  - [before_script](#before_script)
-  - [after_script](#after_script)
-  - [stages](#stages)
-  - [types](#types)
-  - [variables](#variables)
-  - [cache](#cache)
-    - [cache:key](#cache-key)
+    - [image and services](#image-and-services)
+    - [before_script](#before_script)
+    - [after_script](#after_script)
+    - [stages](#stages)
+    - [types](#types)
+    - [variables](#variables)
+    - [cache](#cache)
+        - [cache:key](#cache-key)
 - [Jobs](#jobs)
-  - [script](#script)
-  - [stage](#stage)
-  - [only and except](#only-and-except)
-  - [job variables](#job-variables)
-  - [tags](#tags)
-  - [when](#when)
-  - [environment](#environment)
-  - [artifacts](#artifacts)
-    - [artifacts:name](#artifactsname)
-    - [artifacts:when](#artifactswhen)
-    - [artifacts:expire_in](#artifactsexpire_in)
-  - [dependencies](#dependencies)
-  - [before_script and after_script](#before_script-and-after_script)
+    - [script](#script)
+    - [stage](#stage)
+    - [only and except](#only-and-except)
+    - [job variables](#job-variables)
+    - [tags](#tags)
+    - [allow_failure](#allow_failure)
+    - [when](#when)
+        - [Manual actions](#manual-actions)
+    - [environment](#environment)
+    - [artifacts](#artifacts)
+        - [artifacts:name](#artifacts-name)
+        - [artifacts:when](#artifacts-when)
+        - [artifacts:expire_in](#artifacts-expire_in)
+    - [dependencies](#dependencies)
+    - [before_script and after_script](#before_script-and-after_script)
 - [Git Strategy](#git-strategy)
 - [Shallow cloning](#shallow-cloning)
 - [Hidden jobs](#hidden-jobs)
 - [Special YAML features](#special-yaml-features)
-  - [Anchors](#anchors)
-- [Validate the .gitlab-ci.yml](#validate-the-gitlab-ciyml)
+    - [Anchors](#anchors)
+- [Validate the .gitlab-ci.yml](#validate-the-gitlab-ci-yml)
 - [Skipping builds](#skipping-builds)
 - [Examples](#examples)
 
@@ -473,6 +475,39 @@ job:
 The specification above, will make sure that `job` is built by a Runner that
 has both `ruby` AND `postgres` tags defined.
 
+### allow_failure
+
+`allow_failure` is used when you want to allow a build to fail without impacting
+the rest of the CI suite. Failed builds don't contribute to the commit status.
+
+When enabled and the build fails, the pipeline will be successful/green for all
+intents and purposes, but a "CI build passed with warnings" message  will be
+displayed on the merge request or commit or build page. This is to be used by
+builds that are allowed to fail, but where failure indicates some other (manual)
+steps should be taken elsewhere.
+
+In the example below, `job1` and `job2` will run in parallel, but if `job1`
+fails, it will not stop the next stage from running, since it's marked with
+`allow_failure: true`:
+
+```yaml
+job1:
+  stage: test
+  script:
+  - execute_script_that_will_fail
+  allow_failure: true
+
+job2:
+  stage: test
+  script:
+  - execute_script_that_will_succeed
+
+job3:
+  stage: deploy
+  script:
+  - deploy_to_staging
+```
+
 ### when
 
 `when` is used to implement jobs that are run in case of failure or despite the
@@ -485,6 +520,8 @@ failure.
 1. `on_failure` - execute build only when at least one build from prior stages
     fails.
 1. `always` - execute build regardless of the status of builds from prior stages.
+1. `manual` - execute build manually (added in GitLab 8.10). Read about
+    [manual actions](#manual-actions) below.
 
 For example:
 
@@ -516,6 +553,7 @@ deploy_job:
   stage: deploy
   script:
   - make deploy
+  when: manual
 
 cleanup_job:
   stage: cleanup
@@ -526,8 +564,22 @@ cleanup_job:
 
 The above script will:
 
-1. Execute `cleanup_build_job` only when `build_job` fails
-2. Always execute `cleanup_job` as the last step in pipeline.
+1. Execute `cleanup_build_job` only when `build_job` fails.
+2. Always execute `cleanup_job` as the last step in pipeline regardless of
+   success or failure.
+3. Allow you to manually execute `deploy_job` from GitLab's UI.
+
+#### Manual actions
+
+>**Note:**
+Introduced in GitLab 8.10.
+
+Manual actions are a special type of job that are not executed automatically;
+they need to be explicitly started by a user. Manual actions can be started
+from pipeline, build, environment, and deployment views. You can execute the
+same manual action multiple times.
+
+An example usage of manual actions is deployment to production.
 
 ### environment
 
@@ -630,9 +682,10 @@ be available for download in the GitLab UI.
 Introduced in GitLab 8.6 and GitLab Runner v1.1.0.
 
 The `name` directive allows you to define the name of the created artifacts
-archive. That way, you can have a unique name of every archive which could be
+archive. That way, you can have a unique name for every archive which could be
 useful when you'd like to download the archive from GitLab. The `artifacts:name`
 variable can make use of any of the [predefined variables](../variables/README.md).
+The default name is `artifacts`, which becomes `artifacts.zip` when downloaded.
 
 ---
 
@@ -757,12 +810,13 @@ Introduced in GitLab 8.6 and GitLab Runner v1.1.1.
 This feature should be used in conjunction with [`artifacts`](#artifacts) and
 allows you to define the artifacts to pass between different builds.
 
-Note that `artifacts` from previous [stages](#stages) are passed by default.
+Note that `artifacts` from all previous [stages](#stages) are passed by default.
 
 To use this feature, define `dependencies` in context of the job and pass
 a list of all previous builds from which the artifacts should be downloaded.
 You can only define builds from stages that are executed before the current one.
 An error will be shown if you define builds from the current stage or next ones.
+Defining an empty array will skip downloading any artifacts for that job.
 
 ---
 
@@ -985,11 +1039,11 @@ directive defined in `.postgres_services` and `.mysql_services` respectively:
     - ruby
 
 test:postgres:
-  << *job_definition
+  <<: *job_definition
   services: *postgres_definition
 
 test:mysql:
-  << *job_definition
+  <<: *job_definition
   services: *mysql_definition
 ```
 
diff --git a/doc/container_registry/README.md b/doc/container_registry/README.md
index 1b465434498..55077197ff9 100644
--- a/doc/container_registry/README.md
+++ b/doc/container_registry/README.md
@@ -1,7 +1,8 @@
 # GitLab Container Registry
 
 > **Note:**
-This feature was [introduced][ce-4040] in GitLab 8.8.
+This feature was [introduced][ce-4040] in GitLab 8.8. Docker Registry manifest
+v1 support was added in GitLab 8.9 to support Docker versions earlier than 1.10.
 
 > **Note:**
 This document is about the user guide. To learn how to enable GitLab Container
diff --git a/doc/development/doc_styleguide.md b/doc/development/doc_styleguide.md
index 975bb82c37d..6ee7b3cfeeb 100644
--- a/doc/development/doc_styleguide.md
+++ b/doc/development/doc_styleguide.md
@@ -44,7 +44,7 @@ it organized and easy to find.
 - When introducing a new document, be careful for the headings to be
   grammatically and syntactically correct. It is advised to mention one or all
   of the following GitLab members for a review: `@axil`, `@rspeicher`,
-  `@dblessing`, `@ashleys`, `@nearlythere`. This is to ensure that no document
+  `@dblessing`, `@ashleys`. This is to ensure that no document
   with wrong heading is going live without an audit, thus preventing dead links
   and redirection issues when corrected
 - Leave exactly one newline after a heading
@@ -359,7 +359,7 @@ restrict the sign-up e-mail domains of a GitLab instance to `*.example.com` and
 `example.net`, you would do something like this:
 
 ```bash
-curl -X PUT -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" -d "restricted_signup_domains[]=*.example.com" -d "restricted_signup_domains[]=example.net" https://gitlab.example.com/api/v3/application/settings
+curl -X PUT -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" -d "domain_whitelist[]=*.example.com" -d "domain_whitelist[]=example.net" https://gitlab.example.com/api/v3/application/settings
 ```
 
 [cURL]: http://curl.haxx.se/ "cURL website"
diff --git a/doc/development/migration_style_guide.md b/doc/development/migration_style_guide.md
index e2ca46504e7..b8fab3aaff7 100644
--- a/doc/development/migration_style_guide.md
+++ b/doc/development/migration_style_guide.md
@@ -11,7 +11,8 @@ migrations are written carefully, can be applied online and adhere to the style
 Migrations should not require GitLab installations to be taken offline unless
 _absolutely_ necessary. If a migration requires downtime this should be
 clearly mentioned during the review process as well as being documented in the
-monthly release post.
+monthly release post. For more information see the "Downtime Tagging" section
+below.
 
 When writing your migrations, also consider that databases might have stale data
 or inconsistencies and guard for that. Try to make as little assumptions as possible
@@ -20,35 +21,34 @@ about the state of the database.
 Please don't depend on GitLab specific code since it can change in future versions.
 If needed copy-paste GitLab code into the migration to make it forward compatible.
 
-## Comments in the migration
+## Downtime Tagging
 
-Each migration you write needs to have the two following pieces of information
-as comments.
+Every migration must specify if it requires downtime or not, and if it should
+require downtime it must also specify a reason for this. To do so, add the
+following two constants to the migration class' body:
 
-### Online, Offline, errors?
+* `DOWNTIME`: a boolean that when set to `true` indicates the migration requires
+  downtime.
+* `DOWNTIME_REASON`: a String containing the reason for the migration requiring
+  downtime. This constant **must** be set when `DOWNTIME` is set to `true`.
 
-First, you need to provide information on whether the migration can be applied:
+For example:
 
-1. online without errors (works on previous version and new one)
-2. online with errors on old instances after migrating
-3. online with errors on new instances while migrating
-4. offline (needs to happen without app servers to prevent db corruption)
-
-For example: 
-
-```
-# Migration type: online without errors (works on previous version and new one)
+```ruby
 class MyMigration < ActiveRecord::Migration
-...
-```
+  DOWNTIME = true
+  DOWNTIME_REASON = 'This migration requires downtime because ...'
 
-It is always preferable to have a migration run online. If you expect the migration
-to take particularly long (for instance, if it loops through all notes),
-this is valuable information to add.
+  def change
+    ...
+  end
+end
+```
 
-If you don't provide the information it means that a migration is safe to run online.
+It is an error (that is, CI will fail) if the `DOWNTIME` constant is missing
+from a migration class.
 
-### Reversibility
+## Reversibility
 
 Your migration should be reversible. This is very important, as it should
 be possible to downgrade in case of a vulnerability or bugs.
@@ -100,7 +100,7 @@ value of `10` you'd write the following:
 class MyMigration < ActiveRecord::Migration
   include Gitlab::Database::MigrationHelpers
   disable_ddl_transaction!
-  
+
   def up
     add_column_with_default(:projects, :foo, :integer, default: 10)
   end
diff --git a/doc/development/rake_tasks.md b/doc/development/rake_tasks.md
index 41685c7ee41..8852dbcb19e 100644
--- a/doc/development/rake_tasks.md
+++ b/doc/development/rake_tasks.md
@@ -53,3 +53,8 @@ Generating a sprite file containing all the Emoji can be done by running:
 ```
 bundle exec rake gemojione:sprite
 ```
+
+If new emoji are added, the spritesheet may change size. To compensate for
+such changes, first generate the `emoji.png` spritesheet with the above Rake
+task, then check the dimensions of the new spritesheet and update the
+`SPRITESHEET_WIDTH` and `SPRITESHEET_HEIGHT` constants accordingly.
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 19d083d580d..9bc0dbb5e2a 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -398,7 +398,7 @@ If you are not using Linux you may have to run `gmake` instead of
     cd /home/git
     sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-workhorse.git
     cd gitlab-workhorse
-    sudo -u git -H git checkout v0.7.7
+    sudo -u git -H git checkout v0.7.8
     sudo -u git -H make
 
 ### Initialize Database and Activate Advanced Features
diff --git a/doc/integration/README.md b/doc/integration/README.md
index fd330dd7a7d..ddbd570ac6c 100644
--- a/doc/integration/README.md
+++ b/doc/integration/README.md
@@ -11,7 +11,6 @@ See the documentation below for details on how to configure these services.
 - [OmniAuth](omniauth.md) Sign in via Twitter, GitHub, GitLab.com, Google, Bitbucket, Facebook, Shibboleth, SAML, Crowd and Azure
 - [SAML](saml.md) Configure GitLab as a SAML 2.0 Service Provider
 - [CAS](cas.md) Configure GitLab to sign in using CAS
-- [Slack](slack.md) Integrate with the Slack chat service
 - [OAuth2 provider](oauth_provider.md) OAuth2 application creation
 - [Gmail actions buttons](gmail_action_buttons_for_gitlab.md) Adds GitLab actions to messages
 - [reCAPTCHA](recaptcha.md) Configure GitLab to use Google reCAPTCHA for new users
diff --git a/doc/integration/slack.md b/doc/integration/slack.md
index f6ba80f46d5..8cd151fbf95 100644
--- a/doc/integration/slack.md
+++ b/doc/integration/slack.md
@@ -1,41 +1 @@
-# Slack integration
-
-## On Slack
-
-To enable Slack integration you must create an Incoming WebHooks integration on Slack:
-
-1.  [Sign in to Slack](https://slack.com/signin)
-
-1.  Visit [Incoming WebHooks](https://my.slack.com/services/new/incoming-webhook/)
-
-1.  Choose the channel name you want to send notifications to.
-
-1.  Click **Add Incoming WebHooks Integration**
-    - Optional step; You can change bot's name and avatar by clicking modifying the bot name or avatar under **Integration Settings**.
-
-1. Copy the **Webhook URL**, we'll need this later for GitLab.
-
-
-## On GitLab
-
-After Slack is ready we need to setup GitLab. Here are the steps to achieve this.
-
-1.  Sign in to GitLab
-
-1.  Pick the repository you want.
-
-1.  Navigate to Settings -> Services -> Slack
-
-1. Pick the triggers you want to activate
-
-1.  Fill in your Slack details
-    - Webhook: Paste the Webhook URL from the step above
-    - Username: Fill this in if you want to change the username of the bot
-    - Channel: Fill this in if you want to change the channel where the messages will be posted
-    - Mark it as active
-    
-1. Save your settings
-
-Have fun :)
-
-*P.S. You can set "branch,pushed,Compare changes" as highlight words on your Slack profile settings, so that you can be aware of new commits when somebody pushes them.*
+This document was moved to [project_services/slack.md](../project_services/slack.md).
diff --git a/doc/markdown/img/video.mp4 b/doc/markdown/img/video.mp4
new file mode 100644
index 00000000000..1fc478842f5
--- /dev/null
+++ b/doc/markdown/img/video.mp4
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index fb2dd582754..c6c7ac81c0d 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -13,6 +13,7 @@
 * [Emoji](#emoji)
 * [Special GitLab references](#special-gitlab-references)
 * [Task Lists](#task-lists)
+* [Videos](#videos)
 
 **[Standard Markdown](#standard-markdown)**
 
@@ -31,26 +32,39 @@
 
 ## GitLab Flavored Markdown (GFM)
 
+> **Note:**
+Not all of the GitLab-specific extensions to Markdown that are described in
+this document currently work on our documentation website.
+>
+For the best result, we encourage you to check this document out as rendered
+by GitLab: [markdown.md]
+
 _GitLab uses the [Redcarpet Ruby library][redcarpet] for Markdown processing._
 
 GitLab uses "GitLab Flavored Markdown" (GFM). It extends the standard Markdown in a few significant ways to add some useful functionality. It was inspired by [GitHub Flavored Markdown](https://help.github.com/articles/basic-writing-and-formatting-syntax/).
 
-You can use GFM in
+You can use GFM in the following areas:
 
 - comments
 - issues
 - merge requests
 - milestones
+- snippets (the snippet must be named with a `.md` extension)
 - wiki pages
+- markdown documents inside the repository
 
-You can also use other rich text files in GitLab. You might have to install a dependency to do so. Please see the [github-markup gem readme](https://github.com/gitlabhq/markup#markups) for more information.
+You can also use other rich text files in GitLab. You might have to install a
+dependency to do so. Please see the [github-markup gem readme](https://github.com/gitlabhq/markup#markups) for more information.
 
 ## Newlines
 
+> If this is not rendered correctly, see
+https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#newlines
+
 GFM honors the markdown specification in how [paragraphs and line breaks are handled](https://daringfireball.net/projects/markdown/syntax#p).
 
 A paragraph is simply one or more consecutive lines of text, separated by one or more blank lines.
-Line-breaks, or softreturns, are rendered if you end a line with two or more spaces
+Line-breaks, or softreturns, are rendered if you end a line with two or more spaces:
 
     Roses are red [followed by two or more spaces]
     Violets are blue
@@ -64,17 +78,25 @@ Sugar is sweet
 
 ## Multiple underscores in words
 
-It is not reasonable to italicize just _part_ of a word, especially when you're dealing with code and names that often appear with multiple underscores. Therefore, GFM ignores multiple underscores in words.
+> If this is not rendered correctly, see
+https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#multiple-underscores-in-words
+
+It is not reasonable to italicize just _part_ of a word, especially when you're dealing with code and names that often appear with multiple underscores. Therefore, GFM ignores multiple underscores in words:
 
     perform_complicated_task
+
     do_this_and_do_that_and_another_thing
 
 perform_complicated_task
+
 do_this_and_do_that_and_another_thing
 
 ## URL auto-linking
 
-GFM will autolink almost any URL you copy and paste into your text.
+> If this is not rendered correctly, see
+https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#url-auto-linking
+
+GFM will autolink almost any URL you copy and paste into your text:
 
     * https://www.google.com
     * https://google.com/
@@ -92,8 +114,11 @@ GFM will autolink almost any URL you copy and paste into your text.
 
 ## Multiline Blockquote
 
+> If this is not rendered correctly, see
+https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#multiline-blockquote
+
 On top of standard Markdown [blockquotes](#blockquotes), which require prepending `>` to quoted lines,
-GFM supports multiline blockquotes fenced by <code>>>></code>.
+GFM supports multiline blockquotes fenced by <code>>>></code>:
 
 ```no-highlight
 >>>
@@ -123,10 +148,15 @@ you can quote that without having to manually prepend `>` to every line!
 
 ## Code and Syntax Highlighting
 
+> If this is not rendered correctly, see
+https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#code-and-syntax-highlighting
+
 _GitLab uses the [Rouge Ruby library][rouge] for syntax highlighting. For a
 list of supported languages visit the Rouge website._
 
-Blocks of code are either fenced by lines with three back-ticks <code>```</code>, or are indented with four spaces. Only the fenced code blocks support syntax highlighting.
+Blocks of code are either fenced by lines with three back-ticks <code>```</code>,
+or are indented with four spaces. Only the fenced code blocks support syntax
+highlighting:
 
 ```no-highlight
 Inline `code` has `back-ticks around` it.
@@ -188,6 +218,9 @@ But let's throw in a <b>tag</b>.
 
 ## Inline Diff
 
+> If this is not rendered correctly, see
+https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#inline-diff
+
 With inline diffs tags you can display {+ additions +} or [- deletions -].
 
 The wrapping tags can be either curly braces or square brackets [+ additions +] or {- deletions -}.
@@ -201,6 +234,9 @@ However the wrapping tags cannot be mixed as such:
 
 ## Emoji
 
+> If this is not rendered correctly, see
+https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#emoji
+
 	Sometimes you want to :monkey: around a bit and add some :star2: to your :speech_balloon:. Well we have a gift for you:
 
 	:zap: You can use emoji anywhere GFM is supported. :v:
@@ -263,6 +299,9 @@ GFM also recognizes certain cross-project references:
 
 ## Task Lists
 
+> If this is not rendered correctly, see
+https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#task-lists
+
 You can add task lists to issues, merge requests and comments. To create a task list, add a specially-formatted Markdown list, like so:
 
 ```no-highlight
@@ -281,6 +320,23 @@ You can add task lists to issues, merge requests and comments. To create a task
 
 Task lists can only be created in descriptions, not in titles. Task item state can be managed by editing the description's Markdown or by toggling the rendered check boxes.
 
+## Videos
+
+> If this is not rendered correctly, see
+https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#videos
+
+Image tags with a video extension are automatically converted to a video player.
+
+The valid video extensions are `.mp4`, `.m4v`, `.mov`, `.webm`, and `.ogv`.
+
+    Here's a sample video:
+
+    ![Sample Video](img/video.mp4)
+
+Here's a sample video:
+
+![Sample Video](img/video.mp4)
+
 # Standard Markdown
 
 ## Headers
@@ -584,7 +640,7 @@ This line is separated from the one above by two newlines, so it will be a *sepa
 This line is also a separate paragraph, but...
 This line is only separated by a single newline, so it's a separate line in the *same paragraph*.
 
-This line is also a separate paragraph, and...  
+This line is also a separate paragraph, and...
 This line is on its own line, because the previous line ends with two
 spaces.
 ```
@@ -596,7 +652,7 @@ This line is separated from the one above by two newlines, so it will be a *sepa
 This line is also begins a separate paragraph, but...
 This line is only separated by a single newline, so it's a separate line in the *same paragraph*.
 
-This line is also a separate paragraph, and...  
+This line is also a separate paragraph, and...
 This line is on its own line, because the previous line ends with two
 spaces.
 
@@ -642,6 +698,7 @@ By including colons in the header row, you can align the text within that column
 - The [Markdown Syntax Guide](https://daringfireball.net/projects/markdown/syntax) at Daring Fireball is an excellent resource for a detailed explanation of standard markdown.
 - [Dillinger.io](http://dillinger.io) is a handy tool for testing standard markdown.
 
+[markdown.md]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md
 [rouge]: http://rouge.jneen.net/ "Rouge website"
 [redcarpet]: https://github.com/vmg/redcarpet "Redcarpet website"
 [^1]: This link will be broken if you see this document from the Help page or docs.gitlab.com
diff --git a/doc/project_services/img/slack_configuration.png b/doc/project_services/img/slack_configuration.png
new file mode 100644
index 00000000000..b8de8a56db7
--- /dev/null
+++ b/doc/project_services/img/slack_configuration.png
diff --git a/doc/project_services/project_services.md b/doc/project_services/project_services.md
index e15d5db3253..4442b7c1742 100644
--- a/doc/project_services/project_services.md
+++ b/doc/project_services/project_services.md
@@ -45,7 +45,7 @@ further configuration instructions and details. Contributions are welcome.
 | PivotalTracker | Project Management Software (Source Commits Endpoint) |
 | Pushover | Pushover makes it easy to get real-time notifications on your Android device, iPhone, iPad, and Desktop |
 | [Redmine](redmine.md) | Redmine issue tracker |
-| Slack | A team communication tool for the 21st century |
+| [Slack](slack.md) | A team communication tool for the 21st century |
 
 ## Services Templates
 
diff --git a/doc/project_services/slack.md b/doc/project_services/slack.md
new file mode 100644
index 00000000000..3cfe77c9f85
--- /dev/null
+++ b/doc/project_services/slack.md
@@ -0,0 +1,50 @@
+# Slack Service
+
+## On Slack
+
+To enable Slack integration you must create an incoming webhook integration on
+Slack:
+
+1. [Sign in to Slack](https://slack.com/signin)
+1. Visit [Incoming WebHooks](https://my.slack.com/services/new/incoming-webhook/)
+1. Choose the channel name you want to send notifications to.
+1. Click **Add Incoming WebHooks Integration**
+1. Copy the **Webhook URL**, we'll need this later for GitLab.
+
+## On GitLab
+
+After you set up Slack, it's time to set up GitLab.
+
+Go to your project's **Settings > Services > Slack** and you will see a
+checkbox with the following events that can be triggered:
+
+- Push
+- Issue
+- Merge request
+- Note
+- Tag push
+- Build
+- Wiki page
+
+Bellow each of these event checkboxes, you will have an input field to insert
+which Slack channel you want to send that event message, with `#general`
+being the default. Enter your preferred channel **without** the hash sign (`#`).
+
+At the end, fill in your Slack details:
+
+| Field | Description |
+| ----- | ----------- |
+| **Webhook**  | The [incoming webhook URL][slackhook] which you have to setup on Slack. |
+| **Username** | Optional username which can be on messages sent to slack. Fill this in if you want to change the username of the bot. |
+| **Notify only broken builds** | If you choose to enable the **Build** event and you want to be only notified about failed builds. |
+
+After you are all done, click **Save changes** for the changes to take effect.
+
+>**Note:**
+You can set "branch,pushed,Compare changes" as highlight words on your Slack
+profile settings, so that you can be aware of new commits when somebody pushes
+them.
+
+![Slack configuration](img/slack_configuration.png)
+
+[slackhook]: https://my.slack.com/services/new/incoming-webhook
diff --git a/doc/raketasks/cleanup.md b/doc/raketasks/cleanup.md
index 8fbcbb983e9..cf891cd90ad 100644
--- a/doc/raketasks/cleanup.md
+++ b/doc/raketasks/cleanup.md
@@ -2,7 +2,7 @@
 
 ## Remove garbage from filesystem. Important! Data loss!
 
-Remove namespaces(dirs) from `/home/git/repositories` if they don't exist in GitLab database.
+Remove namespaces(dirs) from all repository storage paths if they don't exist in GitLab database.
 
 ```
 # omnibus-gitlab
@@ -12,7 +12,7 @@ sudo gitlab-rake gitlab:cleanup:dirs
 bundle exec rake gitlab:cleanup:dirs RAILS_ENV=production
 ```
 
-Rename repositories from `/home/git/repositories` if they don't exist in GitLab database.
+Rename repositories from all repository storage paths if they don't exist in GitLab database.
 The repositories get a `+orphaned+TIMESTAMP` suffix so that they cannot block new repositories from being created.
 
 ```
diff --git a/doc/raketasks/maintenance.md b/doc/raketasks/maintenance.md
index d9dce2af480..315cb56a089 100644
--- a/doc/raketasks/maintenance.md
+++ b/doc/raketasks/maintenance.md
@@ -167,3 +167,22 @@ of those assets. Unless you are modifying the JavaScript / CSS code on your
 production machine after installing the package, there should be no reason to redo
 rake assets:precompile on the production machine. If you suspect that assets
 have been corrupted, you should reinstall the omnibus package.
+
+## Tracking Deployments
+
+GitLab provides a Rake task that lets you track deployments in GitLab
+Performance Monitoring. This Rake task simply stores the current GitLab version
+in the GitLab Performance Monitoring database.
+
+For Omnibus-packages:
+
+```
+sudo gitlab-rake gitlab:track_deployment
+```
+
+For installations from source:
+
+```
+cd /home/git/gitlab
+sudo -u git -H bundle exec rake gitlab:track_deployment RAILS_ENV=production
+```
diff --git a/doc/update/8.9-to-8.10.md b/doc/update/8.9-to-8.10.md
index 84065a84e50..71cbe5c8ac6 100644
--- a/doc/update/8.9-to-8.10.md
+++ b/doc/update/8.9-to-8.10.md
@@ -58,7 +58,7 @@ GitLab 8.1.
 ```bash
 cd /home/git/gitlab-workhorse
 sudo -u git -H git fetch --all
-sudo -u git -H git checkout v0.7.7
+sudo -u git -H git checkout v0.7.8
 sudo -u git -H make
 ```
 
diff --git a/doc/user/admin_area/settings/img/access_restrictions.png b/doc/user/admin_area/settings/img/access_restrictions.png
new file mode 100644
index 00000000000..8eea84320d7
--- /dev/null
+++ b/doc/user/admin_area/settings/img/access_restrictions.png
diff --git a/doc/user/admin_area/settings/img/domain_blacklist.png b/doc/user/admin_area/settings/img/domain_blacklist.png
new file mode 100644
index 00000000000..bd87b73cf9e
--- /dev/null
+++ b/doc/user/admin_area/settings/img/domain_blacklist.png
diff --git a/doc/user/admin_area/settings/img/restricted_url.png b/doc/user/admin_area/settings/img/restricted_url.png
new file mode 100644
index 00000000000..8b00a18320b
--- /dev/null
+++ b/doc/user/admin_area/settings/img/restricted_url.png
diff --git a/doc/user/admin_area/settings/sign_up_restrictions.md b/doc/user/admin_area/settings/sign_up_restrictions.md
new file mode 100644
index 00000000000..4b540473a6e
--- /dev/null
+++ b/doc/user/admin_area/settings/sign_up_restrictions.md
@@ -0,0 +1,22 @@
+# Sign-up restrictions
+
+## Blacklist email domains
+
+> [Introduced][ce-5259] in GitLab 8.10.
+
+With this feature enabled, you can block email addresses of a specific domain
+from creating an account on your GitLab server. This is particularly useful to
+prevent spam. Disposable email addresses are usually used by malicious users to
+create dummy accounts and spam issues.
+
+This feature can be activated via the **Application Settings** in the Admin area,
+and you have the option of entering the list manually, or uploading a file with
+the list.
+
+The blacklist accepts wildcards, so you can use `*.test.com` to block every
+`test.com` subdomain, or `*.io` to block all domains ending in `.io`. Domains
+should be separated by a whitespace, semicolon, comma, or a new line.
+
+![Domain Blacklist](img/domain_blacklist.png)
+
+[ce-5259]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5259
diff --git a/doc/administration/access_restrictions.md b/doc/user/admin_area/settings/visibility_and_access_controls.md
index 51d7996effd..633f16a617c 100644
--- a/doc/administration/access_restrictions.md
+++ b/doc/user/admin_area/settings/visibility_and_access_controls.md
@@ -1,6 +1,8 @@
-# Access Restrictions
+# Visibility and access controls
 
-> **Note:** This feature is only available on versions 8.10 and above.
+## Enabled Git access protocols
+
+> [Introduced][ce-4696] in GitLab 8.10.
 
 With GitLab's Access restrictions you can choose which Git access protocols you
 want your users to use to communicate with GitLab. This feature can be enabled
@@ -15,8 +17,6 @@ to choose between:
 
 ![Settings Overview](img/access_restrictions.png)
 
-## Enabled Protocol
-
 When both SSH and HTTP(S) are enabled, GitLab will behave as usual, it will give
 your users the option to choose which protocol they would like to use.
 
@@ -35,4 +35,6 @@ not selected.
 > **Note:** Please keep in mind that disabling an access protocol does not actually
   block access to the server itself. The ports used for the protocol, be it SSH or
   HTTP, will still be accessible. What GitLab does is restrict access on the
-  application level.
\ No newline at end of file
+  application level.
+
+[ce-4696]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4696
diff --git a/doc/user/project/img/project_settings_list.png b/doc/user/project/img/project_settings_list.png
new file mode 100644
index 00000000000..57ca2ac5f9e
--- /dev/null
+++ b/doc/user/project/img/project_settings_list.png
diff --git a/doc/user/project/img/protected_branches_choose_branch.png b/doc/user/project/img/protected_branches_choose_branch.png
new file mode 100644
index 00000000000..26328143717
--- /dev/null
+++ b/doc/user/project/img/protected_branches_choose_branch.png
diff --git a/doc/user/project/img/protected_branches_devs_can_push.png b/doc/user/project/img/protected_branches_devs_can_push.png
new file mode 100644
index 00000000000..9c33db36586
--- /dev/null
+++ b/doc/user/project/img/protected_branches_devs_can_push.png
diff --git a/doc/user/project/img/protected_branches_error_ui.png b/doc/user/project/img/protected_branches_error_ui.png
new file mode 100644
index 00000000000..cc61df7ca97
--- /dev/null
+++ b/doc/user/project/img/protected_branches_error_ui.png
diff --git a/doc/user/project/img/protected_branches_list.png b/doc/user/project/img/protected_branches_list.png
new file mode 100644
index 00000000000..9f070f7a208
--- /dev/null
+++ b/doc/user/project/img/protected_branches_list.png
diff --git a/doc/user/project/img/protected_branches_matches.png b/doc/user/project/img/protected_branches_matches.png
new file mode 100644
index 00000000000..30ce53f704e
--- /dev/null
+++ b/doc/user/project/img/protected_branches_matches.png
diff --git a/doc/user/project/protected_branches.md b/doc/user/project/protected_branches.md
new file mode 100644
index 00000000000..6a8170b5ecb
--- /dev/null
+++ b/doc/user/project/protected_branches.md
@@ -0,0 +1,106 @@
+# Protected Branches
+
+[Permissions](../permissions.md) in GitLab are fundamentally defined around the
+idea of having read or write permission to the repository and branches. To
+prevent people from messing with history or pushing code without review, we've
+created protected branches.
+
+By default, a protected branch does four simple things:
+
+- it prevents its creation, if not already created, from everybody except users
+  with Master permission
+- it prevents pushes from everybody except users with Master permission
+- it prevents **anyone** from force pushing to the branch
+- it prevents **anyone** from deleting the branch
+
+See the [Changelog](#changelog) section for changes over time.
+
+## Configuring protected branches
+
+To protect a branch, you need to have at least Master permission level. Note
+that the `master` branch is protected by default.
+
+1. Navigate to the main page of the project.
+1. In the upper right corner, click the settings wheel and select **Protected branches**.
+
+    ![Project settings list](img/project_settings_list.png)
+
+1. From the **Branch** dropdown menu, select the branch you want to protect and
+   click **Protect**. In the screenshot below, we chose the `develop` branch.
+
+    ![Choose protected branch](img/protected_branches_choose_branch.png)
+
+1. Once done, the protected branch will appear in the "Already protected" list.
+
+    ![Protected branches list](img/protected_branches_list.png)
+
+
+Since GitLab 8.10, we added another layer of branch protection which provides
+more granular management of protected branches. You can now choose the option
+"Developers can merge" so that Developer users can merge a merge request but
+not directly push. In that case, your branches are protected from direct pushes,
+yet Developers don't need elevated permissions or wait for someone with a higher
+permission level to press merge.
+
+You can set this option while creating the protected branch or after its
+creation.
+
+## Wildcard protected branches
+
+>**Note:**
+This feature was [introduced][ce-4665] in GitLab 8.10.
+
+You can specify a wildcard protected branch, which will protect all branches
+matching the wildcard. For example:
+
+| Wildcard Protected Branch | Matching Branches                                      |
+|---------------------------+--------------------------------------------------------|
+| `*-stable`                | `production-stable`, `staging-stable`                  |
+| `production/*`            | `production/app-server`, `production/load-balancer`    |
+| `*gitlab*`                | `gitlab`, `gitlab/staging`, `master/gitlab/production` |
+
+Protected branch settings (like "Developers can push") apply to all matching
+branches.
+
+Two different wildcards can potentially match the same branch. For example,
+`*-stable` and `production-*` would both match a `production-stable` branch.
+In that case, if _any_ of these protected branches have a setting like
+"Allowed to push", then `production-stable` will also inherit this setting.
+
+If you click on a protected branch's name that is created using a wildcard,
+you will be presented with a list of all matching branches:
+
+![Protected branch matches](img/protected_branches_matches.png)
+
+## Restrict the creation of protected branches
+
+Creating a protected branch or a list of protected branches using the wildcard
+feature, not only you are restricting pushes to those branches, but also their
+creation if not already created.
+
+## Error messages when pushing to a protected branch
+
+A user with insufficient permissions will be presented with an error when
+creating or pushing to a branch that's prohibited, either through GitLab's UI:
+
+![Protected branch error GitLab UI](img/protected_branches_error_ui.png)
+
+or using Git from their terminal:
+
+```bash
+remote: GitLab: You are not allowed to push code to protected branches on this project.
+To https://gitlab.example.com/thedude/bowling.git
+ ! [remote rejected] staging-stable -> staging-stable (pre-receive hook declined)
+error: failed to push some refs to 'https://gitlab.example.com/thedude/bowling.git'
+```
+
+## Changelog
+
+**8.10.0**
+
+- Allow specifying protected branches using wildcards [gitlab-org/gitlab-ce!5081][ce-4665]
+
+---
+
+[ce-4665]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4665 "Allow specifying protected branches using wildcards"
+[ce-5081]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5081 "Allow creating protected branches that can't be pushed to"
diff --git a/doc/workflow/README.md b/doc/workflow/README.md
index ddb2f7281b1..49dec613716 100644
--- a/doc/workflow/README.md
+++ b/doc/workflow/README.md
@@ -12,7 +12,7 @@
 - [Project Features](project_features.md)
 - [Project forking workflow](forking_workflow.md)
 - [Project users](add-user/add-user.md)
-- [Protected branches](protected_branches.md)
+- [Protected branches](../user/project/protected_branches.md)
 - [Sharing a project with a group](share_with_group.md)
 - [Share projects with other groups](share_projects_with_other_groups.md)
 - [Web Editor](web_editor.md)
diff --git a/doc/workflow/add-user/add-user.md b/doc/workflow/add-user/add-user.md
index 0537ce0bcd4..e541111d7b3 100644
--- a/doc/workflow/add-user/add-user.md
+++ b/doc/workflow/add-user/add-user.md
@@ -90,6 +90,9 @@ GitLab account using the same e-mail address the invitation was sent to.
 
 ## Request access to a project
 
+As a project owner you can enable or disable non members to request access to
+your project. Go to the project settings and click on **Allow users to request access**.
+
 As a user, you can request to be a member of a project. Go to the project you'd
 like to be a member of, and click the **Request Access** button on the right
 side of your screen.
diff --git a/doc/workflow/groups.md b/doc/workflow/groups.md
index 9b50286b179..a693cc3d0fd 100644
--- a/doc/workflow/groups.md
+++ b/doc/workflow/groups.md
@@ -53,6 +53,9 @@ If necessary, you can increase the access level of an individual user for a spec
 
 ## Requesting access to a group
 
+As a group owner you can enable or disable non members to request access to
+your group. Go to the group settings and click on **Allow users to request access**.
+
 As a user, you can request to be a member of a group. Go to the group you'd
 like to be a member of, and click the **Request Access** button on the right
 side of your screen.
diff --git a/doc/workflow/protected_branches.md b/doc/workflow/protected_branches.md
index 5c1c7b47c8a..aa48b8f750e 100644
--- a/doc/workflow/protected_branches.md
+++ b/doc/workflow/protected_branches.md
@@ -1,55 +1 @@
-# Protected Branches
-
-Permissions in GitLab are fundamentally defined around the idea of having read or write permission to the repository and branches.
-
-To prevent people from messing with history or pushing code without review, we've created protected branches.
-
-A protected branch does three simple things:
-
-* it prevents pushes from everybody except users with Master permission
-* it prevents anyone from force pushing to the branch
-* it prevents anyone from deleting the branch
-
-You can make any branch a protected branch. GitLab makes the master branch a protected branch by default.
-
-To protect a branch, user needs to have at least a Master permission level, see [permissions document](../user/permissions.md).
-
-![protected branches page](protected_branches/protected_branches1.png)
-
-Navigate to project settings page and select `protected branches`. From the `Branch` dropdown menu select the branch you want to protect.
-
-Some workflows, like [GitLab workflow](gitlab_flow.md), require all users with write access to submit a Merge request in order to get the code into a protected branch.
-
-Since Masters and Owners can already push to protected branches, that means Developers cannot push to protected branch and need to submit a Merge request.
-
-However, there are workflows where that is not needed and only protecting from force pushes and branch removal is useful.
-
-For those workflows, you can allow everyone with write access to push to a protected branch by selecting `Developers can push` check box.
-
-On already protected branches you can also allow developers to push to the repository by selecting the `Developers can push` check box.
-
-![Developers can push](protected_branches/protected_branches2.png)
-
-## Wildcard Protected Branches
-
->**Note:**
-This feature was added in GitLab 8.10.
-
-1. You can specify a wildcard protected branch, which will protect all branches matching the wildcard. For example:
-
-    | Wildcard Protected Branch | Matching Branches                                      |
-    |---------------------------+--------------------------------------------------------|
-    | `*-stable`                | `production-stable`, `staging-stable`                  |
-    | `production/*`            | `production/app-server`, `production/load-balancer`    |
-    | `*gitlab*`                | `gitlab`, `gitlab/staging`, `master/gitlab/production` |
-
-1. Protected branch settings (like "Developers Can Push") apply to all matching branches.
-
-1. Two different wildcards can potentially match the same branch. For example, `*-stable` and `production-*` would both match a `production-stable` branch.
-   >**Note:**
-   If _any_ of these protected branches have "Developers Can Push" set to true, then `production-stable` has it set to true.
-
-1. If you click on a protected branch's name, you will be presented with a list of all matching branches:
-
-    ![protected branch matches](protected_branches/protected_branches3.png)
-
+This document is moved to [user/project/protected_branches.md](../user/project/protected_branches.md)
diff --git a/doc/workflow/protected_branches/protected_branches1.png b/doc/workflow/protected_branches/protected_branches1.png
deleted file mode 100644
index c00443803de..00000000000
--- a/doc/workflow/protected_branches/protected_branches1.png
+++ /dev/null
diff --git a/doc/workflow/protected_branches/protected_branches2.png b/doc/workflow/protected_branches/protected_branches2.png
deleted file mode 100644
index a4f664d3b21..00000000000
--- a/doc/workflow/protected_branches/protected_branches2.png
+++ /dev/null
diff --git a/doc/workflow/protected_branches/protected_branches3.png b/doc/workflow/protected_branches/protected_branches3.png
deleted file mode 100644
index 2a50cb174bb..00000000000
--- a/doc/workflow/protected_branches/protected_branches3.png
+++ /dev/null
diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature
index 80670063ea0..358e622b736 100644
--- a/features/project/issues/issues.feature
+++ b/features/project/issues/issues.feature
@@ -37,7 +37,6 @@ Feature: Project Issues
     And I submit new issue "500 error on profile"
     Then I should see issue "500 error on profile"
 
-  @javascript
   Scenario: I submit new unassigned issue with labels
     Given project "Shop" has labels: "bug", "feature", "enhancement"
     And I click link "New Issue"
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index 8176ec5ab45..21768c15c17 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -89,7 +89,7 @@ Feature: Project Merge Requests
     Then The list should be sorted by "Oldest updated"
 
   @javascript
-  Scenario: Visiting Merge Requests from a different Project after sorting
+  Scenario: Visiting Merge Requests from a differente Project after sorting
     Given I visit project "Shop" merge requests page
     And I sort the list by "Oldest updated"
     And I visit dashboard merge requests page
diff --git a/features/project/wiki.feature b/features/project/wiki.feature
index d4811b1ff54..63ce3ccb536 100644
--- a/features/project/wiki.feature
+++ b/features/project/wiki.feature
@@ -8,6 +8,12 @@ Feature: Project Wiki
     Given I create the Wiki Home page
     Then I should see the newly created wiki page
 
+  Scenario: Add new page with errors
+    Given I create the Wiki Home page with no content
+    Then I should see a "Content can't be blank" error message
+    When I create the Wiki Home page
+    Then I should see the newly created wiki page
+
   Scenario: Pressing Cancel while editing a brand new Wiki
     Given I click on the Cancel button
     Then I should be redirected back to the Edit Home Wiki page
diff --git a/features/steps/admin/settings.rb b/features/steps/admin/settings.rb
index 037f7494a77..03f87df7a60 100644
--- a/features/steps/admin/settings.rb
+++ b/features/steps/admin/settings.rb
@@ -27,19 +27,19 @@ class Spinach::Features::AdminSettings < Spinach::FeatureSteps
 
   step 'I check all events and submit form' do
     page.check('Active')
-    page.check('Push events')
-    page.check('Tag push events')
-    page.check('Comments')
-    page.check('Issues events')
-    page.check('Merge Request events')
-    page.check('Build events')
+    page.check('Push')
+    page.check('Tag push')
+    page.check('Note')
+    page.check('Issue')
+    page.check('Merge request')
+    page.check('Build')
     click_on 'Save'
   end
 
   step 'I fill out Slack settings' do
     fill_in 'Webhook', with: 'http://localhost'
     fill_in 'Username', with: 'test_user'
-    fill_in 'Channel', with: '#test_channel'
+    fill_in 'service_push_channel', with: '#test_channel'
     page.check('Notify only broken builds')
   end
 
@@ -56,6 +56,6 @@ class Spinach::Features::AdminSettings < Spinach::FeatureSteps
   step 'I should see Slack settings saved' do
     expect(find_field('Webhook').value).to eq 'http://localhost'
     expect(find_field('Username').value).to eq 'test_user'
-    expect(find_field('Channel').value).to eq '#test_channel'
+    expect(find('#service_push_channel').value).to eq '#test_channel'
   end
 end
diff --git a/features/steps/project/forked_merge_requests.rb b/features/steps/project/forked_merge_requests.rb
index 8f71dfdd899..6b56a77b832 100644
--- a/features/steps/project/forked_merge_requests.rb
+++ b/features/steps/project/forked_merge_requests.rb
@@ -135,17 +135,19 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
   end
 
   step 'I click "Assign to" dropdown"' do
-    click_button 'Assignee'
+    first('.ajax-users-select').click
   end
 
   step 'I should see the target project ID in the input selector' do
-    expect(find('.js-assignee-search')["data-project-id"]).to eq "#{@project.id}"
+    expect(page).to have_selector("input[data-project-id=\"#{@project.id}\"]")
   end
 
   step 'I should see the users from the target project ID' do
-    expect(page).to have_content 'Unassigned'
-    expect(page).to have_content current_user.name
-    expect(page).to have_content @project.users.first.name
+    expect(page).to have_selector('.user-result', visible: true, count: 3)
+    users = page.all('.user-name')
+    expect(users[0].text).to eq 'Unassigned'
+    expect(users[1].text).to eq current_user.name
+    expect(users[2].text).to eq @project.users.first.name
   end
 
   # Verify a link is generated against the correct project
diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb
index b785e15f70e..35f166c7c08 100644
--- a/features/steps/project/issues/issues.rb
+++ b/features/steps/project/issues/issues.rb
@@ -82,8 +82,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
 
   step 'I submit new issue "500 error on profile" with label \'bug\'' do
     fill_in "issue_title", with: "500 error on profile"
-    click_button "Label"
-    click_link "bug"
+    select 'bug', from: "Labels"
     click_button "Submit issue"
   end
 
diff --git a/features/steps/project/wiki.rb b/features/steps/project/wiki.rb
index 3cbf832c728..732dc5d0b93 100644
--- a/features/steps/project/wiki.rb
+++ b/features/steps/project/wiki.rb
@@ -19,6 +19,11 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
     click_on "Create page"
   end
 
+  step 'I create the Wiki Home page with no content' do
+    fill_in "wiki_content", with: ''
+    click_on "Create page"
+  end
+
   step 'I should see the newly created wiki page' do
     expect(page).to have_content "Home"
     expect(page).to have_content "link test"
@@ -125,15 +130,15 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
 
   step 'I create a New page with paths' do
     click_on 'New Page'
-    fill_in 'Page slug', with: 'one/two/three'
+    fill_in 'Page slug', with: 'one/two/three-test'
     click_on 'Create Page'
     fill_in "wiki_content", with: 'wiki content'
     click_on "Create page"
-    expect(current_path).to include 'one/two/three'
+    expect(current_path).to include 'one/two/three-test'
   end
 
   step 'I should see non-escaped link in the pages list' do
-    expect(page).to have_xpath("//a[@href='/#{project.path_with_namespace}/wikis/one/two/three']")
+    expect(page).to have_xpath("//a[@href='/#{project.path_with_namespace}/wikis/one/two/three-test']")
   end
 
   step 'I edit the Wiki page with a path' do
@@ -142,7 +147,7 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
   end
 
   step 'I should see a non-escaped path' do
-    expect(current_path).to include 'one/two/three'
+    expect(current_path).to include 'one/two/three-test'
   end
 
   step 'I should see the Editing page' do
@@ -173,6 +178,11 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
     find('a[href*="?version_id"]')
   end
 
+  step 'I should see a "Content can\'t be blank" error message' do
+    expect(page).to have_content('The form contains the following error:')
+    expect(page).to have_content('Content can\'t be blank')
+  end
+
   def wiki
     @project_wiki = ProjectWiki.new(project, current_user)
   end
diff --git a/fixtures/emojis/aliases.json b/fixtures/emojis/aliases.json
index d3831d8045b..e2f47db0de2 100644
--- a/fixtures/emojis/aliases.json
+++ b/fixtures/emojis/aliases.json
@@ -1,16 +1,9 @@
 {
-   "northeast_pointing_airplane":"airplane_northeast",
    "small_airplane":"airplane_small",
-   "up_pointing_small_airplane":"airplane_small_up",
-   "up_pointing_airplane":"airplane_up",
-   "left_anger_bubble":"anger_left",
    "right_anger_bubble":"anger_right",
    "keycap_asterisk":"asterisk",
    "atom_symbol":"atom",
    "ballot_box_with_ballot":"ballot_box",
-   "ballot_box_with_bold_check":"ballot_box_check",
-   "ballot_box_with_script_x":"ballot_box_x",
-   "ballot_script_x":"ballot_x",
    "person_with_ball":"basketball_player",
    "person_with_ball_tone1":"basketball_player_tone1",
    "person_with_ball_tone2":"basketball_player_tone2",
@@ -21,51 +14,65 @@
    "umbrella_on_ground":"beach_umbrella",
    "bellhop_bell":"bellhop",
    "biohazard_sign":"biohazard",
-   "bouquet_of_flowers":"bouquet2",
    "archery":"bow_and_arrow",
-   "bullhorn_with_sound_waves":"bullhorn_waves",
-   "pocket calculator":"calculator",
+   "boxing_gloves":"boxing_glove",
    "spiral_calendar_pad":"calendar_spiral",
+   "call_me_hand":"call_me",
+   "call_me_hand_tone1":"call_me_tone1",
+   "call_me_hand_tone2":"call_me_tone2",
+   "call_me_hand_tone3":"call_me_tone3",
+   "call_me_hand_tone4":"call_me_tone4",
+   "call_me_hand_tone5":"call_me_tone5",
+   "kayak":"canoe",
    "card_file_box":"card_box",
-   "tape_cartridge":"cartridge",
+   "person_doing_cartwheel":"cartwheel",
+   "person_doing_cartwheel_tone1":"cartwheel_tone1",
+   "person_doing_cartwheel_tone2":"cartwheel_tone2",
+   "person_doing_cartwheel_tone3":"cartwheel_tone3",
+   "person_doing_cartwheel_tone4":"cartwheel_tone4",
+   "person_doing_cartwheel_tone5":"cartwheel_tone5",
    "bottle_with_popping_cork":"champagne",
+   "clinking_glass":"champagne_glass",
    "cheese_wedge":"cheese",
    "city_sunrise":"city_sunset",
    "mantlepiece_clock":"clock",
-   "clockwise_right_and_left_semicircle_arrows":"clockwise_arrows",
    "cloud_with_lightning":"cloud_lightning",
    "cloud_with_rain":"cloud_rain",
    "cloud_with_snow":"cloud_snow",
    "cloud_with_tornado":"cloud_tornado",
-   "old_personal_computer":"computer_old",
-   "building_construction":"contruction_site",
+   "clown_face":"clown",
+   "building_construction":"construction_site",
    "couch_and_lamp":"couch",
    "couple_with_heart_mm":"couple_mm",
    "couple_with_heart_ww":"couple_ww",
+   "face_with_cowboy_hat":"cowboy",
    "lower_left_crayon":"crayon",
    "cricket_bat_ball":"cricket",
    "latin_cross":"cross",
-   "heavy_latin_cross":"cross_heavy",
-   "white_latin_cross":"cross_white",
-   "black_skull_and_crossbones":"crossbones",
    "passenger_ship":"cruise_ship",
    "dagger_knife":"dagger",
    "desktop_computer":"desktop",
    "card_index_dividers":"dividers",
-   "document_with_text":"document_text",
    "dove_of_peace":"dove",
+   "drool":"drooling_face",
+   "drum_with_drumsticks":"drum",
    "email":"e-mail",
-   "back_of_envelope":"envelope_back",
-   "flying_envelope":"envelope_flying",
-   "stamped_envelope":"envelope_stamped",
-   "pen_over_stamped_envelope":"envelope_stamped_pen",
-   "white_down_pointing_left_hand_index":"finger_pointing_down",
-   "sideways_white_down_pointing_index":"finger_pointing_down2",
-   "sideways_white_left_pointing_index":"finger_pointing_left",
-   "sideways_white_right_pointing_index":"finger_pointing_right",
-   "sideways_white_up_pointing_index":"finger_pointing_up",
+   "eject_symbol":"eject",
+   "facepalm":"face_palm",
+   "facepalm_tone1":"face_palm_tone1",
+   "facepalm_tone2":"face_palm_tone2",
+   "facepalm_tone3":"face_palm_tone3",
+   "facepalm_tone4":"face_palm_tone4",
+   "facepalm_tone5":"face_palm_tone5",
+   "fencing":"fencer",
+   "hand_with_index_and_middle_finger_crossed":"fingers_crossed",
+   "hand_with_index_and_middle_fingers_crossed_tone1":"fingers_crossed_tone1",
+   "hand_with_index_and_middle_fingers_crossed_tone2":"fingers_crossed_tone2",
+   "hand_with_index_and_middle_fingers_crossed_tone3":"fingers_crossed_tone3",
+   "hand_with_index_and_middle_fingers_crossed_tone4":"fingers_crossed_tone4",
+   "hand_with_index_and_middle_fingers_crossed_tone5":"fingers_crossed_tone5",
    "flame":"fire",
-   "oncoming_fire_engine":"fire_engine_oncoming",
+   "first_place_medal":"first_place",
    "ac":"flag_ac",
    "ad":"flag_ad",
    "ae":"flag_ae",
@@ -326,44 +333,51 @@
    "za":"flag_za",
    "zm":"flag_zm",
    "zw":"flag_zw",
-   "clamshell_mobile_phone":"flip_phone",
-   "black_hard_shell_floppy_disk":"floppy_black",
-   "white_hard_shell_floppy_disk":"floppy_white",
-   "open_folder":"folder_open",
    "fork_and_knife_with_plate":"fork_knife_plate",
+   "fox_face":"fox",
    "frame_with_picture":"frame_photo",
-   "frame_with_tiles":"frame_tiles",
-   "frame_with_an_x":"frame_x",
+   "baguette_bread":"french_bread",
    "anguished":"frowning",
    "white_frowning_face":"frowning2",
+   "goal_net":"goal",
    "hammer_and_pick":"hammer_pick",
    "raised_hand_with_fingers_splayed":"hand_splayed",
-   "reversed_raised_hand_with_fingers_splayed":"hand_splayed_reverse",
    "raised_hand_with_fingers_splayed_tone1":"hand_splayed_tone1",
    "raised_hand_with_fingers_splayed_tone2":"hand_splayed_tone2",
    "raised_hand_with_fingers_splayed_tone3":"hand_splayed_tone3",
    "raised_hand_with_fingers_splayed_tone4":"hand_splayed_tone4",
    "raised_hand_with_fingers_splayed_tone5":"hand_splayed_tone5",
-   "reversed_victory_hand":"hand_victory",
+   "shaking_hands":"handshake",
+   "shaking_hands_tone1":"handshake_tone1",
+   "shaking_hands_tone2":"handshake_tone2",
+   "shaking_hands_tone3":"handshake_tone3",
+   "shaking_hands_tone4":"handshake_tone4",
+   "shaking_hands_tone5":"handshake_tone5",
    "face_with_head_bandage":"head_bandage",
    "heavy_heart_exclamation_mark_ornament":"heart_exclamation",
-   "heart_with_tip_on_the_left":"heart_tip",
    "helmet_with_white_cross":"helmet_with_cross",
    "house_buildings":"homes",
    "hot_dog":"hotdog",
    "derelict_house_building":"house_abandoned",
    "hugging_face":"hugging",
-   "circled_information_source":"info",
    "desert_island":"island",
-   "up_pointing_military_airplane":"jet_up",
+   "juggler":"juggling",
+   "juggler_tone1":"juggling_tone1",
+   "juggler_tone2":"juggling_tone2",
+   "juggler_tone3":"juggling_tone3",
+   "juggler_tone4":"juggling_tone4",
+   "juggler_tone5":"juggling_tone5",
    "old_key":"key2",
-   "wired_keyboard":"keyboard",
-   "keyboard_and_mouse":"keyboard_mouse",
-   "musical_keyboard_with_jacks":"keyboard_with_jacks",
    "couplekiss_mm":"kiss_mm",
    "couplekiss_ww":"kiss_ww",
+   "kiwifruit":"kiwi",
    "satisfied":"laughing",
-   "left_hand_telephone_receiver":"left_receiver",
+   "left_fist":"left_facing_fist",
+   "left_fist_tone1":"left_facing_fist_tone1",
+   "left_fist_tone2":"left_facing_fist_tone2",
+   "left_fist_tone3":"left_facing_fist_tone3",
+   "left_fist_tone4":"left_facing_fist_tone4",
+   "left_fist_tone5":"left_facing_fist_tone5",
    "man_in_business_suit_levitating":"levitate",
    "weight_lifter":"lifter",
    "weight_lifter_tone1":"lifter_tone1",
@@ -371,9 +385,21 @@
    "weight_lifter_tone3":"lifter_tone3",
    "weight_lifter_tone4":"lifter_tone4",
    "weight_lifter_tone5":"lifter_tone5",
-   "light_mark":"light_check_mark",
    "lion":"lion_face",
+   "liar":"lying_face",
+   "male_dancer":"man_dancing",
+   "male_dancer_tone1":"man_dancing_tone1",
+   "male_dancer_tone2":"man_dancing_tone2",
+   "male_dancer_tone3":"man_dancing_tone3",
+   "male_dancer_tone4":"man_dancing_tone4",
+   "male_dancer_tone5":"man_dancing_tone5",
+   "tuxedo_tone1":"man_in_tuxedo_tone1",
+   "tuxedo_tone2":"man_in_tuxedo_tone2",
+   "tuxedo_tone3":"man_in_tuxedo_tone3",
+   "tuxedo_tone4":"man_in_tuxedo_tone4",
+   "tuxedo_tone5":"man_in_tuxedo_tone5",
    "world_map":"map",
+   "karate_uniform":"martial_arts_uniform",
    "sports_medal":"medal",
    "sign_of_the_horns":"metal",
    "sign_of_the_horns_tone1":"metal_tone1",
@@ -388,21 +414,23 @@
    "reversed_hand_with_middle_finger_extended_tone3":"middle_finger_tone3",
    "reversed_hand_with_middle_finger_extended_tone4":"middle_finger_tone4",
    "reversed_hand_with_middle_finger_extended_tone5":"middle_finger_tone5",
+   "glass_of_milk":"milk",
    "money_mouth_face":"money_mouth",
-   "lightning_mood_bubble":"mood_bubble_lightning",
-   "lightning_mood":"mood_lightning",
+   "motorbike":"motor_scooter",
    "racing_motorcycle":"motorcycle",
    "snow_capped_mountain":"mountain_snow",
-   "one_button_mouse":"mouse_one",
    "three_button_mouse":"mouse_three_button",
+   "mother_christmas":"mrs_claus",
+   "mother_christmas_tone1":"mrs_claus_tone1",
+   "mother_christmas_tone2":"mrs_claus_tone2",
+   "mother_christmas_tone3":"mrs_claus_tone3",
+   "mother_christmas_tone4":"mrs_claus_tone4",
+   "mother_christmas_tone5":"mrs_claus_tone5",
+   "sick":"nauseated_face",
    "nerd_face":"nerd",
-   "three_networked_computers":"network",
    "rolled_up_newspaper":"newspaper2",
-   "note_page":"note",
-   "empty_note_page":"note_empty",
-   "note_pad":"notepad",
-   "empty_note_pad":"notepad_empty",
    "spiral_note_pad":"notepad_spiral",
+   "stop_sign":"octagonal_sign",
    "oil_drum":"oil",
    "grandma":"older_woman",
    "grandma_tone1":"older_woman_tone1",
@@ -410,57 +438,66 @@
    "grandma_tone3":"older_woman_tone3",
    "grandma_tone4":"older_woman_tone4",
    "grandma_tone5":"older_woman_tone5",
-   "optical_disc_icon":"optical_disk",
    "lower_left_paintbrush":"paintbrush",
    "linked_paperclips":"paperclips",
    "national_park":"park",
    "double_vertical_bar":"pause_button",
    "peace_symbol":"peace",
+   "shelled_peanut":"peanuts",
    "lower_left_ballpoint_pen":"pen_ballpoint",
    "lower_left_fountain_pen":"pen_fountain",
    "memo":"pencil",
-   "lower_left_pencil":"pencil3",
-   "black_pennant":"pennant_black",
-   "white_pennant":"pennant_white",
    "table_tennis":"ping_pong",
-   "no_piracy":"piracy",
    "worship_symbol":"place_of_worship",
    "shit":"poop",
    "hankey":"poop",
    "poo":"poop",
-   "prohibited_sign":"prohibited",
+   "expecting_woman":"pregnant_woman",
+   "expecting_woman_tone1":"pregnant_woman_tone1",
+   "expecting_woman_tone2":"pregnant_woman_tone2",
+   "expecting_woman_tone3":"pregnant_woman_tone3",
+   "expecting_woman_tone4":"pregnant_woman_tone4",
+   "expecting_woman_tone5":"pregnant_woman_tone5",
    "film_projector":"projector",
    "racing_car":"race_car",
    "radioactive_sign":"radioactive",
    "railroad_track":"railway_track",
-   "right_speaker_with_one_sound_wave":"right_speaker_one",
-   "right_speaker_with_three_sound_waves":"right_speaker_three",
+   "back_of_hand":"raised_back_of_hand",
+   "back_of_hand_tone1":"raised_back_of_hand_tone1",
+   "back_of_hand_tone2":"raised_back_of_hand_tone2",
+   "back_of_hand_tone3":"raised_back_of_hand_tone3",
+   "back_of_hand_tone4":"raised_back_of_hand_tone4",
+   "back_of_hand_tone5":"raised_back_of_hand_tone5",
+   "rhinoceros":"rhino",
+   "right_fist":"right_facing_fist",
+   "right_fist_tone1":"right_facing_fist_tone1",
+   "right_fist_tone2":"right_facing_fist_tone2",
+   "right_fist_tone3":"right_facing_fist_tone3",
+   "right_fist_tone4":"right_facing_fist_tone4",
+   "right_fist_tone5":"right_facing_fist_tone5",
    "robot_face":"robot",
+   "rolling_on_the_floor_laughing":"rofl",
    "face_with_rolling_eyes":"rolling_eyes",
+   "green_salad":"salad",
+   "second_place_medal":"second_place",
+   "paella":"shallow_pan_of_food",
+   "shopping_trolley":"shopping_cart",
    "skeleton":"skull",
    "skull_and_crossbones":"skull_crossbones",
    "slightly_frowning_face":"slight_frown",
    "slightly_smiling_face":"slight_smile",
+   "sneeze":"sneezing_face",
    "speaking_head_in_silhouette":"speaking_head",
-   "left_speech_bubble":"speech_left",
-   "right_speech_bubble":"speech_right",
-   "three_speech_bubbles":"speech_three",
-   "two_speech_bubbles":"speech_two",
    "sleuth_or_spy":"spy",
    "sleuth_or_spy_tone1":"spy_tone1",
    "sleuth_or_spy_tone2":"spy_tone2",
    "sleuth_or_spy_tone3":"spy_tone3",
    "sleuth_or_spy_tone4":"spy_tone4",
    "sleuth_or_spy_tone5":"spy_tone5",
-   "portable_stereo":"stereo",
-   "black_touchtone_telephone":"telephone_black",
-   "white_touchtone_telephone":"telephone_white",
+   "stuffed_pita":"stuffed_flatbread",
    "face_with_thermometer":"thermometer_face",
    "thinking_face":"thinking",
-   "left_thought_bubble":"thought_left",
-   "right_thought_bubble":"thought_right",
-   "reversed_thumbs_down_sign":"thumbs_down_reverse",
-   "reversed_thumbs_up_sign":"thumbs_up_reverse",
+   "third_place_medal":"third_place",
    "-1":"thumbsdown",
    "-1_tone1":"thumbsdown_tone1",
    "-1_tone2":"thumbsdown_tone2",
@@ -479,9 +516,7 @@
    "hammer_and_wrench":"tools",
    "next_track":"track_next",
    "previous_track":"track_previous",
-   "diesel_locomotive":"train_diesel",
-   "triangle_with_rounded_corners":"triangle_round",
-   "turned_ok_hand_sign":"turned_ok_hand",
+   "whisky":"tumbler_glass",
    "unicorn_face":"unicorn",
    "upside_down_face":"upside_down",
    "funeral_urn":"urn",
@@ -494,6 +529,12 @@
    "white_sun_behind_cloud":"white_sun_cloud",
    "white_sun_behind_cloud_with_rain":"white_sun_rain_cloud",
    "white_sun_with_small_cloud":"white_sun_small_cloud",
-   "left_writing_hand":"writing_hand",
+   "wilted_flower":"wilted_rose",
+   "wrestling":"wrestlers",
+   "wrestling_tone1":"wrestlers_tone1",
+   "wrestling_tone2":"wrestlers_tone2",
+   "wrestling_tone3":"wrestlers_tone3",
+   "wrestling_tone4":"wrestlers_tone4",
+   "wrestling_tone5":"wrestlers_tone5",
    "zipper_mouth_face":"zipper_mouth"
 }
diff --git a/fixtures/emojis/digests.json b/fixtures/emojis/digests.json
index 50ee5089d8f..078d3413f33 100644
--- a/fixtures/emojis/digests.json
+++ b/fixtures/emojis/digests.json
@@ -60,16 +60,6 @@
     "digest": "5544eace06b8e1b6ea91940e893e013d33d6b166e14e6d128a87f2cd2de88332"
   },
   {
-    "name": "airplane_northeast",
-    "unicode": "1F6EA",
-    "digest": "fdddc2cd3618ec6661612581b8b93553cb086b0bb197e96aedf1bee8055e7bb4"
-  },
-  {
-    "name": "northeast_pointing_airplane",
-    "unicode": "1F6EA",
-    "digest": "fdddc2cd3618ec6661612581b8b93553cb086b0bb197e96aedf1bee8055e7bb4"
-  },
-  {
     "name": "airplane_small",
     "unicode": "1F6E9",
     "digest": "1a2e07abbbe90d05cee7ff8dd52f443d595ccb38959f3089fe016b77e5d6de7d"
@@ -80,26 +70,6 @@
     "digest": "1a2e07abbbe90d05cee7ff8dd52f443d595ccb38959f3089fe016b77e5d6de7d"
   },
   {
-    "name": "airplane_small_up",
-    "unicode": "1F6E8",
-    "digest": "029752b29a757c087dec60f45ea242e974fc181129e20390d5d4a2f90442091a"
-  },
-  {
-    "name": "up_pointing_small_airplane",
-    "unicode": "1F6E8",
-    "digest": "029752b29a757c087dec60f45ea242e974fc181129e20390d5d4a2f90442091a"
-  },
-  {
-    "name": "airplane_up",
-    "unicode": "1F6E7",
-    "digest": "ec45d4dbfce1f75dc59339417b1dcf5f1e1359cd9d04ff233babf359a3330e77"
-  },
-  {
-    "name": "up_pointing_airplane",
-    "unicode": "1F6E7",
-    "digest": "ec45d4dbfce1f75dc59339417b1dcf5f1e1359cd9d04ff233babf359a3330e77"
-  },
-  {
     "name": "alarm_clock",
     "unicode": "23F0",
     "digest": "fef05a3cd1cddbeca4de8091b94bddb93790b03fa213da86c0eec420f8c49599"
@@ -165,16 +135,6 @@
     "digest": "332493913891aa0eda2743b4bb16c4682400f249998bf34eb292246c9009e17f"
   },
   {
-    "name": "anger_left",
-    "unicode": "1F5EE",
-    "digest": "f2711991e8b386b2d5b12f296ce20a9b4b00ef91d6d67af2cf4e06abf2faa1dc"
-  },
-  {
-    "name": "left_anger_bubble",
-    "unicode": "1F5EE",
-    "digest": "f2711991e8b386b2d5b12f296ce20a9b4b00ef91d6d67af2cf4e06abf2faa1dc"
-  },
-  {
     "name": "anger_right",
     "unicode": "1F5EF",
     "digest": "8b049511ef3b1b28325841e2f87c60773eaf2f65cabba58d8b0ec3de9b10c0ae"
@@ -325,11 +285,6 @@
     "digest": "c115e6613ebd718268aa31d265e017138b9fb58bbb8201eb3f40de2380e460aa"
   },
   {
-    "name": "ascending_notes",
-    "unicode": "1F39C",
-    "digest": "33432042771d456338dda5d98e49322d3600f2cc9049963480c7c38d9de1ef0a"
-  },
-  {
     "name": "asterisk",
     "unicode": "002A-20E3",
     "digest": "33d92093f2914448d5a939cf62e8ee3e32931923abdef5f0210e8a8150fa312d"
@@ -365,6 +320,11 @@
     "digest": "6b6bb83b00707a314e46ff8eefbda40978a291ec7881caba1b1ee273f49c1368"
   },
   {
+    "name": "avocado",
+    "unicode": "1F951",
+    "digest": "bc1fb203d63b18985598400925de24050bb192afda1cbf0813f85cb139869eff"
+  },
+  {
     "name": "b",
     "unicode": "1F171",
     "digest": "722f9db9442e7c0fc0d0ac0f5291fbf47c6a0ac4d8abd42e97957da705fb82bf"
@@ -420,6 +380,11 @@
     "digest": "083e4e48b51092c28efb4532e840e1091b5d4b685c6e0f221aa0228f061cd91e"
   },
   {
+    "name": "bacon",
+    "unicode": "1F953",
+    "digest": "18ad3817f1f88a69706db5727a58e763dde6c21a2d4f184c3d728c32dc5fa05a"
+  },
+  {
     "name": "badminton",
     "unicode": "1F3F8",
     "digest": "353eb7ee93decd9fe0072e4d78a5618d5e2d9e77a6e4de9fe171870d75e02a66"
@@ -445,41 +410,11 @@
     "digest": "4175a56eca5c6458574a681e109b1403fbb143cf27f69ae6c1917650f3e08892"
   },
   {
-    "name": "ballot_box_check",
-    "unicode": "1F5F9",
-    "digest": "fc3ba16c009d963a4a0ea20a348ac98eee3c4c18c481df19a5ada0d1de7fcc15"
-  },
-  {
-    "name": "ballot_box_with_bold_check",
-    "unicode": "1F5F9",
-    "digest": "fc3ba16c009d963a4a0ea20a348ac98eee3c4c18c481df19a5ada0d1de7fcc15"
-  },
-  {
     "name": "ballot_box_with_check",
     "unicode": "2611",
     "digest": "c98d6f3588dd87e2f318bbfe6c646399a905450edfd814edae4e5b1bddef2134"
   },
   {
-    "name": "ballot_box_x",
-    "unicode": "1F5F5",
-    "digest": "861dcfc2361298262587b5d0e163fed96a55c44636361f5b4a9ab1d6502b8928"
-  },
-  {
-    "name": "ballot_box_with_script_x",
-    "unicode": "1F5F5",
-    "digest": "861dcfc2361298262587b5d0e163fed96a55c44636361f5b4a9ab1d6502b8928"
-  },
-  {
-    "name": "ballot_x",
-    "unicode": "1F5F4",
-    "digest": "0b73b89847eb82bcad5664644c8af237e0aef6c3d8c94b7a5df94e05d0ebf4e1"
-  },
-  {
-    "name": "ballot_script_x",
-    "unicode": "1F5F4",
-    "digest": "0b73b89847eb82bcad5664644c8af237e0aef6c3d8c94b7a5df94e05d0ebf4e1"
-  },
-  {
     "name": "bamboo",
     "unicode": "1F38D",
     "digest": "e4ee65088df43d7081b1ce6fd996f66f3e0accd88840855c47a98a22997823dd"
@@ -580,6 +515,11 @@
     "digest": "c631cefc5d2a0a31bdb9f0a0d97ea68b1c6928e565468998403034644572a0b0"
   },
   {
+    "name": "bat",
+    "unicode": "1F987",
+    "digest": "8fc19e0d7d6f80906bdbc06d616a810de66180d96cf28070a53fa61b88904535"
+  },
+  {
     "name": "bath",
     "unicode": "1F6C0",
     "digest": "33b371832f90aad50baf5296f3ad4cc081c319b279f989c74409903d8568e917"
@@ -760,6 +700,11 @@
     "digest": "c2ba672994ad0f99d7fdc449f3fee45a2dca68a58f9fe95825b38465a30ef44e"
   },
   {
+    "name": "black_heart",
+    "unicode": "1F5A4",
+    "digest": "f334679168d6dd7328c28e9ae3cb2b1fca0e9c2777938d586bfe623db2a688b9"
+  },
+  {
     "name": "black_joker",
     "unicode": "1F0CF",
     "digest": "d004b25f186494d5b2c65204caa9daecd749c840a0bea5718735e18109e5394d"
@@ -840,11 +785,6 @@
     "digest": "9d912a9d1bb10dc7f2645b345ed09e90461e83df0de275acb806f1f75cef1fcf"
   },
   {
-    "name": "book2",
-    "unicode": "1F56E",
-    "digest": "26d6b66a1957e7750b3e22eb2e46d0cc85932977bbb81d3d8482ec1ec58ee12b"
-  },
-  {
     "name": "bookmark",
     "unicode": "1F516",
     "digest": "5705e3108259d6900649157843c50e22d0086c3630b291d3f942da1a736e3e3d"
@@ -875,16 +815,6 @@
     "digest": "b93751a27b40f6185a22b3e8b413f0fe09b6010d1057c672e1a23088e0b8286f"
   },
   {
-    "name": "bouquet2",
-    "unicode": "1F395",
-    "digest": "1643ec51ff26fc1ac0c67859e202386398650bf2a996c82b68e1b73fa52abf7d"
-  },
-  {
-    "name": "bouquet_of_flowers",
-    "unicode": "1F395",
-    "digest": "1643ec51ff26fc1ac0c67859e202386398650bf2a996c82b68e1b73fa52abf7d"
-  },
-  {
     "name": "bow",
     "unicode": "1F647",
     "digest": "33cd6da4d408f18d98bebc6a277dea8b914150e32ee472586ce3f1eb814462bd"
@@ -930,6 +860,16 @@
     "digest": "737f2cdfa4ac964baade585a39771b18080bd5e9b55c8661d3518f468f344662"
   },
   {
+    "name": "boxing_glove",
+    "unicode": "1F94A",
+    "digest": "c914b2ce45f20afad66ad6f0d1b0750c4469e4f48b686dfc4aad1ec8d289c563"
+  },
+  {
+    "name": "boxing_gloves",
+    "unicode": "1F94A",
+    "digest": "c914b2ce45f20afad66ad6f0d1b0750c4469e4f48b686dfc4aad1ec8d289c563"
+  },
+  {
     "name": "boy",
     "unicode": "1F466",
     "digest": "7bc0173d8c88f3f12d41f213f7a3a9f5ebf65efad610fd5a2a31935128a6a6c1"
@@ -960,11 +900,6 @@
     "digest": "0f76e97237203950da36c737dcc6f56dcd6c123401a8c817a0636376c7f38ef5"
   },
   {
-    "name": "boys_symbol",
-    "unicode": "1F6C9",
-    "digest": "47fadbcb876ca436264ce2f3ebd1472bd68f55cc2b4833bf054335be9dc7a0f2"
-  },
-  {
     "name": "bread",
     "unicode": "1F35E",
     "digest": "81739830f16f33e6a1dd7cc17c25df207846062bb5167bb8abed7fdd49268b86"
@@ -1035,21 +970,6 @@
     "digest": "96e74842e919716b7bbbab57339bfd70f099a9bcb4710dffd7c80cf38a7bbff7"
   },
   {
-    "name": "bullhorn",
-    "unicode": "1F56B",
-    "digest": "a4ca5cbfe299e8ccd148d17055d2d395cf8515e416bf771044c9a670509a8254"
-  },
-  {
-    "name": "bullhorn_waves",
-    "unicode": "1F56C",
-    "digest": "92493636cf086205d1e12cc19e613b84152ef10b8cd0215619a0fc813bfc9a7c"
-  },
-  {
-    "name": "bullhorn_with_sound_waves",
-    "unicode": "1F56C",
-    "digest": "92493636cf086205d1e12cc19e613b84152ef10b8cd0215619a0fc813bfc9a7c"
-  },
-  {
     "name": "burrito",
     "unicode": "1F32F",
     "digest": "b2cf81f1efdf87e674461f73f67cd4b58a5f695e65598d0dd3899f2597da43cf"
@@ -1075,6 +995,11 @@
     "digest": "7fee96f1b68bb2c6002e47f2ed13c06baa6a3168441b9aca572db7ec45612f7b"
   },
   {
+    "name": "butterfly",
+    "unicode": "1F98B",
+    "digest": "a91b6598c17b44a8dc8935a1d99e25f4483ea41470cdd2da343039a9eec29ef1"
+  },
+  {
     "name": "cactus",
     "unicode": "1F335",
     "digest": "2c5c4c35f26c7046fdc002b337e0d939729b33a26980e675950f9934c91e40fd"
@@ -1085,16 +1010,6 @@
     "digest": "b928902df8084210d51c1da36f9119164a325393c391b28cd8ea914e0b95c17b"
   },
   {
-    "name": "calculator",
-    "unicode": "1F5A9",
-    "digest": "01b47b5c69c12b65fa4f4c0d580f2a98280d6116f4ad2cf8be378759008bcc3c"
-  },
-  {
-    "name": "pocket calculator",
-    "unicode": "1F5A9",
-    "digest": "01b47b5c69c12b65fa4f4c0d580f2a98280d6116f4ad2cf8be378759008bcc3c"
-  },
-  {
     "name": "calendar",
     "unicode": "1F4C6",
     "digest": "9d990be27778daab041a3583edbd8f83fc8957e42a3aec729c0e2e224a8d05e3"
@@ -1110,6 +1025,66 @@
     "digest": "441a0750eade7ce33e28e58bec76958990c412b68409fcdde59ebad1f25361bb"
   },
   {
+    "name": "call_me",
+    "unicode": "1F919",
+    "digest": "83d2ed96dcb8b4adf4f4d030ffd07e25ca16351e1a4fbefdf9f46f5ca496a55f"
+  },
+  {
+    "name": "call_me_hand",
+    "unicode": "1F919",
+    "digest": "83d2ed96dcb8b4adf4f4d030ffd07e25ca16351e1a4fbefdf9f46f5ca496a55f"
+  },
+  {
+    "name": "call_me_tone1",
+    "unicode": "1F919-1F3FB",
+    "digest": "4a5748efa83e7294e8338b8795d4d315ff1cd31ead6759004d0eb330e50de8cd"
+  },
+  {
+    "name": "call_me_hand_tone1",
+    "unicode": "1F919-1F3FB",
+    "digest": "4a5748efa83e7294e8338b8795d4d315ff1cd31ead6759004d0eb330e50de8cd"
+  },
+  {
+    "name": "call_me_tone2",
+    "unicode": "1F919-1F3FC",
+    "digest": "54feaa6e3c5789ae6e15622127f0e0213234b4b886e1588ce95814348b1f1519"
+  },
+  {
+    "name": "call_me_hand_tone2",
+    "unicode": "1F919-1F3FC",
+    "digest": "54feaa6e3c5789ae6e15622127f0e0213234b4b886e1588ce95814348b1f1519"
+  },
+  {
+    "name": "call_me_tone3",
+    "unicode": "1F919-1F3FD",
+    "digest": "57e949b951e14843b712dab5a828f915ee255f5bb973db33946aab4057427419"
+  },
+  {
+    "name": "call_me_hand_tone3",
+    "unicode": "1F919-1F3FD",
+    "digest": "57e949b951e14843b712dab5a828f915ee255f5bb973db33946aab4057427419"
+  },
+  {
+    "name": "call_me_tone4",
+    "unicode": "1F919-1F3FE",
+    "digest": "f7787e933978a09c7b8ab8d3b1e1ab395aaae998c455e93bb3db24a4c8a60fe0"
+  },
+  {
+    "name": "call_me_hand_tone4",
+    "unicode": "1F919-1F3FE",
+    "digest": "f7787e933978a09c7b8ab8d3b1e1ab395aaae998c455e93bb3db24a4c8a60fe0"
+  },
+  {
+    "name": "call_me_tone5",
+    "unicode": "1F919-1F3FF",
+    "digest": "1fdb7d833d000b117d20d48142d3026a61cc9c8b712ebb498fa66bf75c74d7a5"
+  },
+  {
+    "name": "call_me_hand_tone5",
+    "unicode": "1F919-1F3FF",
+    "digest": "1fdb7d833d000b117d20d48142d3026a61cc9c8b712ebb498fa66bf75c74d7a5"
+  },
+  {
     "name": "calling",
     "unicode": "1F4F2",
     "digest": "acf668c75c11c36686005788266524a972fa1c5bcf666ff3403d909edc5cee91"
@@ -1135,11 +1110,6 @@
     "digest": "a42a4ff9521affa72db7b0f01da169b4cb6afb9db1c5dfad47dd4c507bfc30d9"
   },
   {
-    "name": "cancellation_x",
-    "unicode": "1F5D9",
-    "digest": "cea2f7a48543207615ee06755ded62c2a95a7eaf7d7b68a3fc25e74d94e2c92c"
-  },
-  {
     "name": "cancer",
     "unicode": "264B",
     "digest": "528c6f21df99a756b553d93a7f395b0f662b30a323affd05f0cedee8ff7b41d6"
@@ -1155,6 +1125,16 @@
     "digest": "9cff4538918f60f770fceb96e964f5dc3ce31fd08ddd2ab3bfdf2981bfa74100"
   },
   {
+    "name": "canoe",
+    "unicode": "1F6F6",
+    "digest": "56ca308cc2ad4827468cf58c4ccf6ef6b3382835a91e935540a2b973e01d2572"
+  },
+  {
+    "name": "kayak",
+    "unicode": "1F6F6",
+    "digest": "56ca308cc2ad4827468cf58c4ccf6ef6b3382835a91e935540a2b973e01d2572"
+  },
+  {
     "name": "capital_abcd",
     "unicode": "1F520",
     "digest": "a416d0b3f564037b680f801fb773b6eaf67225e2cbbfd2cb8a5db0de044321fa"
@@ -1185,14 +1165,69 @@
     "digest": "c0e7059efc39a64233f774c02ddb1ab51888fff180f906ce13a6e4f9509672fe"
   },
   {
-    "name": "cartridge",
-    "unicode": "1F5AD",
-    "digest": "0b1625eea118060b51a70905c1eb3313ed632e989f70943eca16aa29fe8a34f2"
+    "name": "carrot",
+    "unicode": "1F955",
+    "digest": "3a6fd98b63ee73d982a9cdacb08cf7b4014368cde8ffce6056b7df25a5a472b1"
+  },
+  {
+    "name": "cartwheel",
+    "unicode": "1F938",
+    "digest": "d78de3435e0b04a9b1a1048ae12e63e3248f9ace3a0db4d3bda584f22af18863"
+  },
+  {
+    "name": "person_doing_cartwheel",
+    "unicode": "1F938",
+    "digest": "d78de3435e0b04a9b1a1048ae12e63e3248f9ace3a0db4d3bda584f22af18863"
+  },
+  {
+    "name": "cartwheel_tone1",
+    "unicode": "1F938-1F3FB",
+    "digest": "39a49781a269bb40d8efc8fd73c973b00fb2e192850ea6073062b5dea0cd5b74"
+  },
+  {
+    "name": "person_doing_cartwheel_tone1",
+    "unicode": "1F938-1F3FB",
+    "digest": "39a49781a269bb40d8efc8fd73c973b00fb2e192850ea6073062b5dea0cd5b74"
+  },
+  {
+    "name": "cartwheel_tone2",
+    "unicode": "1F938-1F3FC",
+    "digest": "6231eb35be45457fd648f8f4b79983f03705c9d983a18067f7e6d9ae47bc1958"
+  },
+  {
+    "name": "person_doing_cartwheel_tone2",
+    "unicode": "1F938-1F3FC",
+    "digest": "6231eb35be45457fd648f8f4b79983f03705c9d983a18067f7e6d9ae47bc1958"
+  },
+  {
+    "name": "cartwheel_tone3",
+    "unicode": "1F938-1F3FD",
+    "digest": "ca483c78cc823811a8c279c501d9b283e4c990dafc5995ad40e68ecb0af554df"
+  },
+  {
+    "name": "person_doing_cartwheel_tone3",
+    "unicode": "1F938-1F3FD",
+    "digest": "ca483c78cc823811a8c279c501d9b283e4c990dafc5995ad40e68ecb0af554df"
+  },
+  {
+    "name": "cartwheel_tone4",
+    "unicode": "1F938-1F3FE",
+    "digest": "8253afb672431c84e498014c30babb00b9284bec773009e79f7f06aa7108643e"
   },
   {
-    "name": "tape_cartridge",
-    "unicode": "1F5AD",
-    "digest": "0b1625eea118060b51a70905c1eb3313ed632e989f70943eca16aa29fe8a34f2"
+    "name": "person_doing_cartwheel_tone4",
+    "unicode": "1F938-1F3FE",
+    "digest": "8253afb672431c84e498014c30babb00b9284bec773009e79f7f06aa7108643e"
+  },
+  {
+    "name": "cartwheel_tone5",
+    "unicode": "1F938-1F3FF",
+    "digest": "6fd92baff57c38b3adb6753d9e7e547e762971a8872fd3f1e71c6aaf0b1d3ab9"
+  },
+  {
+    "name": "person_doing_cartwheel_tone5",
+    "unicode": "1F938-1F3FF",
+    "digest": "6fd92baff57c38b3adb6753d9e7e547e762971a8872fd3f1e71c6aaf0b1d3ab9"
   },
   {
     "name": "cat",
@@ -1210,11 +1245,6 @@
     "digest": "16363d8a34b873c12df6354b99f575cae3d80e0d27100ed7eea70f0310953c7b"
   },
   {
-    "name": "celtic_cross",
-    "unicode": "1F548",
-    "digest": "187aac988d7e02085a15f31c4cc0ff25127be5b088e354e65c7b1152bffb40ff"
-  },
-  {
     "name": "chains",
     "unicode": "26D3",
     "digest": "3884cdbc6f2b433062af06f942552e563231c24727a2f10fa280b3bb7aa614e2"
@@ -1230,6 +1260,16 @@
     "digest": "9e6e8987f30a37ae0f3d7dab2f5eeb50aa32b4f31402b29315eb2994afc72457"
   },
   {
+    "name": "champagne_glass",
+    "unicode": "1F942",
+    "digest": "5a2e4773f7eb126a00122cbfa4dc535da51ce00e0bf0d8d6ff8bab8b3365f8d2"
+  },
+  {
+    "name": "clinking_glass",
+    "unicode": "1F942",
+    "digest": "5a2e4773f7eb126a00122cbfa4dc535da51ce00e0bf0d8d6ff8bab8b3365f8d2"
+  },
+  {
     "name": "chart",
     "unicode": "1F4B9",
     "digest": "a092dbc08f925b028286b2b495a5f59033b8537a586a694f46f4c1e7c3a1e27f"
@@ -1515,16 +1555,6 @@
     "digest": "9fdef6a4939315c017b165e1dbac7710fb335df8c309be3fe2a011ef7fc28d74"
   },
   {
-    "name": "clockwise_arrows",
-    "unicode": "1F5D8",
-    "digest": "67027b7e1a4d800a3ce7d731c21c098d1109d217159a27665eebb7e080fc2622"
-  },
-  {
-    "name": "clockwise_right_and_left_semicircle_arrows",
-    "unicode": "1F5D8",
-    "digest": "67027b7e1a4d800a3ce7d731c21c098d1109d217159a27665eebb7e080fc2622"
-  },
-  {
     "name": "closed_book",
     "unicode": "1F4D5",
     "digest": "b18288629d201bfdfc5d66ec47df89809d00642b15732757e6a04789f36a7d9f"
@@ -1585,6 +1615,16 @@
     "digest": "7cbed2343c280ba3996082b3d0fb9d8cd57d6e62fe6c9ecb159f46b4a2e49151"
   },
   {
+    "name": "clown",
+    "unicode": "1F921",
+    "digest": "eea95687caabc9e808514c2450ba599e5e24ef47923dbec86f5297a64438e2e5"
+  },
+  {
+    "name": "clown_face",
+    "unicode": "1F921",
+    "digest": "eea95687caabc9e808514c2450ba599e5e24ef47923dbec86f5297a64438e2e5"
+  },
+  {
     "name": "clubs",
     "unicode": "2663",
     "digest": "b8cf72ecd8568ced077b475d94788fb282bdb06d25031b5d54dd63e25effb138"
@@ -1625,16 +1665,6 @@
     "digest": "c970ce76b5607434895b0407bdaa93140f887930781a17dd7dcf16f711451d93"
   },
   {
-    "name": "computer_old",
-    "unicode": "1F5B3",
-    "digest": "b27c30d74f205a8a3bd00a55ca17da7cf6ae3b65ae33e949755a4c6bd69a9fd3"
-  },
-  {
-    "name": "old_personal_computer",
-    "unicode": "1F5B3",
-    "digest": "b27c30d74f205a8a3bd00a55ca17da7cf6ae3b65ae33e949755a4c6bd69a9fd3"
-  },
-  {
     "name": "confetti_ball",
     "unicode": "1F38A",
     "digest": "a638b16f1acdbcf69edf760161b1bd7ff1fd5426c5b1203ad9d294dcc0701f10"
@@ -1665,6 +1695,11 @@
     "digest": "c611f0a5de10f000a0756935f226845c7292f19ff5581d1f7a7554316338bbcb"
   },
   {
+    "name": "building_construction",
+    "unicode": "1F3D7",
+    "digest": "c611f0a5de10f000a0756935f226845c7292f19ff5581d1f7a7554316338bbcb"
+  },
+  {
     "name": "construction_worker",
     "unicode": "1F477",
     "digest": "8c094733987e7c4da8d3aa4588b530ae07042bd70cf337b1fd412a70ee8f0ed6"
@@ -1700,16 +1735,6 @@
     "digest": "0d7f33ff7acc1cc3a81e6a786ff007df20da145e3070f338505dfed5100e9fcb"
   },
   {
-    "name": "contruction_site",
-    "unicode": "1F3D7",
-    "digest": "c611f0a5de10f000a0756935f226845c7292f19ff5581d1f7a7554316338bbcb"
-  },
-  {
-    "name": "building_construction",
-    "unicode": "1F3D7",
-    "digest": "c611f0a5de10f000a0756935f226845c7292f19ff5581d1f7a7554316338bbcb"
-  },
-  {
     "name": "convenience_store",
     "unicode": "1F3EA",
     "digest": "975dcf9b8e9e3fb1e29574b41300b9d96fd64703b3c18ff52f9f1875d1cf1b52"
@@ -1720,6 +1745,11 @@
     "digest": "4bed3522bd50091ac5b68ca760661eb484d7f1b9c9d564d2097bd812b7f28ae4"
   },
   {
+    "name": "cooking",
+    "unicode": "1F373",
+    "digest": "563ffd6cae381ce1e318cdacc54e70040d6a01a50d0db8aeb50edbbe413eac58"
+  },
+  {
     "name": "cool",
     "unicode": "1F192",
     "digest": "5739a37341c782a4736adfce804e12776ae33081098a3d052d8ae9a64b4d22d1"
@@ -1820,6 +1850,16 @@
     "digest": "e7a5131d7dee0f3356814b0ac1ea8ff280b12a7b580181e20ddb0b7eeb7e7339"
   },
   {
+    "name": "cowboy",
+    "unicode": "1F920",
+    "digest": "1aabf23f6b95a9b772fdb8eb45b8ec93584a5357f9131c6eabc9d1b83fe67e89"
+  },
+  {
+    "name": "face_with_cowboy_hat",
+    "unicode": "1F920",
+    "digest": "1aabf23f6b95a9b772fdb8eb45b8ec93584a5357f9131c6eabc9d1b83fe67e89"
+  },
+  {
     "name": "crab",
     "unicode": "1F980",
     "digest": "e6be16699fdb5d87f42f28f6cc141a44b7ffd834ecdd536813c4b5b86d3fc4a5"
@@ -1860,6 +1900,11 @@
     "digest": "59cb4164c50b6bc9ae311ce6f7610467c1aaafa848b5fff7614f064715f91992"
   },
   {
+    "name": "croissant",
+    "unicode": "1F950",
+    "digest": "b751e287157a1e276617a841a5b5f7f1208ca226cfd8fa947f144390b65a5e16"
+  },
+  {
     "name": "cross",
     "unicode": "271D",
     "digest": "a6b07c838fb75ef2ebefa2df6005e8d784753239ec03c37695a13e3b1954d653"
@@ -1870,36 +1915,6 @@
     "digest": "a6b07c838fb75ef2ebefa2df6005e8d784753239ec03c37695a13e3b1954d653"
   },
   {
-    "name": "cross_heavy",
-    "unicode": "1F547",
-    "digest": "2e37c26b9bad0beb019c7f3e7a3892352d0ad9ca1b90c4333d42e8d56680be70"
-  },
-  {
-    "name": "heavy_latin_cross",
-    "unicode": "1F547",
-    "digest": "2e37c26b9bad0beb019c7f3e7a3892352d0ad9ca1b90c4333d42e8d56680be70"
-  },
-  {
-    "name": "cross_white",
-    "unicode": "1F546",
-    "digest": "3452e667010d7e49a51d7e1f4ba8ed4f303e33ed43255a051e9a18832a1efba6"
-  },
-  {
-    "name": "white_latin_cross",
-    "unicode": "1F546",
-    "digest": "3452e667010d7e49a51d7e1f4ba8ed4f303e33ed43255a051e9a18832a1efba6"
-  },
-  {
-    "name": "crossbones",
-    "unicode": "1F571",
-    "digest": "f5e7ce293c1a3282711073e68f033a3876e8428d1218cb2f8294630f9124e584"
-  },
-  {
-    "name": "black_skull_and_crossbones",
-    "unicode": "1F571",
-    "digest": "f5e7ce293c1a3282711073e68f033a3876e8428d1218cb2f8294630f9124e584"
-  },
-  {
     "name": "crossed_flags",
     "unicode": "1F38C",
     "digest": "2841c671075e6f1a79c61c2d716423159fb0bc0786e3fb0049697766533bf262"
@@ -1940,6 +1955,11 @@
     "digest": "05f73b30b1e5b0fc66fb5dc6caddd2d547ee7b9d2f97513dc908ba1a2e352e30"
   },
   {
+    "name": "cucumber",
+    "unicode": "1F952",
+    "digest": "d1196e23f2f155ef5c1330f8497f40957a7357cb177127f457c5c471f0a23727"
+  },
+  {
     "name": "cupid",
     "unicode": "1F498",
     "digest": "246e71f44c6ebc2e4f887e25438e4f894e8cc92e06069e711b893ff391abb658"
@@ -2050,16 +2070,16 @@
     "digest": "3c70f1a77f2754f41c830e88d43b7d53c14311d64626ded164aa9ac7d2695790"
   },
   {
+    "name": "deer",
+    "unicode": "1F98C",
+    "digest": "7f4302ca68fd121ee73be48d0a0a0fb9e7e2741071a491ad2b7b0eab9f11ad25"
+  },
+  {
     "name": "department_store",
     "unicode": "1F3EC",
     "digest": "4be910d2efe74d8ce2c1f41d7753c8873579faca83fcf779a4887d8ab9e5923b"
   },
   {
-    "name": "descending_notes",
-    "unicode": "1F39D",
-    "digest": "f09c6a2e094b13bf91cc07b7b776e43348ccef9f91247ca36cc02e7d91098af0"
-  },
-  {
     "name": "desert",
     "unicode": "1F3DC",
     "digest": "d4b1a11c5130debe042df6cc2b3389f15c68a5cb32dc1b3a82b78f733d0c9e4e"
@@ -2075,11 +2095,6 @@
     "digest": "cde5bfb6c71bb7d663808a3561b24cb5b5560f95f510b40f81250cac1b21933e"
   },
   {
-    "name": "desktop_window",
-    "unicode": "1F5D4",
-    "digest": "d5b6c4a847e2a96f97f50fd353a22cb121915cb1d7bbc0f02df38769819b6b7e"
-  },
-  {
     "name": "diamond_shape_with_a_dot_inside",
     "unicode": "1F4A0",
     "digest": "e91323577ab89e95b0fa0b9272ea0c797b76908f24d36992630e9325273a4ce3"
@@ -2125,21 +2140,6 @@
     "digest": "98b07fbbcdb438d1b8a755869fa2de8e180a77fce359ec830eb46d38ec3e67cb"
   },
   {
-    "name": "document",
-    "unicode": "1F5CE",
-    "digest": "2cbca96cc69306a10f1a9b6505723e027239439d899f6b395dc43f3c37d2d777"
-  },
-  {
-    "name": "document_text",
-    "unicode": "1F5B9",
-    "digest": "29407b12409c9673f3d89ef1f86ee50cbc7ed53b1870e33b4a29bbc609017f72"
-  },
-  {
-    "name": "document_with_text",
-    "unicode": "1F5B9",
-    "digest": "29407b12409c9673f3d89ef1f86ee50cbc7ed53b1870e33b4a29bbc609017f72"
-  },
-  {
     "name": "dog",
     "unicode": "1F436",
     "digest": "3b31ce067b13e463284ce85536512cb1f8cd8b52fe73659f69971d0d6c1dfc11"
@@ -2205,11 +2205,36 @@
     "digest": "e06ef69c29f0fb12481727c0b4124e700572d3d7955e173279320f43f286518d"
   },
   {
+    "name": "drooling_face",
+    "unicode": "1F924",
+    "digest": "5203cb05cd266d7a7c929ab40364ad68571d380d9c7ff93a8d6d55261abaa1ba"
+  },
+  {
+    "name": "drool",
+    "unicode": "1F924",
+    "digest": "5203cb05cd266d7a7c929ab40364ad68571d380d9c7ff93a8d6d55261abaa1ba"
+  },
+  {
     "name": "droplet",
     "unicode": "1F4A7",
     "digest": "6475b4a4460a672c436a68f282ac97fb31e2934db4b80620063ee816159aa7c3"
   },
   {
+    "name": "drum",
+    "unicode": "1F941",
+    "digest": "0d0639980b1a5dcbf1c3e7ef47263fb6543b871242c58452a8c2f642525d9dd8"
+  },
+  {
+    "name": "drum_with_drumsticks",
+    "unicode": "1F941",
+    "digest": "0d0639980b1a5dcbf1c3e7ef47263fb6543b871242c58452a8c2f642525d9dd8"
+  },
+  {
+    "name": "duck",
+    "unicode": "1F986",
+    "digest": "8f8373798a7727368b32328e7a9a349727a949e7391ddd243b6456141a4f7e94"
+  },
+  {
     "name": "dvd",
     "unicode": "1F4C0",
     "digest": "3b7903285d91277181c26fdc9df857761bbac509d352e320c2519ea3b132704f"
@@ -2225,6 +2250,11 @@
     "digest": "39b5a57a2376e4a1137e381be02a1775bd580e0371438f5297a401ea634f1830"
   },
   {
+    "name": "eagle",
+    "unicode": "1F985",
+    "digest": "b44fd4f61b83c5114358a272343ac9b0eabbc70847f739bbdbf8aae3ade5bc1d"
+  },
+  {
     "name": "ear",
     "unicode": "1F442",
     "digest": "4fdeb5a46e69311ecfd09c5b45c9018c24b625e28475cca8fa516b086ef952f8"
@@ -2276,8 +2306,8 @@
   },
   {
     "name": "egg",
-    "unicode": "1F373",
-    "digest": "563ffd6cae381ce1e318cdacc54e70040d6a01a50d0db8aeb50edbbe413eac58"
+    "unicode": "1F95A",
+    "digest": "72b9c841af784e7cbccbbe48ba833df5cecdd284397c199cab079872e879d92f"
   },
   {
     "name": "eggplant",
@@ -2300,6 +2330,16 @@
     "digest": "bb0758e7cc0e357285937671a91489bd32ce9d248eecdcc9c275a53a66325b26"
   },
   {
+    "name": "eject",
+    "unicode": "23CF",
+    "digest": "eeb0cd23ead0c965e307de517a6805265f0c780c3e454e64bc4c1425dfe7548e"
+  },
+  {
+    "name": "eject_symbol",
+    "unicode": "23CF",
+    "digest": "eeb0cd23ead0c965e307de517a6805265f0c780c3e454e64bc4c1425dfe7548e"
+  },
+  {
     "name": "electric_plug",
     "unicode": "1F50C",
     "digest": "b10ce87af86fa4f4022572ceb5ecd73bea867347a86832a7ea248364b0aad8d0"
@@ -2320,46 +2360,6 @@
     "digest": "f5a512022a2f5280f372ff39c22cbda815f698710ca66f8f8c4d08418f98ca78"
   },
   {
-    "name": "envelope_back",
-    "unicode": "1F582",
-    "digest": "bc60b6d375feee00758a94a05b42eeb165f4084b20eb3e6012b72faa221f7e75"
-  },
-  {
-    "name": "back_of_envelope",
-    "unicode": "1F582",
-    "digest": "bc60b6d375feee00758a94a05b42eeb165f4084b20eb3e6012b72faa221f7e75"
-  },
-  {
-    "name": "envelope_flying",
-    "unicode": "1F585",
-    "digest": "9d6b6ca4c08006062a6f11948de3e15b13cf5c458967e39a9358665a8e13e214"
-  },
-  {
-    "name": "flying_envelope",
-    "unicode": "1F585",
-    "digest": "9d6b6ca4c08006062a6f11948de3e15b13cf5c458967e39a9358665a8e13e214"
-  },
-  {
-    "name": "envelope_stamped",
-    "unicode": "1F583",
-    "digest": "f6102aea7283ddc136bfeb09589573420b9279105045fc6b965c1633c1297468"
-  },
-  {
-    "name": "stamped_envelope",
-    "unicode": "1F583",
-    "digest": "f6102aea7283ddc136bfeb09589573420b9279105045fc6b965c1633c1297468"
-  },
-  {
-    "name": "envelope_stamped_pen",
-    "unicode": "1F586",
-    "digest": "80ea471318d1e04f8e525ff236b3cd4a4c864e66c6246b6aad77d92f56895f33"
-  },
-  {
-    "name": "pen_over_stamped_envelope",
-    "unicode": "1F586",
-    "digest": "80ea471318d1e04f8e525ff236b3cd4a4c864e66c6246b6aad77d92f56895f33"
-  },
-  {
     "name": "envelope_with_arrow",
     "unicode": "1F4E9",
     "digest": "f8643212e6a94f58ccf2bcedc54c5fda8ebeab274f4a8803f253de5f50ddb1d6"
@@ -2415,6 +2415,36 @@
     "digest": "1d5cae0b9b2e51e1de54295685d7f0c72ee794e2e6335a95b1d056c7e77260e8"
   },
   {
+    "name": "face_palm",
+    "unicode": "1F926",
+    "digest": "4ec873048b34b1bb34430724cf28e4bee6c0a9eee88ce39b9d1565047dc92420"
+  },
+  {
+    "name": "face_palm_tone1",
+    "unicode": "1F926-1F3FB",
+    "digest": "e93ef92b4c01dbea6c400e708e23dd36da92ccfbf5eb4f177b3b20c3a46bdc19"
+  },
+  {
+    "name": "face_palm_tone2",
+    "unicode": "1F926-1F3FC",
+    "digest": "22c8bf9fd9fa2ed9dca7a6397ed00ba6cfe9aeef2b0fb7b516ee4dda0df050ea"
+  },
+  {
+    "name": "face_palm_tone3",
+    "unicode": "1F926-1F3FD",
+    "digest": "c0b8bb9d2423e6787b6bdf1ca5a13f52853e4f48a9a1af0f2d4af1364fff022e"
+  },
+  {
+    "name": "face_palm_tone4",
+    "unicode": "1F926-1F3FE",
+    "digest": "f522ab186adcbb4549ea2c03500cdd7a86add548e43ebf7a54d58cc24deea072"
+  },
+  {
+    "name": "face_palm_tone5",
+    "unicode": "1F926-1F3FF",
+    "digest": "363507ae7178b5ec583635f47bcab10c897346f48b85d8759b1004c32cd8ad65"
+  },
+  {
     "name": "factory",
     "unicode": "1F3ED",
     "digest": "c7aeb61ed8b0ac5c91d5197c73f1e2bb801921c22a76bb82c7659d990680dcb0"
@@ -2520,6 +2550,16 @@
     "digest": "45aca538d3a9831a0c7de491e5656c17705c07b8f4ac8e85254656b608976016"
   },
   {
+    "name": "fencer",
+    "unicode": "1F93A",
+    "digest": "5db00fa456af9f6c7cb88d300579dd63e426bcb97ad25486b664aff25c688e21"
+  },
+  {
+    "name": "fencing",
+    "unicode": "1F93A",
+    "digest": "5db00fa456af9f6c7cb88d300579dd63e426bcb97ad25486b664aff25c688e21"
+  },
+  {
     "name": "ferris_wheel",
     "unicode": "1F3A1",
     "digest": "24b4551b7b79a2a5fd73de61542f2b444f896a52030c5f29791c8fcfcc28b95c"
@@ -2550,54 +2590,64 @@
     "digest": "4da212148cadb9c4ea91e60d2d8316e38cea99ef4f14afc023711dd7c54ade5a"
   },
   {
-    "name": "finger_pointing_down",
-    "unicode": "1F597",
-    "digest": "0c542ac3141e8f2e74767acd0eb399c2d68c779cb78bf16d437ad3b1f8134ad9"
+    "name": "fingers_crossed",
+    "unicode": "1F91E",
+    "digest": "a5c797ead191b9712e185083266b455cdf09f6a34c10f8c51aa145e6073427e1"
   },
   {
-    "name": "white_down_pointing_left_hand_index",
-    "unicode": "1F597",
-    "digest": "0c542ac3141e8f2e74767acd0eb399c2d68c779cb78bf16d437ad3b1f8134ad9"
+    "name": "hand_with_index_and_middle_finger_crossed",
+    "unicode": "1F91E",
+    "digest": "a5c797ead191b9712e185083266b455cdf09f6a34c10f8c51aa145e6073427e1"
   },
   {
-    "name": "finger_pointing_down2",
-    "unicode": "1F59F",
-    "digest": "c5b128a232cbf518544802a2ae1459368274297163721fa05d0103cf95b2b1ee"
+    "name": "fingers_crossed_tone1",
+    "unicode": "1F91E-1F3FB",
+    "digest": "db56d47bf887f2d8459a3aaba23f15c0087234ae5a54125052e7046e034a4988"
   },
   {
-    "name": "sideways_white_down_pointing_index",
-    "unicode": "1F59F",
-    "digest": "c5b128a232cbf518544802a2ae1459368274297163721fa05d0103cf95b2b1ee"
+    "name": "hand_with_index_and_middle_fingers_crossed_tone1",
+    "unicode": "1F91E-1F3FB",
+    "digest": "db56d47bf887f2d8459a3aaba23f15c0087234ae5a54125052e7046e034a4988"
   },
   {
-    "name": "finger_pointing_left",
-    "unicode": "1F598",
-    "digest": "d178ece691e2091be08db77fda9cf05462934628557358a8cb6222587b291f7e"
+    "name": "fingers_crossed_tone2",
+    "unicode": "1F91E-1F3FC",
+    "digest": "19f1bcca3991db7ed2037278c0baab6cd7f12aeaf2e0074de402c4d9e45c1899"
   },
   {
-    "name": "sideways_white_left_pointing_index",
-    "unicode": "1F598",
-    "digest": "d178ece691e2091be08db77fda9cf05462934628557358a8cb6222587b291f7e"
+    "name": "hand_with_index_and_middle_fingers_crossed_tone2",
+    "unicode": "1F91E-1F3FC",
+    "digest": "19f1bcca3991db7ed2037278c0baab6cd7f12aeaf2e0074de402c4d9e45c1899"
   },
   {
-    "name": "finger_pointing_right",
-    "unicode": "1F599",
-    "digest": "a412a47544d8f401f9181f8826c5fa3d6b42a1d76f6926963c2d9cd2a01be06d"
+    "name": "fingers_crossed_tone3",
+    "unicode": "1F91E-1F3FD",
+    "digest": "895a3314f6a310f31f7e728bcca20ff834fbfac62ce00e27e3ea5ad0dfc1ba35"
   },
   {
-    "name": "sideways_white_right_pointing_index",
-    "unicode": "1F599",
-    "digest": "a412a47544d8f401f9181f8826c5fa3d6b42a1d76f6926963c2d9cd2a01be06d"
+    "name": "hand_with_index_and_middle_fingers_crossed_tone3",
+    "unicode": "1F91E-1F3FD",
+    "digest": "895a3314f6a310f31f7e728bcca20ff834fbfac62ce00e27e3ea5ad0dfc1ba35"
   },
   {
-    "name": "finger_pointing_up",
-    "unicode": "1F59E",
-    "digest": "32c2ccab52aa318a47c816d1bcf9c076e667c9ef3e64ce37d7ba7e827238690d"
+    "name": "fingers_crossed_tone4",
+    "unicode": "1F91E-1F3FE",
+    "digest": "fcb5c4de2001d23a5df1b8702624d134b7f94e93e2dcc8adf6c1033c77722b0e"
   },
   {
-    "name": "sideways_white_up_pointing_index",
-    "unicode": "1F59E",
-    "digest": "32c2ccab52aa318a47c816d1bcf9c076e667c9ef3e64ce37d7ba7e827238690d"
+    "name": "hand_with_index_and_middle_fingers_crossed_tone4",
+    "unicode": "1F91E-1F3FE",
+    "digest": "fcb5c4de2001d23a5df1b8702624d134b7f94e93e2dcc8adf6c1033c77722b0e"
+  },
+  {
+    "name": "fingers_crossed_tone5",
+    "unicode": "1F91E-1F3FF",
+    "digest": "50132c78d530b048c21be4e788b446872a79b3b3a91009db12f4021c44c8469d"
+  },
+  {
+    "name": "hand_with_index_and_middle_fingers_crossed_tone5",
+    "unicode": "1F91E-1F3FF",
+    "digest": "50132c78d530b048c21be4e788b446872a79b3b3a91009db12f4021c44c8469d"
   },
   {
     "name": "fire",
@@ -2615,19 +2665,19 @@
     "digest": "c3a518f27d625e3b62dffa227eb82764bf0a147f10ec0e7f4f43f3f96751af20"
   },
   {
-    "name": "fire_engine_oncoming",
-    "unicode": "1F6F1",
-    "digest": "e2482c450136d373f74dfafddf502e0b675eb5d2e1e1c645f163db0e4d15fbb6"
+    "name": "fireworks",
+    "unicode": "1F386",
+    "digest": "b62ae08a00c0cc6eba8f9666c8fd9946ce57c3cfc01fe99542a8690a4a566a65"
   },
   {
-    "name": "oncoming_fire_engine",
-    "unicode": "1F6F1",
-    "digest": "e2482c450136d373f74dfafddf502e0b675eb5d2e1e1c645f163db0e4d15fbb6"
+    "name": "first_place",
+    "unicode": "1F947",
+    "digest": "e3de5d9f14f05544dbee5965cc2baa20e7b417a488c8a18598979038860fd901"
   },
   {
-    "name": "fireworks",
-    "unicode": "1F386",
-    "digest": "b62ae08a00c0cc6eba8f9666c8fd9946ce57c3cfc01fe99542a8690a4a566a65"
+    "name": "first_place_medal",
+    "unicode": "1F947",
+    "digest": "e3de5d9f14f05544dbee5965cc2baa20e7b417a488c8a18598979038860fd901"
   },
   {
     "name": "first_quarter_moon",
@@ -5300,41 +5350,11 @@
     "digest": "ebf49007f367dc05580e9dab942e93e9dda12fa1dc2caa410ac7f8d8cd55d2a3"
   },
   {
-    "name": "flip_phone",
-    "unicode": "1F581",
-    "digest": "be59efba4bc0759af5a726c06619090ef5071bf2541611d71691dedecee6c697"
-  },
-  {
-    "name": "clamshell_mobile_phone",
-    "unicode": "1F581",
-    "digest": "be59efba4bc0759af5a726c06619090ef5071bf2541611d71691dedecee6c697"
-  },
-  {
-    "name": "floppy_black",
-    "unicode": "1F5AA",
-    "digest": "9022f51bb09c5130c6d46bb2accb159bed6f54d6fbffda6ecad62965ebc958ea"
-  },
-  {
-    "name": "black_hard_shell_floppy_disk",
-    "unicode": "1F5AA",
-    "digest": "9022f51bb09c5130c6d46bb2accb159bed6f54d6fbffda6ecad62965ebc958ea"
-  },
-  {
     "name": "floppy_disk",
     "unicode": "1F4BE",
     "digest": "4ee0b5bba41b9e301ed125d3ee1c263bef171ca499e6e1b89276b09af2bc03a0"
   },
   {
-    "name": "floppy_white",
-    "unicode": "1F5AB",
-    "digest": "ec79c400117c4506ef8cf3eebef6c42dd37e60b3079d3e98b6ccd06e517e2af0"
-  },
-  {
-    "name": "white_hard_shell_floppy_disk",
-    "unicode": "1F5AB",
-    "digest": "ec79c400117c4506ef8cf3eebef6c42dd37e60b3079d3e98b6ccd06e517e2af0"
-  },
-  {
     "name": "flower_playing_cards",
     "unicode": "1F3B4",
     "digest": "edba47c2e3051b2c7effd98794ec977174052782edcb491daec82a2b0d853869"
@@ -5355,21 +5375,6 @@
     "digest": "bc3631a4e9e8473b92e842008937add2cd9ffad5b7d772ce759fb5ff6c0e3dca"
   },
   {
-    "name": "folder",
-    "unicode": "1F5C0",
-    "digest": "8932141321911032ce8469ba85fe309b78384545c3b9946978b383670b956644"
-  },
-  {
-    "name": "folder_open",
-    "unicode": "1F5C1",
-    "digest": "74f3b484771c3d6ef61cf003de25c1a59b875afa46c057b5b1d92d9f99460685"
-  },
-  {
-    "name": "open_folder",
-    "unicode": "1F5C1",
-    "digest": "74f3b484771c3d6ef61cf003de25c1a59b875afa46c057b5b1d92d9f99460685"
-  },
-  {
     "name": "football",
     "unicode": "1F3C8",
     "digest": "ebd790471c3a28d3077818e3b31d915ffe443e06e299bc5cf0dd2534d080634c"
@@ -5410,6 +5415,16 @@
     "digest": "ebee16e86bc9be843dfc72ab5372fb462f06be4486b5b25d7d4cac9b2c8b01c8"
   },
   {
+    "name": "fox",
+    "unicode": "1F98A",
+    "digest": "e9903cb0396f7e49bdd2c384b38e614c13bfa576b3ecc1ec7b9819e4a40d91d1"
+  },
+  {
+    "name": "fox_face",
+    "unicode": "1F98A",
+    "digest": "e9903cb0396f7e49bdd2c384b38e614c13bfa576b3ecc1ec7b9819e4a40d91d1"
+  },
+  {
     "name": "frame_photo",
     "unicode": "1F5BC",
     "digest": "d5074f748a15055ec1fb812c1e5e169e6e3cc73c522c54be1359b0e26c0fc75c"
@@ -5420,29 +5435,19 @@
     "digest": "d5074f748a15055ec1fb812c1e5e169e6e3cc73c522c54be1359b0e26c0fc75c"
   },
   {
-    "name": "frame_tiles",
-    "unicode": "1F5BD",
-    "digest": "34a5bb044b4b3ad94b116ad106f7b6747fb8612dc0e9f8ccd4313c2920508df0"
-  },
-  {
-    "name": "frame_with_tiles",
-    "unicode": "1F5BD",
-    "digest": "34a5bb044b4b3ad94b116ad106f7b6747fb8612dc0e9f8ccd4313c2920508df0"
-  },
-  {
-    "name": "frame_x",
-    "unicode": "1F5BE",
-    "digest": "2e427688fd70361c8c59787d0722ad68abe1c3f968258ee99c0c77ce4b8a8e15"
+    "name": "free",
+    "unicode": "1F193",
+    "digest": "9973522457158362fc5bdd7da858e6371e28a8403d1ef9e4b6427195c7f72cfa"
   },
   {
-    "name": "frame_with_an_x",
-    "unicode": "1F5BE",
-    "digest": "2e427688fd70361c8c59787d0722ad68abe1c3f968258ee99c0c77ce4b8a8e15"
+    "name": "french_bread",
+    "unicode": "1F956",
+    "digest": "47518a4312f57207b8e8c38188d4a2bd8b16830a885cfcf2d281cfab50c1bc6e"
   },
   {
-    "name": "free",
-    "unicode": "1F193",
-    "digest": "9973522457158362fc5bdd7da858e6371e28a8403d1ef9e4b6427195c7f72cfa"
+    "name": "baguette_bread",
+    "unicode": "1F956",
+    "digest": "47518a4312f57207b8e8c38188d4a2bd8b16830a885cfcf2d281cfab50c1bc6e"
   },
   {
     "name": "fried_shrimp",
@@ -5560,16 +5565,21 @@
     "digest": "f55e4b16a41b6f5e3c817a301420360ba4486e4e82e1092a56a3e3cc4069087d"
   },
   {
-    "name": "girls_symbol",
-    "unicode": "1F6CA",
-    "digest": "2c55aee81defd7a1620ffeaad8d9bcc1835f19237c72c79633aec45671ddb9ff"
-  },
-  {
     "name": "globe_with_meridians",
     "unicode": "1F310",
     "digest": "725bebeb3c09a9e3701ebe49e672dcfbf2b73575e05f0821263511577b013b75"
   },
   {
+    "name": "goal",
+    "unicode": "1F945",
+    "digest": "7088c432f276ff6f447dc0d431b9062b394fb401de1072fe59ca56267bfd6717"
+  },
+  {
+    "name": "goal_net",
+    "unicode": "1F945",
+    "digest": "7088c432f276ff6f447dc0d431b9062b394fb401de1072fe59ca56267bfd6717"
+  },
+  {
     "name": "goat",
     "unicode": "1F410",
     "digest": "d07e384d08529ddcaddd2710f2ad913e5665dc15d5f99c28e16dadd245a111e8"
@@ -5585,6 +5595,11 @@
     "digest": "7d7ecc6e226596f646030a4109c2b0001ef0cc690e4863e450bf5d29e7a90344"
   },
   {
+    "name": "gorilla",
+    "unicode": "1F98D",
+    "digest": "4a564dc14f8ae5450d094f6410ec7f099a7f07dc5254b6395f44a35527bdb4b7"
+  },
+  {
     "name": "grapes",
     "unicode": "1F347",
     "digest": "74d1a09ab411234a84d025a2e717e7ec5791bc02aad29853896d21c0f0283c50"
@@ -5735,16 +5750,6 @@
     "digest": "c51a30cb7e575d29ffed16780a6c95ae3f300b8ac523012f4a6e116d68c1fd15"
   },
   {
-    "name": "hand_splayed_reverse",
-    "unicode": "1F591",
-    "digest": "ff0af0fe9def7388adca6836e5958492282b1afae99f1b6e1e65d11ba68b96db"
-  },
-  {
-    "name": "reversed_raised_hand_with_fingers_splayed",
-    "unicode": "1F591",
-    "digest": "ff0af0fe9def7388adca6836e5958492282b1afae99f1b6e1e65d11ba68b96db"
-  },
-  {
     "name": "hand_splayed_tone1",
     "unicode": "1F590-1F3FB",
     "digest": "c31fb44a982ed8808e1c311ec1b0b9c5afcb47f16bb1fc731dc483adf8f0d049"
@@ -5795,24 +5800,99 @@
     "digest": "4b3a0aba7829772fec09f26d6facc19a2f822d2998015297b18b5cab85190ee2"
   },
   {
-    "name": "hand_victory",
-    "unicode": "1F594",
-    "digest": "2d512ced4e8a438f2a346aed67310d3080f9828c748ade1be95943c32ba1c735"
+    "name": "handbag",
+    "unicode": "1F45C",
+    "digest": "45410a3eed0c2e3f68748d7649fa9e33a90f4e80d5291206bdd0b40380c6da45"
   },
   {
-    "name": "reversed_victory_hand",
-    "unicode": "1F594",
-    "digest": "2d512ced4e8a438f2a346aed67310d3080f9828c748ade1be95943c32ba1c735"
+    "name": "handball",
+    "unicode": "1F93E",
+    "digest": "94ceb28024eb3259d8b137cafd7438773e717fbc04f5da810f85e43ca0fa9e00"
   },
   {
-    "name": "handbag",
-    "unicode": "1F45C",
-    "digest": "45410a3eed0c2e3f68748d7649fa9e33a90f4e80d5291206bdd0b40380c6da45"
+    "name": "handball_tone1",
+    "unicode": "1F93E-1F3FB",
+    "digest": "8bec4de0d05c80e335e44d65598d186ca92696977353c9fd9c2a5efa122cb842"
+  },
+  {
+    "name": "handball_tone2",
+    "unicode": "1F93E-1F3FC",
+    "digest": "2ff4131e1e2f089b315d8e176c9348877c26c2bd03706fb75d41bc61bc99bf93"
+  },
+  {
+    "name": "handball_tone3",
+    "unicode": "1F93E-1F3FD",
+    "digest": "224a71f94dd37d3729325d11412334667a81422e21f6d7c008730ff350f51a80"
+  },
+  {
+    "name": "handball_tone4",
+    "unicode": "1F93E-1F3FE",
+    "digest": "a5f7a9db790565981bad2d0d9e09554c8c509a8179b4705a418300d58a7894b4"
+  },
+  {
+    "name": "handball_tone5",
+    "unicode": "1F93E-1F3FF",
+    "digest": "00404572d4683f2e8e8a494aa733e96fbec1723634d0a8cb8d75f2829a789d27"
+  },
+  {
+    "name": "handshake",
+    "unicode": "1F91D",
+    "digest": "cb4b08b70560908f96bda0aecd2f4c966bea180f9b7200e4c81d342dc8d36087"
+  },
+  {
+    "name": "shaking_hands",
+    "unicode": "1F91D",
+    "digest": "cb4b08b70560908f96bda0aecd2f4c966bea180f9b7200e4c81d342dc8d36087"
+  },
+  {
+    "name": "handshake_tone1",
+    "unicode": "1F91D-1F3FB",
+    "digest": "40470e224683ba375ed8698c0cbd560556be5a8898237ddf504377a3a7e89ff0"
+  },
+  {
+    "name": "shaking_hands_tone1",
+    "unicode": "1F91D-1F3FB",
+    "digest": "40470e224683ba375ed8698c0cbd560556be5a8898237ddf504377a3a7e89ff0"
+  },
+  {
+    "name": "handshake_tone2",
+    "unicode": "1F91D-1F3FC",
+    "digest": "77ed378243bf682f1f4f1a8caeabcbedf772f54631cc40ea46c099e46a499b18"
+  },
+  {
+    "name": "shaking_hands_tone2",
+    "unicode": "1F91D-1F3FC",
+    "digest": "77ed378243bf682f1f4f1a8caeabcbedf772f54631cc40ea46c099e46a499b18"
+  },
+  {
+    "name": "handshake_tone3",
+    "unicode": "1F91D-1F3FD",
+    "digest": "81b95050f0878b617f5d2640e34031c26a0072e46ca5a688eb4356e48bc74c92"
+  },
+  {
+    "name": "shaking_hands_tone3",
+    "unicode": "1F91D-1F3FD",
+    "digest": "81b95050f0878b617f5d2640e34031c26a0072e46ca5a688eb4356e48bc74c92"
+  },
+  {
+    "name": "handshake_tone4",
+    "unicode": "1F91D-1F3FE",
+    "digest": "74919a6f026fbbd0ccdbdbd4288d1b2ef3bda8930e9142c07736db4a7f3ef345"
+  },
+  {
+    "name": "shaking_hands_tone4",
+    "unicode": "1F91D-1F3FE",
+    "digest": "74919a6f026fbbd0ccdbdbd4288d1b2ef3bda8930e9142c07736db4a7f3ef345"
+  },
+  {
+    "name": "handshake_tone5",
+    "unicode": "1F91D-1F3FF",
+    "digest": "a30d662bfad0074ca7e32cf6f7229b643b636c4beaec496777eb7e1d5b6fc470"
   },
   {
-    "name": "hard_disk",
-    "unicode": "1F5B4",
-    "digest": "df8549d4281f5ae70fb6792a02c078e651764b0276aa43b7407236bd38fc21b4"
+    "name": "shaking_hands_tone5",
+    "unicode": "1F91D-1F3FF",
+    "digest": "a30d662bfad0074ca7e32cf6f7229b643b636c4beaec496777eb7e1d5b6fc470"
   },
   {
     "name": "hash",
@@ -5880,16 +5960,6 @@
     "digest": "8a1f28b97d661ca4cff5ee13889ca61b5fa745ccb590e80832b7d7701df101d6"
   },
   {
-    "name": "heart_tip",
-    "unicode": "1F394",
-    "digest": "2178829e2c85accda55d2f685544587f6de5c8398a127ae1e08ff1c4ab282204"
-  },
-  {
-    "name": "heart_with_tip_on_the_left",
-    "unicode": "1F394",
-    "digest": "2178829e2c85accda55d2f685544587f6de5c8398a127ae1e08ff1c4ab282204"
-  },
-  {
     "name": "heartbeat",
     "unicode": "1F493",
     "digest": "c9ec024943439d476df6f5ec3a6b30508365a7af3427671a80de3ef2f4f95ffe"
@@ -6145,16 +6215,6 @@
     "digest": "310b7bdcca93452fe10c72c03d0aafa12b98e5d3408896d275d06d3693812c7a"
   },
   {
-    "name": "info",
-    "unicode": "1F6C8",
-    "digest": "59c35e77d5ee663c5d56f7d8af845ce8aeb9935e526ae4a06e02ae70e71212ca"
-  },
-  {
-    "name": "circled_information_source",
-    "unicode": "1F6C8",
-    "digest": "59c35e77d5ee663c5d56f7d8af845ce8aeb9935e526ae4a06e02ae70e71212ca"
-  },
-  {
     "name": "information_desk_person",
     "unicode": "1F481",
     "digest": "9f12a4a58a650e8e1d3836ef857003c3ccd42ad4203a2479eb95100bf6559064"
@@ -6250,16 +6310,6 @@
     "digest": "f986ad32e419cca81c995f8371f0189d1490172a97ebbeac60054a1af08949c5"
   },
   {
-    "name": "jet_up",
-    "unicode": "1F6E6",
-    "digest": "3708e5e034b1c64d1268d66527e13c369aa0f8903bce9172bef773b2d1940948"
-  },
-  {
-    "name": "up_pointing_military_airplane",
-    "unicode": "1F6E6",
-    "digest": "3708e5e034b1c64d1268d66527e13c369aa0f8903bce9172bef773b2d1940948"
-  },
-  {
     "name": "joy",
     "unicode": "1F602",
     "digest": "75d7a05043523d290c46d3b313b19ed3c95271f1110bcf234cf13d4273625b08"
@@ -6275,6 +6325,66 @@
     "digest": "671ee588f397a96f27056a67e6a06d6e8d22c2109ec57b2859badb5fec9cf8dd"
   },
   {
+    "name": "juggling",
+    "unicode": "1F939",
+    "digest": "1f5dafa78de8b37f3df88fdf3084d2380666bd74ab2f449754d8724f6f8dbfa5"
+  },
+  {
+    "name": "juggler",
+    "unicode": "1F939",
+    "digest": "1f5dafa78de8b37f3df88fdf3084d2380666bd74ab2f449754d8724f6f8dbfa5"
+  },
+  {
+    "name": "juggling_tone1",
+    "unicode": "1F939-1F3FB",
+    "digest": "b0b4d020148c896be69c28b08e3c486f6db270d138c7ccf4be362b29eb99878d"
+  },
+  {
+    "name": "juggler_tone1",
+    "unicode": "1F939-1F3FB",
+    "digest": "b0b4d020148c896be69c28b08e3c486f6db270d138c7ccf4be362b29eb99878d"
+  },
+  {
+    "name": "juggling_tone2",
+    "unicode": "1F939-1F3FC",
+    "digest": "cfe0c1649b2fdca03673e0e64f3a7d06d4bd49b8954c769aeb7eb88b70ec99f4"
+  },
+  {
+    "name": "juggler_tone2",
+    "unicode": "1F939-1F3FC",
+    "digest": "cfe0c1649b2fdca03673e0e64f3a7d06d4bd49b8954c769aeb7eb88b70ec99f4"
+  },
+  {
+    "name": "juggling_tone3",
+    "unicode": "1F939-1F3FD",
+    "digest": "7f87022722008bb265abe245e8157dc7a61944f5da62b3cf86f26ee1b3bdef63"
+  },
+  {
+    "name": "juggler_tone3",
+    "unicode": "1F939-1F3FD",
+    "digest": "7f87022722008bb265abe245e8157dc7a61944f5da62b3cf86f26ee1b3bdef63"
+  },
+  {
+    "name": "juggling_tone4",
+    "unicode": "1F939-1F3FE",
+    "digest": "1f00da8c05582c95501cc6c3fe5ce0f9bfbc16789dcee59844a8fe7831198583"
+  },
+  {
+    "name": "juggler_tone4",
+    "unicode": "1F939-1F3FE",
+    "digest": "1f00da8c05582c95501cc6c3fe5ce0f9bfbc16789dcee59844a8fe7831198583"
+  },
+  {
+    "name": "juggling_tone5",
+    "unicode": "1F939-1F3FF",
+    "digest": "a195bf734788eb7961c00dbc05255a49da8b9d5042fada29b26cc20393d3ce52"
+  },
+  {
+    "name": "juggler_tone5",
+    "unicode": "1F939-1F3FF",
+    "digest": "a195bf734788eb7961c00dbc05255a49da8b9d5042fada29b26cc20393d3ce52"
+  },
+  {
     "name": "kaaba",
     "unicode": "1F54B",
     "digest": "a4618782f9583f077bd383965f1c91b9985a949bb7b6cec7af22914e7f5e9ab6"
@@ -6296,38 +6406,8 @@
   },
   {
     "name": "keyboard",
-    "unicode": "1F5AE",
-    "digest": "3b254cbf19946df3af05e501d11653d89fcda91684b7248d86186f842b83bf16"
-  },
-  {
-    "name": "wired_keyboard",
-    "unicode": "1F5AE",
-    "digest": "3b254cbf19946df3af05e501d11653d89fcda91684b7248d86186f842b83bf16"
-  },
-  {
-    "name": "keyboard_mouse",
-    "unicode": "1F5A6",
-    "digest": "95b523e55d8afeaeb06442bbe20e47f49643bb0c32d89a8cdbbccdead20532b3"
-  },
-  {
-    "name": "keyboard_and_mouse",
-    "unicode": "1F5A6",
-    "digest": "95b523e55d8afeaeb06442bbe20e47f49643bb0c32d89a8cdbbccdead20532b3"
-  },
-  {
-    "name": "keyboard_with_jacks",
-    "unicode": "1F398",
-    "digest": "e29a0d0b8018d13458469edca13c60a882a2817957c1aa11b050684c995a47ee"
-  },
-  {
-    "name": "musical_keyboard_with_jacks",
-    "unicode": "1F398",
-    "digest": "e29a0d0b8018d13458469edca13c60a882a2817957c1aa11b050684c995a47ee"
-  },
-  {
-    "name": "keycap_ten",
-    "unicode": "1F51F",
-    "digest": "c7c9491021740d2c17edddb856f79579b0b943d8dc85a2f48dbaac84f35b8a40"
+    "unicode": "2328",
+    "digest": "34da8ff62ca964142f9281b80123dbba74deaac8d77fa61758c30cfb36c31386"
   },
   {
     "name": "kimono",
@@ -6385,6 +6465,16 @@
     "digest": "f0f8636cb1a02b93cc72ce1b194b890fca823d91e35926b889be3ecfae79207f"
   },
   {
+    "name": "kiwi",
+    "unicode": "1F95D",
+    "digest": "70a3a05f333d9455d2da12eed970bc3baae416286848fed8e5dd31b5be0819be"
+  },
+  {
+    "name": "kiwifruit",
+    "unicode": "1F95D",
+    "digest": "70a3a05f333d9455d2da12eed970bc3baae416286848fed8e5dd31b5be0819be"
+  },
+  {
     "name": "knife",
     "unicode": "1F52A",
     "digest": "e6189e4843c6e80875b4952fcddb0c858f7c6039b9214bbec6a261a1358425df"
@@ -6450,19 +6540,69 @@
     "digest": "e58cb714353e96a2891a5d97910ff79660e637af909b81c49c919d3735db55b4"
   },
   {
-    "name": "left_luggage",
-    "unicode": "1F6C5",
-    "digest": "6625077767a51163ea20cbc299f3c13fd5ccf1b5ce365ee702ef1fef6be3dadf"
+    "name": "left_facing_fist",
+    "unicode": "1F91B",
+    "digest": "7861be485beefae0de341df2f21576666e22f63511a033e785752f30c07291da"
+  },
+  {
+    "name": "left_fist",
+    "unicode": "1F91B",
+    "digest": "7861be485beefae0de341df2f21576666e22f63511a033e785752f30c07291da"
+  },
+  {
+    "name": "left_facing_fist_tone1",
+    "unicode": "1F91B-1F3FB",
+    "digest": "2e4c4dd96b0e4b46fe0f9ce5666344d266d0f17a8544cbae73d96638d1955296"
+  },
+  {
+    "name": "left_fist_tone1",
+    "unicode": "1F91B-1F3FB",
+    "digest": "2e4c4dd96b0e4b46fe0f9ce5666344d266d0f17a8544cbae73d96638d1955296"
+  },
+  {
+    "name": "left_facing_fist_tone2",
+    "unicode": "1F91B-1F3FC",
+    "digest": "b96a63a801175ce98a75f0edad7b5574251a3fbbd894d8ab3f21aeeda366cc13"
   },
   {
-    "name": "left_receiver",
-    "unicode": "1F57B",
-    "digest": "8052e44951afee04c87296128744b5019ec783c9ed1a231f659af6c8ddaa50f3"
+    "name": "left_fist_tone2",
+    "unicode": "1F91B-1F3FC",
+    "digest": "b96a63a801175ce98a75f0edad7b5574251a3fbbd894d8ab3f21aeeda366cc13"
   },
   {
-    "name": "left_hand_telephone_receiver",
-    "unicode": "1F57B",
-    "digest": "8052e44951afee04c87296128744b5019ec783c9ed1a231f659af6c8ddaa50f3"
+    "name": "left_facing_fist_tone3",
+    "unicode": "1F91B-1F3FD",
+    "digest": "99df84635513c2ebfef24df1bd3705233e02149eef788c7b82ca0548df6f6ea5"
+  },
+  {
+    "name": "left_fist_tone3",
+    "unicode": "1F91B-1F3FD",
+    "digest": "99df84635513c2ebfef24df1bd3705233e02149eef788c7b82ca0548df6f6ea5"
+  },
+  {
+    "name": "left_facing_fist_tone4",
+    "unicode": "1F91B-1F3FE",
+    "digest": "68954842ca725aec0aa39bce4aa81aad17ac30f5f298561dfa411feb07414cd3"
+  },
+  {
+    "name": "left_fist_tone4",
+    "unicode": "1F91B-1F3FE",
+    "digest": "68954842ca725aec0aa39bce4aa81aad17ac30f5f298561dfa411feb07414cd3"
+  },
+  {
+    "name": "left_facing_fist_tone5",
+    "unicode": "1F91B-1F3FF",
+    "digest": "a419b33fae82612dc860ff48950c0547a1642d4f0c94b6547324440837d3bb21"
+  },
+  {
+    "name": "left_fist_tone5",
+    "unicode": "1F91B-1F3FF",
+    "digest": "a419b33fae82612dc860ff48950c0547a1642d4f0c94b6547324440837d3bb21"
+  },
+  {
+    "name": "left_luggage",
+    "unicode": "1F6C5",
+    "digest": "6625077767a51163ea20cbc299f3c13fd5ccf1b5ce365ee702ef1fef6be3dadf"
   },
   {
     "name": "left_right_arrow",
@@ -6570,16 +6710,6 @@
     "digest": "79b0edf6ce1fd024dd7f458e322ad8588af0b789a04cc1cf38380dc8b9c76f55"
   },
   {
-    "name": "light_check_mark",
-    "unicode": "1F5F8",
-    "digest": "7842b0df8c2b6703bed0cce5d2790d394eec7120b2a245a76f375528f2729a7b"
-  },
-  {
-    "name": "light_mark",
-    "unicode": "1F5F8",
-    "digest": "7842b0df8c2b6703bed0cce5d2790d394eec7120b2a245a76f375528f2729a7b"
-  },
-  {
     "name": "light_rail",
     "unicode": "1F688",
     "digest": "2f30b23a738371690b2f00d96ddb5ceb90a1442b5478754626a3dfa263ed2fc1"
@@ -6605,16 +6735,16 @@
     "digest": "8740d8086525c7a836d64625a6915cc1c59af69ba143456dbb59e0179276895e"
   },
   {
-    "name": "lips2",
-    "unicode": "1F5E2",
-    "digest": "c6ba915982ac47d8aaf14ad3605949df95588acfb4e147bf608f8c1714cdf19b"
-  },
-  {
     "name": "lipstick",
     "unicode": "1F484",
     "digest": "751dcb22706a796033b13a2ccb94304236ec13207ad4d011e02d230ae33ab5c1"
   },
   {
+    "name": "lizard",
+    "unicode": "1F98E",
+    "digest": "fb9191f9eab58b8403d4c4626ccbb14ba05c1f6944011751a8edcc4dd03c66e6"
+  },
+  {
     "name": "lock",
     "unicode": "1F512",
     "digest": "043b4fc0b8c79d47a07d91308e628e1ac262aea6c1ec05e6b84bf7bcdf89dc83"
@@ -6660,6 +6790,16 @@
     "digest": "a065d00a416e297c168b0a675cafcf492fedf94865cb21801a1be5a3914593d4"
   },
   {
+    "name": "lying_face",
+    "unicode": "1F925",
+    "digest": "ce836170165e1b70938273f289c02c2106873cd9ab5472dbcd487c2f9f53f13d"
+  },
+  {
+    "name": "liar",
+    "unicode": "1F925",
+    "digest": "ce836170165e1b70938273f289c02c2106873cd9ab5472dbcd487c2f9f53f13d"
+  },
+  {
     "name": "m",
     "unicode": "24C2",
     "digest": "54588ac2b7fcd53a96f17124e9de69b617613fcd5af9ad2930a094cb795bb9f4"
@@ -6705,6 +6845,121 @@
     "digest": "42b882d2c6aa095f1afcf901203838d95c1908bdc725519779186b9c33c728d7"
   },
   {
+    "name": "man_dancing",
+    "unicode": "1F57A",
+    "digest": "9f632ee0c886d5f03c61e5f3a27668262c0cc2693b857a91c23c1e5ea3785b9e"
+  },
+  {
+    "name": "male_dancer",
+    "unicode": "1F57A",
+    "digest": "9f632ee0c886d5f03c61e5f3a27668262c0cc2693b857a91c23c1e5ea3785b9e"
+  },
+  {
+    "name": "man_dancing_tone1",
+    "unicode": "1F57A-1F3FB",
+    "digest": "6c56a16cb105bcdd97472645b3a351cebdbb1132cbfd18b0118f289db5fbe741"
+  },
+  {
+    "name": "male_dancer_tone1",
+    "unicode": "1F57A-1F3FB",
+    "digest": "6c56a16cb105bcdd97472645b3a351cebdbb1132cbfd18b0118f289db5fbe741"
+  },
+  {
+    "name": "man_dancing_tone2",
+    "unicode": "1F57A-1F3FC",
+    "digest": "ed7e78c14d205a03fdd5581e5213add69a55e13b4cbaf76a6d5a0d6c80f53327"
+  },
+  {
+    "name": "male_dancer_tone2",
+    "unicode": "1F57A-1F3FC",
+    "digest": "ed7e78c14d205a03fdd5581e5213add69a55e13b4cbaf76a6d5a0d6c80f53327"
+  },
+  {
+    "name": "man_dancing_tone3",
+    "unicode": "1F57A-1F3FD",
+    "digest": "13b45403e11800163406206eedeb8b579cc83eca2f60246be97e099164387bc8"
+  },
+  {
+    "name": "male_dancer_tone3",
+    "unicode": "1F57A-1F3FD",
+    "digest": "13b45403e11800163406206eedeb8b579cc83eca2f60246be97e099164387bc8"
+  },
+  {
+    "name": "man_dancing_tone4",
+    "unicode": "1F57A-1F3FE",
+    "digest": "f6feb1b0b83565fadcdd1a8737d3daa08893e919547d2a06de899160162d9c4a"
+  },
+  {
+    "name": "male_dancer_tone4",
+    "unicode": "1F57A-1F3FE",
+    "digest": "f6feb1b0b83565fadcdd1a8737d3daa08893e919547d2a06de899160162d9c4a"
+  },
+  {
+    "name": "man_dancing_tone5",
+    "unicode": "1F57A-1F3FF",
+    "digest": "fe20a9ed9ba991653b4d0683de347ed7c226a5d75610307584a2ddd6fcd1e3f2"
+  },
+  {
+    "name": "male_dancer_tone5",
+    "unicode": "1F57A-1F3FF",
+    "digest": "fe20a9ed9ba991653b4d0683de347ed7c226a5d75610307584a2ddd6fcd1e3f2"
+  },
+  {
+    "name": "man_in_tuxedo",
+    "unicode": "1F935",
+    "digest": "4d451a971dfefedc4830ba78e19b123f250e09ae65baddccdc56c0f8aa3a9b50"
+  },
+  {
+    "name": "man_in_tuxedo_tone1",
+    "unicode": "1F935-1F3FB",
+    "digest": "2814833334fb211ae2ecb1fb5964e9752282d0fb4d7f3477de5dd2a4f812a793"
+  },
+  {
+    "name": "tuxedo_tone1",
+    "unicode": "1F935-1F3FB",
+    "digest": "2814833334fb211ae2ecb1fb5964e9752282d0fb4d7f3477de5dd2a4f812a793"
+  },
+  {
+    "name": "man_in_tuxedo_tone2",
+    "unicode": "1F935-1F3FC",
+    "digest": "cd1bab9ee0e2335d3cd99d51216cccdc4fc3c2cf20129b8b7e11a51a77258f68"
+  },
+  {
+    "name": "tuxedo_tone2",
+    "unicode": "1F935-1F3FC",
+    "digest": "cd1bab9ee0e2335d3cd99d51216cccdc4fc3c2cf20129b8b7e11a51a77258f68"
+  },
+  {
+    "name": "man_in_tuxedo_tone3",
+    "unicode": "1F935-1F3FD",
+    "digest": "f387775f925fe60b9f3e7cad63a55d4d196ddd41658029a70440d14c17cb99f9"
+  },
+  {
+    "name": "tuxedo_tone3",
+    "unicode": "1F935-1F3FD",
+    "digest": "f387775f925fe60b9f3e7cad63a55d4d196ddd41658029a70440d14c17cb99f9"
+  },
+  {
+    "name": "man_in_tuxedo_tone4",
+    "unicode": "1F935-1F3FE",
+    "digest": "08debd7a573d1201aee8a2f281ef7cb638d4a2a096222150391f36963f07c622"
+  },
+  {
+    "name": "tuxedo_tone4",
+    "unicode": "1F935-1F3FE",
+    "digest": "08debd7a573d1201aee8a2f281ef7cb638d4a2a096222150391f36963f07c622"
+  },
+  {
+    "name": "man_in_tuxedo_tone5",
+    "unicode": "1F935-1F3FF",
+    "digest": "e3b10e0619f0911cf9b665a265f4ef829b8f6ba6e9c3a021d0539a27e315f8fe"
+  },
+  {
+    "name": "tuxedo_tone5",
+    "unicode": "1F935-1F3FF",
+    "digest": "e3b10e0619f0911cf9b665a265f4ef829b8f6ba6e9c3a021d0539a27e315f8fe"
+  },
+  {
     "name": "man_tone1",
     "unicode": "1F468-1F3FB",
     "digest": "7053e265fa7d2594de54a6c5d06c21795b9a7dfb36a1c5594ca43c4c6cc56504"
@@ -6810,6 +7065,16 @@
     "digest": "72629a205e33f89337815ad7e51bb5c73947d1a9f98afe5072bdf4846827ae72"
   },
   {
+    "name": "martial_arts_uniform",
+    "unicode": "1F94B",
+    "digest": "a1ae797b31081425b388ab31efc635d8eb73a40980fd0fae4708aa5313e2a964"
+  },
+  {
+    "name": "karate_uniform",
+    "unicode": "1F94B",
+    "digest": "a1ae797b31081425b388ab31efc635d8eb73a40980fd0fae4708aa5313e2a964"
+  },
+  {
     "name": "mask",
     "unicode": "1F637",
     "digest": "1b58af9ae599308aabf41bbd38f599fa896bd9fe5df7a40be9f2dc7e0e230600"
@@ -7030,6 +7295,16 @@
     "digest": "5da18351dc14b66cfc070148c83b7c8e67e6b1e3f515ae501133c38ee5c28d3d"
   },
   {
+    "name": "milk",
+    "unicode": "1F95B",
+    "digest": "38b28ea40399601fabc95bac5eaaf5a9e4e25548ec80325bd5069395ea884f85"
+  },
+  {
+    "name": "glass_of_milk",
+    "unicode": "1F95B",
+    "digest": "38b28ea40399601fabc95bac5eaaf5a9e4e25548ec80325bd5069395ea884f85"
+  },
+  {
     "name": "milky_way",
     "unicode": "1F30C",
     "digest": "17405ff31d94b13a1fb0adcda204b8adb95ca340bc3980d9ad9f42ba1e366e7d"
@@ -7085,31 +7360,6 @@
     "digest": "2c9f185babcb4001fcef2b8dfc4a32126729843084d0076c3e3ccdc845ab23ad"
   },
   {
-    "name": "mood_bubble",
-    "unicode": "1F5F0",
-    "digest": "1df7061217e478d43ab9a87d4f351c4ca56705acd6b4e0b0bedfdece77635f1b"
-  },
-  {
-    "name": "mood_bubble_lightning",
-    "unicode": "1F5F1",
-    "digest": "4af3e4e53eaa328b0d20542ab31705a74bf9fd368cd0673b706838ce1681d3c9"
-  },
-  {
-    "name": "lightning_mood_bubble",
-    "unicode": "1F5F1",
-    "digest": "4af3e4e53eaa328b0d20542ab31705a74bf9fd368cd0673b706838ce1681d3c9"
-  },
-  {
-    "name": "mood_lightning",
-    "unicode": "1F5F2",
-    "digest": "6784635e81ec722fd50a1c2a23b0f9679e4bf1b5ae2b5a01eeb995bc1f7a426f"
-  },
-  {
-    "name": "lightning_mood",
-    "unicode": "1F5F2",
-    "digest": "6784635e81ec722fd50a1c2a23b0f9679e4bf1b5ae2b5a01eeb995bc1f7a426f"
-  },
-  {
     "name": "mortar_board",
     "unicode": "1F393",
     "digest": "d7fbe41d4b340d3564e484aec46a22c9613521414b2ba6eece2180db4d23e410"
@@ -7120,6 +7370,16 @@
     "digest": "5f3d3de7feac953a70a318113531c2857d760a516c3d8d6f42d2a3b3b67ed196"
   },
   {
+    "name": "motor_scooter",
+    "unicode": "1F6F5",
+    "digest": "e2dc7c981744a71f46858bd0858ff91af704ac06425ed80377bc3b119e57c872"
+  },
+  {
+    "name": "motorbike",
+    "unicode": "1F6F5",
+    "digest": "e2dc7c981744a71f46858bd0858ff91af704ac06425ed80377bc3b119e57c872"
+  },
+  {
     "name": "motorboat",
     "unicode": "1F6E5",
     "digest": "81c156643528c5a94a12d6d478e52a019f5a4e3eb58ee365cdd9d2361a7fdb01"
@@ -7210,16 +7470,6 @@
     "digest": "f3ed37b639b7c16aae49502bd423f9fdeabaf15bc6f0f74063954b189e176b5d"
   },
   {
-    "name": "mouse_one",
-    "unicode": "1F5AF",
-    "digest": "e0d2055ccba489d24e0c0b6d2f22793efe48a734b0fd50f5af88f721b40665c0"
-  },
-  {
-    "name": "one_button_mouse",
-    "unicode": "1F5AF",
-    "digest": "e0d2055ccba489d24e0c0b6d2f22793efe48a734b0fd50f5af88f721b40665c0"
-  },
-  {
     "name": "mouse_three_button",
     "unicode": "1F5B1",
     "digest": "3724341ac5ad0d01027ef1575db64f1db7619f590ca6ada960d1f2c18dc7fc6a"
@@ -7240,6 +7490,66 @@
     "digest": "2c1d0662c95928936e6b9ab5a40c6110ff1cea5339f2803c7b63aabc76115afb"
   },
   {
+    "name": "mrs_claus",
+    "unicode": "1F936",
+    "digest": "1f72f586ca75bd7ebb4150cdcc8199a930c32fa4b81510cb8d200f1b3ddd4076"
+  },
+  {
+    "name": "mother_christmas",
+    "unicode": "1F936",
+    "digest": "1f72f586ca75bd7ebb4150cdcc8199a930c32fa4b81510cb8d200f1b3ddd4076"
+  },
+  {
+    "name": "mrs_claus_tone1",
+    "unicode": "1F936-1F3FB",
+    "digest": "244596919e0fed050203cf9e040899de323d7821235929f175852439927bd129"
+  },
+  {
+    "name": "mother_christmas_tone1",
+    "unicode": "1F936-1F3FB",
+    "digest": "244596919e0fed050203cf9e040899de323d7821235929f175852439927bd129"
+  },
+  {
+    "name": "mrs_claus_tone2",
+    "unicode": "1F936-1F3FC",
+    "digest": "8cde96e8521f3a90262a7f5f8a2989a9590d9a02cda2c37e92335dc05975c18d"
+  },
+  {
+    "name": "mother_christmas_tone2",
+    "unicode": "1F936-1F3FC",
+    "digest": "8cde96e8521f3a90262a7f5f8a2989a9590d9a02cda2c37e92335dc05975c18d"
+  },
+  {
+    "name": "mrs_claus_tone3",
+    "unicode": "1F936-1F3FD",
+    "digest": "c39cd4346d4581799dd0e9a6447c91a954a75747bf2682c8e4d79c3b0fcf7405"
+  },
+  {
+    "name": "mother_christmas_tone3",
+    "unicode": "1F936-1F3FD",
+    "digest": "c39cd4346d4581799dd0e9a6447c91a954a75747bf2682c8e4d79c3b0fcf7405"
+  },
+  {
+    "name": "mrs_claus_tone4",
+    "unicode": "1F936-1F3FE",
+    "digest": "84c85cf54559ea2d78d196fee96149a249af4f959b78e223a0ec4fb72abdbcab"
+  },
+  {
+    "name": "mother_christmas_tone4",
+    "unicode": "1F936-1F3FE",
+    "digest": "84c85cf54559ea2d78d196fee96149a249af4f959b78e223a0ec4fb72abdbcab"
+  },
+  {
+    "name": "mrs_claus_tone5",
+    "unicode": "1F936-1F3FF",
+    "digest": "ce26c0e0645713b17e7497d9f2d0484cc5477564dae99320cabf04d160d3b2ff"
+  },
+  {
+    "name": "mother_christmas_tone5",
+    "unicode": "1F936-1F3FF",
+    "digest": "ce26c0e0645713b17e7497d9f2d0484cc5477564dae99320cabf04d160d3b2ff"
+  },
+  {
     "name": "muscle",
     "unicode": "1F4AA",
     "digest": "e4ce52757b2b7982e2516e0e8bf2e2253617cc9f3e6178f1887c61c9039461ba"
@@ -7330,6 +7640,16 @@
     "digest": "f9f6a4895ff0be8fb2ccc7ad195b94e9650f742f66ead999e90724cfb77af628"
   },
   {
+    "name": "nauseated_face",
+    "unicode": "1F922",
+    "digest": "f8471cf4720948d8246ec9d30e29783e819f90e3cfe8b1ba628671a1aad1a91c"
+  },
+  {
+    "name": "sick",
+    "unicode": "1F922",
+    "digest": "f8471cf4720948d8246ec9d30e29783e819f90e3cfe8b1ba628671a1aad1a91c"
+  },
+  {
     "name": "necktie",
     "unicode": "1F454",
     "digest": "01bb18dc8bfe787daa9613b5d09988cd5a065449ef906099ce3cb308c8a7da68"
@@ -7350,16 +7670,6 @@
     "digest": "9e5f3c93db25cf1d0f9d6e6bd2993161afec6c30573ba3fe85e13b8c84483d66"
   },
   {
-    "name": "network",
-    "unicode": "1F5A7",
-    "digest": "1dbaa54deeb2328fd8a3f044e450c97ac3ff39627c598bb2f4312d677482ee06"
-  },
-  {
-    "name": "three_networked_computers",
-    "unicode": "1F5A7",
-    "digest": "1dbaa54deeb2328fd8a3f044e450c97ac3ff39627c598bb2f4312d677482ee06"
-  },
-  {
     "name": "neutral_face",
     "unicode": "1F610",
     "digest": "7449430a60619956573e9dc80834045296f2b99853737b6c7794c785ff53d64e"
@@ -7515,26 +7825,6 @@
     "digest": "1e0f9842e0f8ad5805eabd3f35a6038b7a2e49d566a1f5c17271f9cdf467ca60"
   },
   {
-    "name": "note",
-    "unicode": "1F5C9",
-    "digest": "073660fdaa02ecf98d04f61f8d65d6cc447ccae3825fccaff19a2c99ebba52af"
-  },
-  {
-    "name": "note_page",
-    "unicode": "1F5C9",
-    "digest": "073660fdaa02ecf98d04f61f8d65d6cc447ccae3825fccaff19a2c99ebba52af"
-  },
-  {
-    "name": "note_empty",
-    "unicode": "1F5C6",
-    "digest": "06b56eeaca6349bbcf1020bea98f937450a7e086db65cd5d7497748e0fb607be"
-  },
-  {
-    "name": "empty_note_page",
-    "unicode": "1F5C6",
-    "digest": "06b56eeaca6349bbcf1020bea98f937450a7e086db65cd5d7497748e0fb607be"
-  },
-  {
     "name": "notebook",
     "unicode": "1F4D3",
     "digest": "fc679d3728f86073d1607a926885dd8b0261132f5c4a0322f1e46ea9f95c8cb8"
@@ -7545,26 +7835,6 @@
     "digest": "d822eda4b49cbfa399b36f134c1a0b8dcfdd27ed89f12c50bc18f6f0a9aa56ef"
   },
   {
-    "name": "notepad",
-    "unicode": "1F5CA",
-    "digest": "85069e2d13540886457368a57295072aec44c7137d9223bfcf908ce1f0e5124e"
-  },
-  {
-    "name": "note_pad",
-    "unicode": "1F5CA",
-    "digest": "85069e2d13540886457368a57295072aec44c7137d9223bfcf908ce1f0e5124e"
-  },
-  {
-    "name": "notepad_empty",
-    "unicode": "1F5C7",
-    "digest": "8be5053e74c13d8220917c5aee1f4afdecb001612886438f283b0c2a0fecf6af"
-  },
-  {
-    "name": "empty_note_pad",
-    "unicode": "1F5C7",
-    "digest": "8be5053e74c13d8220917c5aee1f4afdecb001612886438f283b0c2a0fecf6af"
-  },
-  {
     "name": "notepad_spiral",
     "unicode": "1F5D2",
     "digest": "c6a8e16aa62474cef13e5659fddb4afc57e3f79635e32e6020edbee2b5b50f18"
@@ -7600,6 +7870,16 @@
     "digest": "1a9ca9848d4fb75852addfc10bf84eccf7caa5339714b90e3de4cb6f2518465e"
   },
   {
+    "name": "octagonal_sign",
+    "unicode": "1F6D1",
+    "digest": "9f6927048e1f9da57f89d1ae1eb86fa4ab7abdbabca756a738a799e948d0b3f9"
+  },
+  {
+    "name": "stop_sign",
+    "unicode": "1F6D1",
+    "digest": "9f6927048e1f9da57f89d1ae1eb86fa4ab7abdbabca756a738a799e948d0b3f9"
+  },
+  {
     "name": "octopus",
     "unicode": "1F419",
     "digest": "0fcc65c12f4b29ea75a8c4823d20838a7e6db6978fdcb536943072aa1460bc59"
@@ -7860,16 +8140,6 @@
     "digest": "6112e2a1656b1cb8bd9a8b0dfa6cbf66d30cae671710a9ef75c821de344aab2b"
   },
   {
-    "name": "optical_disk",
-    "unicode": "1F5B8",
-    "digest": "df8c10028d29d65f144a6b789d1c3294e7b3293554c4c30d28d72dc7ba8d9a5d"
-  },
-  {
-    "name": "optical_disc_icon",
-    "unicode": "1F5B8",
-    "digest": "df8c10028d29d65f144a6b789d1c3294e7b3293554c4c30d28d72dc7ba8d9a5d"
-  },
-  {
     "name": "orange_book",
     "unicode": "1F4D9",
     "digest": "41141b08d2beceded21a94795431603c47fd7d42a3a472a2aa8b2bb25fa87ebf"
@@ -7885,6 +8155,11 @@
     "digest": "e47cb481a0ffcb39996f32fd313e19b362a91d8dda15ffca48ac23a3b5bb5baf"
   },
   {
+    "name": "owl",
+    "unicode": "1F989",
+    "digest": "f62ec1ad23ad9038966eea8d8b79660ac212f291af2e89bcdb0fdc683caf41e5"
+  },
+  {
     "name": "ox",
     "unicode": "1F402",
     "digest": "d13bc60552190bb9936bf32d681bdc742439b702a09cfc62137ea09a98624aed"
@@ -7895,11 +8170,6 @@
     "digest": "e82bf5accebb65136e897c15607eef635fb79fd7b2d8c8e19a9eb00b6786918c"
   },
   {
-    "name": "page",
-    "unicode": "1F5CF",
-    "digest": "cc745056525f59d9128d1d03b14770376bb09ab64b8ef4ac994ab7f38efd4783"
-  },
-  {
     "name": "page_facing_up",
     "unicode": "1F4C4",
     "digest": "3884868bdcb2f29615b09a13a30385cbc5269379094a54b5a7e8a5f4e8ce905a"
@@ -7915,11 +8185,6 @@
     "digest": "e21c756cc1c58ebc1b37ebcd38e22a25b31e2e81306c6f18285d6a7671f9eb12"
   },
   {
-    "name": "pages",
-    "unicode": "1F5D0",
-    "digest": "05bd47b78f089389356d9d839c736843f56b959ab4277056606ffcbb013390bc"
-  },
-  {
     "name": "paintbrush",
     "unicode": "1F58C",
     "digest": "fc0da7a25b726b8be9dd6467953e27293d2313a21eeff21424c2a19be614fff2"
@@ -7935,6 +8200,11 @@
     "digest": "90fedafd62fe0abf51325174d0f293ebb9a4794913b9ba93b12f2d0119056df1"
   },
   {
+    "name": "pancakes",
+    "unicode": "1F95E",
+    "digest": "5256b4832431e8a88555796b1a9726f12d909a26fb2bdc3a0abff76412c45903"
+  },
+  {
     "name": "panda_face",
     "unicode": "1F43C",
     "digest": "56a4b84abe983bd6569be1b81ac5e43071015fd308389a16b92231310ae56a5b"
@@ -8010,6 +8280,16 @@
     "digest": "768d1f4f29e1e06aff5abb29043be83087ded16427ce6a2d0f682814e665e311"
   },
   {
+    "name": "peanuts",
+    "unicode": "1F95C",
+    "digest": "e2384846b6e4a6c3a56e991ebb749cb68b330ac00a9e9d888b2c39105ff7ff5d"
+  },
+  {
+    "name": "shelled_peanut",
+    "unicode": "1F95C",
+    "digest": "e2384846b6e4a6c3a56e991ebb749cb68b330ac00a9e9d888b2c39105ff7ff5d"
+  },
+  {
     "name": "pear",
     "unicode": "1F350",
     "digest": "b7c9cf90bb979649b863d2f4132f1b51f6f8107d42e08fb8b4033fea32844948"
@@ -8050,41 +8330,11 @@
     "digest": "9ca1b56b5726f472b1f1b23050ed163e213916dac379d22e38e4c8358fe871e0"
   },
   {
-    "name": "pencil3",
-    "unicode": "1F589",
-    "digest": "52c1ba1228917eb491ac1745a495e0fdafba6b985a81caba250f71d1f94c725c"
-  },
-  {
-    "name": "lower_left_pencil",
-    "unicode": "1F589",
-    "digest": "52c1ba1228917eb491ac1745a495e0fdafba6b985a81caba250f71d1f94c725c"
-  },
-  {
     "name": "penguin",
     "unicode": "1F427",
     "digest": "a1800ab931d6dc84a9c89bfab2c815198025c276d952509c55b18dd20bd9d316"
   },
   {
-    "name": "pennant_black",
-    "unicode": "1F3F2",
-    "digest": "cd3c33bfc3c7fbe84b98d2d481d56a7bf5488ff94afadd8b5a0e454768b80269"
-  },
-  {
-    "name": "black_pennant",
-    "unicode": "1F3F2",
-    "digest": "cd3c33bfc3c7fbe84b98d2d481d56a7bf5488ff94afadd8b5a0e454768b80269"
-  },
-  {
-    "name": "pennant_white",
-    "unicode": "1F3F1",
-    "digest": "818b1be73540f2cfeb1c514e1ee75d18715af317f0db817d9ae081b9ea33d4b0"
-  },
-  {
-    "name": "white_pennant",
-    "unicode": "1F3F1",
-    "digest": "818b1be73540f2cfeb1c514e1ee75d18715af317f0db817d9ae081b9ea33d4b0"
-  },
-  {
     "name": "pensive",
     "unicode": "1F614",
     "digest": "d237deff9f5ead8a0b281b7e5c6f4b82e98cc30c80c86c22c3fdc6160090b2f2"
@@ -8230,16 +8480,6 @@
     "digest": "943a858bd054c81a08a08951f8351c27c8009b85a9359729c7362868298b58e1"
   },
   {
-    "name": "piracy",
-    "unicode": "1F572",
-    "digest": "f42955ba75c598392e5e258be49968d858c876e0d6e7aa9dc795f7e8cff42be9"
-  },
-  {
-    "name": "no_piracy",
-    "unicode": "1F572",
-    "digest": "f42955ba75c598392e5e258be49968d858c876e0d6e7aa9dc795f7e8cff42be9"
-  },
-  {
     "name": "pisces",
     "unicode": "2653",
     "digest": "453c3915122a4b6b32867056d2447be48675a84469145c88d52f8007fcb0861a"
@@ -8470,6 +8710,11 @@
     "digest": "dbe80d9637837377cc2a290da2e895f81a3108cc18b049e3d87212402c1c2098"
   },
   {
+    "name": "potato",
+    "unicode": "1F954",
+    "digest": "a56a69f36f3a0793f278726d92c0cea2960554f3062ef1a0904526a04511d8e1"
+  },
+  {
     "name": "pouch",
     "unicode": "1F45D",
     "digest": "9f012b90310b4a072b6a8fa2c64def087b5f7ffffaafc36e1856ba943a170351"
@@ -8525,6 +8770,96 @@
     "digest": "80177091264430cbcf7c994fbe5ee17319d1a58d933636cc752a54dafcf98a05"
   },
   {
+    "name": "pregnant_woman",
+    "unicode": "1F930",
+    "digest": "49abb86409103338bdb6ae43c13a78ca2dc9cd158a26df35eadd0da3c84a4352"
+  },
+  {
+    "name": "expecting_woman",
+    "unicode": "1F930",
+    "digest": "49abb86409103338bdb6ae43c13a78ca2dc9cd158a26df35eadd0da3c84a4352"
+  },
+  {
+    "name": "pregnant_woman_tone1",
+    "unicode": "1F930-1F3FB",
+    "digest": "5a9f8ed2b631ecf8af111803a5c11f4c156435a5293cb50329c7b98697c8da25"
+  },
+  {
+    "name": "expecting_woman_tone1",
+    "unicode": "1F930-1F3FB",
+    "digest": "5a9f8ed2b631ecf8af111803a5c11f4c156435a5293cb50329c7b98697c8da25"
+  },
+  {
+    "name": "pregnant_woman_tone2",
+    "unicode": "1F930-1F3FC",
+    "digest": "279a2eafff603b11629c955b05f5bd3d7da9a271d4fb3f02e9ccd457b8d2d815"
+  },
+  {
+    "name": "expecting_woman_tone2",
+    "unicode": "1F930-1F3FC",
+    "digest": "279a2eafff603b11629c955b05f5bd3d7da9a271d4fb3f02e9ccd457b8d2d815"
+  },
+  {
+    "name": "pregnant_woman_tone3",
+    "unicode": "1F930-1F3FD",
+    "digest": "93bb63ec2312db315e3f0065520b715cc413ac0fd65538ec9b5cd97df2a42b20"
+  },
+  {
+    "name": "expecting_woman_tone3",
+    "unicode": "1F930-1F3FD",
+    "digest": "93bb63ec2312db315e3f0065520b715cc413ac0fd65538ec9b5cd97df2a42b20"
+  },
+  {
+    "name": "pregnant_woman_tone4",
+    "unicode": "1F930-1F3FE",
+    "digest": "b8dc3dcec894bfd832a249459b10850f8786b6778d8887a677d1291865623da2"
+  },
+  {
+    "name": "expecting_woman_tone4",
+    "unicode": "1F930-1F3FE",
+    "digest": "b8dc3dcec894bfd832a249459b10850f8786b6778d8887a677d1291865623da2"
+  },
+  {
+    "name": "pregnant_woman_tone5",
+    "unicode": "1F930-1F3FF",
+    "digest": "73ee432752f81980f353a7f9b9f7a5ece62512dca08e15c1876b89227face21c"
+  },
+  {
+    "name": "expecting_woman_tone5",
+    "unicode": "1F930-1F3FF",
+    "digest": "73ee432752f81980f353a7f9b9f7a5ece62512dca08e15c1876b89227face21c"
+  },
+  {
+    "name": "prince",
+    "unicode": "1F934",
+    "digest": "34a0e0625f0a9825d3674192d6233b6cae4d8130451293df09f91a6a4165869c"
+  },
+  {
+    "name": "prince_tone1",
+    "unicode": "1F934-1F3FB",
+    "digest": "ccecdfeccb2ab1fceceae14f3fba875c8c7099785a4c40131c08a697b5b675fc"
+  },
+  {
+    "name": "prince_tone2",
+    "unicode": "1F934-1F3FC",
+    "digest": "c373fd3e0c1798415e3d8d88fab6c98c1bbdedcbe6f52f3a3899f6e2124a768d"
+  },
+  {
+    "name": "prince_tone3",
+    "unicode": "1F934-1F3FD",
+    "digest": "71d15695ca954d55aa69d3c753c7d31a8ba5329713a8ddbc90dafc11e524c4ef"
+  },
+  {
+    "name": "prince_tone4",
+    "unicode": "1F934-1F3FE",
+    "digest": "08f6cb32424f15cc3aaf83c31a5dac7c01a6be2f37ea8f13aed579ce6fb4db19"
+  },
+  {
+    "name": "prince_tone5",
+    "unicode": "1F934-1F3FF",
+    "digest": "77d521148efa33fa4d3409693d050fecfd948411e807327484f174e289834649"
+  },
+  {
     "name": "princess",
     "unicode": "1F478",
     "digest": "efabd28480a843c735f0868734da2f9ce28133933b02ab07b645498f494f3f80"
@@ -8560,16 +8895,6 @@
     "digest": "5e5307e3dc7ec4e16c9978fb00934c99c4adefca7d32732a244d1f2de71ce6f8"
   },
   {
-    "name": "prohibited",
-    "unicode": "1F6C7",
-    "digest": "bc6cdea2269a0ec39576d98dc4cda2bd9efa4dc330dde870148c6a85ad9cc63f"
-  },
-  {
-    "name": "prohibited_sign",
-    "unicode": "1F6C7",
-    "digest": "bc6cdea2269a0ec39576d98dc4cda2bd9efa4dc330dde870148c6a85ad9cc63f"
-  },
-  {
     "name": "projector",
     "unicode": "1F4FD",
     "digest": "7f8e1fdb89584849a56ee34c62cab808af48b7bd4823467d090af4657a2e0420"
@@ -8625,11 +8950,6 @@
     "digest": "c3f7d7008be6bab8dc02284d4d759abf7aafbb3dbbe3a53f0f5b2ff685af88f8"
   },
   {
-    "name": "pushpin_black",
-    "unicode": "1F588",
-    "digest": "80ebac74edb9e8e1f8a219b32a676d318ed73b359cd8193b91b493d775307f63"
-  },
-  {
     "name": "put_litter_in_its_place",
     "unicode": "1F6AE",
     "digest": "f52a57d6f1bada7b6e6b9a6458597d70cb701c01e1120d8cb1d7ff65e01d405c"
@@ -8710,6 +9030,66 @@
     "digest": "a93aceb54e965f35e397e8c8716b1831614933308d026012d5464ee42783ed4d"
   },
   {
+    "name": "raised_back_of_hand",
+    "unicode": "1F91A",
+    "digest": "20973a697e826625deba5ee3c4f25eb5e1737f2e860ac6fe4ee4d0e0c84b5e12"
+  },
+  {
+    "name": "back_of_hand",
+    "unicode": "1F91A",
+    "digest": "20973a697e826625deba5ee3c4f25eb5e1737f2e860ac6fe4ee4d0e0c84b5e12"
+  },
+  {
+    "name": "raised_back_of_hand_tone1",
+    "unicode": "1F91A-1F3FB",
+    "digest": "06af5941255ca69d10d99d0a512bbda6141a296453835dbccf259ce0afe1dd3d"
+  },
+  {
+    "name": "back_of_hand_tone1",
+    "unicode": "1F91A-1F3FB",
+    "digest": "06af5941255ca69d10d99d0a512bbda6141a296453835dbccf259ce0afe1dd3d"
+  },
+  {
+    "name": "raised_back_of_hand_tone2",
+    "unicode": "1F91A-1F3FC",
+    "digest": "429ed19555c9e5197b729b3e7bd8013346551051cb0b3fbc8a4372717c9a027d"
+  },
+  {
+    "name": "back_of_hand_tone2",
+    "unicode": "1F91A-1F3FC",
+    "digest": "429ed19555c9e5197b729b3e7bd8013346551051cb0b3fbc8a4372717c9a027d"
+  },
+  {
+    "name": "raised_back_of_hand_tone3",
+    "unicode": "1F91A-1F3FD",
+    "digest": "487a1c3f19e77c99b520ec073de2acc4a9e585b739a84b3989f7de85d2c2045c"
+  },
+  {
+    "name": "back_of_hand_tone3",
+    "unicode": "1F91A-1F3FD",
+    "digest": "487a1c3f19e77c99b520ec073de2acc4a9e585b739a84b3989f7de85d2c2045c"
+  },
+  {
+    "name": "raised_back_of_hand_tone4",
+    "unicode": "1F91A-1F3FE",
+    "digest": "154254d8500c55ec3de698be4a352f9bcf06e2950cabc4eabaccad0f39a1e1e9"
+  },
+  {
+    "name": "back_of_hand_tone4",
+    "unicode": "1F91A-1F3FE",
+    "digest": "154254d8500c55ec3de698be4a352f9bcf06e2950cabc4eabaccad0f39a1e1e9"
+  },
+  {
+    "name": "raised_back_of_hand_tone5",
+    "unicode": "1F91A-1F3FF",
+    "digest": "6e9c0855ecd5f14adca5e5862427c3d39ffcf86f7ddd3aaa1fefc3cefc7483c8"
+  },
+  {
+    "name": "back_of_hand_tone5",
+    "unicode": "1F91A-1F3FF",
+    "digest": "6e9c0855ecd5f14adca5e5862427c3d39ffcf86f7ddd3aaa1fefc3cefc7483c8"
+  },
+  {
     "name": "raised_hand",
     "unicode": "270B",
     "digest": "5cf11be683aea985d5ba51fbd44722c2327311bfe26b61c3d441c90f5d5a195a"
@@ -8880,6 +9260,16 @@
     "digest": "d20c918c1e528ff0947312738501ca9a6fb6ff4016aad07db7a8125d00fd65cd"
   },
   {
+    "name": "rhino",
+    "unicode": "1F98F",
+    "digest": "163fa3acd78eead72c431a1f48b8465a6d45272a9169560e456d30b4df93dc6b"
+  },
+  {
+    "name": "rhinoceros",
+    "unicode": "1F98F",
+    "digest": "163fa3acd78eead72c431a1f48b8465a6d45272a9169560e456d30b4df93dc6b"
+  },
+  {
     "name": "ribbon",
     "unicode": "1F380",
     "digest": "74315fe907f9f0203afe139cd4552aa442eecfa2a64fac12db3e1292fc5a8828"
@@ -8905,29 +9295,64 @@
     "digest": "b942a06d3da0570aca59bab0af57cd8c16863934f12a38f70339fd0a36f675f5"
   },
   {
-    "name": "right_speaker",
-    "unicode": "1F568",
-    "digest": "d268bb84be863c0884620dfc6d2a764b0c7466d2f9810549b138e21ac70add4e"
+    "name": "right_facing_fist",
+    "unicode": "1F91C",
+    "digest": "f815d1cc0c0345ddcc8886ae9c133582d7dc779732ac9b93dde1ab4fdd3b251d"
+  },
+  {
+    "name": "right_fist",
+    "unicode": "1F91C",
+    "digest": "f815d1cc0c0345ddcc8886ae9c133582d7dc779732ac9b93dde1ab4fdd3b251d"
   },
   {
-    "name": "right_speaker_one",
-    "unicode": "1F569",
-    "digest": "5b92daa87bdf6ee15e798bec382a2ee885f4e6e77a68a3f626adcfe4c782b375"
+    "name": "right_facing_fist_tone1",
+    "unicode": "1F91C-1F3FB",
+    "digest": "0f9269b70cf68071d97389e059a2bdacffd73f2afd2ce6cfd7447bb1a4e9abbb"
   },
   {
-    "name": "right_speaker_with_one_sound_wave",
-    "unicode": "1F569",
-    "digest": "5b92daa87bdf6ee15e798bec382a2ee885f4e6e77a68a3f626adcfe4c782b375"
+    "name": "right_fist_tone1",
+    "unicode": "1F91C-1F3FB",
+    "digest": "0f9269b70cf68071d97389e059a2bdacffd73f2afd2ce6cfd7447bb1a4e9abbb"
   },
   {
-    "name": "right_speaker_three",
-    "unicode": "1F56A",
-    "digest": "4d00b720a65bd0f4c3682b290b1976ec2388d6ae61225398f4e70556ae9e5f80"
+    "name": "right_facing_fist_tone2",
+    "unicode": "1F91C-1F3FC",
+    "digest": "32a9833db853972e49e65aa227fb0512c57362da190aa1cc40e1d64f238e837e"
   },
   {
-    "name": "right_speaker_with_three_sound_waves",
-    "unicode": "1F56A",
-    "digest": "4d00b720a65bd0f4c3682b290b1976ec2388d6ae61225398f4e70556ae9e5f80"
+    "name": "right_fist_tone2",
+    "unicode": "1F91C-1F3FC",
+    "digest": "32a9833db853972e49e65aa227fb0512c57362da190aa1cc40e1d64f238e837e"
+  },
+  {
+    "name": "right_facing_fist_tone3",
+    "unicode": "1F91C-1F3FD",
+    "digest": "be4706f8bb088411f5cbbf9065a0ae5b773c97456bd975c2b6789765657847b9"
+  },
+  {
+    "name": "right_fist_tone3",
+    "unicode": "1F91C-1F3FD",
+    "digest": "be4706f8bb088411f5cbbf9065a0ae5b773c97456bd975c2b6789765657847b9"
+  },
+  {
+    "name": "right_facing_fist_tone4",
+    "unicode": "1F91C-1F3FE",
+    "digest": "1680862891a9d85c4b6f76232a80e2ef7428bcec93087c86eae2efaba9c6a3f7"
+  },
+  {
+    "name": "right_fist_tone4",
+    "unicode": "1F91C-1F3FE",
+    "digest": "1680862891a9d85c4b6f76232a80e2ef7428bcec93087c86eae2efaba9c6a3f7"
+  },
+  {
+    "name": "right_facing_fist_tone5",
+    "unicode": "1F91C-1F3FF",
+    "digest": "388715a4bc2178c52bbb3bc2729f57be50acab5d751784c9f3220e86c6b1fbcc"
+  },
+  {
+    "name": "right_fist_tone5",
+    "unicode": "1F91C-1F3FF",
+    "digest": "388715a4bc2178c52bbb3bc2729f57be50acab5d751784c9f3220e86c6b1fbcc"
   },
   {
     "name": "ring",
@@ -8935,11 +9360,6 @@
     "digest": "b5322907222797b5e1786209cda88513e76cd397a40f0a7da24847245c95ef9d"
   },
   {
-    "name": "ringing_bell",
-    "unicode": "1F56D",
-    "digest": "d71ab7fa937fc4af507b5b07ea58a4f31e875d9e8304ef2b850d7cebe0e9cd66"
-  },
-  {
     "name": "robot",
     "unicode": "1F916",
     "digest": "4d788e6ec89279588b036fca6b17f5a981291681df8f90306ecf5c039de40848"
@@ -8955,6 +9375,16 @@
     "digest": "b82e68a95aa89a6de344d6e256fef86a848ebc91de560b043b3e1f7fd072d57d"
   },
   {
+    "name": "rofl",
+    "unicode": "1F923",
+    "digest": "f4f99ba2ac67b97338f904f9384ff03fb832a2e427bf6e74611bf5fee45f1f48"
+  },
+  {
+    "name": "rolling_on_the_floor_laughing",
+    "unicode": "1F923",
+    "digest": "f4f99ba2ac67b97338f904f9384ff03fb832a2e427bf6e74611bf5fee45f1f48"
+  },
+  {
     "name": "roller_coaster",
     "unicode": "1F3A2",
     "digest": "a65e9ace1d7900499777af1225995f17af90a398bb414764c20b6e09a8c23a2c"
@@ -8985,11 +9415,6 @@
     "digest": "2537def4deef422d4e669b28b1a0675259306ab38601019df3ec3482b14e52d5"
   },
   {
-    "name": "rosette_black",
-    "unicode": "1F3F6",
-    "digest": "ae8675891c88f9d98463d35178445950c39b0deb0f0e8b3f341228a6e0d0e477"
-  },
-  {
     "name": "rotating_light",
     "unicode": "1F6A8",
     "digest": "91fcdb85a752ae904d335a978c7e7936aed4c75d414b35219b5a74430e51555f"
@@ -9090,6 +9515,16 @@
     "digest": "0a786075f3d9da48ae91afccf6ae0d097888da9509d354ee1d3cb99afcc88fe4"
   },
   {
+    "name": "salad",
+    "unicode": "1F957",
+    "digest": "fe321487ab847abe670e68a83f1d9e096129741c689c769ee7de4a65aeac29f8"
+  },
+  {
+    "name": "green_salad",
+    "unicode": "1F957",
+    "digest": "fe321487ab847abe670e68a83f1d9e096129741c689c769ee7de4a65aeac29f8"
+  },
+  {
     "name": "sandal",
     "unicode": "1F461",
     "digest": "03c3077cb4bd900934f9bdf921165b465e5cc9a6bee53e45a091411bceb8892d"
@@ -9160,6 +9595,11 @@
     "digest": "95225be28f05d8b5a6b6e6bf58d973f61f183ad4fef55a558dc1b810796b85c8"
   },
   {
+    "name": "scooter",
+    "unicode": "1F6F4",
+    "digest": "4a7db148880398db75e059711cb53edefb6b8fa9d442009f52856b887ab1dde4"
+  },
+  {
     "name": "scorpion",
     "unicode": "1F982",
     "digest": "d41119d1ea5daf727c17dbea7dadec1718c72fc9f98ae88252161df5fde0938a"
@@ -9190,6 +9630,16 @@
     "digest": "ae68d86fc2a07cae332451b23bd1ceba3f6526a6c56d8c1089777fa4632850e1"
   },
   {
+    "name": "second_place",
+    "unicode": "1F948",
+    "digest": "9e2336fc16e532829b55380252f94655b58817d47c909fc2570002c5b06b9c40"
+  },
+  {
+    "name": "second_place_medal",
+    "unicode": "1F948",
+    "digest": "9e2336fc16e532829b55380252f94655b58817d47c909fc2570002c5b06b9c40"
+  },
+  {
     "name": "secret",
     "unicode": "3299",
     "digest": "1d0b9adde2657f41421b135962de20820cf4b4eb0204044f9859522ab9d211b0"
@@ -9205,16 +9655,61 @@
     "digest": "c0ec5e6d20e1afdc4e78eeddb1301c8b708ad6278e7287a4e4e825417c858e75"
   },
   {
+    "name": "selfie",
+    "unicode": "1F933",
+    "digest": "2a1bc9f18ad4d6fb893d91c88ef1b2d9bd063dc2bb1a4b08c248c30f52545d4e"
+  },
+  {
+    "name": "selfie_tone1",
+    "unicode": "1F933-1F3FB",
+    "digest": "26dc212ffed30c276bd6a66a72bc4513e68098a2205fb4ca5b51ccfa1de5b544"
+  },
+  {
+    "name": "selfie_tone2",
+    "unicode": "1F933-1F3FC",
+    "digest": "71eceaefda46e3521f374f76693e7fa8f215067498067900080e2925ca94d7de"
+  },
+  {
+    "name": "selfie_tone3",
+    "unicode": "1F933-1F3FD",
+    "digest": "53eabbd4f6b8ebbd2f7af7bf5cd64309c4039ac1c5b2180290a547deaafcebdf"
+  },
+  {
+    "name": "selfie_tone4",
+    "unicode": "1F933-1F3FE",
+    "digest": "0baad378b09652b99c5d458db2e03b4db14a1557db4ea0969806a0ca1d33d40c"
+  },
+  {
+    "name": "selfie_tone5",
+    "unicode": "1F933-1F3FF",
+    "digest": "9a07608f34ec4dad48764a855f83f3965709d7b2fd2342e6dc9ed61f23f4adfd"
+  },
+  {
     "name": "seven",
     "unicode": "0037-20E3",
     "digest": "ae85172d2c76c44afb4e3b45d277d400abb2dc895244b9abfbd1dac1cd7c53c2"
   },
   {
+    "name": "shallow_pan_of_food",
+    "unicode": "1F958",
+    "digest": "7c7ad9d5d3f7226427d310b5853e8257fad899febe58dcbc5adb4677964f5c6d"
+  },
+  {
+    "name": "paella",
+    "unicode": "1F958",
+    "digest": "7c7ad9d5d3f7226427d310b5853e8257fad899febe58dcbc5adb4677964f5c6d"
+  },
+  {
     "name": "shamrock",
     "unicode": "2618",
     "digest": "68ed70c26e04a818439a1742d2da6bc169edd02db86b6e6f8014b651f3235488"
   },
   {
+    "name": "shark",
+    "unicode": "1F988",
+    "digest": "23a2364b6356e7bbb84c138e9cf58e2c68cd8caabb337a0c4d365ce87bf5d2da"
+  },
+  {
     "name": "shaved_ice",
     "unicode": "1F367",
     "digest": "54048e77268b7548d03088517bf8558d11324db901ca57f9bec93f1873663a74"
@@ -9255,11 +9750,56 @@
     "digest": "95a3f03c675207bb1354270d02a630c204455c47b3edca23c48523a40cf3ea3b"
   },
   {
+    "name": "shopping_cart",
+    "unicode": "1F6D2",
+    "digest": "4599b63f6861cdb4d8272cac84435c24c1d4d6a73c66d51e04a1cd14a1d333e6"
+  },
+  {
+    "name": "shopping_trolley",
+    "unicode": "1F6D2",
+    "digest": "4599b63f6861cdb4d8272cac84435c24c1d4d6a73c66d51e04a1cd14a1d333e6"
+  },
+  {
     "name": "shower",
     "unicode": "1F6BF",
     "digest": "6b3c767c0eb472d4861c6c3cc2735a5e2c09681872ef42a11dc89f3c80b9da01"
   },
   {
+    "name": "shrimp",
+    "unicode": "1F990",
+    "digest": "b3651f3be3767125076a013fe903854f5b456a8afae865cb219cf528e0f44caa"
+  },
+  {
+    "name": "shrug",
+    "unicode": "1F937",
+    "digest": "6e264243cc3b6e396069dea4357a958bdcd4081cb1af0ed6aa47235bef88cf27"
+  },
+  {
+    "name": "shrug_tone1",
+    "unicode": "1F937-1F3FB",
+    "digest": "0567b9fd95c8a857914003a5465a500ca79c8111811d45b865021b1b1d92d0b1"
+  },
+  {
+    "name": "shrug_tone2",
+    "unicode": "1F937-1F3FC",
+    "digest": "1557c2f5e3d4599c806d74c0b78afcca940678787534b6862bb89a20601bac8a"
+  },
+  {
+    "name": "shrug_tone3",
+    "unicode": "1F937-1F3FD",
+    "digest": "f02754541a7bf74ba7eebe6c27daf1e3e1dac25172c35b8ba45641e278dfda3d"
+  },
+  {
+    "name": "shrug_tone4",
+    "unicode": "1F937-1F3FE",
+    "digest": "2b5121164cb5f4e253d8fb31f6445cf8afaf30dba41732edc511440cdb78d15c"
+  },
+  {
+    "name": "shrug_tone5",
+    "unicode": "1F937-1F3FF",
+    "digest": "62d99a26bbad479f574f66208c41b9960cd41fb9d79d3a13fbdaa44682077115"
+  },
+  {
     "name": "signal_strength",
     "unicode": "1F4F6",
     "digest": "2c6f04ba4ecd2d2d423e19eb52cfbfd253f4db6e0908d91c1af4ea6192597447"
@@ -9415,6 +9955,16 @@
     "digest": "18da2d97c771149ef5454dd23470e900903a62ab93f9e2ce301aad5a8181d773"
   },
   {
+    "name": "sneezing_face",
+    "unicode": "1F927",
+    "digest": "c20ef571dc7e35572fe3c18b7845aefc89af083ea925c48a29de3b7387af6e17"
+  },
+  {
+    "name": "sneeze",
+    "unicode": "1F927",
+    "digest": "c20ef571dc7e35572fe3c18b7845aefc89af083ea925c48a29de3b7387af6e17"
+  },
+  {
     "name": "snowboarder",
     "unicode": "1F3C2",
     "digest": "c6e074139b851aa53b1ba6464d84da14b3da7412fc44c6c196a8469d76915c19"
@@ -9520,46 +10070,6 @@
     "digest": "817100d9979456e7d2f253ac22e13b7a2302dc1590566214915b003e403c53ca"
   },
   {
-    "name": "speech_left",
-    "unicode": "1F5E8",
-    "digest": "912797107d574f5665411498b6e349dbdec69846f085b6dc356548c4155e90b0"
-  },
-  {
-    "name": "left_speech_bubble",
-    "unicode": "1F5E8",
-    "digest": "912797107d574f5665411498b6e349dbdec69846f085b6dc356548c4155e90b0"
-  },
-  {
-    "name": "speech_right",
-    "unicode": "1F5E9",
-    "digest": "8439b13779163c15e678a78b08ebeeb7d131632df21d2a7868de7fed38ca9d8a"
-  },
-  {
-    "name": "right_speech_bubble",
-    "unicode": "1F5E9",
-    "digest": "8439b13779163c15e678a78b08ebeeb7d131632df21d2a7868de7fed38ca9d8a"
-  },
-  {
-    "name": "speech_three",
-    "unicode": "1F5EB",
-    "digest": "55a934f3659b6e75fdce0d0c4e2ea56dd34a43892c85a6666bd1882a0bfb92a9"
-  },
-  {
-    "name": "three_speech_bubbles",
-    "unicode": "1F5EB",
-    "digest": "55a934f3659b6e75fdce0d0c4e2ea56dd34a43892c85a6666bd1882a0bfb92a9"
-  },
-  {
-    "name": "speech_two",
-    "unicode": "1F5EA",
-    "digest": "0563ef0591da243673cf877462acc5d8e1d980a56e81668ac627de74d0c33983"
-  },
-  {
-    "name": "two_speech_bubbles",
-    "unicode": "1F5EA",
-    "digest": "0563ef0591da243673cf877462acc5d8e1d980a56e81668ac627de74d0c33983"
-  },
-  {
     "name": "speedboat",
     "unicode": "1F6A4",
     "digest": "a523b2320f0b24be1e9fdbc1ff828e28d8fd9a64d51e5888ab453ef0bc9f0576"
@@ -9575,6 +10085,11 @@
     "digest": "2434bdfbe56dcc4a43699dd59b638af431486b52fb1d6d685451f3b231b2be23"
   },
   {
+    "name": "spoon",
+    "unicode": "1F944",
+    "digest": "4fa31d59e5bffd2c45a8e01fcd5652e78a5691cbfa744e69882bc67173ddea05"
+  },
+  {
     "name": "spy",
     "unicode": "1F575",
     "digest": "99fe3cdeff934726ee5855b0e401bf32570084aaad4eb10df837fd410ca742aa"
@@ -9635,6 +10150,11 @@
     "digest": "ffc6fefd9a537124ebf0a9ddf387414dce1291335026064644f6cf9315591129"
   },
   {
+    "name": "squid",
+    "unicode": "1F991",
+    "digest": "65a1b318c2c506b9d26cfd8282a5cf9922109595c8d12e92c3f7481ac7c08c49"
+  },
+  {
     "name": "stadium",
     "unicode": "1F3DF",
     "digest": "73bf955e767ba1518c9c92b2ba59a2aa1ec4b018652dffd97bcd74832a33789f"
@@ -9680,26 +10200,11 @@
     "digest": "52ad0073f37b978faf3884fb193046f2b0614e1557bbcc9de1b020e42aff2dba"
   },
   {
-    "name": "stereo",
-    "unicode": "1F4FE",
-    "digest": "1ce1f9a83867514b8351ad4fd80c46bba04ad67dfb9874e63d7296e1a21161a5"
-  },
-  {
-    "name": "portable_stereo",
-    "unicode": "1F4FE",
-    "digest": "1ce1f9a83867514b8351ad4fd80c46bba04ad67dfb9874e63d7296e1a21161a5"
-  },
-  {
     "name": "stew",
     "unicode": "1F372",
     "digest": "c16f61236db314ad8d9f2dd241ec1e15c8d64e5872cce93ec4d0996490dd39df"
   },
   {
-    "name": "stock_chart",
-    "unicode": "1F5E0",
-    "digest": "4a0fbf54d19b0b5626f91c932a24e6ac12a65b4fc276d852ff4356c8c579d28a"
-  },
-  {
     "name": "stop_button",
     "unicode": "23F9",
     "digest": "83f9d0da3ad845fef41b4e8336815d30e9c8f042ab2a8340894ade2f428fc98a"
@@ -9735,6 +10240,16 @@
     "digest": "dbacd6428a2a2933212e6a4dc0c7f302177fb23b963626ccb26f27f91737f03d"
   },
   {
+    "name": "stuffed_flatbread",
+    "unicode": "1F959",
+    "digest": "9f841f2520640d69be4f20a3199023d5811842b28556b5e1152e5ec11f0fda07"
+  },
+  {
+    "name": "stuffed_pita",
+    "unicode": "1F959",
+    "digest": "9f841f2520640d69be4f20a3199023d5811842b28556b5e1152e5ec11f0fda07"
+  },
+  {
     "name": "sun_with_face",
     "unicode": "1F31E",
     "digest": "7256ff5263006c64c03f1eb66e3ddb56d67d785d65dacc37aa886d0cd4be63be"
@@ -9910,31 +10425,11 @@
     "digest": "3a53851e641f8ad938ce3597b1afca2ea63c9314ff81f62563b99937496a13d7"
   },
   {
-    "name": "telephone_black",
-    "unicode": "1F57F",
-    "digest": "c3a42a653a91d90c6b668f678419d5438f2e546050914b841623e57107e805db"
-  },
-  {
-    "name": "black_touchtone_telephone",
-    "unicode": "1F57F",
-    "digest": "c3a42a653a91d90c6b668f678419d5438f2e546050914b841623e57107e805db"
-  },
-  {
     "name": "telephone_receiver",
     "unicode": "1F4DE",
     "digest": "1614d67f3d8814b0d75f39d55f9149e4d28ef57b343498625e62fcfff8365046"
   },
   {
-    "name": "telephone_white",
-    "unicode": "1F57E",
-    "digest": "62a7e0e50c53e9f85eba51a92882e6064be05997910d3f7700e1e957dbaf0581"
-  },
-  {
-    "name": "white_touchtone_telephone",
-    "unicode": "1F57E",
-    "digest": "62a7e0e50c53e9f85eba51a92882e6064be05997910d3f7700e1e957dbaf0581"
-  },
-  {
     "name": "telescope",
     "unicode": "1F52D",
     "digest": "4adf40387870276c4f59fb050d441023e8dac784365b6a8c0282fb519780b495"
@@ -9980,29 +10475,19 @@
     "digest": "4f0b84e5ab8a650cafb166e93688f0e9b31b9ade22a91035261ac90490edb9d3"
   },
   {
-    "name": "thought_balloon",
-    "unicode": "1F4AD",
-    "digest": "bf59624560c333561d636aedf2c8827089e275895cf434974daaabb3d5cea46e"
-  },
-  {
-    "name": "thought_left",
-    "unicode": "1F5EC",
-    "digest": "4fd591bf4318df73d1b17f434a449d8e95f49cca53a3d8f4d1ca983f3809ef46"
+    "name": "third_place",
+    "unicode": "1F949",
+    "digest": "27c9bcba44ad95bee30882cc0722e8b0a798206306655dd648e884447ed26808"
   },
   {
-    "name": "left_thought_bubble",
-    "unicode": "1F5EC",
-    "digest": "4fd591bf4318df73d1b17f434a449d8e95f49cca53a3d8f4d1ca983f3809ef46"
+    "name": "third_place_medal",
+    "unicode": "1F949",
+    "digest": "27c9bcba44ad95bee30882cc0722e8b0a798206306655dd648e884447ed26808"
   },
   {
-    "name": "thought_right",
-    "unicode": "1F5ED",
-    "digest": "0e8c0ce26e2d0e30894f5394b0736456e8268f775e0e7eda4c7dc3c2ff9231ae"
-  },
-  {
-    "name": "right_thought_bubble",
-    "unicode": "1F5ED",
-    "digest": "0e8c0ce26e2d0e30894f5394b0736456e8268f775e0e7eda4c7dc3c2ff9231ae"
+    "name": "thought_balloon",
+    "unicode": "1F4AD",
+    "digest": "bf59624560c333561d636aedf2c8827089e275895cf434974daaabb3d5cea46e"
   },
   {
     "name": "three",
@@ -10010,26 +10495,6 @@
     "digest": "d3f85828787799c769655c38a519cad0743ab799ab276c7606e6e6894cc442e6"
   },
   {
-    "name": "thumbs_down_reverse",
-    "unicode": "1F593",
-    "digest": "a8b561e389bc4e4b07fba70994f6445e5ddc6afe68922fcb6e9e7282d19ad958"
-  },
-  {
-    "name": "reversed_thumbs_down_sign",
-    "unicode": "1F593",
-    "digest": "a8b561e389bc4e4b07fba70994f6445e5ddc6afe68922fcb6e9e7282d19ad958"
-  },
-  {
-    "name": "thumbs_up_reverse",
-    "unicode": "1F592",
-    "digest": "b6e52715c5ce590bfd08f6e05058ec3765ea2da341b11f9825d100608b173837"
-  },
-  {
-    "name": "reversed_thumbs_up_sign",
-    "unicode": "1F592",
-    "digest": "b6e52715c5ce590bfd08f6e05058ec3765ea2da341b11f9825d100608b173837"
-  },
-  {
     "name": "thumbsdown",
     "unicode": "1F44E",
     "digest": "5954334e2dae5357312b3d629f10a496c728029e02216f8c8b887f9b51561c61"
@@ -10315,31 +10780,11 @@
     "digest": "06e65d549e771632f3c64287a38ba67236f9800ccb6a23c3b592bc010e24e122"
   },
   {
-    "name": "train_diesel",
-    "unicode": "1F6F2",
-    "digest": "621bb967cd93fa9f8fd4b155965cc7572d3f91f88d94938ba10c8626718b623c"
-  },
-  {
-    "name": "diesel_locomotive",
-    "unicode": "1F6F2",
-    "digest": "621bb967cd93fa9f8fd4b155965cc7572d3f91f88d94938ba10c8626718b623c"
-  },
-  {
     "name": "tram",
     "unicode": "1F68A",
     "digest": "21a7699f1a94f06dcb4d1e896448b98a4205f8efe902a8ac169a5005d11ab100"
   },
   {
-    "name": "triangle_round",
-    "unicode": "1F6C6",
-    "digest": "e24bb39ecfaaa746b03dc8418697d09ef327d5b077db39014f39d5fb87e23bd5"
-  },
-  {
-    "name": "triangle_with_rounded_corners",
-    "unicode": "1F6C6",
-    "digest": "e24bb39ecfaaa746b03dc8418697d09ef327d5b077db39014f39d5fb87e23bd5"
-  },
-  {
     "name": "triangular_flag_on_post",
     "unicode": "1F6A9",
     "digest": "1f5ce3828a42f5b1717bac1521d0502cf7081ad9f15e8ed292c1a65f0d1386da"
@@ -10395,19 +10840,19 @@
     "digest": "e744e8dbbdc6b126bd5b15aad56b524191de5a604189f4ab6d96730dfef4d086"
   },
   {
-    "name": "turkey",
-    "unicode": "1F983",
-    "digest": "bf5daef15716b66636a5fdb6d059420521443c0603e2d56bd7c99c791a7285f4"
+    "name": "tumbler_glass",
+    "unicode": "1F943",
+    "digest": "7a38658274b9ff28836725a1dbfad49b8fa3af5ec8385e629db6bfdc7d93907a"
   },
   {
-    "name": "turned_ok_hand",
-    "unicode": "1F58F",
-    "digest": "8a6c5b7d4c737866e7e32c6d9f7f447a48a0ac57a8909d43f87367d4a9b59246"
+    "name": "whisky",
+    "unicode": "1F943",
+    "digest": "7a38658274b9ff28836725a1dbfad49b8fa3af5ec8385e629db6bfdc7d93907a"
   },
   {
-    "name": "turned_ok_hand_sign",
-    "unicode": "1F58F",
-    "digest": "8a6c5b7d4c737866e7e32c6d9f7f447a48a0ac57a8909d43f87367d4a9b59246"
+    "name": "turkey",
+    "unicode": "1F983",
+    "digest": "bf5daef15716b66636a5fdb6d059420521443c0603e2d56bd7c99c791a7285f4"
   },
   {
     "name": "turtle",
@@ -10760,6 +11205,36 @@
     "digest": "ba6a840d4f57f8f9f3e9f29b8a030faf02a3a3d912e3e31b067616b2ac48a3d1"
   },
   {
+    "name": "water_polo",
+    "unicode": "1F93D",
+    "digest": "fc77e1d2a84a9f4cf0cf19c1ea10cf137cf0940b9103a523121eda87677ad148"
+  },
+  {
+    "name": "water_polo_tone1",
+    "unicode": "1F93D-1F3FB",
+    "digest": "3be28384edd29ada8109f07720d601a9d5866ed63e6234efe9ee1a194ed5d0c5"
+  },
+  {
+    "name": "water_polo_tone2",
+    "unicode": "1F93D-1F3FC",
+    "digest": "afcd3f28c6719f869ca79a6fd1ccade2ea976ade844fbc1081fc72865bcb652f"
+  },
+  {
+    "name": "water_polo_tone3",
+    "unicode": "1F93D-1F3FD",
+    "digest": "d19481c9b82d9413e99c2652e020fd763f2b54408dedaffec8dfe80973ded407"
+  },
+  {
+    "name": "water_polo_tone4",
+    "unicode": "1F93D-1F3FE",
+    "digest": "375972d882b627e8d525e632e58b30346fc3e01858d7d08d62a9d3bf8132bbc7"
+  },
+  {
+    "name": "water_polo_tone5",
+    "unicode": "1F93D-1F3FF",
+    "digest": "a8e1ced1c5382a8147a1d1801a133cada9a0e52e41de6272e56c3c1f426f6048"
+  },
+  {
     "name": "watermelon",
     "unicode": "1F349",
     "digest": "42a3821d2e4dd595c93f5db7a5c70b7af486b8f0ddd3b9d26bc4e743a88e699a"
@@ -10915,6 +11390,16 @@
     "digest": "0a6164cdadf2413555b7ef47b95f823f5a010f36d2dacfb1a38335a0f59e9601"
   },
   {
+    "name": "wilted_rose",
+    "unicode": "1F940",
+    "digest": "2c9e01ab9a61d057c71478b09ba7d82ae08f4a5a1c2212b7ad562b74f616677f"
+  },
+  {
+    "name": "wilted_flower",
+    "unicode": "1F940",
+    "digest": "2c9e01ab9a61d057c71478b09ba7d82ae08f4a5a1c2212b7ad562b74f616677f"
+  },
+  {
     "name": "wind_blowing_face",
     "unicode": "1F32C",
     "digest": "e4f63149cbc8829118571f6a93487b96d26665fc15d17d578cca4e5c752cd54f"
@@ -10995,14 +11480,69 @@
     "digest": "81aae53bc892035b905bf3ec5b442a8ecc95027c5fa9eb51b7c3e7d8fad3f3f4"
   },
   {
-    "name": "writing_hand",
-    "unicode": "1F58E",
-    "digest": "c4fc18ece6778339ebe14438aaf570e22385c3010c2d341824fa72ac6068cfeb"
+    "name": "wrestlers",
+    "unicode": "1F93C",
+    "digest": "9be983f3f9438f3ab8f6b643a958371d1e710c6d78e728f3465141811f05c2d5"
+  },
+  {
+    "name": "wrestling",
+    "unicode": "1F93C",
+    "digest": "9be983f3f9438f3ab8f6b643a958371d1e710c6d78e728f3465141811f05c2d5"
   },
   {
-    "name": "left_writing_hand",
-    "unicode": "1F58E",
-    "digest": "c4fc18ece6778339ebe14438aaf570e22385c3010c2d341824fa72ac6068cfeb"
+    "name": "wrestlers_tone1",
+    "unicode": "1F93C-1F3FB",
+    "digest": "60461f83bfc93ce59dd027eab4782b7f206a7b142719fa72f301e047dc83a5d9"
+  },
+  {
+    "name": "wrestling_tone1",
+    "unicode": "1F93C-1F3FB",
+    "digest": "60461f83bfc93ce59dd027eab4782b7f206a7b142719fa72f301e047dc83a5d9"
+  },
+  {
+    "name": "wrestlers_tone2",
+    "unicode": "1F93C-1F3FC",
+    "digest": "67ad93c86e6c58d552c18e7a0105cc81fd9bb0474da51f788eba2e4c14b4a636"
+  },
+  {
+    "name": "wrestling_tone2",
+    "unicode": "1F93C-1F3FC",
+    "digest": "67ad93c86e6c58d552c18e7a0105cc81fd9bb0474da51f788eba2e4c14b4a636"
+  },
+  {
+    "name": "wrestlers_tone3",
+    "unicode": "1F93C-1F3FD",
+    "digest": "6bfd06c4435cabf2def153912040e05bf8db424fa383148ddda6d0ce8a8a3349"
+  },
+  {
+    "name": "wrestling_tone3",
+    "unicode": "1F93C-1F3FD",
+    "digest": "6bfd06c4435cabf2def153912040e05bf8db424fa383148ddda6d0ce8a8a3349"
+  },
+  {
+    "name": "wrestlers_tone4",
+    "unicode": "1F93C-1F3FE",
+    "digest": "597312678834c4d288c238482879856d5eba4620deb1eaef495f428e2ba5f2a5"
+  },
+  {
+    "name": "wrestling_tone4",
+    "unicode": "1F93C-1F3FE",
+    "digest": "597312678834c4d288c238482879856d5eba4620deb1eaef495f428e2ba5f2a5"
+  },
+  {
+    "name": "wrestlers_tone5",
+    "unicode": "1F93C-1F3FF",
+    "digest": "d6aebdf1e44fd825b9a5b3716aefbc53f4b4dbb73cb2a628c0f2994ebfd34614"
+  },
+  {
+    "name": "wrestling_tone5",
+    "unicode": "1F93C-1F3FF",
+    "digest": "d6aebdf1e44fd825b9a5b3716aefbc53f4b4dbb73cb2a628c0f2994ebfd34614"
+  },
+  {
+    "name": "writing_hand",
+    "unicode": "270D",
+    "digest": "110517ae4da5587e8b0662881658e27da4120bfacec54734fd6657831d4d782f"
   },
   {
     "name": "writing_hand_tone1",
diff --git a/fixtures/emojis/index.json b/fixtures/emojis/index.json
index 7f204c1a8e0..2a990913b9c 100644
--- a/fixtures/emojis/index.json
+++ b/fixtures/emojis/index.json
@@ -4,7 +4,7 @@
     "unicode_alternates": [],
     "name": "hundred points symbol",
     "shortname": ":100:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -15,12 +15,14 @@
       "percent",
       "a",
       "plus",
-      "perfect",
       "school",
       "quiz",
-      "score",
       "test",
-      "exam"
+      "exam",
+      "symbol",
+      "wow",
+      "win",
+      "parties"
     ],
     "moji": "💯"
   },
@@ -29,12 +31,13 @@
     "unicode_alternates": [],
     "name": "input symbol for numbers",
     "shortname": ":1234:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "blue-square",
-      "numbers"
+      "numbers",
+      "symbol"
     ],
     "moji": "🔢"
   },
@@ -43,16 +46,20 @@
     "unicode_alternates": [],
     "name": "billiards",
     "shortname": ":8ball:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "pool",
       "billiards",
       "eight ball",
-      "pool",
       "pocket ball",
-      "cue"
+      "cue",
+      "game",
+      "ball",
+      "sport",
+      "luck",
+      "boys night"
     ],
     "moji": "🎱"
   },
@@ -61,13 +68,14 @@
     "unicode_alternates": [],
     "name": "negative squared latin capital letter a",
     "shortname": ":a:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "alphabet",
       "letter",
-      "red-square"
+      "red-square",
+      "symbol"
     ],
     "moji": "🅰"
   },
@@ -76,12 +84,13 @@
     "unicode_alternates": [],
     "name": "negative squared ab",
     "shortname": ":ab:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "alphabet",
-      "red-square"
+      "red-square",
+      "symbol"
     ],
     "moji": "🆎"
   },
@@ -90,12 +99,13 @@
     "unicode_alternates": [],
     "name": "input symbol for latin letters",
     "shortname": ":abc:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "alphabet",
-      "blue-square"
+      "blue-square",
+      "symbol"
     ],
     "moji": "🔤"
   },
@@ -104,12 +114,13 @@
     "unicode_alternates": [],
     "name": "input symbol for latin small letters",
     "shortname": ":abcd:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "alphabet",
-      "blue-square"
+      "blue-square",
+      "symbol"
     ],
     "moji": "🔡"
   },
@@ -118,7 +129,7 @@
     "unicode_alternates": [],
     "name": "circled ideograph accept",
     "shortname": ":accept:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -127,7 +138,8 @@
       "good",
       "kanji",
       "ok",
-      "yes"
+      "yes",
+      "symbol"
     ],
     "moji": "🉑"
   },
@@ -136,7 +148,7 @@
     "unicode_alternates": [],
     "name": "aerial tramway",
     "shortname": ":aerial_tramway:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -146,7 +158,9 @@
       "tram",
       "tramway",
       "cable",
-      "transport"
+      "transport",
+      "travel",
+      "train"
     ],
     "moji": "🚡"
   },
@@ -157,7 +171,7 @@
     ],
     "name": "airplane",
     "shortname": ":airplane:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -173,7 +187,8 @@
       "jet",
       "jumbo",
       "boeing",
-      "airbus"
+      "airbus",
+      "vacation"
     ],
     "moji": "✈"
   },
@@ -182,7 +197,7 @@
     "unicode_alternates": [],
     "name": "airplane arriving",
     "shortname": ":airplane_arriving:",
-    "category": "travel_places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -197,15 +212,17 @@
       "jet",
       "jumbo",
       "boeing",
-      "airbus"
-    ]
+      "airbus",
+      "vacation"
+    ],
+    "moji": "🛬"
   },
   "airplane_departure": {
     "unicode": "1F6EB",
     "unicode_alternates": [],
     "name": "airplane departure",
     "shortname": ":airplane_departure:",
-    "category": "travel_places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -221,30 +238,17 @@
       "jumbo",
       "boeing",
       "airbus",
-      "leaving"
-    ]
-  },
-  "airplane_northeast": {
-    "unicode": "1F6EA",
-    "unicode_alternates": [],
-    "name": "northeast-pointing airplane",
-    "shortname": ":airplane_northeast:",
-    "category": "travel_places",
-    "aliases": [
-      ":northeast_pointing_airplane:"
+      "leaving",
+      "vacation"
     ],
-    "aliases_ascii": [],
-    "keywords": [
-      "plane",
-      "travel"
-    ]
+    "moji": "🛫"
   },
   "airplane_small": {
     "unicode": "1F6E9",
     "unicode_alternates": [],
     "name": "small airplane",
     "shortname": ":airplane_small:",
-    "category": "travel_places",
+    "category": "travel",
     "aliases": [
       ":small_airplane:"
     ],
@@ -261,38 +265,10 @@
       "jet",
       "jumbo",
       "boeing",
-      "airbus"
-    ]
-  },
-  "airplane_small_up": {
-    "unicode": "1F6E8",
-    "unicode_alternates": [],
-    "name": "up-pointing small airplane",
-    "shortname": ":airplane_small_up:",
-    "category": "travel_places",
-    "aliases": [
-      ":up_pointing_small_airplane:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "plane",
-      "travel"
-    ]
-  },
-  "airplane_up": {
-    "unicode": "1F6E7",
-    "unicode_alternates": [],
-    "name": "up-pointing airplane",
-    "shortname": ":airplane_up:",
-    "category": "travel_places",
-    "aliases": [
-      ":up_pointing_airplane:"
+      "airbus",
+      "vacation"
     ],
-    "aliases_ascii": [],
-    "keywords": [
-      "plane",
-      "travel"
-    ]
+    "moji": "🛩"
   },
   "alarm_clock": {
     "unicode": "23F0",
@@ -304,13 +280,14 @@
     "aliases_ascii": [],
     "keywords": [
       "time",
-      "wake"
+      "wake",
+      "object"
     ],
     "moji": "⏰"
   },
   "alembic": {
     "unicode": "2697",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "alembic",
     "shortname": ":alembic:",
     "category": "objects",
@@ -319,22 +296,27 @@
     "keywords": [
       "chemistry",
       "object",
-      "tool"
-    ]
+      "tool",
+      "science"
+    ],
+    "moji": "⚗"
   },
   "alien": {
     "unicode": "1F47D",
     "unicode_alternates": [],
     "name": "extraterrestrial alien",
     "shortname": ":alien:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "UFO",
       "paul",
       "alien",
-      "ufo"
+      "ufo",
+      "space",
+      "monster",
+      "scientology"
     ],
     "moji": "👽"
   },
@@ -343,7 +325,7 @@
     "unicode_alternates": [],
     "name": "ambulance",
     "shortname": ":ambulance:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -353,19 +335,23 @@
       "emergency",
       "medical",
       "help",
-      "assistance"
+      "assistance",
+      "transportation"
     ],
     "moji": "🚑"
   },
   "amphora": {
     "unicode": "1F3FA",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "amphora",
     "shortname": ":amphora:",
     "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "object"
+    ],
+    "moji": "🏺"
   },
   "anchor": {
     "unicode": "2693",
@@ -374,21 +360,23 @@
     ],
     "name": "anchor",
     "shortname": ":anchor:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "ferry",
       "ship",
       "anchor",
-      "ship",
       "boat",
       "ocean",
       "harbor",
       "marina",
       "shipyard",
       "sailor",
-      "tattoo"
+      "tattoo",
+      "object",
+      "travel",
+      "vacation"
     ],
     "moji": "⚓"
   },
@@ -397,7 +385,7 @@
     "unicode_alternates": [],
     "name": "baby angel",
     "shortname": ":angel:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -406,16 +394,17 @@
       "halo",
       "cupid",
       "wings",
-      "halo",
       "heaven",
-      "wings",
-      "jesus"
+      "jesus",
+      "people",
+      "diversity",
+      "omg"
     ],
     "moji": "👼"
   },
   "angel_tone1": {
     "unicode": "1F47C-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "baby angel tone 1",
     "shortname": ":angel_tone1:",
     "category": "people",
@@ -427,11 +416,12 @@
       "heaven",
       "wings",
       "jesus"
-    ]
+    ],
+    "moji": "👼🏻"
   },
   "angel_tone2": {
     "unicode": "1F47C-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "baby angel tone 2",
     "shortname": ":angel_tone2:",
     "category": "people",
@@ -443,11 +433,12 @@
       "heaven",
       "wings",
       "jesus"
-    ]
+    ],
+    "moji": "👼🏼"
   },
   "angel_tone3": {
     "unicode": "1F47C-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "baby angel tone 3",
     "shortname": ":angel_tone3:",
     "category": "people",
@@ -459,11 +450,12 @@
       "heaven",
       "wings",
       "jesus"
-    ]
+    ],
+    "moji": "👼🏽"
   },
   "angel_tone4": {
     "unicode": "1F47C-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "baby angel tone 4",
     "shortname": ":angel_tone4:",
     "category": "people",
@@ -475,11 +467,12 @@
       "heaven",
       "wings",
       "jesus"
-    ]
+    ],
+    "moji": "👼🏾"
   },
   "angel_tone5": {
     "unicode": "1F47C-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "baby angel tone 5",
     "shortname": ":angel_tone5:",
     "category": "people",
@@ -491,50 +484,31 @@
       "heaven",
       "wings",
       "jesus"
-    ]
+    ],
+    "moji": "👼🏿"
   },
   "anger": {
     "unicode": "1F4A2",
     "unicode_alternates": [],
     "name": "anger symbol",
     "shortname": ":anger:",
-    "category": "emoticons",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "anger",
       "angry",
-      "mad"
+      "mad",
+      "symbol"
     ],
     "moji": "💢"
   },
-  "anger_left": {
-    "unicode": "1F5EE",
-    "unicode_alternates": [],
-    "name": "left anger bubble",
-    "shortname": ":anger_left:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":left_anger_bubble:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "speech",
-      "balloon",
-      "talk",
-      "mood",
-      "conversation",
-      "communication",
-      "comic",
-      "angry"
-    ]
-  },
   "anger_right": {
     "unicode": "1F5EF",
     "unicode_alternates": [],
     "name": "right anger bubble",
     "shortname": ":anger_right:",
-    "category": "objects_symbols",
+    "category": "symbols",
     "aliases": [
       ":right_anger_bubble:"
     ],
@@ -547,15 +521,17 @@
       "conversation",
       "communication",
       "comic",
-      "angry"
-    ]
+      "angry",
+      "symbol"
+    ],
+    "moji": "🗯"
   },
   "angry": {
     "unicode": "1F620",
     "unicode_alternates": [],
     "name": "angry face",
     "shortname": ":angry:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [
       ">:(",
@@ -571,7 +547,8 @@
       "annoyed",
       "face",
       "frustrated",
-      "mad"
+      "smiley",
+      "emotion"
     ],
     "moji": "😠"
   },
@@ -580,7 +557,7 @@
     "unicode_alternates": [],
     "name": "anguished face",
     "shortname": ":anguished:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -592,7 +569,11 @@
       "ouch",
       "misery",
       "distress",
-      "grief"
+      "grief",
+      "sad",
+      "smiley",
+      "surprised",
+      "emotion"
     ],
     "moji": "😧"
   },
@@ -609,8 +590,8 @@
       "insect",
       "ant",
       "queen",
-      "insect",
-      "team"
+      "team",
+      "insects"
     ],
     "moji": "🐜"
   },
@@ -619,20 +600,21 @@
     "unicode_alternates": [],
     "name": "red apple",
     "shortname": ":apple:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "fruit",
       "mac",
       "apple",
-      "fruit",
       "electronics",
       "red",
       "doctor",
       "teacher",
       "school",
-      "core"
+      "core",
+      "food",
+      "creationism"
     ],
     "moji": "🍎"
   },
@@ -643,7 +625,7 @@
     ],
     "name": "aquarius",
     "shortname": ":aquarius:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -657,9 +639,8 @@
       "zodiac",
       "sign",
       "purple-square",
-      "sign",
-      "zodiac",
-      "horoscope"
+      "horoscope",
+      "symbol"
     ],
     "moji": "♒"
   },
@@ -670,7 +651,7 @@
     ],
     "name": "aries",
     "shortname": ":aries:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -683,9 +664,8 @@
       "zodiac",
       "sign",
       "purple-square",
-      "sign",
-      "zodiac",
-      "horoscope"
+      "horoscope",
+      "symbol"
     ],
     "moji": "♈"
   },
@@ -696,12 +676,14 @@
     ],
     "name": "black left-pointing triangle",
     "shortname": ":arrow_backward:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "arrow",
-      "blue-square"
+      "blue-square",
+      "symbol",
+      "triangle"
     ],
     "moji": "◀"
   },
@@ -710,12 +692,13 @@
     "unicode_alternates": [],
     "name": "black down-pointing double triangle",
     "shortname": ":arrow_double_down:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "arrow",
-      "blue-square"
+      "blue-square",
+      "symbol"
     ],
     "moji": "⏬"
   },
@@ -724,12 +707,13 @@
     "unicode_alternates": [],
     "name": "black up-pointing double triangle",
     "shortname": ":arrow_double_up:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "arrow",
-      "blue-square"
+      "blue-square",
+      "symbol"
     ],
     "moji": "⏫"
   },
@@ -740,12 +724,13 @@
     ],
     "name": "downwards black arrow",
     "shortname": ":arrow_down:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "arrow",
-      "blue-square"
+      "blue-square",
+      "symbol"
     ],
     "moji": "⬇"
   },
@@ -754,12 +739,14 @@
     "unicode_alternates": [],
     "name": "down-pointing small red triangle",
     "shortname": ":arrow_down_small:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "arrow",
-      "blue-square"
+      "blue-square",
+      "symbol",
+      "triangle"
     ],
     "moji": "🔽"
   },
@@ -770,12 +757,14 @@
     ],
     "name": "black right-pointing triangle",
     "shortname": ":arrow_forward:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "arrow",
-      "blue-square"
+      "blue-square",
+      "symbol",
+      "triangle"
     ],
     "moji": "▶"
   },
@@ -786,12 +775,13 @@
     ],
     "name": "arrow pointing rightwards then curving downwards",
     "shortname": ":arrow_heading_down:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "arrow",
-      "blue-square"
+      "blue-square",
+      "symbol"
     ],
     "moji": "⤵"
   },
@@ -802,12 +792,13 @@
     ],
     "name": "arrow pointing rightwards then curving upwards",
     "shortname": ":arrow_heading_up:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "arrow",
-      "blue-square"
+      "blue-square",
+      "symbol"
     ],
     "moji": "⤴"
   },
@@ -818,13 +809,14 @@
     ],
     "name": "leftwards black arrow",
     "shortname": ":arrow_left:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "arrow",
       "blue-square",
-      "previous"
+      "previous",
+      "symbol"
     ],
     "moji": "⬅"
   },
@@ -835,12 +827,13 @@
     ],
     "name": "south west arrow",
     "shortname": ":arrow_lower_left:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "arrow",
-      "blue-square"
+      "blue-square",
+      "symbol"
     ],
     "moji": "↙"
   },
@@ -851,12 +844,13 @@
     ],
     "name": "south east arrow",
     "shortname": ":arrow_lower_right:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "arrow",
-      "blue-square"
+      "blue-square",
+      "symbol"
     ],
     "moji": "↘"
   },
@@ -867,12 +861,14 @@
     ],
     "name": "black rightwards arrow",
     "shortname": ":arrow_right:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "blue-square",
-      "next"
+      "next",
+      "arrow",
+      "symbol"
     ],
     "moji": "➡"
   },
@@ -883,11 +879,13 @@
     ],
     "name": "rightwards arrow with hook",
     "shortname": ":arrow_right_hook:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "blue-square"
+      "blue-square",
+      "arrow",
+      "symbol"
     ],
     "moji": "↪"
   },
@@ -898,11 +896,13 @@
     ],
     "name": "upwards black arrow",
     "shortname": ":arrow_up:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "blue-square"
+      "blue-square",
+      "arrow",
+      "symbol"
     ],
     "moji": "⬆"
   },
@@ -913,11 +913,13 @@
     ],
     "name": "up down arrow",
     "shortname": ":arrow_up_down:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "blue-square"
+      "blue-square",
+      "arrow",
+      "symbol"
     ],
     "moji": "↕"
   },
@@ -926,11 +928,14 @@
     "unicode_alternates": [],
     "name": "up-pointing small red triangle",
     "shortname": ":arrow_up_small:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "blue-square"
+      "blue-square",
+      "arrow",
+      "symbol",
+      "triangle"
     ],
     "moji": "🔼"
   },
@@ -941,11 +946,13 @@
     ],
     "name": "north west arrow",
     "shortname": ":arrow_upper_left:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "blue-square"
+      "blue-square",
+      "arrow",
+      "symbol"
     ],
     "moji": "↖"
   },
@@ -956,11 +963,13 @@
     ],
     "name": "north east arrow",
     "shortname": ":arrow_upper_right:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "blue-square"
+      "blue-square",
+      "arrow",
+      "symbol"
     ],
     "moji": "↗"
   },
@@ -969,11 +978,13 @@
     "unicode_alternates": [],
     "name": "clockwise downwards and upwards open circle arrows",
     "shortname": ":arrows_clockwise:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "sync"
+      "sync",
+      "arrow",
+      "symbol"
     ],
     "moji": "🔃"
   },
@@ -982,12 +993,14 @@
     "unicode_alternates": [],
     "name": "anticlockwise downwards and upwards open circle ar",
     "shortname": ":arrows_counterclockwise:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "blue-square",
-      "sync"
+      "sync",
+      "arrow",
+      "symbol"
     ],
     "moji": "🔄"
   },
@@ -996,7 +1009,7 @@
     "unicode_alternates": [],
     "name": "artist palette",
     "shortname": ":art:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -1007,8 +1020,6 @@
       "palette",
       "art",
       "colors",
-      "paint",
-      "draw",
       "brush",
       "pastels",
       "oils"
@@ -1020,7 +1031,7 @@
     "unicode_alternates": [],
     "name": "articulated lorry",
     "shortname": ":articulated_lorry:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -1035,24 +1046,11 @@
     ],
     "moji": "🚛"
   },
-  "ascending_notes": {
-    "unicode": "1F39C",
-    "unicode_alternates": [],
-    "name": "beamed ascending musical notes",
-    "shortname": ":ascending_notes:",
-    "category": "objects_symbols",
-    "aliases": [],
-    "aliases_ascii": [],
-    "keywords": [
-      "score",
-      "music",
-      "sound",
-      "tone"
-    ]
-  },
   "asterisk": {
     "unicode": "002A-20E3",
-    "unicode_alternates": "002a-fe0f-20e3",
+    "unicode_alternates": [
+      "002A-FE0F-20E3"
+    ],
     "name": "keycap asterisk",
     "shortname": ":asterisk:",
     "category": "symbols",
@@ -1064,14 +1062,15 @@
       "*",
       "star",
       "symbol"
-    ]
+    ],
+    "moji": "*⃣"
   },
   "astonished": {
     "unicode": "1F632",
     "unicode_alternates": [],
     "name": "astonished face",
     "shortname": ":astonished:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -1079,7 +1078,12 @@
       "xox",
       "shocked",
       "surprise",
-      "astonished"
+      "astonished",
+      "smiley",
+      "surprised",
+      "wow",
+      "emotion",
+      "omg"
     ],
     "moji": "😲"
   },
@@ -1088,12 +1092,16 @@
     "unicode_alternates": [],
     "name": "athletic shoe",
     "shortname": ":athletic_shoe:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "shoes",
-      "sports"
+      "sports",
+      "fashion",
+      "shoe",
+      "accessories",
+      "boys night"
     ],
     "moji": "👟"
   },
@@ -1102,7 +1110,7 @@
     "unicode_alternates": [],
     "name": "automated teller machine",
     "shortname": ":atm:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -1115,17 +1123,16 @@
       "bank",
       "adam",
       "payday",
-      "bank",
       "blue-square",
-      "cash",
-      "money",
-      "payment"
+      "payment",
+      "electronics",
+      "symbol"
     ],
     "moji": "🏧"
   },
   "atom": {
     "unicode": "269B",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "atom symbol",
     "shortname": ":atom:",
     "category": "symbols",
@@ -1134,21 +1141,36 @@
     ],
     "aliases_ascii": [],
     "keywords": [
-      "atheist"
-    ]
+      "atheist",
+      "symbol",
+      "science"
+    ],
+    "moji": "⚛"
+  },
+  "avocado": {
+    "unicode": "1F951",
+    "unicode_alternates": [],
+    "name": "avocado",
+    "shortname": ":avocado:",
+    "category": "food",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🥑"
   },
   "b": {
     "unicode": "1F171",
     "unicode_alternates": [],
     "name": "negative squared latin capital letter b",
     "shortname": ":b:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "alphabet",
       "letter",
-      "red-square"
+      "red-square",
+      "symbol"
     ],
     "moji": "🅱"
   },
@@ -1157,13 +1179,16 @@
     "unicode_alternates": [],
     "name": "baby",
     "shortname": ":baby:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "boy",
       "child",
-      "infant"
+      "infant",
+      "people",
+      "baby",
+      "diversity"
     ],
     "moji": "👶"
   },
@@ -1172,7 +1197,7 @@
     "unicode_alternates": [],
     "name": "baby bottle",
     "shortname": ":baby_bottle:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -1184,7 +1209,9 @@
       "mother",
       "nipple",
       "newborn",
-      "formula"
+      "formula",
+      "drink",
+      "object"
     ],
     "moji": "🍼"
   },
@@ -1202,7 +1229,6 @@
       "chick",
       "baby",
       "bird",
-      "chicken",
       "young",
       "woman",
       "cute"
@@ -1214,7 +1240,7 @@
     "unicode_alternates": [],
     "name": "baby symbol",
     "shortname": ":baby_symbol:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -1226,13 +1252,14 @@
       "human",
       "diaper",
       "small",
-      "babe"
+      "babe",
+      "symbol"
     ],
     "moji": "🚼"
   },
   "baby_tone1": {
     "unicode": "1F476-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "baby tone 1",
     "shortname": ":baby_tone1:",
     "category": "people",
@@ -1242,11 +1269,12 @@
       "child",
       "infant",
       "toddler"
-    ]
+    ],
+    "moji": "👶🏻"
   },
   "baby_tone2": {
     "unicode": "1F476-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "baby tone 2",
     "shortname": ":baby_tone2:",
     "category": "people",
@@ -1256,11 +1284,12 @@
       "child",
       "infant",
       "toddler"
-    ]
+    ],
+    "moji": "👶🏼"
   },
   "baby_tone3": {
     "unicode": "1F476-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "baby tone 3",
     "shortname": ":baby_tone3:",
     "category": "people",
@@ -1270,11 +1299,12 @@
       "child",
       "infant",
       "toddler"
-    ]
+    ],
+    "moji": "👶🏽"
   },
   "baby_tone4": {
     "unicode": "1F476-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "baby tone 4",
     "shortname": ":baby_tone4:",
     "category": "people",
@@ -1284,11 +1314,12 @@
       "child",
       "infant",
       "toddler"
-    ]
+    ],
+    "moji": "👶🏾"
   },
   "baby_tone5": {
     "unicode": "1F476-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "baby tone 5",
     "shortname": ":baby_tone5:",
     "category": "people",
@@ -1298,37 +1329,57 @@
       "child",
       "infant",
       "toddler"
-    ]
+    ],
+    "moji": "👶🏿"
   },
   "back": {
     "unicode": "1F519",
     "unicode_alternates": [],
     "name": "back with leftwards arrow above",
     "shortname": ":back:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "arrow"
+      "arrow",
+      "symbol"
     ],
     "moji": "🔙"
   },
+  "bacon": {
+    "unicode": "1F953",
+    "unicode_alternates": [],
+    "name": "bacon",
+    "shortname": ":bacon:",
+    "category": "food",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [
+      "pig"
+    ],
+    "moji": "🥓"
+  },
   "badminton": {
     "unicode": "1F3F8",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "badminton racquet",
     "shortname": ":badminton:",
     "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "game",
+      "sport",
+      "badminton"
+    ],
+    "moji": "🏸"
   },
   "baggage_claim": {
     "unicode": "1F6C4",
     "unicode_alternates": [],
     "name": "baggage claim",
     "shortname": ":baggage_claim:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -1338,7 +1389,8 @@
       "bag",
       "baggage",
       "luggage",
-      "travel"
+      "travel",
+      "symbol"
     ],
     "moji": "🛄"
   },
@@ -1355,11 +1407,13 @@
       "party",
       "balloon",
       "birthday",
-      "celebration",
       "helium",
       "gas",
       "children",
-      "float"
+      "float",
+      "object",
+      "good",
+      "parties"
     ],
     "moji": "🎈"
   },
@@ -1368,29 +1422,17 @@
     "unicode_alternates": [],
     "name": "ballot box with ballot",
     "shortname": ":ballot_box:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [
       ":ballot_box_with_ballot:"
     ],
     "aliases_ascii": [],
     "keywords": [
-      "vote"
-    ]
-  },
-  "ballot_box_check": {
-    "unicode": "1F5F9",
-    "unicode_alternates": [],
-    "name": "ballot box with bold check",
-    "shortname": ":ballot_box_check:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":ballot_box_with_bold_check:"
+      "vote",
+      "object",
+      "office"
     ],
-    "aliases_ascii": [],
-    "keywords": [
-      "mark",
-      "vote"
-    ]
+    "moji": "🗳"
   },
   "ballot_box_with_check": {
     "unicode": "2611",
@@ -1399,51 +1441,22 @@
     ],
     "name": "ballot box with check",
     "shortname": ":ballot_box_with_check:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "agree",
-      "ok"
+      "ok",
+      "symbol"
     ],
     "moji": "☑"
   },
-  "ballot_box_x": {
-    "unicode": "1F5F5",
-    "unicode_alternates": [],
-    "name": "ballot box with script x",
-    "shortname": ":ballot_box_x:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":ballot_box_with_script_x:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "mark",
-      "vote"
-    ]
-  },
-  "ballot_x": {
-    "unicode": "1F5F4",
-    "unicode_alternates": [],
-    "name": "ballot script x",
-    "shortname": ":ballot_x:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":ballot_script_x:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "mark",
-      "vote"
-    ]
-  },
   "bamboo": {
     "unicode": "1F38D",
     "unicode_alternates": [],
     "name": "pine decoration",
     "shortname": ":bamboo:",
-    "category": "objects",
+    "category": "nature",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -1472,7 +1485,7 @@
     "unicode_alternates": [],
     "name": "banana",
     "shortname": ":banana:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -1480,7 +1493,8 @@
       "fruit",
       "banana",
       "peel",
-      "bunch"
+      "bunch",
+      "penis"
     ],
     "moji": "🍌"
   },
@@ -1491,12 +1505,14 @@
     ],
     "name": "double exclamation mark",
     "shortname": ":bangbang:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "exclamation",
-      "surprise"
+      "surprise",
+      "symbol",
+      "punctuation"
     ],
     "moji": "‼"
   },
@@ -1505,11 +1521,12 @@
     "unicode_alternates": [],
     "name": "bank",
     "shortname": ":bank:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "building"
+      "building",
+      "places"
     ],
     "moji": "🏦"
   },
@@ -1524,7 +1541,9 @@
     "keywords": [
       "graph",
       "presentation",
-      "stats"
+      "stats",
+      "work",
+      "office"
     ],
     "moji": "📊"
   },
@@ -1533,13 +1552,14 @@
     "unicode_alternates": [],
     "name": "barber pole",
     "shortname": ":barber:",
-    "category": "places",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "hair",
       "salon",
-      "style"
+      "style",
+      "object"
     ],
     "moji": "💈"
   },
@@ -1550,13 +1570,17 @@
     ],
     "name": "baseball",
     "shortname": ":baseball:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "MLB",
       "balls",
-      "sports"
+      "sports",
+      "game",
+      "ball",
+      "sport",
+      "baseball"
     ],
     "moji": "⚾"
   },
@@ -1565,7 +1589,7 @@
     "unicode_alternates": [],
     "name": "basketball and hoop",
     "shortname": ":basketball:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -1578,13 +1602,16 @@
       "hoop",
       "net",
       "swish",
-      "rip city"
+      "rip city",
+      "game",
+      "ball",
+      "sport"
     ],
     "moji": "🏀"
   },
   "basketball_player": {
     "unicode": "26F9",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person with ball",
     "shortname": ":basketball_player:",
     "category": "activity",
@@ -1594,12 +1621,18 @@
     "aliases_ascii": [],
     "keywords": [
       "sport",
-      "travel"
-    ]
+      "travel",
+      "men",
+      "game",
+      "ball",
+      "basketball",
+      "diversity"
+    ],
+    "moji": "⛹"
   },
   "basketball_player_tone1": {
     "unicode": "26F9-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person with ball tone 1",
     "shortname": ":basketball_player_tone1:",
     "category": "activity",
@@ -1607,11 +1640,19 @@
       ":person_with_ball_tone1:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "sport",
+      "travel",
+      "men",
+      "game",
+      "ball",
+      "basketball"
+    ],
+    "moji": "⛹🏻"
   },
   "basketball_player_tone2": {
     "unicode": "26F9-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person with ball tone 2",
     "shortname": ":basketball_player_tone2:",
     "category": "activity",
@@ -1619,11 +1660,19 @@
       ":person_with_ball_tone2:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "sport",
+      "travel",
+      "men",
+      "game",
+      "ball",
+      "basketball"
+    ],
+    "moji": "⛹🏼"
   },
   "basketball_player_tone3": {
     "unicode": "26F9-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person with ball tone 3",
     "shortname": ":basketball_player_tone3:",
     "category": "activity",
@@ -1631,11 +1680,19 @@
       ":person_with_ball_tone3:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "sport",
+      "travel",
+      "men",
+      "game",
+      "ball",
+      "basketball"
+    ],
+    "moji": "⛹🏽"
   },
   "basketball_player_tone4": {
     "unicode": "26F9-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person with ball tone 4",
     "shortname": ":basketball_player_tone4:",
     "category": "activity",
@@ -1643,11 +1700,19 @@
       ":person_with_ball_tone4:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "sport",
+      "travel",
+      "men",
+      "game",
+      "ball",
+      "basketball"
+    ],
+    "moji": "⛹🏾"
   },
   "basketball_player_tone5": {
     "unicode": "26F9-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person with ball tone 5",
     "shortname": ":basketball_player_tone5:",
     "category": "activity",
@@ -1655,14 +1720,33 @@
       ":person_with_ball_tone5:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "sport",
+      "travel",
+      "men",
+      "game",
+      "ball",
+      "basketball"
+    ],
+    "moji": "⛹🏿"
+  },
+  "bat": {
+    "unicode": "1F987",
+    "unicode_alternates": [],
+    "name": "bat",
+    "shortname": ":bat:",
+    "category": "nature",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🦇"
   },
   "bath": {
     "unicode": "1F6C0",
     "unicode_alternates": [],
     "name": "bath",
     "shortname": ":bath:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -1677,16 +1761,17 @@
       "bathroom",
       "soap",
       "water",
-      "clean",
       "shampoo",
       "lather",
-      "water"
+      "tired",
+      "diversity",
+      "steam"
     ],
     "moji": "🛀"
   },
   "bath_tone1": {
     "unicode": "1F6C0-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "bath tone 1",
     "shortname": ":bath_tone1:",
     "category": "activity",
@@ -1705,11 +1790,12 @@
       "clean",
       "shampoo",
       "lather"
-    ]
+    ],
+    "moji": "🛀🏻"
   },
   "bath_tone2": {
     "unicode": "1F6C0-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "bath tone 2",
     "shortname": ":bath_tone2:",
     "category": "activity",
@@ -1728,11 +1814,12 @@
       "clean",
       "shampoo",
       "lather"
-    ]
+    ],
+    "moji": "🛀🏼"
   },
   "bath_tone3": {
     "unicode": "1F6C0-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "bath tone 3",
     "shortname": ":bath_tone3:",
     "category": "activity",
@@ -1751,11 +1838,12 @@
       "clean",
       "shampoo",
       "lather"
-    ]
+    ],
+    "moji": "🛀🏽"
   },
   "bath_tone4": {
     "unicode": "1F6C0-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "bath tone 4",
     "shortname": ":bath_tone4:",
     "category": "activity",
@@ -1774,11 +1862,12 @@
       "clean",
       "shampoo",
       "lather"
-    ]
+    ],
+    "moji": "🛀🏾"
   },
   "bath_tone5": {
     "unicode": "1F6C0-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "bath tone 5",
     "shortname": ":bath_tone5:",
     "category": "activity",
@@ -1797,7 +1886,8 @@
       "clean",
       "shampoo",
       "lather"
-    ]
+    ],
+    "moji": "🛀🏿"
   },
   "bathtub": {
     "unicode": "1F6C1",
@@ -1819,10 +1909,11 @@
       "bathroom",
       "soap",
       "water",
-      "clean",
       "shampoo",
       "lather",
-      "water"
+      "object",
+      "tired",
+      "steam"
     ],
     "moji": "🛁"
   },
@@ -1837,7 +1928,8 @@
     "keywords": [
       "energy",
       "power",
-      "sustain"
+      "sustain",
+      "object"
     ],
     "moji": "🔋"
   },
@@ -1846,7 +1938,7 @@
     "unicode_alternates": [],
     "name": "beach with umbrella",
     "shortname": ":beach:",
-    "category": "travel_places",
+    "category": "travel",
     "aliases": [
       ":beach_with_umbrella:"
     ],
@@ -1859,12 +1951,18 @@
       "relaxation",
       "tanning",
       "tan",
-      "swimming"
-    ]
+      "swimming",
+      "places",
+      "travel",
+      "tropical",
+      "beach",
+      "swim"
+    ],
+    "moji": "🏖"
   },
   "beach_umbrella": {
     "unicode": "26F1",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "umbrella on ground",
     "shortname": ":beach_umbrella:",
     "category": "objects",
@@ -1877,8 +1975,11 @@
       "rain",
       "sun",
       "travel",
-      "weather"
-    ]
+      "weather",
+      "vacation",
+      "tropical"
+    ],
+    "moji": "⛱"
   },
   "bear": {
     "unicode": "1F43B",
@@ -1890,7 +1991,9 @@
     "aliases_ascii": [],
     "keywords": [
       "animal",
-      "nature"
+      "nature",
+      "wildlife",
+      "roar"
     ],
     "moji": "🐻"
   },
@@ -1899,7 +2002,7 @@
     "unicode_alternates": [],
     "name": "bed",
     "shortname": ":bed:",
-    "category": "travel_places",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -1909,8 +2012,11 @@
       "full",
       "twin",
       "king",
-      "mattress"
-    ]
+      "mattress",
+      "object",
+      "tired"
+    ],
+    "moji": "🛏"
   },
   "bee": {
     "unicode": "1F41D",
@@ -1932,7 +2038,8 @@
       "honey",
       "hive",
       "bumble",
-      "pollination"
+      "pollination",
+      "insects"
     ],
     "moji": "🐝"
   },
@@ -1941,7 +2048,7 @@
     "unicode_alternates": [],
     "name": "beer mug",
     "shortname": ":beer:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -1962,7 +2069,9 @@
       "brewery",
       "micro",
       "pint",
-      "boot"
+      "boot",
+      "alcohol",
+      "parties"
     ],
     "moji": "🍺"
   },
@@ -1971,7 +2080,7 @@
     "unicode_alternates": [],
     "name": "clinking beer mugs",
     "shortname": ":beers:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -1987,11 +2096,14 @@
       "mug",
       "toast",
       "celebrate",
-      "pub",
       "bar",
       "jolly",
       "hops",
-      "clink"
+      "clink",
+      "alcohol",
+      "thank you",
+      "boys night",
+      "parties"
     ],
     "moji": "🍻"
   },
@@ -2013,8 +2125,9 @@
       "beetle",
       "cow",
       "lady cow",
-      "insect",
-      "endearment"
+      "endearment",
+      "insects",
+      "animal"
     ],
     "moji": "🐞"
   },
@@ -2023,12 +2136,13 @@
     "unicode_alternates": [],
     "name": "japanese symbol for beginner",
     "shortname": ":beginner:",
-    "category": "places",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "badge",
-      "shield"
+      "shield",
+      "symbol"
     ],
     "moji": "🔰"
   },
@@ -2037,7 +2151,7 @@
     "unicode_alternates": [],
     "name": "bell",
     "shortname": ":bell:",
-    "category": "objects",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -2045,7 +2159,10 @@
       "christmas",
       "notification",
       "sound",
-      "xmas"
+      "xmas",
+      "object",
+      "alarm",
+      "symbol"
     ],
     "moji": "🔔"
   },
@@ -2054,7 +2171,7 @@
     "unicode_alternates": [],
     "name": "bellhop bell",
     "shortname": ":bellhop:",
-    "category": "travel_places",
+    "category": "objects",
     "aliases": [
       ":bellhop_bell:"
     ],
@@ -2062,15 +2179,17 @@
     "keywords": [
       "hotel",
       "porter",
-      "ding"
-    ]
+      "ding",
+      "object"
+    ],
+    "moji": "🛎"
   },
   "bento": {
     "unicode": "1F371",
     "unicode_alternates": [],
     "name": "bento box",
     "shortname": ":bento:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -2078,13 +2197,14 @@
       "food",
       "japanese",
       "bento",
-      "japanese",
       "rice",
       "meal",
-      "box",
       "obento",
       "convenient",
-      "lunchbox"
+      "lunchbox",
+      "object",
+      "sushi",
+      "japan"
     ],
     "moji": "🍱"
   },
@@ -2093,7 +2213,7 @@
     "unicode_alternates": [],
     "name": "bicyclist",
     "shortname": ":bicyclist:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -2103,16 +2223,19 @@
       "sports",
       "bicyclist",
       "road",
-      "bike",
       "pedal",
       "bicycle",
-      "transportation"
+      "transportation",
+      "men",
+      "workout",
+      "sport",
+      "diversity"
     ],
     "moji": "🚴"
   },
   "bicyclist_tone1": {
     "unicode": "1F6B4-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "bicyclist tone 1",
     "shortname": ":bicyclist_tone1:",
     "category": "activity",
@@ -2127,11 +2250,12 @@
       "pedal",
       "bicycle",
       "transportation"
-    ]
+    ],
+    "moji": "🚴🏻"
   },
   "bicyclist_tone2": {
     "unicode": "1F6B4-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "bicyclist tone 2",
     "shortname": ":bicyclist_tone2:",
     "category": "activity",
@@ -2146,11 +2270,12 @@
       "pedal",
       "bicycle",
       "transportation"
-    ]
+    ],
+    "moji": "🚴🏼"
   },
   "bicyclist_tone3": {
     "unicode": "1F6B4-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "bicyclist tone 3",
     "shortname": ":bicyclist_tone3:",
     "category": "activity",
@@ -2165,11 +2290,12 @@
       "pedal",
       "bicycle",
       "transportation"
-    ]
+    ],
+    "moji": "🚴🏽"
   },
   "bicyclist_tone4": {
     "unicode": "1F6B4-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "bicyclist tone 4",
     "shortname": ":bicyclist_tone4:",
     "category": "activity",
@@ -2184,11 +2310,12 @@
       "pedal",
       "bicycle",
       "transportation"
-    ]
+    ],
+    "moji": "🚴🏾"
   },
   "bicyclist_tone5": {
     "unicode": "1F6B4-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "bicyclist tone 5",
     "shortname": ":bicyclist_tone5:",
     "category": "activity",
@@ -2203,14 +2330,15 @@
       "pedal",
       "bicycle",
       "transportation"
-    ]
+    ],
+    "moji": "🚴🏿"
   },
   "bike": {
     "unicode": "1F6B2",
     "unicode_alternates": [],
     "name": "bicycle",
     "shortname": ":bike:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -2220,8 +2348,8 @@
       "sports",
       "bike",
       "pedal",
-      "bicycle",
-      "transportation"
+      "transportation",
+      "travel"
     ],
     "moji": "🚲"
   },
@@ -2230,7 +2358,7 @@
     "unicode_alternates": [],
     "name": "bikini",
     "shortname": ":bikini:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -2239,13 +2367,18 @@
       "female",
       "girl",
       "swimming",
-      "woman"
+      "woman",
+      "women",
+      "sexy",
+      "vacation",
+      "tropical",
+      "swim"
     ],
     "moji": "👙"
   },
   "biohazard": {
     "unicode": "2623",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "biohazard sign",
     "shortname": ":biohazard:",
     "category": "symbols",
@@ -2254,8 +2387,10 @@
     ],
     "aliases_ascii": [],
     "keywords": [
-      "symbol"
-    ]
+      "symbol",
+      "science"
+    ],
+    "moji": "☣"
   },
   "bird": {
     "unicode": "1F426",
@@ -2269,7 +2404,8 @@
       "animal",
       "fly",
       "nature",
-      "tweet"
+      "tweet",
+      "wildlife"
     ],
     "moji": "🐦"
   },
@@ -2278,7 +2414,7 @@
     "unicode_alternates": [],
     "name": "birthday cake",
     "shortname": ":birthday:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -2286,10 +2422,11 @@
       "party",
       "birthday",
       "birth",
-      "cake",
       "dessert",
       "wish",
-      "celebrate"
+      "celebrate",
+      "food",
+      "parties"
     ],
     "moji": "🎂"
   },
@@ -2300,26 +2437,42 @@
     ],
     "name": "medium black circle",
     "shortname": ":black_circle:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "shape"
+      "shape",
+      "shapes",
+      "symbol",
+      "circle"
     ],
     "moji": "⚫"
   },
+  "black_heart": {
+    "unicode": "1F5A4",
+    "unicode_alternates": [],
+    "name": "black heart",
+    "shortname": ":black_heart:",
+    "category": "symbols",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🖤"
+  },
   "black_joker": {
     "unicode": "1F0CF",
     "unicode_alternates": [],
     "name": "playing card black joker",
     "shortname": ":black_joker:",
-    "category": "objects",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "cards",
       "game",
-      "poker"
+      "poker",
+      "object",
+      "symbol"
     ],
     "moji": "🃏"
   },
@@ -2330,11 +2483,14 @@
     ],
     "name": "black large square",
     "shortname": ":black_large_square:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "shape"
+      "shape",
+      "shapes",
+      "symbol",
+      "square"
     ],
     "moji": "⬛"
   },
@@ -2345,10 +2501,14 @@
     ],
     "name": "black medium small square",
     "shortname": ":black_medium_small_square:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": [],
+    "keywords": [
+      "shapes",
+      "symbol",
+      "square"
+    ],
     "moji": "◾"
   },
   "black_medium_square": {
@@ -2358,11 +2518,14 @@
     ],
     "name": "black medium square",
     "shortname": ":black_medium_square:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "shape"
+      "shape",
+      "shapes",
+      "symbol",
+      "square"
     ],
     "moji": "◼"
   },
@@ -2378,7 +2541,10 @@
     "aliases_ascii": [],
     "keywords": [
       "pen",
-      "stationery"
+      "stationery",
+      "object",
+      "office",
+      "write"
     ],
     "moji": "✒"
   },
@@ -2389,10 +2555,14 @@
     ],
     "name": "black small square",
     "shortname": ":black_small_square:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": [],
+    "keywords": [
+      "shapes",
+      "symbol",
+      "square"
+    ],
     "moji": "▪"
   },
   "black_square_button": {
@@ -2400,11 +2570,14 @@
     "unicode_alternates": [],
     "name": "black square button",
     "shortname": ":black_square_button:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "frame"
+      "frame",
+      "shapes",
+      "symbol",
+      "square"
     ],
     "moji": "🔲"
   },
@@ -2422,7 +2595,8 @@
       "yellow",
       "blossom",
       "daisy",
-      "flower"
+      "flower",
+      "plant"
     ],
     "moji": "🌼"
   },
@@ -2445,7 +2619,9 @@
       "ballonfish",
       "toadfish",
       "fugu fish",
-      "sushi"
+      "sushi",
+      "wildlife",
+      "animal"
     ],
     "moji": "🐡"
   },
@@ -2460,7 +2636,11 @@
     "keywords": [
       "knowledge",
       "library",
-      "read"
+      "read",
+      "object",
+      "office",
+      "write",
+      "book"
     ],
     "moji": "📘"
   },
@@ -2469,15 +2649,16 @@
     "unicode_alternates": [],
     "name": "recreational vehicle",
     "shortname": ":blue_car:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "car",
       "suv",
-      "car",
       "wagon",
-      "automobile"
+      "automobile",
+      "transportation",
+      "travel"
     ],
     "moji": "🚙"
   },
@@ -2486,7 +2667,7 @@
     "unicode_alternates": [],
     "name": "blue heart",
     "shortname": ":blue_heart:",
-    "category": "emoticons",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -2496,11 +2677,11 @@
       "valentines",
       "blue",
       "heart",
-      "love",
       "stability",
       "truth",
       "loyalty",
-      "trust"
+      "trust",
+      "symbol"
     ],
     "moji": "💙"
   },
@@ -2509,7 +2690,7 @@
     "unicode_alternates": [],
     "name": "smiling face with smiling eyes",
     "shortname": ":blush:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -2521,8 +2702,10 @@
       "shy",
       "smile",
       "smiling",
-      "smile",
-      "smiley"
+      "smiley",
+      "emotion",
+      "good",
+      "beautiful"
     ],
     "moji": "😊"
   },
@@ -2536,7 +2719,8 @@
     "aliases_ascii": [],
     "keywords": [
       "animal",
-      "nature"
+      "nature",
+      "wildlife"
     ],
     "moji": "🐗"
   },
@@ -2550,7 +2734,11 @@
     "aliases_ascii": [],
     "keywords": [
       "boom",
-      "explode"
+      "explode",
+      "object",
+      "weapon",
+      "dead",
+      "blast"
     ],
     "moji": "💣"
   },
@@ -2564,26 +2752,14 @@
     "aliases_ascii": [],
     "keywords": [
       "library",
-      "literature"
+      "literature",
+      "object",
+      "office",
+      "write",
+      "book"
     ],
     "moji": "📖"
   },
-  "book2": {
-    "unicode": "1F56E",
-    "unicode_alternates": [],
-    "name": "book",
-    "shortname": ":book2:",
-    "category": "objects_symbols",
-    "aliases": [],
-    "aliases_ascii": [],
-    "keywords": [
-      "library",
-      "literature",
-      "novel",
-      "reading",
-      "story"
-    ]
-  },
   "bookmark": {
     "unicode": "1F516",
     "unicode_alternates": [],
@@ -2593,7 +2769,9 @@
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "favorite"
+      "favorite",
+      "object",
+      "book"
     ],
     "moji": "🔖"
   },
@@ -2606,7 +2784,9 @@
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "favorite"
+      "favorite",
+      "office",
+      "write"
     ],
     "moji": "📑"
   },
@@ -2620,7 +2800,11 @@
     "aliases_ascii": [],
     "keywords": [
       "library",
-      "literature"
+      "literature",
+      "object",
+      "office",
+      "write",
+      "book"
     ],
     "moji": "📚"
   },
@@ -2629,7 +2813,7 @@
     "unicode_alternates": [],
     "name": "collision symbol",
     "shortname": ":boom:",
-    "category": "emoticons",
+    "category": "nature",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -2642,7 +2826,9 @@
       "fire",
       "emphasis",
       "wow",
-      "bam"
+      "bam",
+      "symbol",
+      "blast"
     ],
     "moji": "💥"
   },
@@ -2651,12 +2837,16 @@
     "unicode_alternates": [],
     "name": "womans boots",
     "shortname": ":boot:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "fashion",
-      "shoes"
+      "shoes",
+      "women",
+      "shoe",
+      "sexy",
+      "accessories"
     ],
     "moji": "👢"
   },
@@ -2670,33 +2860,20 @@
     "aliases_ascii": [],
     "keywords": [
       "flowers",
-      "nature"
+      "nature",
+      "flower",
+      "plant",
+      "rip",
+      "condolence"
     ],
     "moji": "💐"
   },
-  "bouquet2": {
-    "unicode": "1F395",
-    "unicode_alternates": [],
-    "name": "bouquet of flowers",
-    "shortname": ":bouquet2:",
-    "category": "celebration",
-    "aliases": [
-      ":bouquet_of_flowers:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "nature",
-      "marriage",
-      "wedding",
-      "bride"
-    ]
-  },
   "bow": {
     "unicode": "1F647",
     "unicode_alternates": [],
     "name": "person bowing deeply",
     "shortname": ":bow:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -2707,13 +2884,16 @@
       "bow",
       "respect",
       "curtsy",
-      "bend"
+      "bend",
+      "people",
+      "pray",
+      "diversity"
     ],
     "moji": "🙇"
   },
   "bow_and_arrow": {
     "unicode": "1F3F9",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "bow and arrow",
     "shortname": ":bow_and_arrow:",
     "category": "activity",
@@ -2721,11 +2901,15 @@
       ":archery:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "weapon",
+      "sport"
+    ],
+    "moji": "🏹"
   },
   "bow_tone1": {
     "unicode": "1F647-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person bowing deeply tone 1",
     "shortname": ":bow_tone1:",
     "category": "people",
@@ -2739,11 +2923,12 @@
       "bow",
       "respect",
       "bend"
-    ]
+    ],
+    "moji": "🙇🏻"
   },
   "bow_tone2": {
     "unicode": "1F647-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person bowing deeply tone 2",
     "shortname": ":bow_tone2:",
     "category": "people",
@@ -2757,11 +2942,12 @@
       "bow",
       "respect",
       "bend"
-    ]
+    ],
+    "moji": "🙇🏼"
   },
   "bow_tone3": {
     "unicode": "1F647-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person bowing deeply tone 3",
     "shortname": ":bow_tone3:",
     "category": "people",
@@ -2775,11 +2961,12 @@
       "bow",
       "respect",
       "bend"
-    ]
+    ],
+    "moji": "🙇🏽"
   },
   "bow_tone4": {
     "unicode": "1F647-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person bowing deeply tone 4",
     "shortname": ":bow_tone4:",
     "category": "people",
@@ -2793,11 +2980,12 @@
       "bow",
       "respect",
       "bend"
-    ]
+    ],
+    "moji": "🙇🏾"
   },
   "bow_tone5": {
     "unicode": "1F647-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person bowing deeply tone 5",
     "shortname": ":bow_tone5:",
     "category": "people",
@@ -2811,14 +2999,15 @@
       "bow",
       "respect",
       "bend"
-    ]
+    ],
+    "moji": "🙇🏿"
   },
   "bowling": {
     "unicode": "1F3B3",
     "unicode_alternates": [],
     "name": "bowling",
     "shortname": ":bowling:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -2831,28 +3020,46 @@
       "pin",
       "strike",
       "spare",
-      "game"
+      "game",
+      "sport",
+      "boys night"
     ],
     "moji": "🎳"
   },
+  "boxing_glove": {
+    "unicode": "1F94A",
+    "unicode_alternates": [],
+    "name": "boxing glove",
+    "shortname": ":boxing_glove:",
+    "category": "activity",
+    "aliases": [
+      ":boxing_gloves:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🥊"
+  },
   "boy": {
     "unicode": "1F466",
     "unicode_alternates": [],
     "name": "boy",
     "shortname": ":boy:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "guy",
       "male",
-      "man"
+      "man",
+      "people",
+      "baby",
+      "diversity"
     ],
     "moji": "👦"
   },
   "boy_tone1": {
     "unicode": "1F466-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "boy tone 1",
     "shortname": ":boy_tone1:",
     "category": "people",
@@ -2862,11 +3069,12 @@
       "male",
       "kid",
       "child"
-    ]
+    ],
+    "moji": "👦🏻"
   },
   "boy_tone2": {
     "unicode": "1F466-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "boy tone 2",
     "shortname": ":boy_tone2:",
     "category": "people",
@@ -2876,11 +3084,12 @@
       "male",
       "kid",
       "child"
-    ]
+    ],
+    "moji": "👦🏼"
   },
   "boy_tone3": {
     "unicode": "1F466-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "boy tone 3",
     "shortname": ":boy_tone3:",
     "category": "people",
@@ -2890,11 +3099,12 @@
       "male",
       "kid",
       "child"
-    ]
+    ],
+    "moji": "👦🏽"
   },
   "boy_tone4": {
     "unicode": "1F466-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "boy tone 4",
     "shortname": ":boy_tone4:",
     "category": "people",
@@ -2904,11 +3114,12 @@
       "male",
       "kid",
       "child"
-    ]
+    ],
+    "moji": "👦🏾"
   },
   "boy_tone5": {
     "unicode": "1F466-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "boy tone 5",
     "shortname": ":boy_tone5:",
     "category": "people",
@@ -2918,27 +3129,15 @@
       "male",
       "kid",
       "child"
-    ]
-  },
-  "boys_symbol": {
-    "unicode": "1F6C9",
-    "unicode_alternates": [],
-    "name": "boys symbol",
-    "shortname": ":boys_symbol:",
-    "category": "objects_symbols",
-    "aliases": [],
-    "aliases_ascii": [],
-    "keywords": [
-      "male",
-      "child"
-    ]
+    ],
+    "moji": "👦🏿"
   },
   "bread": {
     "unicode": "1F35E",
     "unicode_alternates": [],
     "name": "bread",
     "shortname": ":bread:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -2957,7 +3156,7 @@
     "unicode_alternates": [],
     "name": "bride with veil",
     "shortname": ":bride_with_veil:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -2965,19 +3164,21 @@
       "marriage",
       "wedding",
       "bride",
-      "wedding",
       "planning",
       "veil",
       "gown",
       "dress",
       "engagement",
-      "white"
+      "white",
+      "people",
+      "women",
+      "diversity"
     ],
     "moji": "👰"
   },
   "bride_with_veil_tone1": {
     "unicode": "1F470-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "bride with veil tone 1",
     "shortname": ":bride_with_veil_tone1:",
     "category": "people",
@@ -2987,17 +3188,17 @@
       "couple",
       "marriage",
       "wedding",
-      "wedding",
       "planning",
       "gown",
       "dress",
       "engagement",
       "white"
-    ]
+    ],
+    "moji": "👰🏻"
   },
   "bride_with_veil_tone2": {
     "unicode": "1F470-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "bride with veil tone 2",
     "shortname": ":bride_with_veil_tone2:",
     "category": "people",
@@ -3007,17 +3208,17 @@
       "couple",
       "marriage",
       "wedding",
-      "wedding",
       "planning",
       "gown",
       "dress",
       "engagement",
       "white"
-    ]
+    ],
+    "moji": "👰🏼"
   },
   "bride_with_veil_tone3": {
     "unicode": "1F470-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "bride with veil tone 3",
     "shortname": ":bride_with_veil_tone3:",
     "category": "people",
@@ -3027,17 +3228,17 @@
       "couple",
       "marriage",
       "wedding",
-      "wedding",
       "planning",
       "gown",
       "dress",
       "engagement",
       "white"
-    ]
+    ],
+    "moji": "👰🏽"
   },
   "bride_with_veil_tone4": {
     "unicode": "1F470-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "bride with veil tone 4",
     "shortname": ":bride_with_veil_tone4:",
     "category": "people",
@@ -3047,17 +3248,17 @@
       "couple",
       "marriage",
       "wedding",
-      "wedding",
       "planning",
       "gown",
       "dress",
       "engagement",
       "white"
-    ]
+    ],
+    "moji": "👰🏾"
   },
   "bride_with_veil_tone5": {
     "unicode": "1F470-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "bride with veil tone 5",
     "shortname": ":bride_with_veil_tone5:",
     "category": "people",
@@ -3067,20 +3268,20 @@
       "couple",
       "marriage",
       "wedding",
-      "wedding",
       "planning",
       "gown",
       "dress",
       "engagement",
       "white"
-    ]
+    ],
+    "moji": "👰🏿"
   },
   "bridge_at_night": {
     "unicode": "1F309",
     "unicode_alternates": [],
     "name": "bridge at night",
     "shortname": ":bridge_at_night:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -3093,7 +3294,11 @@
       "evening",
       "suspension",
       "golden",
-      "gate"
+      "gate",
+      "places",
+      "travel",
+      "vacation",
+      "goodnight"
     ],
     "moji": "🌉"
   },
@@ -3102,13 +3307,17 @@
     "unicode_alternates": [],
     "name": "briefcase",
     "shortname": ":briefcase:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "business",
       "documents",
-      "work"
+      "work",
+      "bag",
+      "accessories",
+      "nutcase",
+      "job"
     ],
     "moji": "💼"
   },
@@ -3117,14 +3326,17 @@
     "unicode_alternates": [],
     "name": "broken heart",
     "shortname": ":broken_heart:",
-    "category": "emoticons",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [
       "</3"
     ],
     "keywords": [
       "sad",
-      "sorry"
+      "sorry",
+      "love",
+      "symbol",
+      "heartbreak"
     ],
     "moji": "💔"
   },
@@ -3140,9 +3352,10 @@
       "insect",
       "nature",
       "bug",
-      "insect",
       "virus",
-      "error"
+      "error",
+      "insects",
+      "animal"
     ],
     "moji": "🐛"
   },
@@ -3159,7 +3372,8 @@
       "light",
       "idea",
       "bulb",
-      "light"
+      "object",
+      "science"
     ],
     "moji": "💡"
   },
@@ -3168,14 +3382,15 @@
     "unicode_alternates": [],
     "name": "high-speed train with bullet nose",
     "shortname": ":bullettrain_front:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "transportation",
       "train",
       "bullet",
-      "rail"
+      "rail",
+      "travel"
     ],
     "moji": "🚅"
   },
@@ -3184,7 +3399,7 @@
     "unicode_alternates": [],
     "name": "high-speed train",
     "shortname": ":bullettrain_side:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -3192,58 +3407,31 @@
       "vehicle",
       "train",
       "bullet",
-      "rail"
+      "rail",
+      "travel"
     ],
     "moji": "🚄"
   },
-  "bullhorn": {
-    "unicode": "1F56B",
-    "unicode_alternates": [],
-    "name": "bullhorn",
-    "shortname": ":bullhorn:",
-    "category": "objects_symbols",
-    "aliases": [],
-    "aliases_ascii": [],
-    "keywords": [
-      "sound",
-      "noise",
-      "announcement",
-      "megaphone"
-    ]
-  },
-  "bullhorn_waves": {
-    "unicode": "1F56C",
-    "unicode_alternates": [],
-    "name": "bullhorn with sound waves",
-    "shortname": ":bullhorn_waves:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":bullhorn_with_sound_waves:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "sound",
-      "noise",
-      "announcement",
-      "megaphone"
-    ]
-  },
   "burrito": {
     "unicode": "1F32F",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "burrito",
     "shortname": ":burrito:",
-    "category": "foods",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "food",
+      "mexican"
+    ],
+    "moji": "🌯"
   },
   "bus": {
     "unicode": "1F68C",
     "unicode_alternates": [],
     "name": "bus",
     "shortname": ":bus:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -3253,8 +3441,8 @@
       "bus",
       "school",
       "city",
-      "transportation",
-      "public"
+      "public",
+      "office"
     ],
     "moji": "🚌"
   },
@@ -3263,7 +3451,7 @@
     "unicode_alternates": [],
     "name": "bus stop",
     "shortname": ":busstop:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -3272,7 +3460,7 @@
       "stop",
       "city",
       "transport",
-      "transportation"
+      "object"
     ],
     "moji": "🚏"
   },
@@ -3281,7 +3469,7 @@
     "unicode_alternates": [],
     "name": "bust in silhouette",
     "shortname": ":bust_in_silhouette:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -3290,8 +3478,6 @@
       "person",
       "user",
       "silhouette",
-      "person",
-      "user",
       "member",
       "account",
       "guest",
@@ -3300,7 +3486,8 @@
       "profile",
       "me",
       "myself",
-      "i"
+      "i",
+      "people"
     ],
     "moji": "👤"
   },
@@ -3309,7 +3496,7 @@
     "unicode_alternates": [],
     "name": "busts in silhouette",
     "shortname": ":busts_in_silhouette:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -3322,7 +3509,6 @@
       "silhouette",
       "silhouettes",
       "people",
-      "user",
       "members",
       "accounts",
       "relationship",
@@ -3330,6 +3516,17 @@
     ],
     "moji": "👥"
   },
+  "butterfly": {
+    "unicode": "1F98B",
+    "unicode_alternates": [],
+    "name": "butterfly",
+    "shortname": ":butterfly:",
+    "category": "nature",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🦋"
+  },
   "cactus": {
     "unicode": "1F335",
     "unicode_alternates": [],
@@ -3346,7 +3543,8 @@
       "desert",
       "drought",
       "spike",
-      "poke"
+      "poke",
+      "trees"
     ],
     "moji": "🌵"
   },
@@ -3355,7 +3553,7 @@
     "unicode_alternates": [],
     "name": "shortcake",
     "shortname": ":cake:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -3368,24 +3566,6 @@
     ],
     "moji": "🍰"
   },
-  "calculator": {
-    "unicode": "1F5A9",
-    "unicode_alternates": [],
-    "name": "pocket calculator",
-    "shortname": ":calculator:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":pocket calculator:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "add",
-      "subtract",
-      "multiple",
-      "divide",
-      "scientific"
-    ]
-  },
   "calendar": {
     "unicode": "1F4C6",
     "unicode_alternates": [],
@@ -3395,7 +3575,9 @@
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "schedule"
+      "schedule",
+      "object",
+      "office"
     ],
     "moji": "📆"
   },
@@ -3404,7 +3586,7 @@
     "unicode_alternates": [],
     "name": "spiral calendar pad",
     "shortname": ":calendar_spiral:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [
       ":spiral_calendar_pad:"
     ],
@@ -3412,8 +3594,89 @@
     "keywords": [
       "schedule",
       "date",
-      "day"
-    ]
+      "day",
+      "object",
+      "office"
+    ],
+    "moji": "🗓"
+  },
+  "call_me": {
+    "unicode": "1F919",
+    "unicode_alternates": [],
+    "name": "call me hand",
+    "shortname": ":call_me:",
+    "category": "people",
+    "aliases": [
+      ":call_me_hand:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤙"
+  },
+  "call_me_tone1": {
+    "unicode": "1F919-1F3FB",
+    "unicode_alternates": [],
+    "name": "call me hand tone 1",
+    "shortname": ":call_me_tone1:",
+    "category": "people",
+    "aliases": [
+      ":call_me_hand_tone1:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤙🏻"
+  },
+  "call_me_tone2": {
+    "unicode": "1F919-1F3FC",
+    "unicode_alternates": [],
+    "name": "call me hand tone 2",
+    "shortname": ":call_me_tone2:",
+    "category": "people",
+    "aliases": [
+      ":call_me_hand_tone2:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤙🏼"
+  },
+  "call_me_tone3": {
+    "unicode": "1F919-1F3FD",
+    "unicode_alternates": [],
+    "name": "call me hand tone 3",
+    "shortname": ":call_me_tone3:",
+    "category": "people",
+    "aliases": [
+      ":call_me_hand_tone3:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤙🏽"
+  },
+  "call_me_tone4": {
+    "unicode": "1F919-1F3FE",
+    "unicode_alternates": [],
+    "name": "call me hand tone 4",
+    "shortname": ":call_me_tone4:",
+    "category": "people",
+    "aliases": [
+      ":call_me_hand_tone4:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤙🏾"
+  },
+  "call_me_tone5": {
+    "unicode": "1F919-1F3FF",
+    "unicode_alternates": [],
+    "name": "call me hand tone 5",
+    "shortname": ":call_me_tone5:",
+    "category": "people",
+    "aliases": [
+      ":call_me_hand_tone5:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤙🏿"
   },
   "calling": {
     "unicode": "1F4F2",
@@ -3425,7 +3688,10 @@
     "aliases_ascii": [],
     "keywords": [
       "incoming",
-      "iphone"
+      "iphone",
+      "electronics",
+      "phone",
+      "selfie"
     ],
     "moji": "📲"
   },
@@ -3447,11 +3713,11 @@
       "desert",
       "central asia",
       "heat",
-      "hot",
       "water",
       "hump day",
       "wednesday",
-      "sex"
+      "sex",
+      "wildlife"
     ],
     "moji": "🐫"
   },
@@ -3465,7 +3731,10 @@
     "aliases_ascii": [],
     "keywords": [
       "gadgets",
-      "photo"
+      "photo",
+      "electronics",
+      "camera",
+      "selfie"
     ],
     "moji": "📷"
   },
@@ -3474,20 +3743,23 @@
     "unicode_alternates": [],
     "name": "camera with flash",
     "shortname": ":camera_with_flash:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "photo",
-      "picture"
-    ]
+      "picture",
+      "electronics",
+      "camera"
+    ],
+    "moji": "📸"
   },
   "camping": {
     "unicode": "1F3D5",
     "unicode_alternates": [],
     "name": "camping",
     "shortname": ":camping:",
-    "category": "travel_places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -3495,22 +3767,13 @@
       "nature",
       "wilderness",
       "roughing",
-      "activity"
-    ]
-  },
-  "cancellation_x": {
-    "unicode": "1F5D9",
-    "unicode_alternates": [],
-    "name": "cancellation x",
-    "shortname": ":cancellation_x:",
-    "category": "objects_symbols",
-    "aliases": [],
-    "aliases_ascii": [],
-    "keywords": [
-      "cancel",
-      "stop",
-      "delete"
-    ]
+      "activity",
+      "places",
+      "travel",
+      "vacation",
+      "camp"
+    ],
+    "moji": "🏕"
   },
   "cancer": {
     "unicode": "264B",
@@ -3519,7 +3782,7 @@
     ],
     "name": "cancer",
     "shortname": ":cancer:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -3531,9 +3794,8 @@
       "stars",
       "zodiac",
       "sign",
-      "sign",
-      "zodiac",
-      "horoscope"
+      "horoscope",
+      "symbol"
     ],
     "moji": "♋"
   },
@@ -3542,20 +3804,22 @@
     "unicode_alternates": [],
     "name": "candle",
     "shortname": ":candle:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "light",
-      "wax"
-    ]
+      "wax",
+      "object"
+    ],
+    "moji": "🕯"
   },
   "candy": {
     "unicode": "1F36C",
     "unicode_alternates": [],
     "name": "candy",
     "shortname": ":candy:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -3564,22 +3828,38 @@
       "candy",
       "sugar",
       "sweet",
-      "hard"
+      "hard",
+      "food",
+      "halloween"
     ],
     "moji": "🍬"
   },
+  "canoe": {
+    "unicode": "1F6F6",
+    "unicode_alternates": [],
+    "name": "canoe",
+    "shortname": ":canoe:",
+    "category": "travel",
+    "aliases": [
+      ":kayak:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🛶"
+  },
   "capital_abcd": {
     "unicode": "1F520",
     "unicode_alternates": [],
     "name": "input symbol for latin capital letters",
     "shortname": ":capital_abcd:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "alphabet",
       "blue-square",
-      "words"
+      "words",
+      "symbol"
     ],
     "moji": "🔠"
   },
@@ -3590,7 +3870,7 @@
     ],
     "name": "capricorn",
     "shortname": ":capricorn:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -3603,9 +3883,8 @@
       "stars",
       "zodiac",
       "sign",
-      "sign",
-      "zodiac",
-      "horoscope"
+      "horoscope",
+      "symbol"
     ],
     "moji": "♑"
   },
@@ -3614,15 +3893,19 @@
     "unicode_alternates": [],
     "name": "card file box",
     "shortname": ":card_box:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [
       ":card_file_box:"
     ],
     "aliases_ascii": [],
     "keywords": [
       "index",
-      "organization"
-    ]
+      "organization",
+      "object",
+      "work",
+      "office"
+    ],
+    "moji": "🗃"
   },
   "card_index": {
     "unicode": "1F4C7",
@@ -3634,7 +3917,10 @@
     "aliases_ascii": [],
     "keywords": [
       "business",
-      "stationery"
+      "stationery",
+      "object",
+      "work",
+      "office"
     ],
     "moji": "📇"
   },
@@ -3643,7 +3929,7 @@
     "unicode_alternates": [],
     "name": "carousel horse",
     "shortname": ":carousel_horse:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -3651,37 +3937,106 @@
       "horse",
       "photo",
       "carousel",
-      "horse",
       "amusement",
       "park",
       "ride",
       "entertainment",
-      "park",
-      "fair"
+      "fair",
+      "places",
+      "object",
+      "vacation",
+      "roller coaster"
     ],
     "moji": "🎠"
   },
-  "cartridge": {
-    "unicode": "1F5AD",
+  "carrot": {
+    "unicode": "1F955",
     "unicode_alternates": [],
-    "name": "tape cartridge",
-    "shortname": ":cartridge:",
-    "category": "objects_symbols",
+    "name": "carrot",
+    "shortname": ":carrot:",
+    "category": "food",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🥕"
+  },
+  "cartwheel": {
+    "unicode": "1F938",
+    "unicode_alternates": [],
+    "name": "person doing cartwheel",
+    "shortname": ":cartwheel:",
+    "category": "activity",
     "aliases": [
-      ":tape_cartridge:"
+      ":person_doing_cartwheel:"
     ],
     "aliases_ascii": [],
-    "keywords": [
-      "oldschool",
-      "save",
-      "technology",
-      "disk",
-      "storage",
-      "information",
-      "computer",
-      "drive",
-      "megabyte"
-    ]
+    "keywords": [],
+    "moji": "🤸"
+  },
+  "cartwheel_tone1": {
+    "unicode": "1F938-1F3FB",
+    "unicode_alternates": [],
+    "name": "person doing cartwheel tone 1",
+    "shortname": ":cartwheel_tone1:",
+    "category": "activity",
+    "aliases": [
+      ":person_doing_cartwheel_tone1:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤸🏻"
+  },
+  "cartwheel_tone2": {
+    "unicode": "1F938-1F3FC",
+    "unicode_alternates": [],
+    "name": "person doing cartwheel tone 2",
+    "shortname": ":cartwheel_tone2:",
+    "category": "activity",
+    "aliases": [
+      ":person_doing_cartwheel_tone2:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤸🏼"
+  },
+  "cartwheel_tone3": {
+    "unicode": "1F938-1F3FD",
+    "unicode_alternates": [],
+    "name": "person doing cartwheel tone 3",
+    "shortname": ":cartwheel_tone3:",
+    "category": "activity",
+    "aliases": [
+      ":person_doing_cartwheel_tone3:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤸🏽"
+  },
+  "cartwheel_tone4": {
+    "unicode": "1F938-1F3FE",
+    "unicode_alternates": [],
+    "name": "person doing cartwheel tone 4",
+    "shortname": ":cartwheel_tone4:",
+    "category": "activity",
+    "aliases": [
+      ":person_doing_cartwheel_tone4:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤸🏾,"
+  },
+  "cartwheel_tone5": {
+    "unicode": "1F938-1F3FF",
+    "unicode_alternates": [],
+    "name": "person doing cartwheel tone 5",
+    "shortname": ":cartwheel_tone5:",
+    "category": "activity",
+    "aliases": [
+      ":person_doing_cartwheel_tone5:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤸🏿"
   },
   "cat": {
     "unicode": "1F431",
@@ -3693,7 +4048,10 @@
     "aliases_ascii": [],
     "keywords": [
       "animal",
-      "meow"
+      "meow",
+      "halloween",
+      "vagina",
+      "cat"
     ],
     "moji": "🐱"
   },
@@ -3711,13 +4069,13 @@
       "pet",
       "cat",
       "kitten",
-      "meow"
+      "halloween"
     ],
     "moji": "🐈"
   },
   "cd": {
     "unicode": "1F4BF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "optical disc",
     "shortname": ":cd:",
     "category": "objects",
@@ -3732,25 +4090,14 @@
       "cd",
       "computer",
       "object",
-      "office"
-    ]
-  },
-  "celtic_cross": {
-    "unicode": "1F548",
-    "unicode_alternates": [],
-    "name": "celtic cross",
-    "shortname": ":celtic_cross:",
-    "category": "objects_symbols",
-    "aliases": [],
-    "aliases_ascii": [],
-    "keywords": [
-      "religion",
-      "symbol"
-    ]
+      "office",
+      "electronics"
+    ],
+    "moji": "💿"
   },
   "chains": {
     "unicode": "26D3",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "chains",
     "shortname": ":chains:",
     "category": "objects",
@@ -3758,32 +4105,55 @@
     "aliases_ascii": [],
     "keywords": [
       "chain",
-      "object"
-    ]
+      "object",
+      "tool"
+    ],
+    "moji": "⛓"
   },
   "champagne": {
     "unicode": "1F37E",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "bottle with popping cork",
     "shortname": ":champagne:",
-    "category": "foods",
+    "category": "food",
     "aliases": [
       ":bottle_with_popping_cork:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "drink",
+      "cheers",
+      "alcohol",
+      "parties"
+    ],
+    "moji": "🍾"
+  },
+  "champagne_glass": {
+    "unicode": "1F942",
+    "unicode_alternates": [],
+    "name": "clinking glasses",
+    "shortname": ":champagne_glass:",
+    "category": "food",
+    "aliases": [
+      ":clinking_glass:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🥂"
   },
   "chart": {
     "unicode": "1F4B9",
     "unicode_alternates": [],
     "name": "chart with upwards trend and yen sign",
     "shortname": ":chart:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "graph",
-      "green-square"
+      "green-square",
+      "symbol",
+      "money"
     ],
     "moji": "💹"
   },
@@ -3796,7 +4166,9 @@
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "graph"
+      "graph",
+      "work",
+      "office"
     ],
     "moji": "📉"
   },
@@ -3809,7 +4181,9 @@
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "graph"
+      "graph",
+      "work",
+      "office"
     ],
     "moji": "📈"
   },
@@ -3818,7 +4192,7 @@
     "unicode_alternates": [],
     "name": "chequered flag",
     "shortname": ":checkered_flag:",
-    "category": "objects",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -3832,28 +4206,32 @@
       "flag",
       "finish",
       "complete",
-      "end"
+      "end",
+      "object"
     ],
     "moji": "🏁"
   },
   "cheese": {
     "unicode": "1F9C0",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "cheese wedge",
     "shortname": ":cheese:",
-    "category": "foods",
+    "category": "food",
     "aliases": [
       ":cheese_wedge:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "food"
+    ],
+    "moji": "🧀"
   },
   "cherries": {
     "unicode": "1F352",
     "unicode_alternates": [],
     "name": "cherries",
     "shortname": ":cherries:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -3862,7 +4240,6 @@
       "cherry",
       "cherries",
       "tree",
-      "fruit",
       "pit"
     ],
     "moji": "🍒"
@@ -3882,7 +4259,7 @@
       "cherry",
       "blossom",
       "tree",
-      "flower"
+      "tropical"
     ],
     "moji": "🌸"
   },
@@ -3899,8 +4276,9 @@
       "squirrel",
       "chestnut",
       "roasted",
-      "food",
-      "tree"
+      "tree",
+      "nature",
+      "plant"
     ],
     "moji": "🌰"
   },
@@ -3927,7 +4305,7 @@
     "unicode_alternates": [],
     "name": "children crossing",
     "shortname": ":children_crossing:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -3938,7 +4316,8 @@
       "crossing",
       "street",
       "crosswalk",
-      "slow"
+      "slow",
+      "symbol"
     ],
     "moji": "🚸"
   },
@@ -3952,15 +4331,17 @@
     "aliases_ascii": [],
     "keywords": [
       "animal",
-      "nature"
-    ]
+      "nature",
+      "wildlife"
+    ],
+    "moji": "🐿"
   },
   "chocolate_bar": {
     "unicode": "1F36B",
     "unicode_alternates": [],
     "name": "chocolate bar",
     "shortname": ":chocolate_bar:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -3971,7 +4352,8 @@
       "bar",
       "candy",
       "coca",
-      "hershey&#039;s"
+      "hershey&#039;s",
+      "halloween"
     ],
     "moji": "🍫"
   },
@@ -3980,7 +4362,7 @@
     "unicode_alternates": [],
     "name": "christmas tree",
     "shortname": ":christmas_tree:",
-    "category": "objects",
+    "category": "nature",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -3990,17 +4372,17 @@
       "vacation",
       "xmas",
       "christmas",
-      "xmas",
       "santa",
       "holiday",
       "winter",
-      "december",
-      "santa",
       "evergreen",
       "ornaments",
       "jesus",
       "gifts",
-      "presents"
+      "presents",
+      "plant",
+      "holidays",
+      "trees"
     ],
     "moji": "🎄"
   },
@@ -4011,13 +4393,16 @@
     ],
     "name": "church",
     "shortname": ":church:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "building",
       "christ",
-      "religion"
+      "religion",
+      "places",
+      "wedding",
+      "condolence"
     ],
     "moji": "⛪"
   },
@@ -4026,7 +4411,7 @@
     "unicode_alternates": [],
     "name": "cinema",
     "shortname": ":cinema:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -4035,10 +4420,11 @@
       "movie",
       "record",
       "cinema",
-      "movie",
       "theater",
       "motion",
-      "picture"
+      "picture",
+      "symbol",
+      "camera"
     ],
     "moji": "🎦"
   },
@@ -4047,7 +4433,7 @@
     "unicode_alternates": [],
     "name": "circus tent",
     "shortname": ":circus_tent:",
-    "category": "places",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -4057,10 +4443,10 @@
       "circus",
       "tent",
       "event",
-      "carnival",
       "big",
       "top",
-      "canvas"
+      "canvas",
+      "circus tent"
     ],
     "moji": "🎪"
   },
@@ -4069,7 +4455,7 @@
     "unicode_alternates": [],
     "name": "cityscape at dusk",
     "shortname": ":city_dusk:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -4082,7 +4468,9 @@
       "evening",
       "metropolitan",
       "night",
-      "dark"
+      "dark",
+      "places",
+      "building"
     ],
     "moji": "🌆"
   },
@@ -4091,7 +4479,7 @@
     "unicode_alternates": [],
     "name": "sunset over buildings",
     "shortname": ":city_sunset:",
-    "category": "places",
+    "category": "travel",
     "aliases": [
       ":city_sunrise:"
     ],
@@ -4106,7 +4494,11 @@
       "morning",
       "metropolitan",
       "rise",
-      "sun"
+      "sun",
+      "places",
+      "building",
+      "sky",
+      "vacation"
     ],
     "moji": "🌇"
   },
@@ -4115,7 +4507,7 @@
     "unicode_alternates": [],
     "name": "cityscape",
     "shortname": ":cityscape:",
-    "category": "travel_places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -4124,12 +4516,16 @@
       "view",
       "lights",
       "buiildings",
-      "metropolis"
-    ]
+      "metropolis",
+      "places",
+      "building",
+      "vacation"
+    ],
+    "moji": "🏙"
   },
   "cl": {
     "unicode": "1F191",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "squared cl",
     "shortname": ":cl:",
     "category": "symbols",
@@ -4143,14 +4539,15 @@
       "clear",
       "symbol",
       "word"
-    ]
+    ],
+    "moji": "🆑"
   },
   "clap": {
     "unicode": "1F44F",
     "unicode_alternates": [],
     "name": "clapping hands sign",
     "shortname": ":clap:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -4163,13 +4560,18 @@
       "approval",
       "sound",
       "encouragement",
-      "enthusiasm"
+      "enthusiasm",
+      "body",
+      "win",
+      "diversity",
+      "good",
+      "beautiful"
     ],
     "moji": "👏"
   },
   "clap_tone1": {
     "unicode": "1F44F-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "clapping hands sign tone 1",
     "shortname": ":clap_tone1:",
     "category": "people",
@@ -4185,11 +4587,12 @@
       "sound",
       "encouragement",
       "enthusiasm"
-    ]
+    ],
+    "moji": "👏🏻"
   },
   "clap_tone2": {
     "unicode": "1F44F-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "clapping hands sign tone 2",
     "shortname": ":clap_tone2:",
     "category": "people",
@@ -4205,11 +4608,12 @@
       "sound",
       "encouragement",
       "enthusiasm"
-    ]
+    ],
+    "moji": "👏🏼"
   },
   "clap_tone3": {
     "unicode": "1F44F-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "clapping hands sign tone 3",
     "shortname": ":clap_tone3:",
     "category": "people",
@@ -4225,11 +4629,12 @@
       "sound",
       "encouragement",
       "enthusiasm"
-    ]
+    ],
+    "moji": "👏🏽"
   },
   "clap_tone4": {
     "unicode": "1F44F-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "clapping hands sign tone 4",
     "shortname": ":clap_tone4:",
     "category": "people",
@@ -4245,11 +4650,12 @@
       "sound",
       "encouragement",
       "enthusiasm"
-    ]
+    ],
+    "moji": "👏🏾"
   },
   "clap_tone5": {
     "unicode": "1F44F-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "clapping hands sign tone 5",
     "shortname": ":clap_tone5:",
     "category": "people",
@@ -4265,14 +4671,15 @@
       "sound",
       "encouragement",
       "enthusiasm"
-    ]
+    ],
+    "moji": "👏🏿"
   },
   "clapper": {
     "unicode": "1F3AC",
     "unicode_alternates": [],
     "name": "clapper board",
     "shortname": ":clapper:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -4282,8 +4689,6 @@
       "clapper",
       "board",
       "clapboard",
-      "movie",
-      "film",
       "take"
     ],
     "moji": "🎬"
@@ -4293,7 +4698,7 @@
     "unicode_alternates": [],
     "name": "classical building",
     "shortname": ":classical_building:",
-    "category": "travel_places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -4301,8 +4706,13 @@
       "architecture",
       "history",
       "iconic",
-      "genre"
-    ]
+      "genre",
+      "places",
+      "building",
+      "travel",
+      "vacation"
+    ],
+    "moji": "🏛"
   },
   "clipboard": {
     "unicode": "1F4CB",
@@ -4314,7 +4724,11 @@
     "aliases_ascii": [],
     "keywords": [
       "documents",
-      "stationery"
+      "stationery",
+      "object",
+      "work",
+      "office",
+      "write"
     ],
     "moji": "📋"
   },
@@ -4323,26 +4737,29 @@
     "unicode_alternates": [],
     "name": "mantlepiece clock",
     "shortname": ":clock:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [
       ":mantlepiece_clock:"
     ],
     "aliases_ascii": [],
     "keywords": [
-      "time"
-    ]
+      "time",
+      "object"
+    ],
+    "moji": "🕰"
   },
   "clock1": {
     "unicode": "1F550",
     "unicode_alternates": [],
     "name": "clock face one oclock",
     "shortname": ":clock1:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
+      "time",
+      "symbol"
     ],
     "moji": "🕐"
   },
@@ -4351,12 +4768,13 @@
     "unicode_alternates": [],
     "name": "clock face ten oclock",
     "shortname": ":clock10:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
+      "time",
+      "symbol"
     ],
     "moji": "🕙"
   },
@@ -4365,12 +4783,13 @@
     "unicode_alternates": [],
     "name": "clock face ten-thirty",
     "shortname": ":clock1030:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
+      "time",
+      "symbol"
     ],
     "moji": "🕥"
   },
@@ -4379,12 +4798,13 @@
     "unicode_alternates": [],
     "name": "clock face eleven oclock",
     "shortname": ":clock11:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
+      "time",
+      "symbol"
     ],
     "moji": "🕚"
   },
@@ -4393,12 +4813,13 @@
     "unicode_alternates": [],
     "name": "clock face eleven-thirty",
     "shortname": ":clock1130:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
+      "time",
+      "symbol"
     ],
     "moji": "🕦"
   },
@@ -4407,12 +4828,13 @@
     "unicode_alternates": [],
     "name": "clock face twelve oclock",
     "shortname": ":clock12:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
+      "time",
+      "symbol"
     ],
     "moji": "🕛"
   },
@@ -4421,25 +4843,28 @@
     "unicode_alternates": [],
     "name": "clock face twelve-thirty",
     "shortname": ":clock1230:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
-    ]
+      "time",
+      "symbol"
+    ],
+    "moji": "🕧"
   },
   "clock130": {
     "unicode": "1F55C",
     "unicode_alternates": [],
     "name": "clock face one-thirty",
     "shortname": ":clock130:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
+      "time",
+      "symbol"
     ],
     "moji": "🕜"
   },
@@ -4448,12 +4873,13 @@
     "unicode_alternates": [],
     "name": "clock face two oclock",
     "shortname": ":clock2:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
+      "time",
+      "symbol"
     ],
     "moji": "🕑"
   },
@@ -4462,12 +4888,13 @@
     "unicode_alternates": [],
     "name": "clock face two-thirty",
     "shortname": ":clock230:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
+      "time",
+      "symbol"
     ],
     "moji": "🕝"
   },
@@ -4476,12 +4903,13 @@
     "unicode_alternates": [],
     "name": "clock face three oclock",
     "shortname": ":clock3:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
+      "time",
+      "symbol"
     ],
     "moji": "🕒"
   },
@@ -4490,12 +4918,13 @@
     "unicode_alternates": [],
     "name": "clock face three-thirty",
     "shortname": ":clock330:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
+      "time",
+      "symbol"
     ],
     "moji": "🕞"
   },
@@ -4504,12 +4933,13 @@
     "unicode_alternates": [],
     "name": "clock face four oclock",
     "shortname": ":clock4:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
+      "time",
+      "symbol"
     ],
     "moji": "🕓"
   },
@@ -4518,12 +4948,13 @@
     "unicode_alternates": [],
     "name": "clock face four-thirty",
     "shortname": ":clock430:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
+      "time",
+      "symbol"
     ],
     "moji": "🕟"
   },
@@ -4532,12 +4963,13 @@
     "unicode_alternates": [],
     "name": "clock face five oclock",
     "shortname": ":clock5:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
+      "time",
+      "symbol"
     ],
     "moji": "🕔"
   },
@@ -4546,12 +4978,13 @@
     "unicode_alternates": [],
     "name": "clock face five-thirty",
     "shortname": ":clock530:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
+      "time",
+      "symbol"
     ],
     "moji": "🕠"
   },
@@ -4560,12 +4993,13 @@
     "unicode_alternates": [],
     "name": "clock face six oclock",
     "shortname": ":clock6:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
+      "time",
+      "symbol"
     ],
     "moji": "🕕"
   },
@@ -4574,12 +5008,13 @@
     "unicode_alternates": [],
     "name": "clock face six-thirty",
     "shortname": ":clock630:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
+      "time",
+      "symbol"
     ],
     "moji": "🕡"
   },
@@ -4588,12 +5023,13 @@
     "unicode_alternates": [],
     "name": "clock face seven oclock",
     "shortname": ":clock7:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
+      "time",
+      "symbol"
     ],
     "moji": "🕖"
   },
@@ -4602,12 +5038,13 @@
     "unicode_alternates": [],
     "name": "clock face seven-thirty",
     "shortname": ":clock730:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
+      "time",
+      "symbol"
     ],
     "moji": "🕢"
   },
@@ -4616,12 +5053,13 @@
     "unicode_alternates": [],
     "name": "clock face eight oclock",
     "shortname": ":clock8:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
+      "time",
+      "symbol"
     ],
     "moji": "🕗"
   },
@@ -4630,12 +5068,13 @@
     "unicode_alternates": [],
     "name": "clock face eight-thirty",
     "shortname": ":clock830:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
+      "time",
+      "symbol"
     ],
     "moji": "🕣"
   },
@@ -4644,12 +5083,13 @@
     "unicode_alternates": [],
     "name": "clock face nine oclock",
     "shortname": ":clock9:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
+      "time",
+      "symbol"
     ],
     "moji": "🕘"
   },
@@ -4658,29 +5098,16 @@
     "unicode_alternates": [],
     "name": "clock face nine-thirty",
     "shortname": ":clock930:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clock",
-      "time"
+      "time",
+      "symbol"
     ],
     "moji": "🕤"
   },
-  "clockwise_arrows": {
-    "unicode": "1F5D8",
-    "unicode_alternates": [],
-    "name": "clockwise right and left semicircle arrows",
-    "shortname": ":clockwise_arrows:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":clockwise_right_and_left_semicircle_arrows:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "sync"
-    ]
-  },
   "closed_book": {
     "unicode": "1F4D5",
     "unicode_alternates": [],
@@ -4692,7 +5119,11 @@
     "keywords": [
       "knowledge",
       "library",
-      "read"
+      "read",
+      "object",
+      "office",
+      "write",
+      "book"
     ],
     "moji": "📕"
   },
@@ -4706,7 +5137,9 @@
     "aliases_ascii": [],
     "keywords": [
       "privacy",
-      "security"
+      "security",
+      "object",
+      "lock"
     ],
     "moji": "🔐"
   },
@@ -4715,7 +5148,7 @@
     "unicode_alternates": [],
     "name": "closed umbrella",
     "shortname": ":closed_umbrella:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -4724,12 +5157,14 @@
       "weather",
       "umbrella",
       "closed",
-      "rain",
       "moisture",
       "protection",
       "sun",
       "ultraviolet",
-      "uv"
+      "uv",
+      "object",
+      "sky",
+      "accessories"
     ],
     "moji": "🌂"
   },
@@ -4745,7 +5180,10 @@
     "aliases_ascii": [],
     "keywords": [
       "sky",
-      "weather"
+      "weather",
+      "cloud",
+      "cold",
+      "rain"
     ],
     "moji": "☁"
   },
@@ -4761,8 +5199,13 @@
     "aliases_ascii": [],
     "keywords": [
       "weather",
-      "thunder"
-    ]
+      "thunder",
+      "sky",
+      "cloud",
+      "cold",
+      "rain"
+    ],
+    "moji": "🌩"
   },
   "cloud_rain": {
     "unicode": "1F327",
@@ -4776,8 +5219,14 @@
     "aliases_ascii": [],
     "keywords": [
       "weather",
-      "wet"
-    ]
+      "wet",
+      "winter",
+      "sky",
+      "cloud",
+      "cold",
+      "rain"
+    ],
+    "moji": "🌧"
   },
   "cloud_snow": {
     "unicode": "1F328",
@@ -4791,8 +5240,13 @@
     "aliases_ascii": [],
     "keywords": [
       "weather",
-      "cold"
-    ]
+      "cold",
+      "winter",
+      "sky",
+      "cloud",
+      "snow"
+    ],
+    "moji": "🌨"
   },
   "cloud_tornado": {
     "unicode": "1F32A",
@@ -4807,8 +5261,24 @@
     "keywords": [
       "weather",
       "destruction",
-      "funnel"
-    ]
+      "funnel",
+      "sky",
+      "cold"
+    ],
+    "moji": "🌪"
+  },
+  "clown": {
+    "unicode": "1F921",
+    "unicode_alternates": [],
+    "name": "clown face",
+    "shortname": ":clown:",
+    "category": "people",
+    "aliases": [
+      ":clown_face:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤡"
   },
   "clubs": {
     "unicode": "2663",
@@ -4817,12 +5287,14 @@
     ],
     "name": "black club suit",
     "shortname": ":clubs:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "cards",
-      "poker"
+      "poker",
+      "symbol",
+      "game"
     ],
     "moji": "♣"
   },
@@ -4831,7 +5303,7 @@
     "unicode_alternates": [],
     "name": "cocktail glass",
     "shortname": ":cocktail:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -4841,11 +5313,11 @@
       "drunk",
       "cocktail",
       "mixed",
-      "drink",
-      "alcohol",
       "glass",
       "martini",
-      "bar"
+      "bar",
+      "girls night",
+      "parties"
     ],
     "moji": "🍸"
   },
@@ -4856,20 +5328,23 @@
     ],
     "name": "hot beverage",
     "shortname": ":coffee:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "beverage",
       "cafe",
       "drink",
-      "espresso"
+      "espresso",
+      "caffeine",
+      "steam",
+      "morning"
     ],
     "moji": "☕"
   },
   "coffin": {
     "unicode": "26B0",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "coffin",
     "shortname": ":coffin:",
     "category": "objects",
@@ -4877,15 +5352,18 @@
     "aliases_ascii": [],
     "keywords": [
       "death",
-      "object"
-    ]
+      "object",
+      "dead",
+      "rip"
+    ],
+    "moji": "⚰"
   },
   "cold_sweat": {
     "unicode": "1F630",
     "unicode_alternates": [],
     "name": "face with open mouth and cold sweat",
     "shortname": ":cold_sweat:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -4893,13 +5371,15 @@
       "nervous",
       "sweat",
       "exasperated",
-      "frustrated"
+      "frustrated",
+      "smiley",
+      "emotion"
     ],
     "moji": "😰"
   },
   "comet": {
     "unicode": "2604",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "comet",
     "shortname": ":comet:",
     "category": "nature",
@@ -4907,20 +5387,23 @@
     "aliases_ascii": [],
     "keywords": [
       "object",
-      "space"
-    ]
+      "space",
+      "sky"
+    ],
+    "moji": "☄"
   },
   "compression": {
     "unicode": "1F5DC",
     "unicode_alternates": [],
     "name": "compression",
     "shortname": ":compression:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "reduce"
-    ]
+    ],
+    "moji": "🗜"
   },
   "computer": {
     "unicode": "1F4BB",
@@ -4932,25 +5415,13 @@
     "aliases_ascii": [],
     "keywords": [
       "laptop",
-      "tech"
+      "tech",
+      "electronics",
+      "work",
+      "office"
     ],
     "moji": "💻"
   },
-  "computer_old": {
-    "unicode": "1F5B3",
-    "unicode_alternates": [],
-    "name": "old personal computer",
-    "shortname": ":computer_old:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":old_personal_computer:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "cpu",
-      "terminal"
-    ]
-  },
   "confetti_ball": {
     "unicode": "1F38A",
     "unicode_alternates": [],
@@ -4962,7 +5433,6 @@
     "keywords": [
       "festival",
       "party",
-      "party",
       "congratulations",
       "confetti",
       "ball",
@@ -4970,7 +5440,13 @@
       "win",
       "birthday",
       "new years",
-      "wedding"
+      "wedding",
+      "object",
+      "holidays",
+      "cheers",
+      "girls night",
+      "boys night",
+      "parties"
     ],
     "moji": "🎊"
   },
@@ -4979,7 +5455,7 @@
     "unicode_alternates": [],
     "name": "confounded face",
     "shortname": ":confounded:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -4991,7 +5467,11 @@
       "amaze",
       "perplex",
       "puzzle",
-      "mystify"
+      "mystify",
+      "sad",
+      "smiley",
+      "angry",
+      "emotion"
     ],
     "moji": "😖"
   },
@@ -5000,7 +5480,7 @@
     "unicode_alternates": [],
     "name": "confused face",
     "shortname": ":confused:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [
       ">:\\",
@@ -5024,7 +5504,10 @@
       "skeptical",
       "undecided",
       "uneasy",
-      "hesitant"
+      "hesitant",
+      "smiley",
+      "surprised",
+      "emotion"
     ],
     "moji": "😕"
   },
@@ -5035,13 +5518,15 @@
     ],
     "name": "circled ideograph congratulation",
     "shortname": ":congratulations:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "chinese",
       "japanese",
-      "kanji"
+      "kanji",
+      "japan",
+      "symbol"
     ],
     "moji": "㊗"
   },
@@ -5050,19 +5535,20 @@
     "unicode_alternates": [],
     "name": "construction sign",
     "shortname": ":construction:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "caution",
       "progress",
-      "wip"
+      "wip",
+      "object"
     ],
     "moji": "🚧"
   },
   "construction_site": {
     "unicode": "1F3D7",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "building construction",
     "shortname": ":construction_site:",
     "category": "travel",
@@ -5073,28 +5559,36 @@
     "keywords": [
       "site",
       "work",
-      "place"
-    ]
+      "place",
+      "building",
+      "crane"
+    ],
+    "moji": "🏗"
   },
   "construction_worker": {
     "unicode": "1F477",
     "unicode_alternates": [],
     "name": "construction worker",
     "shortname": ":construction_worker:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "human",
       "male",
       "man",
-      "wip"
+      "wip",
+      "people",
+      "hat",
+      "men",
+      "diversity",
+      "job"
     ],
     "moji": "👷"
   },
   "construction_worker_tone1": {
     "unicode": "1F477-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "construction worker tone 1",
     "shortname": ":construction_worker_tone1:",
     "category": "people",
@@ -5105,11 +5599,12 @@
       "male",
       "man",
       "wip"
-    ]
+    ],
+    "moji": "👷🏻"
   },
   "construction_worker_tone2": {
     "unicode": "1F477-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "construction worker tone 2",
     "shortname": ":construction_worker_tone2:",
     "category": "people",
@@ -5120,11 +5615,12 @@
       "male",
       "man",
       "wip"
-    ]
+    ],
+    "moji": "👷🏼"
   },
   "construction_worker_tone3": {
     "unicode": "1F477-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "construction worker tone 3",
     "shortname": ":construction_worker_tone3:",
     "category": "people",
@@ -5135,11 +5631,12 @@
       "male",
       "man",
       "wip"
-    ]
+    ],
+    "moji": "👷🏽"
   },
   "construction_worker_tone4": {
     "unicode": "1F477-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "construction worker tone 4",
     "shortname": ":construction_worker_tone4:",
     "category": "people",
@@ -5150,11 +5647,12 @@
       "male",
       "man",
       "wip"
-    ]
+    ],
+    "moji": "👷🏾"
   },
   "construction_worker_tone5": {
     "unicode": "1F477-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "construction worker tone 5",
     "shortname": ":construction_worker_tone5:",
     "category": "people",
@@ -5165,45 +5663,34 @@
       "male",
       "man",
       "wip"
-    ]
+    ],
+    "moji": "👷🏿"
   },
   "control_knobs": {
     "unicode": "1F39B",
     "unicode_alternates": [],
     "name": "control knobs",
     "shortname": ":control_knobs:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "dial"
-    ]
-  },
-  "contruction_site": {
-    "unicode": "1F3D7",
-    "unicode_alternates": [],
-    "name": "building construction",
-    "shortname": ":contruction_site:",
-    "category": "travel_places",
-    "aliases": [
-      ":building_construction:"
+      "dial",
+      "time"
     ],
-    "aliases_ascii": [],
-    "keywords": [
-      "site",
-      "work"
-    ]
+    "moji": "🎛"
   },
   "convenience_store": {
     "unicode": "1F3EA",
     "unicode_alternates": [],
     "name": "convenience store",
     "shortname": ":convenience_store:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "building"
+      "building",
+      "places"
     ],
     "moji": "🏪"
   },
@@ -5212,7 +5699,7 @@
     "unicode_alternates": [],
     "name": "cookie",
     "shortname": ":cookie:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -5224,21 +5711,44 @@
       "dessert",
       "biscuit",
       "sweet",
-      "chocolate"
+      "vagina"
     ],
     "moji": "🍪"
   },
+  "cooking": {
+    "unicode": "1F373",
+    "unicode_alternates": [],
+    "name": "cooking",
+    "shortname": ":cooking:",
+    "category": "food",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [
+      "breakfast",
+      "food",
+      "egg",
+      "fry",
+      "pan",
+      "flat",
+      "cook",
+      "frying",
+      "cooking",
+      "utensil"
+    ],
+    "moji": "🍳"
+  },
   "cool": {
     "unicode": "1F192",
     "unicode_alternates": [],
     "name": "squared cool",
     "shortname": ":cool:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "blue-square",
-      "words"
+      "words",
+      "symbol"
     ],
     "moji": "🆒"
   },
@@ -5247,7 +5757,7 @@
     "unicode_alternates": [],
     "name": "police officer",
     "shortname": ":cop:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -5255,13 +5765,19 @@
       "enforcement",
       "law",
       "man",
-      "police"
+      "police",
+      "people",
+      "hat",
+      "men",
+      "diversity",
+      "job",
+      "911"
     ],
     "moji": "👮"
   },
   "cop_tone1": {
     "unicode": "1F46E-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "police officer tone 1",
     "shortname": ":cop_tone1:",
     "category": "people",
@@ -5273,11 +5789,12 @@
       "law",
       "man",
       "cop"
-    ]
+    ],
+    "moji": "👮🏻"
   },
   "cop_tone2": {
     "unicode": "1F46E-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "police officer tone 2",
     "shortname": ":cop_tone2:",
     "category": "people",
@@ -5289,11 +5806,12 @@
       "law",
       "man",
       "cop"
-    ]
+    ],
+    "moji": "👮🏼"
   },
   "cop_tone3": {
     "unicode": "1F46E-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "police officer tone 3",
     "shortname": ":cop_tone3:",
     "category": "people",
@@ -5305,11 +5823,12 @@
       "law",
       "man",
       "cop"
-    ]
+    ],
+    "moji": "👮🏽"
   },
   "cop_tone4": {
     "unicode": "1F46E-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "police officer tone 4",
     "shortname": ":cop_tone4:",
     "category": "people",
@@ -5321,11 +5840,12 @@
       "law",
       "man",
       "cop"
-    ]
+    ],
+    "moji": "👮🏾"
   },
   "cop_tone5": {
     "unicode": "1F46E-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "police officer tone 5",
     "shortname": ":cop_tone5:",
     "category": "people",
@@ -5337,7 +5857,8 @@
       "law",
       "man",
       "cop"
-    ]
+    ],
+    "moji": "👮🏿"
   },
   "copyright": {
     "moji": "©",
@@ -5345,12 +5866,13 @@
     "unicode_alternates": [],
     "name": "copyright sign",
     "shortname": ":copyright:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "ip",
-      "license"
+      "license",
+      "symbol"
     ]
   },
   "corn": {
@@ -5358,7 +5880,7 @@
     "unicode_alternates": [],
     "name": "ear of maize",
     "shortname": ":corn:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -5367,7 +5889,6 @@
       "vegetable",
       "corn",
       "maize",
-      "food",
       "iowa",
       "kernel",
       "popcorn",
@@ -5375,7 +5896,8 @@
       "yellow",
       "stalk",
       "cob",
-      "ear"
+      "ear",
+      "vegetables"
     ],
     "moji": "🌽"
   },
@@ -5384,7 +5906,7 @@
     "unicode_alternates": [],
     "name": "couch and lamp",
     "shortname": ":couch:",
-    "category": "travel_places",
+    "category": "objects",
     "aliases": [
       ":couch_and_lamp:"
     ],
@@ -5397,15 +5919,17 @@
       "leather",
       "microfiber",
       "sit",
-      "relax"
-    ]
+      "relax",
+      "object"
+    ],
+    "moji": "🛋"
   },
   "couple": {
     "unicode": "1F46B",
     "unicode_alternates": [],
     "name": "man and woman holding hands",
     "shortname": ":couple:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -5417,7 +5941,9 @@
       "love",
       "marriage",
       "people",
-      "valentines"
+      "valentines",
+      "sex",
+      "creationism"
     ],
     "moji": "👫"
   },
@@ -5440,15 +5966,21 @@
       "like",
       "love",
       "marriage",
-      "valentines"
-    ]
+      "valentines",
+      "people",
+      "gay",
+      "men",
+      "sex",
+      "lgbt"
+    ],
+    "moji": "👨‍❤️‍👨"
   },
   "couple_with_heart": {
     "unicode": "1F491",
     "unicode_alternates": [],
     "name": "couple with heart",
     "shortname": ":couple_with_heart:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -5458,7 +5990,9 @@
       "like",
       "love",
       "marriage",
-      "valentines"
+      "valentines",
+      "people",
+      "sex"
     ],
     "moji": "💑"
   },
@@ -5481,15 +6015,20 @@
       "like",
       "love",
       "marriage",
-      "valentines"
-    ]
+      "valentines",
+      "people",
+      "women",
+      "sex",
+      "lgbt"
+    ],
+    "moji": "👩‍❤️‍👩"
   },
   "couplekiss": {
     "unicode": "1F48F",
     "unicode_alternates": [],
     "name": "kiss",
     "shortname": ":couplekiss:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -5497,7 +6036,9 @@
       "like",
       "love",
       "marriage",
-      "valentines"
+      "valentines",
+      "people",
+      "sex"
     ],
     "moji": "💏"
   },
@@ -5532,28 +6073,44 @@
       "cow",
       "milk",
       "dairy",
-      "beef",
       "bessie",
       "moo"
     ],
     "moji": "🐄"
   },
+  "cowboy": {
+    "unicode": "1F920",
+    "unicode_alternates": [],
+    "name": "face with cowboy hat",
+    "shortname": ":cowboy:",
+    "category": "people",
+    "aliases": [
+      ":face_with_cowboy_hat:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤠"
+  },
   "crab": {
     "unicode": "1F980",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "crab",
     "shortname": ":crab:",
     "category": "nature",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "tropical",
+      "animal"
+    ],
+    "moji": "🦀"
   },
   "crayon": {
     "unicode": "1F58D",
     "unicode_alternates": [],
     "name": "lower left crayon",
     "shortname": ":crayon:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [
       ":lower_left_crayon:"
     ],
@@ -5562,8 +6119,11 @@
       "write",
       "draw",
       "color",
-      "wax"
-    ]
+      "wax",
+      "object",
+      "office"
+    ],
+    "moji": "🖍"
   },
   "credit_card": {
     "unicode": "1F4B3",
@@ -5588,7 +6148,9 @@
       "visa",
       "american express",
       "wallet",
-      "signature"
+      "signature",
+      "object",
+      "boys night"
     ],
     "moji": "💳"
   },
@@ -5606,15 +6168,16 @@
       "crescent",
       "waxing",
       "sky",
-      "night",
       "cheese",
-      "phase"
+      "phase",
+      "space",
+      "goodnight"
     ],
     "moji": "🌙"
   },
   "cricket": {
     "unicode": "1F3CF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "cricket bat and ball",
     "shortname": ":cricket:",
     "category": "activity",
@@ -5622,7 +6185,12 @@
       ":cricket_bat_ball:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "ball",
+      "sport",
+      "cricket"
+    ],
+    "moji": "🏏"
   },
   "crocodile": {
     "unicode": "1F40A",
@@ -5639,13 +6207,26 @@
       "croc",
       "alligator",
       "gator",
-      "cranky"
+      "cranky",
+      "wildlife",
+      "reptile"
     ],
     "moji": "🐊"
   },
+  "croissant": {
+    "unicode": "1F950",
+    "unicode_alternates": [],
+    "name": "croissant",
+    "shortname": ":croissant:",
+    "category": "food",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🥐"
+  },
   "cross": {
     "unicode": "271D",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "latin cross",
     "shortname": ":cross:",
     "category": "symbols",
@@ -5657,53 +6238,8 @@
       "religion",
       "symbol",
       "christian"
-    ]
-  },
-  "cross_heavy": {
-    "unicode": "1F547",
-    "unicode_alternates": [],
-    "name": "heavy latin cross",
-    "shortname": ":cross_heavy:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":heavy_latin_cross:"
     ],
-    "aliases_ascii": [],
-    "keywords": [
-      "religion",
-      "symbol"
-    ]
-  },
-  "cross_white": {
-    "unicode": "1F546",
-    "unicode_alternates": [],
-    "name": "white latin cross",
-    "shortname": ":cross_white:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":white_latin_cross:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "religion",
-      "symbol"
-    ]
-  },
-  "crossbones": {
-    "unicode": "1F571",
-    "unicode_alternates": [],
-    "name": "black skull and crossbones",
-    "shortname": ":crossbones:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":black_skull_and_crossbones:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "poison",
-      "danger",
-      "death"
-    ]
+    "moji": "✝"
   },
   "crossed_flags": {
     "unicode": "1F38C",
@@ -5714,13 +6250,14 @@
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "japan"
+      "japan",
+      "object"
     ],
     "moji": "🎌"
   },
   "crossed_swords": {
     "unicode": "2694",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "crossed swords",
     "shortname": ":crossed_swords:",
     "category": "objects",
@@ -5729,21 +6266,25 @@
     "keywords": [
       "object",
       "weapon"
-    ]
+    ],
+    "moji": "⚔"
   },
   "crown": {
     "unicode": "1F451",
     "unicode_alternates": [],
     "name": "crown",
     "shortname": ":crown:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "king",
       "kod",
       "leader",
-      "royalty"
+      "royalty",
+      "object",
+      "gem",
+      "accessories"
     ],
     "moji": "👑"
   },
@@ -5752,7 +6293,7 @@
     "unicode_alternates": [],
     "name": "passenger ship",
     "shortname": ":cruise_ship:",
-    "category": "travel_places",
+    "category": "travel",
     "aliases": [
       ":passenger_ship:"
     ],
@@ -5760,15 +6301,18 @@
     "keywords": [
       "titanic",
       "transportation",
-      "boat"
-    ]
+      "boat",
+      "travel",
+      "vacation"
+    ],
+    "moji": "🛳"
   },
   "cry": {
     "unicode": "1F622",
     "unicode_alternates": [],
     "name": "crying face",
     "shortname": ":cry:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [
       ":'(",
@@ -5779,11 +6323,14 @@
     "keywords": [
       "face",
       "sad",
-      "sad",
       "cry",
       "tear",
       "weep",
-      "tears"
+      "tears",
+      "smiley",
+      "emotion",
+      "rip",
+      "heartbreak"
     ],
     "moji": "😢"
   },
@@ -5792,7 +6339,7 @@
     "unicode_alternates": [],
     "name": "crying cat face",
     "shortname": ":crying_cat_face:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -5804,8 +6351,6 @@
       "cry",
       "cat",
       "sob",
-      "tears",
-      "sad",
       "melancholy",
       "morn",
       "somber",
@@ -5823,16 +6368,29 @@
     "aliases_ascii": [],
     "keywords": [
       "disco",
-      "party"
+      "party",
+      "object",
+      "ball"
     ],
     "moji": "🔮"
   },
+  "cucumber": {
+    "unicode": "1F952",
+    "unicode_alternates": [],
+    "name": "cucumber",
+    "shortname": ":cucumber:",
+    "category": "food",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🥒"
+  },
   "cupid": {
     "unicode": "1F498",
     "unicode_alternates": [],
     "name": "heart with arrow",
     "shortname": ":cupid:",
-    "category": "emoticons",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -5840,7 +6398,8 @@
       "heart",
       "like",
       "love",
-      "valentines"
+      "valentines",
+      "symbol"
     ],
     "moji": "💘"
   },
@@ -5849,11 +6408,12 @@
     "unicode_alternates": [],
     "name": "curly loop",
     "shortname": ":curly_loop:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "scribble"
+      "scribble",
+      "symbol"
     ],
     "moji": "➰"
   },
@@ -5862,13 +6422,14 @@
     "unicode_alternates": [],
     "name": "currency exchange",
     "shortname": ":currency_exchange:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "dollar",
       "money",
-      "travel"
+      "travel",
+      "symbol"
     ],
     "moji": "💱"
   },
@@ -5877,7 +6438,7 @@
     "unicode_alternates": [],
     "name": "curry and rice",
     "shortname": ":curry:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -5888,7 +6449,6 @@
       "curry",
       "spice",
       "flavor",
-      "food",
       "meal"
     ],
     "moji": "🍛"
@@ -5898,7 +6458,7 @@
     "unicode_alternates": [],
     "name": "custard",
     "shortname": ":custard:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -5920,7 +6480,7 @@
     "unicode_alternates": [],
     "name": "customs",
     "shortname": ":customs:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -5932,7 +6492,8 @@
       "goods",
       "check",
       "authority",
-      "government"
+      "government",
+      "symbol"
     ],
     "moji": "🛃"
   },
@@ -5942,7 +6503,7 @@
     "unicode_alternates": [],
     "name": "cyclone",
     "shortname": ":cyclone:",
-    "category": "nature",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -5954,7 +6515,9 @@
       "hurricane",
       "typhoon",
       "storm",
-      "ocean"
+      "ocean",
+      "symbol",
+      "drugs"
     ]
   },
   "dagger": {
@@ -5962,22 +6525,25 @@
     "unicode_alternates": [],
     "name": "dagger knife",
     "shortname": ":dagger:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [
       ":dagger_knife:"
     ],
     "aliases_ascii": [],
     "keywords": [
       "blade",
-      "knife"
-    ]
+      "knife",
+      "object",
+      "weapon"
+    ],
+    "moji": "🗡"
   },
   "dancer": {
     "unicode": "1F483",
     "unicode_alternates": [],
     "name": "dancer",
     "shortname": ":dancer:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -5995,13 +6561,18 @@
       "ballet",
       "tango",
       "cha cha",
-      "music"
+      "music",
+      "people",
+      "women",
+      "sexy",
+      "diversity",
+      "girls night"
     ],
     "moji": "💃"
   },
   "dancer_tone1": {
     "unicode": "1F483-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "dancer tone 1",
     "shortname": ":dancer_tone1:",
     "category": "people",
@@ -6021,11 +6592,12 @@
       "tango",
       "cha cha",
       "music"
-    ]
+    ],
+    "moji": "💃🏻"
   },
   "dancer_tone2": {
     "unicode": "1F483-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "dancer tone 2",
     "shortname": ":dancer_tone2:",
     "category": "people",
@@ -6045,11 +6617,12 @@
       "tango",
       "cha cha",
       "music"
-    ]
+    ],
+    "moji": "💃🏼"
   },
   "dancer_tone3": {
     "unicode": "1F483-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "dancer tone 3",
     "shortname": ":dancer_tone3:",
     "category": "people",
@@ -6069,11 +6642,12 @@
       "tango",
       "cha cha",
       "music"
-    ]
+    ],
+    "moji": "💃🏽"
   },
   "dancer_tone4": {
     "unicode": "1F483-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "dancer tone 4",
     "shortname": ":dancer_tone4:",
     "category": "people",
@@ -6093,11 +6667,12 @@
       "tango",
       "cha cha",
       "music"
-    ]
+    ],
+    "moji": "💃🏾"
   },
   "dancer_tone5": {
     "unicode": "1F483-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "dancer tone 5",
     "shortname": ":dancer_tone5:",
     "category": "people",
@@ -6117,14 +6692,15 @@
       "tango",
       "cha cha",
       "music"
-    ]
+    ],
+    "moji": "💃🏿"
   },
   "dancers": {
     "unicode": "1F46F",
     "unicode_alternates": [],
     "name": "woman with bunny ears",
     "shortname": ":dancers:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -6137,8 +6713,13 @@
       "showgirl",
       "playboy",
       "costume",
-      "bunny",
-      "cancan"
+      "cancan",
+      "people",
+      "sexy",
+      "girls night",
+      "boys night",
+      "parties",
+      "dance"
     ],
     "moji": "👯"
   },
@@ -6147,7 +6728,7 @@
     "unicode_alternates": [],
     "name": "dango",
     "shortname": ":dango:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -6166,20 +6747,24 @@
     "unicode_alternates": [],
     "name": "dark sunglasses",
     "shortname": ":dark_sunglasses:",
-    "category": "objects_symbols",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "shades",
-      "eyes"
-    ]
+      "eyes",
+      "fashion",
+      "glasses",
+      "accessories"
+    ],
+    "moji": "🕶"
   },
   "dart": {
     "unicode": "1F3AF",
     "unicode_alternates": [],
     "name": "direct hit",
     "shortname": ":dart:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -6190,10 +6775,10 @@
       "bullseye",
       "dart",
       "archery",
-      "game",
       "fletching",
       "arrow",
-      "sport"
+      "sport",
+      "boys night"
     ],
     "moji": "🎯"
   },
@@ -6202,14 +6787,17 @@
     "unicode_alternates": [],
     "name": "dash symbol",
     "shortname": ":dash:",
-    "category": "emoticons",
+    "category": "nature",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "air",
       "fast",
       "shoo",
-      "wind"
+      "wind",
+      "cloud",
+      "cold",
+      "smoking"
     ],
     "moji": "💨"
   },
@@ -6223,7 +6811,9 @@
     "aliases_ascii": [],
     "keywords": [
       "calendar",
-      "schedule"
+      "schedule",
+      "object",
+      "office"
     ],
     "moji": "📅"
   },
@@ -6242,16 +6832,29 @@
       "tree",
       "leaves",
       "fall",
-      "color"
+      "color",
+      "camp",
+      "trees"
     ],
     "moji": "🌳"
   },
+  "deer": {
+    "unicode": "1F98C",
+    "unicode_alternates": [],
+    "name": "deer",
+    "shortname": ":deer:",
+    "category": "nature",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🦌"
+  },
   "department_store": {
     "unicode": "1F3EC",
     "unicode_alternates": [],
     "name": "department store",
     "shortname": ":department_store:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -6262,31 +6865,17 @@
       "store",
       "retail",
       "sale",
-      "merchandise"
+      "merchandise",
+      "places"
     ],
     "moji": "🏬"
   },
-  "descending_notes": {
-    "unicode": "1F39D",
-    "unicode_alternates": [],
-    "name": "beamed descending musical notes",
-    "shortname": ":descending_notes:",
-    "category": "objects_symbols",
-    "aliases": [],
-    "aliases_ascii": [],
-    "keywords": [
-      "score",
-      "music",
-      "sound",
-      "tone"
-    ]
-  },
   "desert": {
     "unicode": "1F3DC",
     "unicode_alternates": [],
     "name": "desert",
     "shortname": ":desert:",
-    "category": "travel_places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -6295,41 +6884,36 @@
       "sandy",
       "cactus",
       "sunny",
-      "barren"
-    ]
+      "barren",
+      "places",
+      "travel",
+      "vacation"
+    ],
+    "moji": "🏜"
   },
   "desktop": {
     "unicode": "1F5A5",
     "unicode_alternates": [],
     "name": "desktop computer",
     "shortname": ":desktop:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [
       ":desktop_computer:"
     ],
     "aliases_ascii": [],
     "keywords": [
-      "cpu"
-    ]
-  },
-  "desktop_window": {
-    "unicode": "1F5D4",
-    "unicode_alternates": [],
-    "name": "desktop window",
-    "shortname": ":desktop_window:",
-    "category": "objects_symbols",
-    "aliases": [],
-    "aliases_ascii": [],
-    "keywords": [
-      "computer"
-    ]
+      "cpu",
+      "electronics",
+      "work"
+    ],
+    "moji": "🖥"
   },
   "diamond_shape_with_a_dot_inside": {
     "unicode": "1F4A0",
     "unicode_alternates": [],
     "name": "diamond shape with a dot inside",
     "shortname": ":diamond_shape_with_a_dot_inside:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -6339,7 +6923,8 @@
       "kawaii",
       "japanese",
       "glyph",
-      "adorable"
+      "adorable",
+      "symbol"
     ],
     "moji": "💠"
   },
@@ -6350,12 +6935,15 @@
     ],
     "name": "black diamond suit",
     "shortname": ":diamonds:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "cards",
-      "poker"
+      "poker",
+      "shapes",
+      "symbol",
+      "game"
     ],
     "moji": "♦"
   },
@@ -6364,7 +6952,7 @@
     "unicode_alternates": [],
     "name": "disappointed face",
     "shortname": ":disappointed:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [
       ">:[",
@@ -6382,7 +6970,10 @@
       "discouraged",
       "face",
       "sad",
-      "upset"
+      "upset",
+      "smiley",
+      "tired",
+      "emotion"
     ],
     "moji": "😞"
   },
@@ -6391,7 +6982,7 @@
     "unicode_alternates": [],
     "name": "disappointed but relieved face",
     "shortname": ":disappointed_relieved:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -6400,7 +6991,12 @@
       "phew",
       "sweat",
       "disappoint",
-      "relief"
+      "relief",
+      "sad",
+      "smiley",
+      "stressed",
+      "cry",
+      "emotion"
     ],
     "moji": "😥"
   },
@@ -6409,22 +7005,25 @@
     "unicode_alternates": [],
     "name": "card index dividers",
     "shortname": ":dividers:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [
       ":card_index_dividers:"
     ],
     "aliases_ascii": [],
     "keywords": [
       "stationery",
-      "rolodex"
-    ]
+      "rolodex",
+      "work",
+      "office"
+    ],
+    "moji": "🗂"
   },
   "dizzy": {
     "unicode": "1F4AB",
     "unicode_alternates": [],
     "name": "dizzy symbol",
     "shortname": ":dizzy:",
-    "category": "emoticons",
+    "category": "nature",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -6437,7 +7036,7 @@
       "intoxicated",
       "squeans",
       "starburst",
-      "star"
+      "symbol"
     ],
     "moji": "💫"
   },
@@ -6446,7 +7045,7 @@
     "unicode_alternates": [],
     "name": "dizzy face",
     "shortname": ":dizzy_face:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [
       "#-)",
@@ -6463,7 +7062,13 @@
       "face",
       "spent",
       "unconscious",
-      "xox"
+      "xox",
+      "smiley",
+      "surprised",
+      "dead",
+      "wow",
+      "emotion",
+      "omg"
     ],
     "moji": "😵"
   },
@@ -6472,7 +7077,7 @@
     "unicode_alternates": [],
     "name": "do not litter symbol",
     "shortname": ":do_not_litter:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -6480,40 +7085,13 @@
       "garbage",
       "trash",
       "litter",
-      "garbage",
       "waste",
       "no",
       "can",
-      "trash"
+      "symbol"
     ],
     "moji": "🚯"
   },
-  "document": {
-    "unicode": "1F5CE",
-    "unicode_alternates": [],
-    "name": "document",
-    "shortname": ":document:",
-    "category": "objects_symbols",
-    "aliases": [],
-    "aliases_ascii": [],
-    "keywords": [
-      "page"
-    ]
-  },
-  "document_text": {
-    "unicode": "1F5B9",
-    "unicode_alternates": [],
-    "name": "document with text",
-    "shortname": ":document_text:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":document_with_text:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "page"
-    ]
-  },
   "dog": {
     "unicode": "1F436",
     "unicode_alternates": [],
@@ -6526,7 +7104,9 @@
       "animal",
       "friend",
       "nature",
-      "woof"
+      "woof",
+      "dog",
+      "pug"
     ],
     "moji": "🐶"
   },
@@ -6546,11 +7126,10 @@
       "pet",
       "dog",
       "puppy",
-      "pet",
-      "friend",
       "woof",
       "bark",
-      "fido"
+      "fido",
+      "pug"
     ],
     "moji": "🐕"
   },
@@ -6571,8 +7150,6 @@
       "canada",
       "australia",
       "banknote",
-      "money",
-      "currency",
       "paper",
       "cash",
       "bills"
@@ -6593,7 +7170,6 @@
       "toy",
       "dolls",
       "japan",
-      "japanese",
       "day",
       "girls",
       "emperor",
@@ -6602,7 +7178,8 @@
       "blessing",
       "imperial",
       "family",
-      "royal"
+      "royal",
+      "people"
     ],
     "moji": "🎎"
   },
@@ -6621,7 +7198,9 @@
       "flipper",
       "nature",
       "ocean",
-      "sea"
+      "sea",
+      "wildlife",
+      "tropical"
     ],
     "moji": "🐬"
   },
@@ -6641,8 +7220,7 @@
       "doorway",
       "entrance",
       "enter",
-      "exit",
-      "entry"
+      "object"
     ],
     "moji": "🚪"
   },
@@ -6651,7 +7229,7 @@
     "unicode_alternates": [],
     "name": "doughnut",
     "shortname": ":doughnut:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -6666,8 +7244,7 @@
       "dessert",
       "breakfast",
       "police",
-      "homer",
-      "sweet"
+      "homer"
     ],
     "moji": "🍩"
   },
@@ -6676,15 +7253,17 @@
     "unicode_alternates": [],
     "name": "dove of peace",
     "shortname": ":dove:",
-    "category": "objects_symbols",
+    "category": "nature",
     "aliases": [
       ":dove_of_peace:"
     ],
     "aliases_ascii": [],
     "keywords": [
       "symbol",
-      "bird"
-    ]
+      "bird",
+      "animal"
+    ],
+    "moji": "🕊"
   },
   "dragon": {
     "unicode": "1F409",
@@ -6703,7 +7282,8 @@
       "dragon",
       "fire",
       "legendary",
-      "myth"
+      "roar",
+      "reptile"
     ],
     "moji": "🐉"
   },
@@ -6725,7 +7305,9 @@
       "head",
       "fire",
       "legendary",
-      "myth"
+      "roar",
+      "monster",
+      "reptile"
     ],
     "moji": "🐲"
   },
@@ -6734,12 +7316,15 @@
     "unicode_alternates": [],
     "name": "dress",
     "shortname": ":dress:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "clothes",
-      "fashion"
+      "fashion",
+      "women",
+      "sexy",
+      "girls night"
     ],
     "moji": "👗"
   },
@@ -6758,23 +7343,35 @@
       "dromedary",
       "camel",
       "hump",
-      "desert",
       "middle east",
       "heat",
-      "hot",
       "water",
       "hump day",
       "wednesday",
-      "sex"
+      "sex",
+      "wildlife"
     ],
     "moji": "🐪"
   },
+  "drooling_face": {
+    "unicode": "1F924",
+    "unicode_alternates": [],
+    "name": "drooling face",
+    "shortname": ":drooling_face:",
+    "category": "people",
+    "aliases": [
+      ":drool:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤤"
+  },
   "droplet": {
     "unicode": "1F4A7",
     "unicode_alternates": [],
     "name": "droplet",
     "shortname": ":droplet:",
-    "category": "emoticons",
+    "category": "nature",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -6784,7 +7381,6 @@
       "drop",
       "droplet",
       "h20",
-      "water",
       "aqua",
       "tear",
       "sweat",
@@ -6792,10 +7388,36 @@
       "moisture",
       "wet",
       "moist",
-      "spit"
+      "spit",
+      "weather",
+      "sky"
     ],
     "moji": "💧"
   },
+  "drum": {
+    "unicode": "1F941",
+    "unicode_alternates": [],
+    "name": "drum with drumsticks",
+    "shortname": ":drum:",
+    "category": "activity",
+    "aliases": [
+      ":drum_with_drumsticks:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🥁"
+  },
+  "duck": {
+    "unicode": "1F986",
+    "unicode_alternates": [],
+    "name": "duck",
+    "shortname": ":duck:",
+    "category": "nature",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🦆"
+  },
   "dvd": {
     "unicode": "1F4C0",
     "unicode_alternates": [],
@@ -6807,7 +7429,8 @@
     "keywords": [
       "cd",
       "disc",
-      "disk"
+      "disk",
+      "electronics"
     ],
     "moji": "📀"
   },
@@ -6823,23 +7446,37 @@
     "aliases_ascii": [],
     "keywords": [
       "communication",
-      "inbox"
+      "inbox",
+      "office"
     ],
     "moji": "📧"
   },
+  "eagle": {
+    "unicode": "1F985",
+    "unicode_alternates": [],
+    "name": "eagle",
+    "shortname": ":eagle:",
+    "category": "nature",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🦅"
+  },
   "ear": {
     "unicode": "1F442",
     "unicode_alternates": [],
     "name": "ear",
     "shortname": ":ear:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "face",
       "hear",
       "listen",
-      "sound"
+      "sound",
+      "body",
+      "diversity"
     ],
     "moji": "👂"
   },
@@ -6857,14 +7494,14 @@
       "ear",
       "rice",
       "food",
-      "plant",
-      "seed"
+      "seed",
+      "leaf"
     ],
     "moji": "🌾"
   },
   "ear_tone1": {
     "unicode": "1F442-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "ear tone 1",
     "shortname": ":ear_tone1:",
     "category": "people",
@@ -6874,11 +7511,12 @@
       "hear",
       "listen",
       "sound"
-    ]
+    ],
+    "moji": "👂🏻"
   },
   "ear_tone2": {
     "unicode": "1F442-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "ear tone 2",
     "shortname": ":ear_tone2:",
     "category": "people",
@@ -6888,11 +7526,12 @@
       "hear",
       "listen",
       "sound"
-    ]
+    ],
+    "moji": "👂🏼"
   },
   "ear_tone3": {
     "unicode": "1F442-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "ear tone 3",
     "shortname": ":ear_tone3:",
     "category": "people",
@@ -6902,11 +7541,12 @@
       "hear",
       "listen",
       "sound"
-    ]
+    ],
+    "moji": "👂🏽"
   },
   "ear_tone4": {
     "unicode": "1F442-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "ear tone 4",
     "shortname": ":ear_tone4:",
     "category": "people",
@@ -6916,11 +7556,12 @@
       "hear",
       "listen",
       "sound"
-    ]
+    ],
+    "moji": "👂🏾"
   },
   "ear_tone5": {
     "unicode": "1F442-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "ear tone 5",
     "shortname": ":ear_tone5:",
     "category": "people",
@@ -6930,7 +7571,8 @@
       "hear",
       "listen",
       "sound"
-    ]
+    ],
+    "moji": "👂🏿"
   },
   "earth_africa": {
     "unicode": "1F30D",
@@ -6945,12 +7587,13 @@
       "international",
       "world",
       "earth",
-      "globe",
       "space",
       "planet",
       "africa",
       "europe",
-      "home"
+      "home",
+      "map",
+      "vacation"
     ],
     "moji": "🌍"
   },
@@ -6968,14 +7611,15 @@
       "international",
       "world",
       "earth",
-      "globe",
       "space",
       "planet",
       "north",
       "south",
       "america",
       "americas",
-      "home"
+      "home",
+      "map",
+      "vacation"
     ],
     "moji": "🌎"
   },
@@ -6993,43 +7637,33 @@
       "international",
       "world",
       "earth",
-      "globe",
       "space",
       "planet",
       "asia",
       "australia",
-      "home"
+      "home",
+      "map",
+      "vacation"
     ],
     "moji": "🌏"
   },
   "egg": {
-    "unicode": "1F373",
+    "unicode": "1F95A",
     "unicode_alternates": [],
-    "name": "cooking",
+    "name": "egg",
     "shortname": ":egg:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": [
-      "breakfast",
-      "food",
-      "egg",
-      "fry",
-      "pan",
-      "flat",
-      "cook",
-      "frying",
-      "cooking",
-      "utensil"
-    ],
-    "moji": "🍳"
+    "keywords": [],
+    "moji": "🥚"
   },
   "eggplant": {
     "unicode": "1F346",
     "unicode_alternates": [],
     "name": "aubergine",
     "shortname": ":eggplant:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -7038,10 +7672,10 @@
       "nature",
       "vegetable",
       "eggplant",
-      "aubergine",
       "fruit",
       "purple",
-      "penis"
+      "penis",
+      "vegetables"
     ],
     "moji": "🍆"
   },
@@ -7051,15 +7685,18 @@
     "unicode_alternates": [
       "0038-FE0F-20E3"
     ],
-    "name": "digit eight",
+    "name": "keycap digit eight",
     "shortname": ":eight:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "8",
       "blue-square",
-      "numbers"
+      "numbers",
+      "number",
+      "math",
+      "symbol"
     ]
   },
   "eight_pointed_black_star": {
@@ -7069,10 +7706,12 @@
     ],
     "name": "eight pointed black star",
     "shortname": ":eight_pointed_black_star:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": [],
+    "keywords": [
+      "symbol"
+    ],
     "moji": "✴"
   },
   "eight_spoked_asterisk": {
@@ -7082,16 +7721,32 @@
     ],
     "name": "eight spoked asterisk",
     "shortname": ":eight_spoked_asterisk:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "green-square",
       "sparkle",
-      "star"
+      "star",
+      "symbol"
     ],
     "moji": "✳"
   },
+  "eject": {
+    "unicode": "23CF",
+    "unicode_alternates": [
+      "23CF-FE0F"
+    ],
+    "name": "eject symbol",
+    "shortname": ":eject:",
+    "category": "symbols",
+    "aliases": [
+      ":eject_symbol:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "⏏"
+  },
   "electric_plug": {
     "unicode": "1F50C",
     "unicode_alternates": [],
@@ -7102,7 +7757,8 @@
     "aliases_ascii": [],
     "keywords": [
       "charger",
-      "power"
+      "power",
+      "electronics"
     ],
     "moji": "🔌"
   },
@@ -7118,7 +7774,8 @@
       "animal",
       "nature",
       "nose",
-      "thailand"
+      "thailand",
+      "wildlife"
     ],
     "moji": "🐘"
   },
@@ -7127,12 +7784,13 @@
     "unicode_alternates": [],
     "name": "end with leftwards arrow above",
     "shortname": ":end:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "arrow",
-      "words"
+      "words",
+      "symbol"
     ],
     "moji": "🔚"
   },
@@ -7150,78 +7808,13 @@
       "communication",
       "letter",
       "mail",
-      "postal"
+      "postal",
+      "object",
+      "office",
+      "write"
     ],
     "moji": "✉"
   },
-  "envelope_back": {
-    "unicode": "1F582",
-    "unicode_alternates": [],
-    "name": "back of envelope",
-    "shortname": ":envelope_back:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":back_of_envelope:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "communication",
-      "letter",
-      "mail",
-      "postal"
-    ]
-  },
-  "envelope_flying": {
-    "unicode": "1F585",
-    "unicode_alternates": [],
-    "name": "flying envelope",
-    "shortname": ":envelope_flying:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":flying_envelope:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "communication",
-      "letter",
-      "mail",
-      "postal"
-    ]
-  },
-  "envelope_stamped": {
-    "unicode": "1F583",
-    "unicode_alternates": [],
-    "name": "stamped envelope",
-    "shortname": ":envelope_stamped:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":stamped_envelope:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "communication",
-      "letter",
-      "mail",
-      "postal"
-    ]
-  },
-  "envelope_stamped_pen": {
-    "unicode": "1F586",
-    "unicode_alternates": [],
-    "name": "pen over stamped envelope",
-    "shortname": ":envelope_stamped_pen:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":pen_over_stamped_envelope:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "communication",
-      "letter",
-      "mail",
-      "postal"
-    ]
-  },
   "envelope_with_arrow": {
     "unicode": "1F4E9",
     "unicode_alternates": [],
@@ -7231,7 +7824,9 @@
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "email"
+      "email",
+      "object",
+      "office"
     ],
     "moji": "📩"
   },
@@ -7250,8 +7845,6 @@
       "euro",
       "europe",
       "banknote",
-      "money",
-      "currency",
       "paper",
       "cash",
       "bills"
@@ -7263,7 +7856,7 @@
     "unicode_alternates": [],
     "name": "european castle",
     "shortname": ":european_castle:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -7273,7 +7866,6 @@
       "castle",
       "european",
       "residence",
-      "royalty",
       "disneyland",
       "disney",
       "fort",
@@ -7287,7 +7879,10 @@
       "queen",
       "fortress",
       "nobel",
-      "stronghold"
+      "stronghold",
+      "places",
+      "travel",
+      "vacation"
     ],
     "moji": "🏰"
   },
@@ -7296,11 +7891,13 @@
     "unicode_alternates": [],
     "name": "european post office",
     "shortname": ":european_post_office:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "building"
+      "building",
+      "places",
+      "post office"
     ],
     "moji": "🏤"
   },
@@ -7318,7 +7915,10 @@
       "evergreen",
       "tree",
       "needles",
-      "christmas"
+      "christmas",
+      "holidays",
+      "camp",
+      "trees"
     ],
     "moji": "🌲"
   },
@@ -7329,11 +7929,13 @@
     ],
     "name": "heavy exclamation mark symbol",
     "shortname": ":exclamation:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "surprise"
+      "surprise",
+      "symbol",
+      "punctuation"
     ],
     "moji": "❗"
   },
@@ -7342,7 +7944,7 @@
     "unicode_alternates": [],
     "name": "expressionless face",
     "shortname": ":expressionless:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [
       "-_-",
@@ -7356,7 +7958,11 @@
       "vapid",
       "without expression",
       "face",
-      "indifferent"
+      "indifferent",
+      "mad",
+      "smiley",
+      "neutral",
+      "emotion"
     ],
     "moji": "😑"
   },
@@ -7371,25 +7977,36 @@
     "keywords": [
       "look",
       "peek",
-      "watch"
-    ]
+      "watch",
+      "body",
+      "eyes"
+    ],
+    "moji": "👁"
   },
   "eye_in_speech_bubble": {
     "unicode": "1F441-1F5E8",
-    "unicode_alternates": "1f441-200d-1f5e8",
+    "unicode_alternates": [
+      "1F441-200D-1F5E8"
+    ],
     "name": "eye in speech bubble",
     "shortname": ":eye_in_speech_bubble:",
     "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "object",
+      "symbol",
+      "eyes",
+      "talk"
+    ],
+    "moji": "👁‍🗨"
   },
   "eyeglasses": {
     "unicode": "1F453",
     "unicode_alternates": [],
     "name": "eyeglasses",
     "shortname": ":eyeglasses:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -7408,7 +8025,8 @@
       "vision",
       "see",
       "blurry",
-      "contacts"
+      "contacts",
+      "glasses"
     ],
     "moji": "👓"
   },
@@ -7417,27 +8035,110 @@
     "unicode_alternates": [],
     "name": "eyes",
     "shortname": ":eyes:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "look",
       "peek",
       "stalk",
-      "watch"
+      "watch",
+      "body",
+      "eyes"
     ],
     "moji": "👀"
   },
+  "face_palm": {
+    "unicode": "1F926",
+    "unicode_alternates": [],
+    "name": "face palm",
+    "shortname": ":face_palm:",
+    "category": "people",
+    "aliases": [
+      ":facepalm:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤦"
+  },
+  "face_palm_tone1": {
+    "unicode": "1F926-1F3FB",
+    "unicode_alternates": [],
+    "name": "face palm tone 1",
+    "shortname": ":face_palm_tone1:",
+    "category": "people",
+    "aliases": [
+      ":facepalm_tone1:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤦🏻"
+  },
+  "face_palm_tone2": {
+    "unicode": "1F926-1F3FC",
+    "unicode_alternates": [],
+    "name": "face palm tone 2",
+    "shortname": ":face_palm_tone2:",
+    "category": "people",
+    "aliases": [
+      ":facepalm_tone2:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤦🏼"
+  },
+  "face_palm_tone3": {
+    "unicode": "1F926-1F3FD",
+    "unicode_alternates": [],
+    "name": "face palm tone 3",
+    "shortname": ":face_palm_tone3:",
+    "category": "people",
+    "aliases": [
+      ":facepalm_tone3:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤦🏽"
+  },
+  "face_palm_tone4": {
+    "unicode": "1F926-1F3FE",
+    "unicode_alternates": [],
+    "name": "face palm tone 4",
+    "shortname": ":face_palm_tone4:",
+    "category": "people",
+    "aliases": [
+      ":facepalm_tone4:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤦🏾"
+  },
+  "face_palm_tone5": {
+    "unicode": "1F926-1F3FF",
+    "unicode_alternates": [],
+    "name": "face palm tone 5",
+    "shortname": ":face_palm_tone5:",
+    "category": "people",
+    "aliases": [
+      ":facepalm_tone5:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤦🏿"
+  },
   "factory": {
     "unicode": "1F3ED",
     "unicode_alternates": [],
     "name": "factory",
     "shortname": ":factory:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "building"
+      "building",
+      "places",
+      "travel",
+      "steam"
     ],
     "moji": "🏭"
   },
@@ -7467,7 +8168,7 @@
     "unicode_alternates": [],
     "name": "family",
     "shortname": ":family:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -7479,13 +8180,12 @@
       "mother",
       "parents",
       "family",
-      "mother",
-      "father",
-      "child",
       "girl",
       "boy",
       "group",
-      "unit"
+      "unit",
+      "people",
+      "baby"
     ],
     "moji": "👪"
   },
@@ -7509,8 +8209,14 @@
       "gay",
       "homosexual",
       "man",
-      "boy"
-    ]
+      "boy",
+      "people",
+      "family",
+      "men",
+      "baby",
+      "lgbt"
+    ],
+    "moji": "👨‍👨‍👦"
   },
   "family_mmbb": {
     "unicode": "1F468-1F468-1F466-1F466",
@@ -7532,8 +8238,14 @@
       "gay",
       "homosexual",
       "man",
-      "boy"
-    ]
+      "boy",
+      "people",
+      "family",
+      "men",
+      "baby",
+      "lgbt"
+    ],
+    "moji": "👨‍👨‍👦‍👦"
   },
   "family_mmg": {
     "unicode": "1F468-1F468-1F467",
@@ -7555,8 +8267,14 @@
       "gay",
       "homosexual",
       "man",
-      "girl"
-    ]
+      "girl",
+      "people",
+      "family",
+      "men",
+      "baby",
+      "lgbt"
+    ],
+    "moji": "👨‍👨‍👧"
   },
   "family_mmgb": {
     "unicode": "1F468-1F468-1F467-1F466",
@@ -7579,8 +8297,14 @@
       "homosexual",
       "man",
       "girl",
-      "boy"
-    ]
+      "boy",
+      "people",
+      "family",
+      "men",
+      "baby",
+      "lgbt"
+    ],
+    "moji": "👨‍👨‍👧‍👦"
   },
   "family_mmgg": {
     "unicode": "1F468-1F468-1F467-1F467",
@@ -7602,8 +8326,14 @@
       "gay",
       "homosexual",
       "man",
-      "girl"
-    ]
+      "girl",
+      "people",
+      "family",
+      "men",
+      "baby",
+      "lgbt"
+    ],
+    "moji": "👨‍👨‍👧‍👧"
   },
   "family_mwbb": {
     "unicode": "1F468-1F469-1F466-1F466",
@@ -7626,8 +8356,12 @@
       "group",
       "unit",
       "man",
-      "woman"
-    ]
+      "woman",
+      "people",
+      "family",
+      "baby"
+    ],
+    "moji": "👨‍👩‍👦‍👦"
   },
   "family_mwg": {
     "unicode": "1F468-1F469-1F467",
@@ -7651,8 +8385,12 @@
       "group",
       "unit",
       "man",
-      "woman"
-    ]
+      "woman",
+      "people",
+      "family",
+      "baby"
+    ],
+    "moji": "👨‍👩‍👧"
   },
   "family_mwgb": {
     "unicode": "1F468-1F469-1F467-1F466",
@@ -7676,8 +8414,12 @@
       "group",
       "unit",
       "man",
-      "woman"
-    ]
+      "woman",
+      "people",
+      "family",
+      "baby"
+    ],
+    "moji": "👨‍👩‍👧‍👦"
   },
   "family_mwgg": {
     "unicode": "1F468-1F469-1F467-1F467",
@@ -7700,8 +8442,12 @@
       "group",
       "unit",
       "man",
-      "woman"
-    ]
+      "woman",
+      "people",
+      "family",
+      "baby"
+    ],
+    "moji": "👨‍👩‍👧‍👧"
   },
   "family_wwb": {
     "unicode": "1F469-1F469-1F466",
@@ -7724,8 +8470,14 @@
       "gay",
       "lesbian",
       "homosexual",
-      "woman"
-    ]
+      "woman",
+      "people",
+      "family",
+      "women",
+      "baby",
+      "lgbt"
+    ],
+    "moji": "👩‍👩‍👦"
   },
   "family_wwbb": {
     "unicode": "1F469-1F469-1F466-1F466",
@@ -7748,8 +8500,14 @@
       "lesbian",
       "homosexual",
       "woman",
-      "boy"
-    ]
+      "boy",
+      "people",
+      "family",
+      "women",
+      "baby",
+      "lgbt"
+    ],
+    "moji": "👩‍👩‍👦‍👦"
   },
   "family_wwg": {
     "unicode": "1F469-1F469-1F467",
@@ -7772,8 +8530,14 @@
       "unit",
       "gay",
       "lesbian",
-      "homosexual"
-    ]
+      "homosexual",
+      "people",
+      "family",
+      "women",
+      "baby",
+      "lgbt"
+    ],
+    "moji": "👩‍👩‍👧"
   },
   "family_wwgb": {
     "unicode": "1F469-1F469-1F467-1F466",
@@ -7797,8 +8561,14 @@
       "homosexual",
       "woman",
       "girl",
-      "boy"
-    ]
+      "boy",
+      "people",
+      "family",
+      "women",
+      "baby",
+      "lgbt"
+    ],
+    "moji": "👩‍👩‍👧‍👦"
   },
   "family_wwgg": {
     "unicode": "1F469-1F469-1F467-1F467",
@@ -7821,19 +8591,27 @@
       "lesbian",
       "homosexual",
       "woman",
-      "girl"
-    ]
+      "girl",
+      "people",
+      "family",
+      "women",
+      "baby",
+      "lgbt"
+    ],
+    "moji": "👩‍👩‍👧‍👧"
   },
   "fast_forward": {
     "unicode": "23E9",
     "unicode_alternates": [],
     "name": "black right-pointing double triangle",
     "shortname": ":fast_forward:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "blue-square"
+      "blue-square",
+      "arrow",
+      "symbol"
     ],
     "moji": "⏩"
   },
@@ -7847,7 +8625,10 @@
     "aliases_ascii": [],
     "keywords": [
       "communication",
-      "technology"
+      "technology",
+      "electronics",
+      "work",
+      "office"
     ],
     "moji": "📠"
   },
@@ -7856,7 +8637,7 @@
     "unicode_alternates": [],
     "name": "fearful face",
     "shortname": ":fearful:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -7867,8 +8648,10 @@
       "terrified",
       "fear",
       "fearful",
-      "scared",
-      "frightened"
+      "frightened",
+      "smiley",
+      "surprised",
+      "emotion"
     ],
     "moji": "😨"
   },
@@ -7888,16 +8671,12 @@
       "paw",
       "pet",
       "tracking",
-      "paw",
       "prints",
       "mark",
       "imprints",
       "footsteps",
-      "animal",
       "lion",
       "bear",
-      "dog",
-      "cat",
       "raccoon",
       "critter",
       "feet",
@@ -7905,12 +8684,25 @@
     ],
     "moji": "🐾"
   },
+  "fencer": {
+    "unicode": "1F93A",
+    "unicode_alternates": [],
+    "name": "fencer",
+    "shortname": ":fencer:",
+    "category": "activity",
+    "aliases": [
+      ":fencing:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤺"
+  },
   "ferris_wheel": {
     "unicode": "1F3A1",
     "unicode_alternates": [],
     "name": "ferris wheel",
     "shortname": ":ferris_wheel:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -7923,13 +8715,16 @@
       "park",
       "fair",
       "ride",
-      "entertainment"
+      "entertainment",
+      "places",
+      "vacation",
+      "ferris wheel"
     ],
     "moji": "🎡"
   },
   "ferry": {
     "unicode": "26F4",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "ferry",
     "shortname": ":ferry:",
     "category": "travel",
@@ -7938,33 +8733,44 @@
     "keywords": [
       "boat",
       "place",
-      "travel"
-    ]
+      "travel",
+      "transportation",
+      "vacation"
+    ],
+    "moji": "⛴"
   },
   "field_hockey": {
     "unicode": "1F3D1",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "field hockey stick and ball",
     "shortname": ":field_hockey:",
     "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "ball",
+      "sport",
+      "hockey"
+    ],
+    "moji": "🏑"
   },
   "file_cabinet": {
     "unicode": "1F5C4",
     "unicode_alternates": [],
     "name": "file cabinet",
     "shortname": ":file_cabinet:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "folders",
       "office",
       "documents",
-      "storage"
-    ]
+      "storage",
+      "object",
+      "work"
+    ],
+    "moji": "🗄"
   },
   "file_folder": {
     "unicode": "1F4C1",
@@ -7975,7 +8781,9 @@
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "documents"
+      "documents",
+      "work",
+      "office"
     ],
     "moji": "📁"
   },
@@ -7984,7 +8792,7 @@
     "unicode_alternates": [],
     "name": "film frames",
     "shortname": ":film_frames:",
-    "category": "activity",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -7993,95 +8801,96 @@
       "8mm",
       "16mm",
       "reel",
-      "celluloid"
-    ]
+      "celluloid",
+      "object",
+      "camera"
+    ],
+    "moji": "🎞"
   },
-  "finger_pointing_down": {
-    "unicode": "1F597",
+  "fingers_crossed": {
+    "unicode": "1F91E",
     "unicode_alternates": [],
-    "name": "white down pointing left hand index",
-    "shortname": ":finger_pointing_down:",
+    "name": "hand with first and index finger crossed",
+    "shortname": ":fingers_crossed:",
     "category": "people",
     "aliases": [
-      ":white_down_pointing_left_hand_index:"
+      ":hand_with_index_and_middle_finger_crossed:"
     ],
     "aliases_ascii": [],
-    "keywords": [
-      "direction",
-      "finger",
-      "hand"
-    ]
+    "keywords": [],
+    "moji": "🤞"
   },
-  "finger_pointing_down2": {
-    "unicode": "1F59F",
+  "fingers_crossed_tone1": {
+    "unicode": "1F91E-1F3FB",
     "unicode_alternates": [],
-    "name": "sideways white down pointing index",
-    "shortname": ":finger_pointing_down2:",
+    "name": "hand with index and middle fingers crossed tone 1",
+    "shortname": ":fingers_crossed_tone1:",
     "category": "people",
     "aliases": [
-      ":sideways_white_down_pointing_index:"
+      ":hand_with_index_and_middle_fingers_crossed_tone1:"
     ],
     "aliases_ascii": [],
-    "keywords": [
-      "direction",
-      "finger",
-      "hand"
-    ]
+    "keywords": [],
+    "moji": "🤞🏻"
   },
-  "finger_pointing_left": {
-    "unicode": "1F598",
+  "fingers_crossed_tone2": {
+    "unicode": "1F91E-1F3FC",
     "unicode_alternates": [],
-    "name": "sideways white left pointing index",
-    "shortname": ":finger_pointing_left:",
+    "name": "hand with index and middle fingers crossed tone 2",
+    "shortname": ":fingers_crossed_tone2:",
     "category": "people",
     "aliases": [
-      ":sideways_white_left_pointing_index:"
+      ":hand_with_index_and_middle_fingers_crossed_tone2:"
     ],
     "aliases_ascii": [],
-    "keywords": [
-      "direction",
-      "finger",
-      "hand"
-    ]
+    "keywords": [],
+    "moji": "🤞🏼"
   },
-  "finger_pointing_right": {
-    "unicode": "1F599",
+  "fingers_crossed_tone3": {
+    "unicode": "1F91E-1F3FD",
     "unicode_alternates": [],
-    "name": "sideways white right pointing index",
-    "shortname": ":finger_pointing_right:",
+    "name": "hand with index and middle fingers crossed tone 3",
+    "shortname": ":fingers_crossed_tone3:",
     "category": "people",
     "aliases": [
-      ":sideways_white_right_pointing_index:"
+      ":hand_with_index_and_middle_fingers_crossed_tone3:"
     ],
     "aliases_ascii": [],
-    "keywords": [
-      "direction",
-      "finger",
-      "hand"
-    ]
+    "keywords": [],
+    "moji": "🤞🏽"
   },
-  "finger_pointing_up": {
-    "unicode": "1F59E",
+  "fingers_crossed_tone4": {
+    "unicode": "1F91E-1F3FE",
     "unicode_alternates": [],
-    "name": "sideways white up pointing index",
-    "shortname": ":finger_pointing_up:",
+    "name": "hand with index and middle fingers crossed tone 4",
+    "shortname": ":fingers_crossed_tone4:",
     "category": "people",
     "aliases": [
-      ":sideways_white_up_pointing_index:"
+      ":hand_with_index_and_middle_fingers_crossed_tone4:"
     ],
     "aliases_ascii": [],
-    "keywords": [
-      "direction",
-      "finger",
-      "hand"
-    ]
+    "keywords": [],
+    "moji": "🤞🏾"
+  },
+  "fingers_crossed_tone5": {
+    "unicode": "1F91E-1F3FF",
+    "unicode_alternates": [],
+    "name": "hand with index and middle fingers crossed tone 5",
+    "shortname": ":fingers_crossed_tone5:",
+    "category": "people",
+    "aliases": [
+      ":hand_with_index_and_middle_fingers_crossed_tone5:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤞🏿"
   },
   "fire": {
     "unicode": "1F525",
     "unicode_alternates": [],
     "name": "fire",
     "shortname": ":fire:",
-    "category": "emoticons",
+    "category": "nature",
     "aliases": [
       ":flame:"
     ],
@@ -8089,7 +8898,8 @@
     "keywords": [
       "cook",
       "hot",
-      "flame"
+      "flame",
+      "wth"
     ],
     "moji": "🔥"
   },
@@ -8098,7 +8908,7 @@
     "unicode_alternates": [],
     "name": "fire engine",
     "shortname": ":fire_engine:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -8110,34 +8920,17 @@
       "engine",
       "truck",
       "emergency",
-      "medical"
+      "medical",
+      "911"
     ],
     "moji": "🚒"
   },
-  "fire_engine_oncoming": {
-    "unicode": "1F6F1",
-    "unicode_alternates": [],
-    "name": "oncoming fire engine",
-    "shortname": ":fire_engine_oncoming:",
-    "category": "travel_places",
-    "aliases": [
-      ":oncoming_fire_engine:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "transportation",
-      "vehicle",
-      "fighter",
-      "truck",
-      "emergency"
-    ]
-  },
   "fireworks": {
     "unicode": "1F386",
     "unicode_alternates": [],
     "name": "fireworks",
     "shortname": ":fireworks:",
-    "category": "objects",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -8154,10 +8947,24 @@
       "rocket",
       "sky",
       "idea",
-      "excitement"
+      "excitement",
+      "parties"
     ],
     "moji": "🎆"
   },
+  "first_place": {
+    "unicode": "1F947",
+    "unicode_alternates": [],
+    "name": "first place medal",
+    "shortname": ":first_place:",
+    "category": "activity",
+    "aliases": [
+      ":first_place_medal:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🥇"
+  },
   "first_quarter_moon": {
     "unicode": "1F313",
     "unicode_alternates": [],
@@ -8174,7 +8981,8 @@
       "sky",
       "night",
       "cheese",
-      "phase"
+      "phase",
+      "space"
     ],
     "moji": "🌓"
   },
@@ -8196,7 +9004,8 @@
       "sky",
       "night",
       "cheese",
-      "phase"
+      "phase",
+      "space"
     ],
     "moji": "🌛"
   },
@@ -8211,7 +9020,8 @@
     "keywords": [
       "animal",
       "food",
-      "nature"
+      "nature",
+      "wildlife"
     ],
     "moji": "🐟"
   },
@@ -8220,7 +9030,7 @@
     "unicode_alternates": [],
     "name": "fish cake with swirl design",
     "shortname": ":fish_cake:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -8231,7 +9041,8 @@
       "swirl",
       "ramen",
       "noodles",
-      "naruto"
+      "naruto",
+      "sushi"
     ],
     "moji": "🍥"
   },
@@ -8240,7 +9051,7 @@
     "unicode_alternates": [],
     "name": "fishing pole and fish",
     "shortname": ":fishing_pole_and_fish:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -8248,7 +9059,9 @@
       "hobby",
       "fish",
       "fishing",
-      "pole"
+      "pole",
+      "vacation",
+      "sport"
     ],
     "moji": "🎣"
   },
@@ -8257,19 +9070,25 @@
     "unicode_alternates": [],
     "name": "raised fist",
     "shortname": ":fist:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "fingers",
       "grasp",
-      "hand"
+      "hand",
+      "body",
+      "hands",
+      "hi",
+      "fist bump",
+      "diversity",
+      "condolence"
     ],
     "moji": "✊"
   },
   "fist_tone1": {
     "unicode": "270A-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "raised fist tone 1",
     "shortname": ":fist_tone1:",
     "category": "people",
@@ -8279,11 +9098,12 @@
       "fingers",
       "grasp",
       "hand"
-    ]
+    ],
+    "moji": "✊🏻"
   },
   "fist_tone2": {
     "unicode": "270A-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "raised fist tone 2",
     "shortname": ":fist_tone2:",
     "category": "people",
@@ -8293,11 +9113,12 @@
       "fingers",
       "grasp",
       "hand"
-    ]
+    ],
+    "moji": "✊🏼"
   },
   "fist_tone3": {
     "unicode": "270A-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "raised fist tone 3",
     "shortname": ":fist_tone3:",
     "category": "people",
@@ -8307,11 +9128,12 @@
       "fingers",
       "grasp",
       "hand"
-    ]
+    ],
+    "moji": "✊🏽"
   },
   "fist_tone4": {
     "unicode": "270A-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "raised fist tone 4",
     "shortname": ":fist_tone4:",
     "category": "people",
@@ -8321,11 +9143,12 @@
       "fingers",
       "grasp",
       "hand"
-    ]
+    ],
+    "moji": "✊🏾"
   },
   "fist_tone5": {
     "unicode": "270A-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "raised fist tone 5",
     "shortname": ":fist_tone5:",
     "category": "people",
@@ -8335,7 +9158,8 @@
       "fingers",
       "grasp",
       "hand"
-    ]
+    ],
+    "moji": "✊🏿"
   },
   "five": {
     "moji": "5️⃣",
@@ -8343,15 +9167,18 @@
     "unicode_alternates": [
       "0035-FE0F-20E3"
     ],
-    "name": "digit five",
+    "name": "keycap digit five",
     "shortname": ":five:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "blue-square",
       "numbers",
-      "prime"
+      "prime",
+      "number",
+      "math",
+      "symbol"
     ]
   },
   "flag_ac": {
@@ -8367,8 +9194,10 @@
     "keywords": [
       "country",
       "nation",
-      "ac"
-    ]
+      "ac",
+      "flag"
+    ],
+    "moji": "🇦🇨"
   },
   "flag_ad": {
     "unicode": "1F1E6-1F1E9",
@@ -8383,8 +9212,10 @@
     "keywords": [
       "country",
       "nation",
-      "ad"
-    ]
+      "ad",
+      "flag"
+    ],
+    "moji": "🇦🇩"
   },
   "flag_ae": {
     "unicode": "1F1E6-1F1EA",
@@ -8399,8 +9230,10 @@
     "keywords": [
       "country",
       "nation",
-      "ae"
-    ]
+      "ae",
+      "flag"
+    ],
+    "moji": "🇦🇪"
   },
   "flag_af": {
     "unicode": "1F1E6-1F1EB",
@@ -8416,8 +9249,10 @@
       "country",
       "nation",
       "afghanestan",
-      "af"
-    ]
+      "af",
+      "flag"
+    ],
+    "moji": "🇦🇫"
   },
   "flag_ag": {
     "unicode": "1F1E6-1F1EC",
@@ -8432,8 +9267,10 @@
     "keywords": [
       "country",
       "nation",
-      "ag"
-    ]
+      "ag",
+      "flag"
+    ],
+    "moji": "🇦🇬"
   },
   "flag_ai": {
     "unicode": "1F1E6-1F1EE",
@@ -8448,8 +9285,10 @@
     "keywords": [
       "country",
       "nation",
-      "ai"
-    ]
+      "ai",
+      "flag"
+    ],
+    "moji": "🇦🇮"
   },
   "flag_al": {
     "unicode": "1F1E6-1F1F1",
@@ -8465,8 +9304,10 @@
       "country",
       "nation",
       "shqiperia",
-      "al"
-    ]
+      "al",
+      "flag"
+    ],
+    "moji": "🇦🇱"
   },
   "flag_am": {
     "unicode": "1F1E6-1F1F2",
@@ -8482,8 +9323,10 @@
       "country",
       "nation",
       "hayastan",
-      "am"
-    ]
+      "am",
+      "flag"
+    ],
+    "moji": "🇦🇲"
   },
   "flag_ao": {
     "unicode": "1F1E6-1F1F4",
@@ -8498,12 +9341,14 @@
     "keywords": [
       "country",
       "nation",
-      "ao"
-    ]
+      "ao",
+      "flag"
+    ],
+    "moji": "🇦🇴"
   },
   "flag_aq": {
     "unicode": "1F1E6-1F1F6",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "antarctica",
     "shortname": ":flag_aq:",
     "category": "flags",
@@ -8511,7 +9356,11 @@
       ":aq:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇦🇶"
   },
   "flag_ar": {
     "unicode": "1F1E6-1F1F7",
@@ -8526,12 +9375,14 @@
     "keywords": [
       "country",
       "nation",
-      "ar"
-    ]
+      "ar",
+      "flag"
+    ],
+    "moji": "🇦🇷"
   },
   "flag_as": {
     "unicode": "1F1E6-1F1F8",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "american samoa",
     "shortname": ":flag_as:",
     "category": "flags",
@@ -8539,7 +9390,11 @@
       ":as:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇦🇸"
   },
   "flag_at": {
     "unicode": "1F1E6-1F1F9",
@@ -8556,8 +9411,10 @@
       "nation",
       "&ouml;sterreich",
       "osterreich",
-      "at"
-    ]
+      "at",
+      "flag"
+    ],
+    "moji": "🇦🇹"
   },
   "flag_au": {
     "unicode": "1F1E6-1F1FA",
@@ -8572,8 +9429,10 @@
     "keywords": [
       "country",
       "nation",
-      "au"
-    ]
+      "au",
+      "flag"
+    ],
+    "moji": "🇦🇺"
   },
   "flag_aw": {
     "unicode": "1F1E6-1F1FC",
@@ -8588,12 +9447,14 @@
     "keywords": [
       "country",
       "nation",
-      "aw"
-    ]
+      "aw",
+      "flag"
+    ],
+    "moji": "🇦🇼"
   },
   "flag_ax": {
     "unicode": "1F1E6-1F1FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "åland islands",
     "shortname": ":flag_ax:",
     "category": "flags",
@@ -8601,7 +9462,11 @@
       ":ax:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇦🇽"
   },
   "flag_az": {
     "unicode": "1F1E6-1F1FF",
@@ -8617,8 +9482,10 @@
       "country",
       "nation",
       "azarbaycan",
-      "az"
-    ]
+      "az",
+      "flag"
+    ],
+    "moji": "🇦🇿"
   },
   "flag_ba": {
     "unicode": "1F1E7-1F1E6",
@@ -8634,8 +9501,10 @@
       "country",
       "nation",
       "bosna i hercegovina",
-      "ba"
-    ]
+      "ba",
+      "flag"
+    ],
+    "moji": "🇧🇦"
   },
   "flag_bb": {
     "unicode": "1F1E7-1F1E7",
@@ -8650,8 +9519,10 @@
     "keywords": [
       "country",
       "nation",
-      "bb"
-    ]
+      "bb",
+      "flag"
+    ],
+    "moji": "🇧🇧"
   },
   "flag_bd": {
     "unicode": "1F1E7-1F1E9",
@@ -8666,8 +9537,10 @@
     "keywords": [
       "country",
       "nation",
-      "bd"
-    ]
+      "bd",
+      "flag"
+    ],
+    "moji": "🇧🇩"
   },
   "flag_be": {
     "unicode": "1F1E7-1F1EA",
@@ -8684,8 +9557,10 @@
       "nation",
       "belgique",
       "belgie",
-      "be"
-    ]
+      "be",
+      "flag"
+    ],
+    "moji": "🇧🇪"
   },
   "flag_bf": {
     "unicode": "1F1E7-1F1EB",
@@ -8700,8 +9575,10 @@
     "keywords": [
       "country",
       "nation",
-      "bf"
-    ]
+      "bf",
+      "flag"
+    ],
+    "moji": "🇧🇫"
   },
   "flag_bg": {
     "unicode": "1F1E7-1F1EC",
@@ -8716,8 +9593,10 @@
     "keywords": [
       "country",
       "nation",
-      "bg"
-    ]
+      "bg",
+      "flag"
+    ],
+    "moji": "🇧🇬"
   },
   "flag_bh": {
     "unicode": "1F1E7-1F1ED",
@@ -8733,8 +9612,10 @@
       "country",
       "nation",
       "al bahrayn",
-      "bh"
-    ]
+      "bh",
+      "flag"
+    ],
+    "moji": "🇧🇭"
   },
   "flag_bi": {
     "unicode": "1F1E7-1F1EE",
@@ -8749,8 +9630,10 @@
     "keywords": [
       "country",
       "nation",
-      "bi"
-    ]
+      "bi",
+      "flag"
+    ],
+    "moji": "🇧🇮"
   },
   "flag_bj": {
     "unicode": "1F1E7-1F1EF",
@@ -8765,12 +9648,14 @@
     "keywords": [
       "country",
       "nation",
-      "bj"
-    ]
+      "bj",
+      "flag"
+    ],
+    "moji": "🇧🇯"
   },
   "flag_bl": {
     "unicode": "1F1E7-1F1F1",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "saint barthélemy",
     "shortname": ":flag_bl:",
     "category": "flags",
@@ -8778,22 +9663,28 @@
       ":bl:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇧🇱"
   },
   "flag_black": {
     "unicode": "1F3F4",
     "unicode_alternates": [],
     "name": "waving black flag",
     "shortname": ":flag_black:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [
       ":waving_black_flag:"
     ],
     "aliases_ascii": [],
     "keywords": [
       "symbol",
-      "signal"
-    ]
+      "signal",
+      "object"
+    ],
+    "moji": "🏴"
   },
   "flag_bm": {
     "unicode": "1F1E7-1F1F2",
@@ -8808,8 +9699,10 @@
     "keywords": [
       "country",
       "nation",
-      "bm"
-    ]
+      "bm",
+      "flag"
+    ],
+    "moji": "🇧🇲"
   },
   "flag_bn": {
     "unicode": "1F1E7-1F1F3",
@@ -8824,8 +9717,10 @@
     "keywords": [
       "country",
       "nation",
-      "bn"
-    ]
+      "bn",
+      "flag"
+    ],
+    "moji": "🇧🇳"
   },
   "flag_bo": {
     "unicode": "1F1E7-1F1F4",
@@ -8840,12 +9735,14 @@
     "keywords": [
       "country",
       "nation",
-      "bo"
-    ]
+      "bo",
+      "flag"
+    ],
+    "moji": "🇧🇴"
   },
   "flag_bq": {
     "unicode": "1F1E7-1F1F6",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "caribbean netherlands",
     "shortname": ":flag_bq:",
     "category": "flags",
@@ -8853,7 +9750,11 @@
       ":bq:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇧🇶"
   },
   "flag_br": {
     "unicode": "1F1E7-1F1F7",
@@ -8869,8 +9770,10 @@
       "country",
       "nation",
       "brasil",
-      "br"
-    ]
+      "br",
+      "flag"
+    ],
+    "moji": "🇧🇷"
   },
   "flag_bs": {
     "unicode": "1F1E7-1F1F8",
@@ -8885,8 +9788,10 @@
     "keywords": [
       "country",
       "nation",
-      "bs"
-    ]
+      "bs",
+      "flag"
+    ],
+    "moji": "🇧🇸"
   },
   "flag_bt": {
     "unicode": "1F1E7-1F1F9",
@@ -8901,12 +9806,14 @@
     "keywords": [
       "country",
       "nation",
-      "bt"
-    ]
+      "bt",
+      "flag"
+    ],
+    "moji": "🇧🇹"
   },
   "flag_bv": {
     "unicode": "1F1E7-1F1FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "bouvet island",
     "shortname": ":flag_bv:",
     "category": "flags",
@@ -8914,7 +9821,11 @@
       ":bv:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇧🇻"
   },
   "flag_bw": {
     "unicode": "1F1E7-1F1FC",
@@ -8929,8 +9840,10 @@
     "keywords": [
       "country",
       "nation",
-      "bw"
-    ]
+      "bw",
+      "flag"
+    ],
+    "moji": "🇧🇼"
   },
   "flag_by": {
     "unicode": "1F1E7-1F1FE",
@@ -8946,8 +9859,10 @@
       "country",
       "nation",
       "byelarus",
-      "by"
-    ]
+      "by",
+      "flag"
+    ],
+    "moji": "🇧🇾"
   },
   "flag_bz": {
     "unicode": "1F1E7-1F1FF",
@@ -8962,8 +9877,10 @@
     "keywords": [
       "country",
       "nation",
-      "bz"
-    ]
+      "bz",
+      "flag"
+    ],
+    "moji": "🇧🇿"
   },
   "flag_ca": {
     "unicode": "1F1E8-1F1E6",
@@ -8978,12 +9895,14 @@
     "keywords": [
       "country",
       "nation",
-      "ca"
-    ]
+      "ca",
+      "flag"
+    ],
+    "moji": "🇨🇦"
   },
   "flag_cc": {
     "unicode": "1F1E8-1F1E8",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "cocos (keeling) islands",
     "shortname": ":flag_cc:",
     "category": "flags",
@@ -8991,7 +9910,11 @@
       ":cc:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇨🇨"
   },
   "flag_cd": {
     "unicode": "1F1E8-1F1E9",
@@ -9008,8 +9931,10 @@
       "nation",
       "r&eacute;publique d&eacute;mocratique du congo",
       "republique democratique du congo",
-      "cd"
-    ]
+      "cd",
+      "flag"
+    ],
+    "moji": "🇨🇩"
   },
   "flag_cf": {
     "unicode": "1F1E8-1F1EB",
@@ -9024,8 +9949,10 @@
     "keywords": [
       "country",
       "nation",
-      "cf"
-    ]
+      "cf",
+      "flag"
+    ],
+    "moji": "🇨🇫"
   },
   "flag_cg": {
     "unicode": "1F1E8-1F1EC",
@@ -9040,8 +9967,10 @@
     "keywords": [
       "country",
       "nation",
-      "cg"
-    ]
+      "cg",
+      "flag"
+    ],
+    "moji": "🇨🇬"
   },
   "flag_ch": {
     "unicode": "1F1E8-1F1ED",
@@ -9056,8 +9985,11 @@
     "keywords": [
       "country",
       "nation",
-      "swiss"
-    ]
+      "swiss",
+      "neutral",
+      "flag"
+    ],
+    "moji": "🇨🇭"
   },
   "flag_ci": {
     "unicode": "1F1E8-1F1EE",
@@ -9072,12 +10004,14 @@
     "keywords": [
       "country",
       "nation",
-      "ci"
-    ]
+      "ci",
+      "flag"
+    ],
+    "moji": "🇨🇮"
   },
   "flag_ck": {
     "unicode": "1F1E8-1F1F0",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "cook islands",
     "shortname": ":flag_ck:",
     "category": "flags",
@@ -9085,7 +10019,11 @@
       ":ck:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇨🇰"
   },
   "flag_cl": {
     "unicode": "1F1E8-1F1F1",
@@ -9100,8 +10038,10 @@
     "keywords": [
       "country",
       "nation",
-      "cl"
-    ]
+      "cl",
+      "flag"
+    ],
+    "moji": "🇨🇱"
   },
   "flag_cm": {
     "unicode": "1F1E8-1F1F2",
@@ -9116,8 +10056,10 @@
     "keywords": [
       "country",
       "nation",
-      "cm"
-    ]
+      "cm",
+      "flag"
+    ],
+    "moji": "🇨🇲"
   },
   "flag_cn": {
     "unicode": "1F1E8-1F1F3",
@@ -9135,8 +10077,10 @@
       "zhong guo",
       "country",
       "nation",
-      "cn"
-    ]
+      "cn",
+      "flag"
+    ],
+    "moji": "🇨🇳"
   },
   "flag_co": {
     "unicode": "1F1E8-1F1F4",
@@ -9151,12 +10095,14 @@
     "keywords": [
       "country",
       "nation",
-      "co"
-    ]
+      "co",
+      "flag"
+    ],
+    "moji": "🇨🇴"
   },
   "flag_cp": {
     "unicode": "1F1E8-1F1F5",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "clipperton island",
     "shortname": ":flag_cp:",
     "category": "flags",
@@ -9164,7 +10110,11 @@
       ":cp:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇨🇵"
   },
   "flag_cr": {
     "unicode": "1F1E8-1F1F7",
@@ -9179,8 +10129,10 @@
     "keywords": [
       "country",
       "nation",
-      "cr"
-    ]
+      "cr",
+      "flag"
+    ],
+    "moji": "🇨🇷"
   },
   "flag_cu": {
     "unicode": "1F1E8-1F1FA",
@@ -9195,8 +10147,10 @@
     "keywords": [
       "country",
       "nation",
-      "cu"
-    ]
+      "cu",
+      "flag"
+    ],
+    "moji": "🇨🇺"
   },
   "flag_cv": {
     "unicode": "1F1E8-1F1FB",
@@ -9212,12 +10166,14 @@
       "country",
       "nation",
       "cabo verde",
-      "cv"
-    ]
+      "cv",
+      "flag"
+    ],
+    "moji": "🇨🇻"
   },
   "flag_cw": {
     "unicode": "1F1E8-1F1FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "curaçao",
     "shortname": ":flag_cw:",
     "category": "flags",
@@ -9225,11 +10181,15 @@
       ":cw:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇨🇼"
   },
   "flag_cx": {
     "unicode": "1F1E8-1F1FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "christmas island",
     "shortname": ":flag_cx:",
     "category": "flags",
@@ -9237,7 +10197,11 @@
       ":cx:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇨🇽"
   },
   "flag_cy": {
     "unicode": "1F1E8-1F1FE",
@@ -9254,8 +10218,10 @@
       "nation",
       "kibris",
       "kypros",
-      "cy"
-    ]
+      "cy",
+      "flag"
+    ],
+    "moji": "🇨🇾"
   },
   "flag_cz": {
     "unicode": "1F1E8-1F1FF",
@@ -9271,8 +10237,10 @@
       "country",
       "nation",
       "ceska republika",
-      "cz"
-    ]
+      "cz",
+      "flag"
+    ],
+    "moji": "🇨🇿"
   },
   "flag_de": {
     "unicode": "1F1E9-1F1EA",
@@ -9289,12 +10257,14 @@
       "nation",
       "deutschland",
       "country",
-      "de"
-    ]
+      "de",
+      "flag"
+    ],
+    "moji": "🇩🇪"
   },
   "flag_dg": {
     "unicode": "1F1E9-1F1EC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "diego garcia",
     "shortname": ":flag_dg:",
     "category": "flags",
@@ -9302,7 +10272,11 @@
       ":dg:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇩🇬"
   },
   "flag_dj": {
     "unicode": "1F1E9-1F1EF",
@@ -9317,8 +10291,10 @@
     "keywords": [
       "country",
       "nation",
-      "dj"
-    ]
+      "dj",
+      "flag"
+    ],
+    "moji": "🇩🇯"
   },
   "flag_dk": {
     "unicode": "1F1E9-1F1F0",
@@ -9334,8 +10310,10 @@
       "country",
       "nation",
       "danmark",
-      "dk"
-    ]
+      "dk",
+      "flag"
+    ],
+    "moji": "🇩🇰"
   },
   "flag_dm": {
     "unicode": "1F1E9-1F1F2",
@@ -9350,8 +10328,10 @@
     "keywords": [
       "country",
       "nation",
-      "dm"
-    ]
+      "dm",
+      "flag"
+    ],
+    "moji": "🇩🇲"
   },
   "flag_do": {
     "unicode": "1F1E9-1F1F4",
@@ -9366,8 +10346,10 @@
     "keywords": [
       "country",
       "nation",
-      "do"
-    ]
+      "do",
+      "flag"
+    ],
+    "moji": "🇩🇴"
   },
   "flag_dz": {
     "unicode": "1F1E9-1F1FF",
@@ -9384,12 +10366,14 @@
       "nation",
       "al jaza'ir",
       "al jazair",
-      "dz"
-    ]
+      "dz",
+      "flag"
+    ],
+    "moji": "🇩🇿"
   },
   "flag_ea": {
     "unicode": "1F1EA-1F1E6",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "ceuta, melilla",
     "shortname": ":flag_ea:",
     "category": "flags",
@@ -9397,7 +10381,11 @@
       ":ea:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇪🇦"
   },
   "flag_ec": {
     "unicode": "1F1EA-1F1E8",
@@ -9412,8 +10400,10 @@
     "keywords": [
       "country",
       "nation",
-      "ec"
-    ]
+      "ec",
+      "flag"
+    ],
+    "moji": "🇪🇨"
   },
   "flag_ee": {
     "unicode": "1F1EA-1F1EA",
@@ -9429,8 +10419,10 @@
       "country",
       "nation",
       "eesti vabariik",
-      "ee"
-    ]
+      "ee",
+      "flag"
+    ],
+    "moji": "🇪🇪"
   },
   "flag_eg": {
     "unicode": "1F1EA-1F1EC",
@@ -9446,8 +10438,10 @@
       "country",
       "nation",
       "misr",
-      "eg"
-    ]
+      "eg",
+      "flag"
+    ],
+    "moji": "🇪🇬"
   },
   "flag_eh": {
     "unicode": "1F1EA-1F1ED",
@@ -9465,8 +10459,10 @@
       "aṣ-Ṣaḥrā’ al-gharbīyah",
       "sahra",
       "gharbiyah",
-      "eh"
-    ]
+      "eh",
+      "flag"
+    ],
+    "moji": "🇪🇭"
   },
   "flag_er": {
     "unicode": "1F1EA-1F1F7",
@@ -9482,8 +10478,10 @@
       "country",
       "nation",
       "hagere ertra",
-      "er"
-    ]
+      "er",
+      "flag"
+    ],
+    "moji": "🇪🇷"
   },
   "flag_es": {
     "unicode": "1F1EA-1F1F8",
@@ -9500,8 +10498,10 @@
       "espa&ntilde;a",
       "country",
       "espana",
-      "es"
-    ]
+      "es",
+      "flag"
+    ],
+    "moji": "🇪🇸"
   },
   "flag_et": {
     "unicode": "1F1EA-1F1F9",
@@ -9518,12 +10518,14 @@
       "nation",
       "ityop'iya",
       "ityopiya",
-      "et"
-    ]
+      "et",
+      "flag"
+    ],
+    "moji": "🇪🇹"
   },
   "flag_eu": {
     "unicode": "1F1EA-1F1FA",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "european union",
     "shortname": ":flag_eu:",
     "category": "flags",
@@ -9531,7 +10533,11 @@
       ":eu:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇪🇺"
   },
   "flag_fi": {
     "unicode": "1F1EB-1F1EE",
@@ -9547,8 +10553,10 @@
       "country",
       "nation",
       "suomen tasavalta",
-      "fi"
-    ]
+      "fi",
+      "flag"
+    ],
+    "moji": "🇫🇮"
   },
   "flag_fj": {
     "unicode": "1F1EB-1F1EF",
@@ -9563,8 +10571,10 @@
     "keywords": [
       "country",
       "nation",
-      "fj"
-    ]
+      "fj",
+      "flag"
+    ],
+    "moji": "🇫🇯"
   },
   "flag_fk": {
     "unicode": "1F1EB-1F1F0",
@@ -9580,8 +10590,10 @@
       "country",
       "nation",
       "islas malvinas",
-      "fk"
-    ]
+      "fk",
+      "flag"
+    ],
+    "moji": "🇫🇰"
   },
   "flag_fm": {
     "unicode": "1F1EB-1F1F2",
@@ -9596,8 +10608,10 @@
     "keywords": [
       "country",
       "nation",
-      "fm"
-    ]
+      "fm",
+      "flag"
+    ],
+    "moji": "🇫🇲"
   },
   "flag_fo": {
     "unicode": "1F1EB-1F1F4",
@@ -9613,8 +10627,10 @@
       "country",
       "nation",
       "foroyar",
-      "fo"
-    ]
+      "fo",
+      "flag"
+    ],
+    "moji": "🇫🇴"
   },
   "flag_fr": {
     "unicode": "1F1EB-1F1F7",
@@ -9630,8 +10646,10 @@
       "french",
       "nation",
       "country",
-      "fr"
-    ]
+      "fr",
+      "flag"
+    ],
+    "moji": "🇫🇷"
   },
   "flag_ga": {
     "unicode": "1F1EC-1F1E6",
@@ -9646,8 +10664,10 @@
     "keywords": [
       "country",
       "nation",
-      "ga"
-    ]
+      "ga",
+      "flag"
+    ],
+    "moji": "🇬🇦"
   },
   "flag_gb": {
     "unicode": "1F1EC-1F1E7",
@@ -9666,8 +10686,10 @@
       "nation",
       "united kingdom",
       "england",
-      "country"
-    ]
+      "country",
+      "flag"
+    ],
+    "moji": "🇬🇧"
   },
   "flag_gd": {
     "unicode": "1F1EC-1F1E9",
@@ -9682,8 +10704,10 @@
     "keywords": [
       "country",
       "nation",
-      "gd"
-    ]
+      "gd",
+      "flag"
+    ],
+    "moji": "🇬🇩"
   },
   "flag_ge": {
     "unicode": "1F1EC-1F1EA",
@@ -9700,12 +10724,14 @@
       "nation",
       "sak'art'velo",
       "sakartvelo",
-      "ge"
-    ]
+      "ge",
+      "flag"
+    ],
+    "moji": "🇬🇪"
   },
   "flag_gf": {
     "unicode": "1F1EC-1F1EB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "french guiana",
     "shortname": ":flag_gf:",
     "category": "flags",
@@ -9713,11 +10739,15 @@
       ":gf:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇬🇫"
   },
   "flag_gg": {
     "unicode": "1F1EC-1F1EC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "guernsey",
     "shortname": ":flag_gg:",
     "category": "flags",
@@ -9725,7 +10755,11 @@
       ":gg:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇬🇬"
   },
   "flag_gh": {
     "unicode": "1F1EC-1F1ED",
@@ -9740,8 +10774,10 @@
     "keywords": [
       "country",
       "nation",
-      "gh"
-    ]
+      "gh",
+      "flag"
+    ],
+    "moji": "🇬🇭"
   },
   "flag_gi": {
     "unicode": "1F1EC-1F1EE",
@@ -9756,8 +10792,10 @@
     "keywords": [
       "country",
       "nation",
-      "gi"
-    ]
+      "gi",
+      "flag"
+    ],
+    "moji": "🇬🇮"
   },
   "flag_gl": {
     "unicode": "1F1EC-1F1F1",
@@ -9773,8 +10811,10 @@
       "country",
       "nation",
       "kalaallit nunaat",
-      "gl"
-    ]
+      "gl",
+      "flag"
+    ],
+    "moji": "🇬🇱"
   },
   "flag_gm": {
     "unicode": "1F1EC-1F1F2",
@@ -9789,8 +10829,10 @@
     "keywords": [
       "country",
       "nation",
-      "gm"
-    ]
+      "gm",
+      "flag"
+    ],
+    "moji": "🇬🇲"
   },
   "flag_gn": {
     "unicode": "1F1EC-1F1F3",
@@ -9806,12 +10848,14 @@
       "country",
       "nation",
       "guinee",
-      "gn"
-    ]
+      "gn",
+      "flag"
+    ],
+    "moji": "🇬🇳"
   },
   "flag_gp": {
     "unicode": "1F1EC-1F1F5",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "guadeloupe",
     "shortname": ":flag_gp:",
     "category": "flags",
@@ -9819,7 +10863,11 @@
       ":gp:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇬🇵"
   },
   "flag_gq": {
     "unicode": "1F1EC-1F1F6",
@@ -9835,8 +10883,10 @@
       "country",
       "nation",
       "guinea ecuatorial",
-      "gq"
-    ]
+      "gq",
+      "flag"
+    ],
+    "moji": "🇬🇶"
   },
   "flag_gr": {
     "unicode": "1F1EC-1F1F7",
@@ -9853,12 +10903,14 @@
       "nation",
       "ellas",
       "ellada",
-      "gr"
-    ]
+      "gr",
+      "flag"
+    ],
+    "moji": "🇬🇷"
   },
   "flag_gs": {
     "unicode": "1F1EC-1F1F8",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "south georgia",
     "shortname": ":flag_gs:",
     "category": "flags",
@@ -9866,7 +10918,11 @@
       ":gs:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇬🇸"
   },
   "flag_gt": {
     "unicode": "1F1EC-1F1F9",
@@ -9881,8 +10937,10 @@
     "keywords": [
       "country",
       "nation",
-      "gt"
-    ]
+      "gt",
+      "flag"
+    ],
+    "moji": "🇬🇹"
   },
   "flag_gu": {
     "unicode": "1F1EC-1F1FA",
@@ -9897,8 +10955,10 @@
     "keywords": [
       "country",
       "nation",
-      "gu"
-    ]
+      "gu",
+      "flag"
+    ],
+    "moji": "🇬🇺"
   },
   "flag_gw": {
     "unicode": "1F1EC-1F1FC",
@@ -9915,8 +10975,10 @@
       "nation",
       "guine-bissau",
       "guine bissau",
-      "gw"
-    ]
+      "gw",
+      "flag"
+    ],
+    "moji": "🇬🇼"
   },
   "flag_gy": {
     "unicode": "1F1EC-1F1FE",
@@ -9931,8 +10993,10 @@
     "keywords": [
       "country",
       "nation",
-      "gy"
-    ]
+      "gy",
+      "flag"
+    ],
+    "moji": "🇬🇾"
   },
   "flag_hk": {
     "unicode": "1F1ED-1F1F0",
@@ -9948,12 +11012,14 @@
       "country",
       "nation",
       "xianggang",
-      "hk"
-    ]
+      "hk",
+      "flag"
+    ],
+    "moji": "🇭🇰"
   },
   "flag_hm": {
     "unicode": "1F1ED-1F1F2",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "heard island and mcdonald islands",
     "shortname": ":flag_hm:",
     "category": "flags",
@@ -9961,7 +11027,11 @@
       ":hm:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇭🇲"
   },
   "flag_hn": {
     "unicode": "1F1ED-1F1F3",
@@ -9976,8 +11046,10 @@
     "keywords": [
       "country",
       "nation",
-      "hn"
-    ]
+      "hn",
+      "flag"
+    ],
+    "moji": "🇭🇳"
   },
   "flag_hr": {
     "unicode": "1F1ED-1F1F7",
@@ -9993,8 +11065,10 @@
       "country",
       "nation",
       "hrvatska",
-      "hr"
-    ]
+      "hr",
+      "flag"
+    ],
+    "moji": "🇭🇷"
   },
   "flag_ht": {
     "unicode": "1F1ED-1F1F9",
@@ -10009,8 +11083,10 @@
     "keywords": [
       "country",
       "nation",
-      "ht"
-    ]
+      "ht",
+      "flag"
+    ],
+    "moji": "🇭🇹"
   },
   "flag_hu": {
     "unicode": "1F1ED-1F1FA",
@@ -10026,12 +11102,14 @@
       "country",
       "nation",
       "magyarorszag",
-      "hu"
-    ]
+      "hu",
+      "flag"
+    ],
+    "moji": "🇭🇺"
   },
   "flag_ic": {
     "unicode": "1F1EE-1F1E8",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "canary islands",
     "shortname": ":flag_ic:",
     "category": "flags",
@@ -10039,7 +11117,11 @@
       ":ic:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇮🇨"
   },
   "flag_id": {
     "unicode": "1F1EE-1F1E9",
@@ -10054,8 +11136,10 @@
     "keywords": [
       "country",
       "nation",
-      "id"
-    ]
+      "id",
+      "flag"
+    ],
+    "moji": "🇮🇩"
   },
   "flag_ie": {
     "unicode": "1F1EE-1F1EA",
@@ -10072,8 +11156,10 @@
       "nation",
       "&eacute;ire",
       "eire",
-      "ie"
-    ]
+      "ie",
+      "flag"
+    ],
+    "moji": "🇮🇪"
   },
   "flag_il": {
     "unicode": "1F1EE-1F1F1",
@@ -10090,12 +11176,15 @@
       "nation",
       "yisra'el",
       "yisrael",
-      "il"
-    ]
+      "il",
+      "jew",
+      "flag"
+    ],
+    "moji": "🇮🇱"
   },
   "flag_im": {
     "unicode": "1F1EE-1F1F2",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "isle of man",
     "shortname": ":flag_im:",
     "category": "flags",
@@ -10103,7 +11192,11 @@
       ":im:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇮🇲"
   },
   "flag_in": {
     "unicode": "1F1EE-1F1F3",
@@ -10119,12 +11212,14 @@
       "country",
       "nation",
       "bharat",
-      "in"
-    ]
+      "in",
+      "flag"
+    ],
+    "moji": "🇮🇳"
   },
   "flag_io": {
     "unicode": "1F1EE-1F1F4",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "british indian ocean territory",
     "shortname": ":flag_io:",
     "category": "flags",
@@ -10132,7 +11227,11 @@
       ":io:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇮🇴"
   },
   "flag_iq": {
     "unicode": "1F1EE-1F1F6",
@@ -10147,8 +11246,10 @@
     "keywords": [
       "country",
       "nation",
-      "iq"
-    ]
+      "iq",
+      "flag"
+    ],
+    "moji": "🇮🇶"
   },
   "flag_ir": {
     "unicode": "1F1EE-1F1F7",
@@ -10163,8 +11264,10 @@
     "keywords": [
       "country",
       "nation",
-      "ir"
-    ]
+      "ir",
+      "flag"
+    ],
+    "moji": "🇮🇷"
   },
   "flag_is": {
     "unicode": "1F1EE-1F1F8",
@@ -10180,8 +11283,10 @@
       "country",
       "nation",
       "lyoveldio island",
-      "is"
-    ]
+      "is",
+      "flag"
+    ],
+    "moji": "🇮🇸"
   },
   "flag_it": {
     "unicode": "1F1EE-1F1F9",
@@ -10197,8 +11302,11 @@
       "italia",
       "country",
       "nation",
-      "it"
-    ]
+      "it",
+      "italian",
+      "flag"
+    ],
+    "moji": "🇮🇹"
   },
   "flag_je": {
     "unicode": "1F1EF-1F1EA",
@@ -10213,8 +11321,10 @@
     "keywords": [
       "country",
       "nation",
-      "je"
-    ]
+      "je",
+      "flag"
+    ],
+    "moji": "🇯🇪"
   },
   "flag_jm": {
     "unicode": "1F1EF-1F1F2",
@@ -10229,8 +11339,10 @@
     "keywords": [
       "country",
       "nation",
-      "jm"
-    ]
+      "jm",
+      "flag"
+    ],
+    "moji": "🇯🇲"
   },
   "flag_jo": {
     "unicode": "1F1EF-1F1F4",
@@ -10246,8 +11358,10 @@
       "country",
       "nation",
       "al urdun",
-      "jo"
-    ]
+      "jo",
+      "flag"
+    ],
+    "moji": "🇯🇴"
   },
   "flag_jp": {
     "unicode": "1F1EF-1F1F5",
@@ -10263,8 +11377,11 @@
       "nation",
       "nippon",
       "country",
-      "jp"
-    ]
+      "jp",
+      "japan",
+      "flag"
+    ],
+    "moji": "🇯🇵"
   },
   "flag_ke": {
     "unicode": "1F1F0-1F1EA",
@@ -10279,8 +11396,10 @@
     "keywords": [
       "country",
       "nation",
-      "ke"
-    ]
+      "ke",
+      "flag"
+    ],
+    "moji": "🇰🇪"
   },
   "flag_kg": {
     "unicode": "1F1F0-1F1EC",
@@ -10296,8 +11415,10 @@
       "country",
       "nation",
       "kyrgyz respublikasy",
-      "kg"
-    ]
+      "kg",
+      "flag"
+    ],
+    "moji": "🇰🇬"
   },
   "flag_kh": {
     "unicode": "1F1F0-1F1ED",
@@ -10313,8 +11434,10 @@
       "country",
       "nation",
       "kampuchea",
-      "kh"
-    ]
+      "kh",
+      "flag"
+    ],
+    "moji": "🇰🇭"
   },
   "flag_ki": {
     "unicode": "1F1F0-1F1EE",
@@ -10331,8 +11454,10 @@
       "nation",
       "kiribati",
       "kiribas",
-      "ki"
-    ]
+      "ki",
+      "flag"
+    ],
+    "moji": "🇰🇮"
   },
   "flag_km": {
     "unicode": "1F1F0-1F1F2",
@@ -10347,8 +11472,10 @@
     "keywords": [
       "country",
       "nation",
-      "km"
-    ]
+      "km",
+      "flag"
+    ],
+    "moji": "🇰🇲"
   },
   "flag_kn": {
     "unicode": "1F1F0-1F1F3",
@@ -10363,8 +11490,10 @@
     "keywords": [
       "country",
       "nation",
-      "kn"
-    ]
+      "kn",
+      "flag"
+    ],
+    "moji": "🇰🇳"
   },
   "flag_kp": {
     "unicode": "1F1F0-1F1F5",
@@ -10379,8 +11508,10 @@
     "keywords": [
       "country",
       "nation",
-      "kp"
-    ]
+      "kp",
+      "flag"
+    ],
+    "moji": "🇰🇵"
   },
   "flag_kr": {
     "unicode": "1F1F0-1F1F7",
@@ -10396,8 +11527,10 @@
       "nation",
       "country",
       "south korea",
-      "kr"
-    ]
+      "kr",
+      "flag"
+    ],
+    "moji": "🇰🇷"
   },
   "flag_kw": {
     "unicode": "1F1F0-1F1FC",
@@ -10413,8 +11546,10 @@
       "country",
       "nation",
       "al kuwayt",
-      "kw"
-    ]
+      "kw",
+      "flag"
+    ],
+    "moji": "🇰🇼"
   },
   "flag_ky": {
     "unicode": "1F1F0-1F1FE",
@@ -10429,8 +11564,10 @@
     "keywords": [
       "country",
       "nation",
-      "ky"
-    ]
+      "ky",
+      "flag"
+    ],
+    "moji": "🇰🇾"
   },
   "flag_kz": {
     "unicode": "1F1F0-1F1FF",
@@ -10446,8 +11583,10 @@
       "country",
       "nation",
       "qazaqstan",
-      "kz"
-    ]
+      "kz",
+      "flag"
+    ],
+    "moji": "🇰🇿"
   },
   "flag_la": {
     "unicode": "1F1F1-1F1E6",
@@ -10462,8 +11601,10 @@
     "keywords": [
       "country",
       "nation",
-      "la"
-    ]
+      "la",
+      "flag"
+    ],
+    "moji": "🇱🇦"
   },
   "flag_lb": {
     "unicode": "1F1F1-1F1E7",
@@ -10479,8 +11620,10 @@
       "country",
       "nation",
       "lubnan",
-      "lb"
-    ]
+      "lb",
+      "flag"
+    ],
+    "moji": "🇱🇧"
   },
   "flag_lc": {
     "unicode": "1F1F1-1F1E8",
@@ -10495,8 +11638,10 @@
     "keywords": [
       "country",
       "nation",
-      "lc"
-    ]
+      "lc",
+      "flag"
+    ],
+    "moji": "🇱🇨"
   },
   "flag_li": {
     "unicode": "1F1F1-1F1EE",
@@ -10511,8 +11656,10 @@
     "keywords": [
       "country",
       "nation",
-      "li"
-    ]
+      "li",
+      "flag"
+    ],
+    "moji": "🇱🇮"
   },
   "flag_lk": {
     "unicode": "1F1F1-1F1F0",
@@ -10527,8 +11674,10 @@
     "keywords": [
       "country",
       "nation",
-      "lk"
-    ]
+      "lk",
+      "flag"
+    ],
+    "moji": "🇱🇰"
   },
   "flag_lr": {
     "unicode": "1F1F1-1F1F7",
@@ -10543,8 +11692,10 @@
     "keywords": [
       "country",
       "nation",
-      "lr"
-    ]
+      "lr",
+      "flag"
+    ],
+    "moji": "🇱🇷"
   },
   "flag_ls": {
     "unicode": "1F1F1-1F1F8",
@@ -10559,8 +11710,10 @@
     "keywords": [
       "country",
       "nation",
-      "ls"
-    ]
+      "ls",
+      "flag"
+    ],
+    "moji": "🇱🇸"
   },
   "flag_lt": {
     "unicode": "1F1F1-1F1F9",
@@ -10576,8 +11729,10 @@
       "country",
       "nation",
       "lietuva",
-      "lt"
-    ]
+      "lt",
+      "flag"
+    ],
+    "moji": "🇱🇹"
   },
   "flag_lu": {
     "unicode": "1F1F1-1F1FA",
@@ -10594,8 +11749,10 @@
       "nation",
       "luxembourg",
       "letzebuerg",
-      "lu"
-    ]
+      "lu",
+      "flag"
+    ],
+    "moji": "🇱🇺"
   },
   "flag_lv": {
     "unicode": "1F1F1-1F1FB",
@@ -10611,8 +11768,10 @@
       "country",
       "nation",
       "latvija",
-      "lv"
-    ]
+      "lv",
+      "flag"
+    ],
+    "moji": "🇱🇻"
   },
   "flag_ly": {
     "unicode": "1F1F1-1F1FE",
@@ -10628,8 +11787,10 @@
       "country",
       "nation",
       "libiyah",
-      "ly"
-    ]
+      "ly",
+      "flag"
+    ],
+    "moji": "🇱🇾"
   },
   "flag_ma": {
     "unicode": "1F1F2-1F1E6",
@@ -10645,8 +11806,10 @@
       "country",
       "nation",
       "al maghrib",
-      "ma"
-    ]
+      "ma",
+      "flag"
+    ],
+    "moji": "🇲🇦"
   },
   "flag_mc": {
     "unicode": "1F1F2-1F1E8",
@@ -10661,8 +11824,10 @@
     "keywords": [
       "country",
       "nation",
-      "mc"
-    ]
+      "mc",
+      "flag"
+    ],
+    "moji": "🇲🇨"
   },
   "flag_md": {
     "unicode": "1F1F2-1F1E9",
@@ -10677,8 +11842,10 @@
     "keywords": [
       "country",
       "nation",
-      "md"
-    ]
+      "md",
+      "flag"
+    ],
+    "moji": "🇲🇩"
   },
   "flag_me": {
     "unicode": "1F1F2-1F1EA",
@@ -10694,12 +11861,14 @@
       "country",
       "nation",
       "crna gora",
-      "me"
-    ]
+      "me",
+      "flag"
+    ],
+    "moji": "🇲🇪"
   },
   "flag_mf": {
     "unicode": "1F1F2-1F1EB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "saint martin",
     "shortname": ":flag_mf:",
     "category": "flags",
@@ -10707,7 +11876,11 @@
       ":mf:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇲🇫"
   },
   "flag_mg": {
     "unicode": "1F1F2-1F1EC",
@@ -10722,8 +11895,10 @@
     "keywords": [
       "country",
       "nation",
-      "mg"
-    ]
+      "mg",
+      "flag"
+    ],
+    "moji": "🇲🇬"
   },
   "flag_mh": {
     "unicode": "1F1F2-1F1ED",
@@ -10738,8 +11913,10 @@
     "keywords": [
       "country",
       "nation",
-      "mh"
-    ]
+      "mh",
+      "flag"
+    ],
+    "moji": "🇲🇭"
   },
   "flag_mk": {
     "unicode": "1F1F2-1F1F0",
@@ -10754,8 +11931,10 @@
     "keywords": [
       "country",
       "nation",
-      "mk"
-    ]
+      "mk",
+      "flag"
+    ],
+    "moji": "🇲🇰"
   },
   "flag_ml": {
     "unicode": "1F1F2-1F1F1",
@@ -10770,8 +11949,10 @@
     "keywords": [
       "country",
       "nation",
-      "ml"
-    ]
+      "ml",
+      "flag"
+    ],
+    "moji": "🇲🇱"
   },
   "flag_mm": {
     "unicode": "1F1F2-1F1F2",
@@ -10787,8 +11968,10 @@
       "country",
       "nation",
       "myanma naingngandaw",
-      "mm"
-    ]
+      "mm",
+      "flag"
+    ],
+    "moji": "🇲🇲"
   },
   "flag_mn": {
     "unicode": "1F1F2-1F1F3",
@@ -10804,8 +11987,10 @@
       "country",
       "nation",
       "mongol uls",
-      "mn"
-    ]
+      "mn",
+      "flag"
+    ],
+    "moji": "🇲🇳"
   },
   "flag_mo": {
     "unicode": "1F1F2-1F1F4",
@@ -10821,12 +12006,14 @@
       "country",
       "nation",
       "aomen",
-      "mo"
-    ]
+      "mo",
+      "flag"
+    ],
+    "moji": "🇲🇴"
   },
   "flag_mp": {
     "unicode": "1F1F2-1F1F5",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "northern mariana islands",
     "shortname": ":flag_mp:",
     "category": "flags",
@@ -10834,11 +12021,15 @@
       ":mp:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇲🇵"
   },
   "flag_mq": {
     "unicode": "1F1F2-1F1F6",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "martinique",
     "shortname": ":flag_mq:",
     "category": "flags",
@@ -10846,7 +12037,11 @@
       ":mq:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇲🇶"
   },
   "flag_mr": {
     "unicode": "1F1F2-1F1F7",
@@ -10862,8 +12057,10 @@
       "country",
       "nation",
       "muritaniyah",
-      "mr"
-    ]
+      "mr",
+      "flag"
+    ],
+    "moji": "🇲🇷"
   },
   "flag_ms": {
     "unicode": "1F1F2-1F1F8",
@@ -10878,8 +12075,10 @@
     "keywords": [
       "country",
       "nation",
-      "ms"
-    ]
+      "ms",
+      "flag"
+    ],
+    "moji": "🇲🇸"
   },
   "flag_mt": {
     "unicode": "1F1F2-1F1F9",
@@ -10894,8 +12093,10 @@
     "keywords": [
       "country",
       "nation",
-      "mt"
-    ]
+      "mt",
+      "flag"
+    ],
+    "moji": "🇲🇹"
   },
   "flag_mu": {
     "unicode": "1F1F2-1F1FA",
@@ -10910,8 +12111,10 @@
     "keywords": [
       "country",
       "nation",
-      "mu"
-    ]
+      "mu",
+      "flag"
+    ],
+    "moji": "🇲🇺"
   },
   "flag_mv": {
     "unicode": "1F1F2-1F1FB",
@@ -10927,8 +12130,10 @@
       "country",
       "nation",
       "dhivehi raajje",
-      "mv"
-    ]
+      "mv",
+      "flag"
+    ],
+    "moji": "🇲🇻"
   },
   "flag_mw": {
     "unicode": "1F1F2-1F1FC",
@@ -10943,8 +12148,10 @@
     "keywords": [
       "country",
       "nation",
-      "mw"
-    ]
+      "mw",
+      "flag"
+    ],
+    "moji": "🇲🇼"
   },
   "flag_mx": {
     "unicode": "1F1F2-1F1FD",
@@ -10959,8 +12166,11 @@
     "keywords": [
       "country",
       "nation",
-      "mx"
-    ]
+      "mx",
+      "mexican",
+      "flag"
+    ],
+    "moji": "🇲🇽"
   },
   "flag_my": {
     "unicode": "1F1F2-1F1FE",
@@ -10975,8 +12185,10 @@
     "keywords": [
       "country",
       "nation",
-      "my"
-    ]
+      "my",
+      "flag"
+    ],
+    "moji": "🇲🇾"
   },
   "flag_mz": {
     "unicode": "1F1F2-1F1FF",
@@ -10992,8 +12204,10 @@
       "country",
       "nation",
       "mocambique",
-      "mz"
-    ]
+      "mz",
+      "flag"
+    ],
+    "moji": "🇲🇿"
   },
   "flag_na": {
     "unicode": "1F1F3-1F1E6",
@@ -11008,8 +12222,10 @@
     "keywords": [
       "country",
       "nation",
-      "na"
-    ]
+      "na",
+      "flag"
+    ],
+    "moji": "🇳🇦"
   },
   "flag_nc": {
     "unicode": "1F1F3-1F1E8",
@@ -11027,8 +12243,10 @@
       "nouvelle",
       "cal&eacute;donie",
       "caledonie",
-      "nc"
-    ]
+      "nc",
+      "flag"
+    ],
+    "moji": "🇳🇨"
   },
   "flag_ne": {
     "unicode": "1F1F3-1F1EA",
@@ -11043,12 +12261,14 @@
     "keywords": [
       "country",
       "nation",
-      "ne"
-    ]
+      "ne",
+      "flag"
+    ],
+    "moji": "🇳🇪"
   },
   "flag_nf": {
     "unicode": "1F1F3-1F1EB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "norfolk island",
     "shortname": ":flag_nf:",
     "category": "flags",
@@ -11056,7 +12276,11 @@
       ":nf:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇳🇫"
   },
   "flag_ng": {
     "unicode": "1F1F3-1F1EC",
@@ -11071,8 +12295,10 @@
     "keywords": [
       "country",
       "nation",
-      "ng"
-    ]
+      "ng",
+      "flag"
+    ],
+    "moji": "🇳🇬"
   },
   "flag_ni": {
     "unicode": "1F1F3-1F1EE",
@@ -11087,8 +12313,10 @@
     "keywords": [
       "country",
       "nation",
-      "ni"
-    ]
+      "ni",
+      "flag"
+    ],
+    "moji": "🇳🇮"
   },
   "flag_nl": {
     "unicode": "1F1F3-1F1F1",
@@ -11105,8 +12333,10 @@
       "nation",
       "nederland",
       "holland",
-      "nl"
-    ]
+      "nl",
+      "flag"
+    ],
+    "moji": "🇳🇱"
   },
   "flag_no": {
     "unicode": "1F1F3-1F1F4",
@@ -11122,8 +12352,10 @@
       "country",
       "nation",
       "norge",
-      "no"
-    ]
+      "no",
+      "flag"
+    ],
+    "moji": "🇳🇴"
   },
   "flag_np": {
     "unicode": "1F1F3-1F1F5",
@@ -11138,8 +12370,10 @@
     "keywords": [
       "country",
       "nation",
-      "np"
-    ]
+      "np",
+      "flag"
+    ],
+    "moji": "🇳🇵"
   },
   "flag_nr": {
     "unicode": "1F1F3-1F1F7",
@@ -11154,8 +12388,10 @@
     "keywords": [
       "country",
       "nation",
-      "nr"
-    ]
+      "nr",
+      "flag"
+    ],
+    "moji": "🇳🇷"
   },
   "flag_nu": {
     "unicode": "1F1F3-1F1FA",
@@ -11170,8 +12406,10 @@
     "keywords": [
       "country",
       "nation",
-      "nu"
-    ]
+      "nu",
+      "flag"
+    ],
+    "moji": "🇳🇺"
   },
   "flag_nz": {
     "unicode": "1F1F3-1F1FF",
@@ -11187,8 +12425,10 @@
       "country",
       "nation",
       "aotearoa",
-      "nz"
-    ]
+      "nz",
+      "flag"
+    ],
+    "moji": "🇳🇿"
   },
   "flag_om": {
     "unicode": "1F1F4-1F1F2",
@@ -11204,8 +12444,10 @@
       "country",
       "nation",
       "saltanat uman",
-      "om"
-    ]
+      "om",
+      "flag"
+    ],
+    "moji": "🇴🇲"
   },
   "flag_pa": {
     "unicode": "1F1F5-1F1E6",
@@ -11220,8 +12462,10 @@
     "keywords": [
       "country",
       "nation",
-      "pa"
-    ]
+      "pa",
+      "flag"
+    ],
+    "moji": "🇵🇦"
   },
   "flag_pe": {
     "unicode": "1F1F5-1F1EA",
@@ -11236,8 +12480,10 @@
     "keywords": [
       "country",
       "nation",
-      "pe"
-    ]
+      "pe",
+      "flag"
+    ],
+    "moji": "🇵🇪"
   },
   "flag_pf": {
     "unicode": "1F1F5-1F1EB",
@@ -11254,8 +12500,10 @@
       "nation",
       "polyn&eacute;sie fran&ccedil;aise",
       "polynesie francaise",
-      "pf"
-    ]
+      "pf",
+      "flag"
+    ],
+    "moji": "🇵🇫"
   },
   "flag_pg": {
     "unicode": "1F1F5-1F1EC",
@@ -11271,8 +12519,10 @@
       "country",
       "nation",
       "papua niu gini",
-      "pg"
-    ]
+      "pg",
+      "flag"
+    ],
+    "moji": "🇵🇬"
   },
   "flag_ph": {
     "unicode": "1F1F5-1F1ED",
@@ -11288,8 +12538,10 @@
       "country",
       "nation",
       "pilipinas",
-      "ph"
-    ]
+      "ph",
+      "flag"
+    ],
+    "moji": "🇵🇭"
   },
   "flag_pk": {
     "unicode": "1F1F5-1F1F0",
@@ -11304,8 +12556,10 @@
     "keywords": [
       "country",
       "nation",
-      "pk"
-    ]
+      "pk",
+      "flag"
+    ],
+    "moji": "🇵🇰"
   },
   "flag_pl": {
     "unicode": "1F1F5-1F1F1",
@@ -11321,12 +12575,14 @@
       "country",
       "nation",
       "polska",
-      "pl"
-    ]
+      "pl",
+      "flag"
+    ],
+    "moji": "🇵🇱"
   },
   "flag_pm": {
     "unicode": "1F1F5-1F1F2",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "saint pierre and miquelon",
     "shortname": ":flag_pm:",
     "category": "flags",
@@ -11334,11 +12590,15 @@
       ":pm:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇵🇲"
   },
   "flag_pn": {
     "unicode": "1F1F5-1F1F3",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "pitcairn",
     "shortname": ":flag_pn:",
     "category": "flags",
@@ -11346,7 +12606,11 @@
       ":pn:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇵🇳"
   },
   "flag_pr": {
     "unicode": "1F1F5-1F1F7",
@@ -11361,8 +12625,10 @@
     "keywords": [
       "country",
       "nation",
-      "pr"
-    ]
+      "pr",
+      "flag"
+    ],
+    "moji": "🇵🇷"
   },
   "flag_ps": {
     "unicode": "1F1F5-1F1F8",
@@ -11377,8 +12643,10 @@
     "keywords": [
       "country",
       "nation",
-      "ps"
-    ]
+      "ps",
+      "flag"
+    ],
+    "moji": "🇵🇸"
   },
   "flag_pt": {
     "unicode": "1F1F5-1F1F9",
@@ -11393,8 +12661,10 @@
     "keywords": [
       "country",
       "nation",
-      "pt"
-    ]
+      "pt",
+      "flag"
+    ],
+    "moji": "🇵🇹"
   },
   "flag_pw": {
     "unicode": "1F1F5-1F1FC",
@@ -11410,8 +12680,10 @@
       "country",
       "nation",
       "belau",
-      "pw"
-    ]
+      "pw",
+      "flag"
+    ],
+    "moji": "🇵🇼"
   },
   "flag_py": {
     "unicode": "1F1F5-1F1FE",
@@ -11426,8 +12698,10 @@
     "keywords": [
       "country",
       "nation",
-      "py"
-    ]
+      "py",
+      "flag"
+    ],
+    "moji": "🇵🇾"
   },
   "flag_qa": {
     "unicode": "1F1F6-1F1E6",
@@ -11443,12 +12717,14 @@
       "country",
       "nation",
       "dawlat qatar",
-      "qa"
-    ]
+      "qa",
+      "flag"
+    ],
+    "moji": "🇶🇦"
   },
   "flag_re": {
     "unicode": "1F1F7-1F1EA",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "réunion",
     "shortname": ":flag_re:",
     "category": "flags",
@@ -11456,7 +12732,11 @@
       ":re:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇷🇪"
   },
   "flag_ro": {
     "unicode": "1F1F7-1F1F4",
@@ -11471,8 +12751,10 @@
     "keywords": [
       "country",
       "nation",
-      "ro"
-    ]
+      "ro",
+      "flag"
+    ],
+    "moji": "🇷🇴"
   },
   "flag_rs": {
     "unicode": "1F1F7-1F1F8",
@@ -11488,8 +12770,10 @@
       "country",
       "nation",
       "srbija",
-      "rs"
-    ]
+      "rs",
+      "flag"
+    ],
+    "moji": "🇷🇸"
   },
   "flag_ru": {
     "unicode": "1F1F7-1F1FA",
@@ -11505,8 +12789,10 @@
       "nation",
       "russian",
       "country",
-      "ru"
-    ]
+      "ru",
+      "flag"
+    ],
+    "moji": "🇷🇺"
   },
   "flag_rw": {
     "unicode": "1F1F7-1F1FC",
@@ -11521,8 +12807,10 @@
     "keywords": [
       "country",
       "nation",
-      "rw"
-    ]
+      "rw",
+      "flag"
+    ],
+    "moji": "🇷🇼"
   },
   "flag_sa": {
     "unicode": "1F1F8-1F1E6",
@@ -11539,8 +12827,10 @@
       "country",
       "nation",
       "al arabiyah as suudiyah",
-      "sa"
-    ]
+      "sa",
+      "flag"
+    ],
+    "moji": "🇸🇦"
   },
   "flag_sb": {
     "unicode": "1F1F8-1F1E7",
@@ -11555,8 +12845,10 @@
     "keywords": [
       "country",
       "nation",
-      "sb"
-    ]
+      "sb",
+      "flag"
+    ],
+    "moji": "🇸🇧"
   },
   "flag_sc": {
     "unicode": "1F1F8-1F1E8",
@@ -11572,8 +12864,10 @@
       "country",
       "nation",
       "seychelles",
-      "sc"
-    ]
+      "sc",
+      "flag"
+    ],
+    "moji": "🇸🇨"
   },
   "flag_sd": {
     "unicode": "1F1F8-1F1E9",
@@ -11589,8 +12883,10 @@
       "country",
       "nation",
       "as-sudan",
-      "sd"
-    ]
+      "sd",
+      "flag"
+    ],
+    "moji": "🇸🇩"
   },
   "flag_se": {
     "unicode": "1F1F8-1F1EA",
@@ -11606,8 +12902,10 @@
       "country",
       "nation",
       "sverige",
-      "se"
-    ]
+      "se",
+      "flag"
+    ],
+    "moji": "🇸🇪"
   },
   "flag_sg": {
     "unicode": "1F1F8-1F1EC",
@@ -11622,8 +12920,10 @@
     "keywords": [
       "country",
       "nation",
-      "sg"
-    ]
+      "sg",
+      "flag"
+    ],
+    "moji": "🇸🇬"
   },
   "flag_sh": {
     "unicode": "1F1F8-1F1ED",
@@ -11638,8 +12938,10 @@
     "keywords": [
       "country",
       "nation",
-      "sh"
-    ]
+      "sh",
+      "flag"
+    ],
+    "moji": "🇸🇭"
   },
   "flag_si": {
     "unicode": "1F1F8-1F1EE",
@@ -11655,12 +12957,14 @@
       "country",
       "nation",
       "slovenija",
-      "si"
-    ]
+      "si",
+      "flag"
+    ],
+    "moji": "🇸🇮"
   },
   "flag_sj": {
     "unicode": "1F1F8-1F1EF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "svalbard and jan mayen",
     "shortname": ":flag_sj:",
     "category": "flags",
@@ -11668,7 +12972,11 @@
       ":sj:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇸🇯"
   },
   "flag_sk": {
     "unicode": "1F1F8-1F1F0",
@@ -11683,8 +12991,10 @@
     "keywords": [
       "country",
       "nation",
-      "sk"
-    ]
+      "sk",
+      "flag"
+    ],
+    "moji": "🇸🇰"
   },
   "flag_sl": {
     "unicode": "1F1F8-1F1F1",
@@ -11699,8 +13009,10 @@
     "keywords": [
       "country",
       "nation",
-      "sl"
-    ]
+      "sl",
+      "flag"
+    ],
+    "moji": "🇸🇱"
   },
   "flag_sm": {
     "unicode": "1F1F8-1F1F2",
@@ -11715,8 +13027,10 @@
     "keywords": [
       "country",
       "nation",
-      "sm"
-    ]
+      "sm",
+      "flag"
+    ],
+    "moji": "🇸🇲"
   },
   "flag_sn": {
     "unicode": "1F1F8-1F1F3",
@@ -11731,8 +13045,10 @@
     "keywords": [
       "country",
       "nation",
-      "sn"
-    ]
+      "sn",
+      "flag"
+    ],
+    "moji": "🇸🇳"
   },
   "flag_so": {
     "unicode": "1F1F8-1F1F4",
@@ -11747,8 +13063,10 @@
     "keywords": [
       "country",
       "nation",
-      "so"
-    ]
+      "so",
+      "flag"
+    ],
+    "moji": "🇸🇴"
   },
   "flag_sr": {
     "unicode": "1F1F8-1F1F7",
@@ -11763,12 +13081,14 @@
     "keywords": [
       "country",
       "nation",
-      "sr"
-    ]
+      "sr",
+      "flag"
+    ],
+    "moji": "🇸🇷"
   },
   "flag_ss": {
     "unicode": "1F1F8-1F1F8",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "south sudan",
     "shortname": ":flag_ss:",
     "category": "flags",
@@ -11776,7 +13096,11 @@
       ":ss:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇸🇸"
   },
   "flag_st": {
     "unicode": "1F1F8-1F1F9",
@@ -11792,8 +13116,10 @@
       "country",
       "nation",
       "sao tome e principe",
-      "st"
-    ]
+      "st",
+      "flag"
+    ],
+    "moji": "🇸🇹"
   },
   "flag_sv": {
     "unicode": "1F1F8-1F1FB",
@@ -11808,12 +13134,14 @@
     "keywords": [
       "country",
       "nation",
-      "sv"
-    ]
+      "sv",
+      "flag"
+    ],
+    "moji": "🇸🇻"
   },
   "flag_sx": {
     "unicode": "1F1F8-1F1FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "sint maarten",
     "shortname": ":flag_sx:",
     "category": "flags",
@@ -11821,7 +13149,11 @@
       ":sx:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇸🇽"
   },
   "flag_sy": {
     "unicode": "1F1F8-1F1FE",
@@ -11836,8 +13168,10 @@
     "keywords": [
       "country",
       "nation",
-      "sy"
-    ]
+      "sy",
+      "flag"
+    ],
+    "moji": "🇸🇾"
   },
   "flag_sz": {
     "unicode": "1F1F8-1F1FF",
@@ -11852,12 +13186,14 @@
     "keywords": [
       "country",
       "nation",
-      "sz"
-    ]
+      "sz",
+      "flag"
+    ],
+    "moji": "🇸🇿"
   },
   "flag_ta": {
     "unicode": "1F1F9-1F1E6",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "tristan da cunha",
     "shortname": ":flag_ta:",
     "category": "flags",
@@ -11865,11 +13201,15 @@
       ":ta:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇹🇦"
   },
   "flag_tc": {
     "unicode": "1F1F9-1F1E8",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "turks and caicos islands",
     "shortname": ":flag_tc:",
     "category": "flags",
@@ -11877,7 +13217,11 @@
       ":tc:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇹🇨"
   },
   "flag_td": {
     "unicode": "1F1F9-1F1E9",
@@ -11893,12 +13237,14 @@
       "country",
       "nation",
       "tchad",
-      "td"
-    ]
+      "td",
+      "flag"
+    ],
+    "moji": "🇹🇩"
   },
   "flag_tf": {
     "unicode": "1F1F9-1F1EB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "french southern territories",
     "shortname": ":flag_tf:",
     "category": "flags",
@@ -11906,7 +13252,11 @@
       ":tf:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇹🇫"
   },
   "flag_tg": {
     "unicode": "1F1F9-1F1EC",
@@ -11922,8 +13272,10 @@
       "country",
       "nation",
       "republique togolaise",
-      "tg"
-    ]
+      "tg",
+      "flag"
+    ],
+    "moji": "🇹🇬"
   },
   "flag_th": {
     "unicode": "1F1F9-1F1ED",
@@ -11939,8 +13291,10 @@
       "country",
       "nation",
       "prathet thai",
-      "th"
-    ]
+      "th",
+      "flag"
+    ],
+    "moji": "🇹🇭"
   },
   "flag_tj": {
     "unicode": "1F1F9-1F1EF",
@@ -11956,12 +13310,14 @@
       "country",
       "nation",
       "jumhurii tojikiston",
-      "tj"
-    ]
+      "tj",
+      "flag"
+    ],
+    "moji": "🇹🇯"
   },
   "flag_tk": {
     "unicode": "1F1F9-1F1F0",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "tokelau",
     "shortname": ":flag_tk:",
     "category": "flags",
@@ -11969,7 +13325,11 @@
       ":tk:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇹🇰"
   },
   "flag_tl": {
     "unicode": "1F1F9-1F1F1",
@@ -11984,8 +13344,10 @@
     "keywords": [
       "country",
       "nation",
-      "tl"
-    ]
+      "tl",
+      "flag"
+    ],
+    "moji": "🇹🇱"
   },
   "flag_tm": {
     "unicode": "1F1F9-1F1F2",
@@ -12000,8 +13362,10 @@
     "keywords": [
       "country",
       "nation",
-      "tm"
-    ]
+      "tm",
+      "flag"
+    ],
+    "moji": "🇹🇲"
   },
   "flag_tn": {
     "unicode": "1F1F9-1F1F3",
@@ -12017,8 +13381,10 @@
       "country",
       "nation",
       "tunis",
-      "tn"
-    ]
+      "tn",
+      "flag"
+    ],
+    "moji": "🇹🇳"
   },
   "flag_to": {
     "unicode": "1F1F9-1F1F4",
@@ -12033,8 +13399,10 @@
     "keywords": [
       "country",
       "nation",
-      "to"
-    ]
+      "to",
+      "flag"
+    ],
+    "moji": "🇹🇴"
   },
   "flag_tr": {
     "unicode": "1F1F9-1F1F7",
@@ -12049,8 +13417,10 @@
     "keywords": [
       "country",
       "nation",
-      "turkiye"
-    ]
+      "turkiye",
+      "flag"
+    ],
+    "moji": "🇹🇷"
   },
   "flag_tt": {
     "unicode": "1F1F9-1F1F9",
@@ -12065,8 +13435,10 @@
     "keywords": [
       "country",
       "nation",
-      "tt"
-    ]
+      "tt",
+      "flag"
+    ],
+    "moji": "🇹🇹"
   },
   "flag_tv": {
     "unicode": "1F1F9-1F1FB",
@@ -12081,8 +13453,10 @@
     "keywords": [
       "country",
       "nation",
-      "tv"
-    ]
+      "tv",
+      "flag"
+    ],
+    "moji": "🇹🇻"
   },
   "flag_tw": {
     "unicode": "1F1F9-1F1FC",
@@ -12098,8 +13472,10 @@
       "country",
       "nation",
       "taiwan",
-      "tw"
-    ]
+      "tw",
+      "flag"
+    ],
+    "moji": "🇹🇼"
   },
   "flag_tz": {
     "unicode": "1F1F9-1F1FF",
@@ -12114,8 +13490,10 @@
     "keywords": [
       "country",
       "nation",
-      "tz"
-    ]
+      "tz",
+      "flag"
+    ],
+    "moji": "🇹🇿"
   },
   "flag_ua": {
     "unicode": "1F1FA-1F1E6",
@@ -12131,8 +13509,10 @@
       "country",
       "nation",
       "ukrayina",
-      "ua"
-    ]
+      "ua",
+      "flag"
+    ],
+    "moji": "🇺🇦"
   },
   "flag_ug": {
     "unicode": "1F1FA-1F1EC",
@@ -12147,12 +13527,14 @@
     "keywords": [
       "country",
       "nation",
-      "ug"
-    ]
+      "ug",
+      "flag"
+    ],
+    "moji": "🇺🇬"
   },
   "flag_um": {
     "unicode": "1F1FA-1F1F2",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "united states minor outlying islands",
     "shortname": ":flag_um:",
     "category": "flags",
@@ -12160,7 +13542,11 @@
       ":um:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇺🇲"
   },
   "flag_us": {
     "unicode": "1F1FA-1F1F8",
@@ -12180,8 +13566,10 @@
       "united states of america",
       "america",
       "old glory",
-      "us"
-    ]
+      "us",
+      "flag"
+    ],
+    "moji": "🇺🇸"
   },
   "flag_uy": {
     "unicode": "1F1FA-1F1FE",
@@ -12196,8 +13584,10 @@
     "keywords": [
       "country",
       "nation",
-      "uy"
-    ]
+      "uy",
+      "flag"
+    ],
+    "moji": "🇺🇾"
   },
   "flag_uz": {
     "unicode": "1F1FA-1F1FF",
@@ -12213,8 +13603,10 @@
       "country",
       "nation",
       "uzbekiston respublikasi",
-      "uz"
-    ]
+      "uz",
+      "flag"
+    ],
+    "moji": "🇺🇿"
   },
   "flag_va": {
     "unicode": "1F1FB-1F1E6",
@@ -12229,8 +13621,10 @@
     "keywords": [
       "country",
       "nation",
-      "va"
-    ]
+      "va",
+      "flag"
+    ],
+    "moji": "🇻🇦"
   },
   "flag_vc": {
     "unicode": "1F1FB-1F1E8",
@@ -12245,8 +13639,10 @@
     "keywords": [
       "country",
       "nation",
-      "vc"
-    ]
+      "vc",
+      "flag"
+    ],
+    "moji": "🇻🇨"
   },
   "flag_ve": {
     "unicode": "1F1FB-1F1EA",
@@ -12261,12 +13657,14 @@
     "keywords": [
       "country",
       "nation",
-      "ve"
-    ]
+      "ve",
+      "flag"
+    ],
+    "moji": "🇻🇪"
   },
   "flag_vg": {
     "unicode": "1F1FB-1F1EC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "british virgin islands",
     "shortname": ":flag_vg:",
     "category": "flags",
@@ -12274,7 +13672,11 @@
       ":vg:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇻🇬"
   },
   "flag_vi": {
     "unicode": "1F1FB-1F1EE",
@@ -12289,8 +13691,10 @@
     "keywords": [
       "country",
       "nation",
-      "vi"
-    ]
+      "vi",
+      "flag"
+    ],
+    "moji": "🇻🇮"
   },
   "flag_vn": {
     "unicode": "1F1FB-1F1F3",
@@ -12306,8 +13710,10 @@
       "country",
       "nation",
       "viet nam",
-      "vn"
-    ]
+      "vn",
+      "flag"
+    ],
+    "moji": "🇻🇳"
   },
   "flag_vu": {
     "unicode": "1F1FB-1F1FA",
@@ -12322,8 +13728,10 @@
     "keywords": [
       "country",
       "nation",
-      "vu"
-    ]
+      "vu",
+      "flag"
+    ],
+    "moji": "🇻🇺"
   },
   "flag_wf": {
     "unicode": "1F1FC-1F1EB",
@@ -12338,23 +13746,27 @@
     "keywords": [
       "country",
       "nation",
-      "wf"
-    ]
+      "wf",
+      "flag"
+    ],
+    "moji": "🇼🇫"
   },
   "flag_white": {
     "unicode": "1F3F3",
     "unicode_alternates": [],
     "name": "waving white flag",
     "shortname": ":flag_white:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [
       ":waving_white_flag:"
     ],
     "aliases_ascii": [],
     "keywords": [
       "symbol",
-      "signal"
-    ]
+      "signal",
+      "object"
+    ],
+    "moji": "🏳"
   },
   "flag_ws": {
     "unicode": "1F1FC-1F1F8",
@@ -12370,8 +13782,10 @@
       "country",
       "nation",
       "american samoa",
-      "ws"
-    ]
+      "ws",
+      "flag"
+    ],
+    "moji": "🇼🇸"
   },
   "flag_xk": {
     "unicode": "1F1FD-1F1F0",
@@ -12386,8 +13800,10 @@
     "keywords": [
       "country",
       "nation",
-      "xk"
-    ]
+      "xk",
+      "flag"
+    ],
+    "moji": "🇽🇰"
   },
   "flag_ye": {
     "unicode": "1F1FE-1F1EA",
@@ -12403,12 +13819,14 @@
       "country",
       "nation",
       "al yaman",
-      "ye"
-    ]
+      "ye",
+      "flag"
+    ],
+    "moji": "🇾🇪"
   },
   "flag_yt": {
     "unicode": "1F1FE-1F1F9",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "mayotte",
     "shortname": ":flag_yt:",
     "category": "flags",
@@ -12416,7 +13834,11 @@
       ":yt:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "country",
+      "flag"
+    ],
+    "moji": "🇾🇹"
   },
   "flag_za": {
     "unicode": "1F1FF-1F1E6",
@@ -12430,8 +13852,10 @@
     "aliases_ascii": [],
     "keywords": [
       "country",
-      "nation"
-    ]
+      "nation",
+      "flag"
+    ],
+    "moji": "🇿🇦"
   },
   "flag_zm": {
     "unicode": "1F1FF-1F1F2",
@@ -12446,8 +13870,10 @@
     "keywords": [
       "country",
       "nation",
-      "zm"
-    ]
+      "zm",
+      "flag"
+    ],
+    "moji": "🇿🇲"
   },
   "flag_zw": {
     "unicode": "1F1FF-1F1FC",
@@ -12462,8 +13888,10 @@
     "keywords": [
       "country",
       "nation",
-      "zw"
-    ]
+      "zw",
+      "flag"
+    ],
+    "moji": "🇿🇼"
   },
   "flags": {
     "unicode": "1F38F",
@@ -12484,11 +13912,11 @@
       "boys",
       "celebration",
       "happiness",
-      "carp",
       "streamers",
-      "japanese",
       "holiday",
-      "flags"
+      "flags",
+      "object",
+      "japan"
     ],
     "moji": "🎏"
   },
@@ -12501,56 +13929,25 @@
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "dark"
+      "dark",
+      "electronics",
+      "object"
     ],
     "moji": "🔦"
   },
   "fleur-de-lis": {
     "unicode": "269C",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "fleur-de-lis",
     "shortname": ":fleur-de-lis:",
     "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "symbol"
-    ]
-  },
-  "flip_phone": {
-    "unicode": "1F581",
-    "unicode_alternates": [],
-    "name": "clamshell mobile phone",
-    "shortname": ":flip_phone:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":clamshell_mobile_phone:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "cellphone"
-    ]
-  },
-  "floppy_black": {
-    "unicode": "1F5AA",
-    "unicode_alternates": [],
-    "name": "black hard shell floppy disk",
-    "shortname": ":floppy_black:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":black_hard_shell_floppy_disk:"
+      "symbol",
+      "object"
     ],
-    "aliases_ascii": [],
-    "keywords": [
-      "oldschool",
-      "save",
-      "technology",
-      "storage",
-      "information",
-      "computer",
-      "drive",
-      "megabyte"
-    ]
+    "moji": "⚜"
   },
   "floppy_disk": {
     "unicode": "1F4BE",
@@ -12570,37 +13967,18 @@
       "information",
       "computer",
       "drive",
-      "megabyte"
+      "megabyte",
+      "electronics",
+      "office"
     ],
     "moji": "💾"
   },
-  "floppy_white": {
-    "unicode": "1F5AB",
-    "unicode_alternates": [],
-    "name": "white hard shell floppy disk",
-    "shortname": ":floppy_white:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":white_hard_shell_floppy_disk:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "oldschool",
-      "save",
-      "technology",
-      "storage",
-      "information",
-      "computer",
-      "drive",
-      "megabyte"
-    ]
-  },
   "flower_playing_cards": {
     "unicode": "1F3B4",
     "unicode_alternates": [],
     "name": "flower playing cards",
     "shortname": ":flower_playing_cards:",
-    "category": "objects",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -12610,7 +13988,9 @@
       "game",
       "august",
       "moon",
-      "special"
+      "special",
+      "object",
+      "symbol"
     ],
     "moji": "🎴"
   },
@@ -12619,7 +13999,7 @@
     "unicode_alternates": [],
     "name": "flushed face",
     "shortname": ":flushed:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [
       ":$",
@@ -12630,11 +14010,13 @@
       "face",
       "flattered",
       "flush",
-      "blush",
       "red",
       "pink",
       "cheeks",
-      "shy"
+      "shy",
+      "smiley",
+      "emotion",
+      "omg"
     ],
     "moji": "😳"
   },
@@ -12650,15 +14032,18 @@
       "weather",
       "damp",
       "cloud",
-      "hazy"
-    ]
+      "hazy",
+      "sky",
+      "cold"
+    ],
+    "moji": "🌫"
   },
   "foggy": {
     "unicode": "1F301",
     "unicode_alternates": [],
     "name": "foggy",
     "shortname": ":foggy:",
-    "category": "nature",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -12667,43 +14052,21 @@
       "bridge",
       "weather",
       "fog",
-      "foggy"
+      "foggy",
+      "places",
+      "building",
+      "sky",
+      "travel",
+      "vacation"
     ],
     "moji": "🌁"
   },
-  "folder": {
-    "unicode": "1F5C0",
-    "unicode_alternates": [],
-    "name": "folder",
-    "shortname": ":folder:",
-    "category": "objects_symbols",
-    "aliases": [],
-    "aliases_ascii": [],
-    "keywords": [
-      "documents"
-    ]
-  },
-  "folder_open": {
-    "unicode": "1F5C1",
-    "unicode_alternates": [],
-    "name": "open folder",
-    "shortname": ":folder_open:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":open_folder:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "documents",
-      "load"
-    ]
-  },
   "football": {
     "unicode": "1F3C8",
     "unicode_alternates": [],
     "name": "american football",
     "shortname": ":football:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -12714,7 +14077,8 @@
       "ball",
       "sport",
       "america",
-      "american"
+      "american",
+      "game"
     ],
     "moji": "🏈"
   },
@@ -12723,7 +14087,7 @@
     "unicode_alternates": [],
     "name": "footprints",
     "shortname": ":footprints:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -12736,7 +14100,7 @@
     "unicode_alternates": [],
     "name": "fork and knife",
     "shortname": ":fork_and_knife:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -12747,7 +14111,9 @@
       "restaurant",
       "meal",
       "food",
-      "eat"
+      "eat",
+      "object",
+      "weapon"
     ],
     "moji": "🍴"
   },
@@ -12756,7 +14122,7 @@
     "unicode_alternates": [],
     "name": "fork and knife with plate",
     "shortname": ":fork_knife_plate:",
-    "category": "travel_places",
+    "category": "food",
     "aliases": [
       ":fork_and_knife_with_plate:"
     ],
@@ -12768,8 +14134,10 @@
       "lunch",
       "dinner",
       "utensils",
-      "setting"
-    ]
+      "setting",
+      "object"
+    ],
+    "moji": "🍽"
   },
   "fountain": {
     "unicode": "26F2",
@@ -12778,11 +14146,13 @@
     ],
     "name": "fountain",
     "shortname": ":fountain:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "photo"
+      "photo",
+      "travel",
+      "vacation"
     ],
     "moji": "⛲"
   },
@@ -12792,15 +14162,18 @@
     "unicode_alternates": [
       "0034-FE0F-20E3"
     ],
-    "name": "digit four",
+    "name": "keycap digit four",
     "shortname": ":four:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "4",
       "blue-square",
-      "numbers"
+      "numbers",
+      "number",
+      "math",
+      "symbol"
     ]
   },
   "four_leaf_clover": {
@@ -12823,74 +14196,75 @@
       "irish",
       "saint",
       "patrick",
-      "green"
+      "green",
+      "sol"
     ],
     "moji": "🍀"
   },
-  "frame_photo": {
-    "unicode": "1F5BC",
+  "fox": {
+    "unicode": "1F98A",
     "unicode_alternates": [],
-    "name": "frame with picture",
-    "shortname": ":frame_photo:",
-    "category": "objects_symbols",
+    "name": "fox face",
+    "shortname": ":fox:",
+    "category": "nature",
     "aliases": [
-      ":frame_with_picture:"
+      ":fox_face:"
     ],
     "aliases_ascii": [],
-    "keywords": [
-      "photo"
-    ]
+    "keywords": [],
+    "moji": "🦊"
   },
-  "frame_tiles": {
-    "unicode": "1F5BD",
+  "frame_photo": {
+    "unicode": "1F5BC",
     "unicode_alternates": [],
-    "name": "frame with tiles",
-    "shortname": ":frame_tiles:",
-    "category": "objects_symbols",
+    "name": "frame with picture",
+    "shortname": ":frame_photo:",
+    "category": "objects",
     "aliases": [
-      ":frame_with_tiles:"
+      ":frame_with_picture:"
     ],
     "aliases_ascii": [],
     "keywords": [
       "photo",
-      "painting"
-    ]
-  },
-  "frame_x": {
-    "unicode": "1F5BE",
-    "unicode_alternates": [],
-    "name": "frame with an x",
-    "shortname": ":frame_x:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":frame_with_an_x:"
+      "travel",
+      "vacation"
     ],
-    "aliases_ascii": [],
-    "keywords": [
-      "photo",
-      "painting"
-    ]
+    "moji": "🖼"
   },
   "free": {
     "unicode": "1F193",
     "unicode_alternates": [],
     "name": "squared free",
     "shortname": ":free:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "blue-square",
-      "words"
+      "words",
+      "symbol"
     ],
     "moji": "🆓"
   },
+  "french_bread": {
+    "unicode": "1F956",
+    "unicode_alternates": [],
+    "name": "baguette bread",
+    "shortname": ":french_bread:",
+    "category": "food",
+    "aliases": [
+      ":baguette_bread:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🥖"
+  },
   "fried_shrimp": {
     "unicode": "1F364",
     "unicode_alternates": [],
     "name": "fried shrimp",
     "shortname": ":fried_shrimp:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -12909,7 +14283,7 @@
     "unicode_alternates": [],
     "name": "french fries",
     "shortname": ":fries:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -12920,7 +14294,8 @@
       "potato",
       "fry",
       "russet",
-      "idaho"
+      "idaho",
+      "america"
     ],
     "moji": "🍟"
   },
@@ -12934,7 +14309,8 @@
     "aliases_ascii": [],
     "keywords": [
       "animal",
-      "nature"
+      "nature",
+      "wildlife"
     ],
     "moji": "🐸"
   },
@@ -12943,7 +14319,7 @@
     "unicode_alternates": [],
     "name": "frowning face with open mouth",
     "shortname": ":frowning:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [
       ":anguished:"
     ],
@@ -12955,13 +14331,16 @@
       "sad",
       "pout",
       "sulk",
-      "glower"
+      "glower",
+      "smiley",
+      "surprised",
+      "emotion"
     ],
     "moji": "😦"
   },
   "frowning2": {
     "unicode": "2639",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white frowning face",
     "shortname": ":frowning2:",
     "category": "people",
@@ -12971,8 +14350,12 @@
     "aliases_ascii": [],
     "keywords": [
       "frown",
-      "person"
-    ]
+      "person",
+      "sad",
+      "smiley",
+      "emotion"
+    ],
+    "moji": "☹"
   },
   "fuelpump": {
     "unicode": "26FD",
@@ -12981,12 +14364,14 @@
     ],
     "name": "fuel pump",
     "shortname": ":fuelpump:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "gas station",
-      "petroleum"
+      "petroleum",
+      "object",
+      "gas pump"
     ],
     "moji": "⛽"
   },
@@ -13010,7 +14395,8 @@
       "monster",
       "spooky",
       "werewolves",
-      "twilight"
+      "twilight",
+      "space"
     ],
     "moji": "🌕"
   },
@@ -13029,12 +14415,13 @@
       "anthropomorphic",
       "face",
       "sky",
-      "night",
       "cheese",
       "phase",
       "spooky",
       "werewolves",
-      "monsters"
+      "monsters",
+      "space",
+      "goodnight"
     ],
     "moji": "🌝"
   },
@@ -13043,23 +14430,24 @@
     "unicode_alternates": [],
     "name": "game die",
     "shortname": ":game_die:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "dice",
       "game",
       "die",
-      "dice",
       "craps",
       "gamble",
-      "play"
+      "play",
+      "object",
+      "boys night"
     ],
     "moji": "🎲"
   },
   "gear": {
     "unicode": "2699",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "gear",
     "shortname": ":gear:",
     "category": "objects",
@@ -13068,19 +14456,22 @@
     "keywords": [
       "object",
       "tool"
-    ]
+    ],
+    "moji": "⚙"
   },
   "gem": {
     "unicode": "1F48E",
     "unicode_alternates": [],
     "name": "gem stone",
     "shortname": ":gem:",
-    "category": "emoticons",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "blue",
-      "ruby"
+      "ruby",
+      "object",
+      "gem"
     ],
     "moji": "💎"
   },
@@ -13091,7 +14482,7 @@
     ],
     "name": "gemini",
     "shortname": ":gemini:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -13103,9 +14494,8 @@
       "stars",
       "zodiac",
       "sign",
-      "sign",
-      "zodiac",
-      "horoscope"
+      "horoscope",
+      "symbol"
     ],
     "moji": "♊"
   },
@@ -13114,11 +14504,13 @@
     "unicode_alternates": [],
     "name": "ghost",
     "shortname": ":ghost:",
-    "category": "objects",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "halloween"
+      "halloween",
+      "holidays",
+      "monster"
     ],
     "moji": "👻"
   },
@@ -13136,11 +14528,12 @@
       "present",
       "xmas",
       "gift",
-      "present",
       "wrap",
       "package",
-      "birthday",
-      "wedding"
+      "wedding",
+      "object",
+      "holidays",
+      "parties"
     ],
     "moji": "🎁"
   },
@@ -13149,12 +14542,14 @@
     "unicode_alternates": [],
     "name": "heart with ribbon",
     "shortname": ":gift_heart:",
-    "category": "objects",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "love",
-      "valentines"
+      "valentines",
+      "symbol",
+      "condolence"
     ],
     "moji": "💝"
   },
@@ -13163,18 +14558,22 @@
     "unicode_alternates": [],
     "name": "girl",
     "shortname": ":girl:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "female",
-      "woman"
+      "woman",
+      "people",
+      "women",
+      "baby",
+      "diversity"
     ],
     "moji": "👧"
   },
   "girl_tone1": {
     "unicode": "1F467-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "girl tone 1",
     "shortname": ":girl_tone1:",
     "category": "people",
@@ -13184,11 +14583,12 @@
       "female",
       "kid",
       "child"
-    ]
+    ],
+    "moji": "👧🏻"
   },
   "girl_tone2": {
     "unicode": "1F467-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "girl tone 2",
     "shortname": ":girl_tone2:",
     "category": "people",
@@ -13198,11 +14598,12 @@
       "female",
       "kid",
       "child"
-    ]
+    ],
+    "moji": "👧🏼"
   },
   "girl_tone3": {
     "unicode": "1F467-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "girl tone 3",
     "shortname": ":girl_tone3:",
     "category": "people",
@@ -13212,11 +14613,12 @@
       "female",
       "kid",
       "child"
-    ]
+    ],
+    "moji": "👧🏽"
   },
   "girl_tone4": {
     "unicode": "1F467-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "girl tone 4",
     "shortname": ":girl_tone4:",
     "category": "people",
@@ -13226,11 +14628,12 @@
       "female",
       "kid",
       "child"
-    ]
+    ],
+    "moji": "👧🏾"
   },
   "girl_tone5": {
     "unicode": "1F467-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "girl tone 5",
     "shortname": ":girl_tone5:",
     "category": "people",
@@ -13240,42 +14643,43 @@
       "female",
       "kid",
       "child"
-    ]
-  },
-  "girls_symbol": {
-    "unicode": "1F6CA",
-    "unicode_alternates": [],
-    "name": "girls symbol",
-    "shortname": ":girls_symbol:",
-    "category": "objects_symbols",
-    "aliases": [],
-    "aliases_ascii": [],
-    "keywords": [
-      "female",
-      "child"
-    ]
+    ],
+    "moji": "👧🏿"
   },
   "globe_with_meridians": {
     "unicode": "1F310",
     "unicode_alternates": [],
     "name": "globe with meridians",
     "shortname": ":globe_with_meridians:",
-    "category": "nature",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "earth",
       "international",
       "world",
-      "earth",
       "meridian",
       "globe",
       "space",
       "planet",
-      "home"
+      "home",
+      "symbol"
     ],
     "moji": "🌐"
   },
+  "goal": {
+    "unicode": "1F945",
+    "unicode_alternates": [],
+    "name": "goal net",
+    "shortname": ":goal:",
+    "category": "activity",
+    "aliases": [
+      ":goal_net:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🥅"
+  },
   "goat": {
     "unicode": "1F410",
     "unicode_alternates": [],
@@ -13302,12 +14706,17 @@
     ],
     "name": "flag in hole",
     "shortname": ":golf:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "business",
-      "sports"
+      "sports",
+      "game",
+      "ball",
+      "vacation",
+      "sport",
+      "golf"
     ],
     "moji": "⛳"
   },
@@ -13324,15 +14733,32 @@
       "par",
       "birdie",
       "eagle",
-      "mulligan"
-    ]
+      "mulligan",
+      "men",
+      "game",
+      "ball",
+      "vacation",
+      "golf"
+    ],
+    "moji": "🏌"
+  },
+  "gorilla": {
+    "unicode": "1F98D",
+    "unicode_alternates": [],
+    "name": "gorilla",
+    "shortname": ":gorilla:",
+    "category": "nature",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🦍"
   },
   "grapes": {
     "unicode": "1F347",
     "unicode_alternates": [],
     "name": "grapes",
     "shortname": ":grapes:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -13341,7 +14767,6 @@
       "grapes",
       "wine",
       "vinegar",
-      "fruit",
       "cluster",
       "vine"
     ],
@@ -13352,19 +14777,19 @@
     "unicode_alternates": [],
     "name": "green apple",
     "shortname": ":green_apple:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "fruit",
       "nature",
       "apple",
-      "fruit",
       "green",
       "pie",
       "granny",
       "smith",
-      "core"
+      "core",
+      "food"
     ],
     "moji": "🍏"
   },
@@ -13379,7 +14804,10 @@
     "keywords": [
       "knowledge",
       "library",
-      "read"
+      "read",
+      "object",
+      "office",
+      "book"
     ],
     "moji": "📗"
   },
@@ -13388,7 +14816,7 @@
     "unicode_alternates": [],
     "name": "green heart",
     "shortname": ":green_heart:",
-    "category": "emoticons",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -13398,14 +14826,14 @@
       "valentines",
       "green",
       "heart",
-      "love",
       "nature",
       "rebirth",
       "reborn",
       "jealous",
       "clingy",
       "envious",
-      "possessive"
+      "possessive",
+      "symbol"
     ],
     "moji": "💚"
   },
@@ -13414,11 +14842,13 @@
     "unicode_alternates": [],
     "name": "white exclamation mark ornament",
     "shortname": ":grey_exclamation:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "surprise"
+      "surprise",
+      "symbol",
+      "punctuation"
     ],
     "moji": "❕"
   },
@@ -13427,11 +14857,13 @@
     "unicode_alternates": [],
     "name": "white question mark ornament",
     "shortname": ":grey_question:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "doubts"
+      "doubts",
+      "symbol",
+      "punctuation"
     ],
     "moji": "❔"
   },
@@ -13440,16 +14872,19 @@
     "unicode_alternates": [],
     "name": "grimacing face",
     "shortname": ":grimacing:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "face",
       "grimace",
       "teeth",
-      "grimace",
       "disapprove",
-      "pain"
+      "pain",
+      "silly",
+      "smiley",
+      "emotion",
+      "selfie"
     ],
     "moji": "😬"
   },
@@ -13458,7 +14893,7 @@
     "unicode_alternates": [],
     "name": "grinning face with smiling eyes",
     "shortname": ":grin:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -13469,8 +14904,11 @@
       "grin",
       "grinning",
       "smiling",
-      "smile",
-      "smiley"
+      "smiley",
+      "silly",
+      "emotion",
+      "good",
+      "selfie"
     ],
     "moji": "😁"
   },
@@ -13479,7 +14917,7 @@
     "unicode_alternates": [],
     "name": "grinning face",
     "shortname": ":grinning:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -13490,17 +14928,17 @@
       "grin",
       "grinning",
       "smiling",
-      "smile",
-      "smiley"
+      "smiley",
+      "emotion"
     ],
-    "moji": "🕧"
+    "moji": "😀"
   },
   "guardsman": {
     "unicode": "1F482",
     "unicode_alternates": [],
     "name": "guardsman",
     "shortname": ":guardsman:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -13513,16 +14951,19 @@
       "guard",
       "bearskin",
       "hat",
-      "british",
       "queen",
       "ceremonial",
-      "military"
+      "military",
+      "people",
+      "men",
+      "diversity",
+      "job"
     ],
     "moji": "💂"
   },
   "guardsman_tone1": {
     "unicode": "1F482-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "guardsman tone 1",
     "shortname": ":guardsman_tone1:",
     "category": "people",
@@ -13537,15 +14978,15 @@
       "guard",
       "bearskin",
       "hat",
-      "british",
       "queen",
       "ceremonial",
       "military"
-    ]
+    ],
+    "moji": "💂🏻"
   },
   "guardsman_tone2": {
     "unicode": "1F482-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "guardsman tone 2",
     "shortname": ":guardsman_tone2:",
     "category": "people",
@@ -13560,15 +15001,15 @@
       "guard",
       "bearskin",
       "hat",
-      "british",
       "queen",
       "ceremonial",
       "military"
-    ]
+    ],
+    "moji": "💂🏼"
   },
   "guardsman_tone3": {
     "unicode": "1F482-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "guardsman tone 3",
     "shortname": ":guardsman_tone3:",
     "category": "people",
@@ -13583,15 +15024,15 @@
       "guard",
       "bearskin",
       "hat",
-      "british",
       "queen",
       "ceremonial",
       "military"
-    ]
+    ],
+    "moji": "💂🏽"
   },
   "guardsman_tone4": {
     "unicode": "1F482-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "guardsman tone 4",
     "shortname": ":guardsman_tone4:",
     "category": "people",
@@ -13606,15 +15047,15 @@
       "guard",
       "bearskin",
       "hat",
-      "british",
       "queen",
       "ceremonial",
       "military"
-    ]
+    ],
+    "moji": "💂🏾"
   },
   "guardsman_tone5": {
     "unicode": "1F482-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "guardsman tone 5",
     "shortname": ":guardsman_tone5:",
     "category": "people",
@@ -13629,18 +15070,18 @@
       "guard",
       "bearskin",
       "hat",
-      "british",
       "queen",
       "ceremonial",
       "military"
-    ]
+    ],
+    "moji": "💂🏿"
   },
   "guitar": {
     "unicode": "1F3B8",
     "unicode_alternates": [],
     "name": "guitar",
     "shortname": ":guitar:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -13648,12 +15089,11 @@
       "music",
       "guitar",
       "string",
-      "music",
-      "instrument",
       "jam",
       "rock",
       "acoustic",
-      "electric"
+      "electric",
+      "instruments"
     ],
     "moji": "🎸"
   },
@@ -13667,7 +15107,11 @@
     "aliases_ascii": [],
     "keywords": [
       "violence",
-      "weapon"
+      "weapon",
+      "object",
+      "dead",
+      "gun",
+      "sarcastic"
     ],
     "moji": "🔫"
   },
@@ -13676,19 +15120,22 @@
     "unicode_alternates": [],
     "name": "haircut",
     "shortname": ":haircut:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "female",
       "girl",
-      "woman"
+      "woman",
+      "people",
+      "women",
+      "diversity"
     ],
     "moji": "💇"
   },
   "haircut_tone1": {
     "unicode": "1F487-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "haircut tone 1",
     "shortname": ":haircut_tone1:",
     "category": "people",
@@ -13698,11 +15145,12 @@
       "female",
       "girl",
       "woman"
-    ]
+    ],
+    "moji": "💇🏻"
   },
   "haircut_tone2": {
     "unicode": "1F487-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "haircut tone 2",
     "shortname": ":haircut_tone2:",
     "category": "people",
@@ -13712,11 +15160,12 @@
       "female",
       "girl",
       "woman"
-    ]
+    ],
+    "moji": "💇🏼"
   },
   "haircut_tone3": {
     "unicode": "1F487-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "haircut tone 3",
     "shortname": ":haircut_tone3:",
     "category": "people",
@@ -13726,11 +15175,12 @@
       "female",
       "girl",
       "woman"
-    ]
+    ],
+    "moji": "💇🏽"
   },
   "haircut_tone4": {
     "unicode": "1F487-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "haircut tone 4",
     "shortname": ":haircut_tone4:",
     "category": "people",
@@ -13740,11 +15190,12 @@
       "female",
       "girl",
       "woman"
-    ]
+    ],
+    "moji": "💇🏾"
   },
   "haircut_tone5": {
     "unicode": "1F487-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "haircut tone 5",
     "shortname": ":haircut_tone5:",
     "category": "people",
@@ -13754,14 +15205,15 @@
       "female",
       "girl",
       "woman"
-    ]
+    ],
+    "moji": "💇🏿"
   },
   "hamburger": {
     "unicode": "1F354",
     "unicode_alternates": [],
     "name": "hamburger",
     "shortname": ":hamburger:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -13769,9 +15221,9 @@
       "meat",
       "hamburger",
       "burger",
-      "meat",
       "cow",
-      "beef"
+      "beef",
+      "america"
     ],
     "moji": "🍔"
   },
@@ -13789,13 +15241,16 @@
       "law",
       "ruling",
       "tools",
-      "verdict"
+      "verdict",
+      "object",
+      "tool",
+      "weapon"
     ],
     "moji": "🔨"
   },
   "hammer_pick": {
     "unicode": "2692",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "hammer and pick",
     "shortname": ":hammer_pick:",
     "category": "objects",
@@ -13805,8 +15260,10 @@
     "aliases_ascii": [],
     "keywords": [
       "object",
-      "tool"
-    ]
+      "tool",
+      "weapon"
+    ],
+    "moji": "⚒"
   },
   "hamster": {
     "unicode": "1F439",
@@ -13836,29 +15293,16 @@
       "hi",
       "five",
       "stop",
-      "halt"
-    ]
-  },
-  "hand_splayed_reverse": {
-    "unicode": "1F591",
-    "unicode_alternates": [],
-    "name": "reversed raised hand with fingers splayed",
-    "shortname": ":hand_splayed_reverse:",
-    "category": "people",
-    "aliases": [
-      ":reversed_raised_hand_with_fingers_splayed:"
+      "halt",
+      "body",
+      "hands",
+      "diversity"
     ],
-    "aliases_ascii": [],
-    "keywords": [
-      "hi",
-      "five",
-      "stop",
-      "halt"
-    ]
+    "moji": "🖐"
   },
   "hand_splayed_tone1": {
     "unicode": "1F590-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "raised hand with fingers splayed tone 1",
     "shortname": ":hand_splayed_tone1:",
     "category": "people",
@@ -13871,11 +15315,12 @@
       "five",
       "stop",
       "halt"
-    ]
+    ],
+    "moji": "🖐🏻"
   },
   "hand_splayed_tone2": {
     "unicode": "1F590-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "raised hand with fingers splayed tone 2",
     "shortname": ":hand_splayed_tone2:",
     "category": "people",
@@ -13888,11 +15333,12 @@
       "five",
       "stop",
       "halt"
-    ]
+    ],
+    "moji": "🖐🏼"
   },
   "hand_splayed_tone3": {
     "unicode": "1F590-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "raised hand with fingers splayed tone 3",
     "shortname": ":hand_splayed_tone3:",
     "category": "people",
@@ -13905,11 +15351,12 @@
       "five",
       "stop",
       "halt"
-    ]
+    ],
+    "moji": "🖐🏽"
   },
   "hand_splayed_tone4": {
     "unicode": "1F590-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "raised hand with fingers splayed tone 4",
     "shortname": ":hand_splayed_tone4:",
     "category": "people",
@@ -13922,11 +15369,12 @@
       "five",
       "stop",
       "halt"
-    ]
+    ],
+    "moji": "🖐🏾"
   },
   "hand_splayed_tone5": {
     "unicode": "1F590-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "raised hand with fingers splayed tone 5",
     "shortname": ":hand_splayed_tone5:",
     "category": "people",
@@ -13939,57 +15387,170 @@
       "five",
       "stop",
       "halt"
-    ]
-  },
-  "hand_victory": {
-    "unicode": "1F594",
-    "unicode_alternates": [],
-    "name": "reversed victory hand",
-    "shortname": ":hand_victory:",
-    "category": "people",
-    "aliases": [
-      ":reversed_victory_hand:"
     ],
-    "aliases_ascii": [],
-    "keywords": [
-      "fu"
-    ]
+    "moji": "🖐🏿"
   },
   "handbag": {
     "unicode": "1F45C",
     "unicode_alternates": [],
     "name": "handbag",
     "shortname": ":handbag:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "accessories",
       "accessory",
       "bag",
-      "fashion"
+      "fashion",
+      "women",
+      "vacation"
     ],
     "moji": "👜"
   },
-  "hard_disk": {
-    "unicode": "1F5B4",
+  "handball": {
+    "unicode": "1F93E",
     "unicode_alternates": [],
-    "name": "hard disk",
-    "shortname": ":hard_disk:",
-    "category": "objects_symbols",
+    "name": "handball",
+    "shortname": ":handball:",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": [
-      "save",
-      "technology",
-      "storage",
-      "information",
-      "computer",
-      "drive",
-      "megabyte",
-      "gigabyte",
-      "hd"
-    ]
+    "keywords": [],
+    "moji": "🤾"
+  },
+  "handball_tone1": {
+    "unicode": "1F93E-1F3FB",
+    "unicode_alternates": [],
+    "name": "handball tone 1",
+    "shortname": ":handball_tone1:",
+    "category": "activity",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤾🏻"
+  },
+  "handball_tone2": {
+    "unicode": "1F93E-1F3FC",
+    "unicode_alternates": [],
+    "name": "handball tone 2",
+    "shortname": ":handball_tone2:",
+    "category": "activity",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤾🏼"
+  },
+  "handball_tone3": {
+    "unicode": "1F93E-1F3FD",
+    "unicode_alternates": [],
+    "name": "handball tone 3",
+    "shortname": ":handball_tone3:",
+    "category": "activity",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤾🏽"
+  },
+  "handball_tone4": {
+    "unicode": "1F93E-1F3FE",
+    "unicode_alternates": [],
+    "name": "handball tone 4",
+    "shortname": ":handball_tone4:",
+    "category": "activity",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤾🏾"
+  },
+  "handball_tone5": {
+    "unicode": "1F93E-1F3FF",
+    "unicode_alternates": [],
+    "name": "handball tone 5",
+    "shortname": ":handball_tone5:",
+    "category": "activity",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤾🏿"
+  },
+  "handshake": {
+    "unicode": "1F91D",
+    "unicode_alternates": [],
+    "name": "handshake",
+    "shortname": ":handshake:",
+    "category": "people",
+    "aliases": [
+      ":shaking_hands:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤝"
+  },
+  "handshake_tone1": {
+    "unicode": "1F91D-1F3FB",
+    "unicode_alternates": [],
+    "name": "handshake tone 1",
+    "shortname": ":handshake_tone1:",
+    "category": "people",
+    "aliases": [
+      ":shaking_hands_tone1:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤝🏻"
+  },
+  "handshake_tone2": {
+    "unicode": "1F91D-1F3FC",
+    "unicode_alternates": [],
+    "name": "handshake tone 2",
+    "shortname": ":handshake_tone2:",
+    "category": "people",
+    "aliases": [
+      ":shaking_hands_tone2:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤝🏼"
+  },
+  "handshake_tone3": {
+    "unicode": "1F91D-1F3FD",
+    "unicode_alternates": [],
+    "name": "handshake tone 3",
+    "shortname": ":handshake_tone3:",
+    "category": "people",
+    "aliases": [
+      ":shaking_hands_tone3:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤝🏽"
+  },
+  "handshake_tone4": {
+    "unicode": "1F91D-1F3FE",
+    "unicode_alternates": [],
+    "name": "handshake tone 4",
+    "shortname": ":handshake_tone4:",
+    "category": "people",
+    "aliases": [
+      ":shaking_hands_tone4:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤝🏾"
+  },
+  "handshake_tone5": {
+    "unicode": "1F91D-1F3FF",
+    "unicode_alternates": [],
+    "name": "handshake tone 5",
+    "shortname": ":handshake_tone5:",
+    "category": "people",
+    "aliases": [
+      ":shaking_hands_tone5:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤝🏿"
   },
   "hash": {
     "moji": "#⃣",
@@ -13999,11 +15560,12 @@
     ],
     "name": "number sign",
     "shortname": ":hash:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "symbol"
+      "symbol",
+      "number"
     ]
   },
   "hatched_chick": {
@@ -14018,12 +15580,11 @@
       "baby",
       "chicken",
       "chick",
-      "baby",
       "bird",
-      "chicken",
       "young",
       "woman",
-      "cute"
+      "cute",
+      "animal"
     ],
     "moji": "🐥"
   },
@@ -14040,19 +15601,18 @@
       "chicken",
       "egg",
       "chick",
-      "egg",
       "baby",
       "bird",
-      "chicken",
       "young",
       "woman",
-      "cute"
+      "cute",
+      "animal"
     ],
     "moji": "🐣"
   },
   "head_bandage": {
     "unicode": "1F915",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "face with head-bandage",
     "shortname": ":head_bandage:",
     "category": "people",
@@ -14060,14 +15620,20 @@
       ":face_with_head_bandage:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "smiley",
+      "health",
+      "sick",
+      "emotion"
+    ],
+    "moji": "🤕"
   },
   "headphones": {
     "unicode": "1F3A7",
     "unicode_alternates": [],
     "name": "headphone",
     "shortname": ":headphones:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -14076,12 +15642,12 @@
       "score",
       "headphone",
       "sound",
-      "music",
       "ears",
       "beats",
       "buds",
       "audio",
-      "listen"
+      "listen",
+      "instruments"
     ],
     "moji": "🎧"
   },
@@ -14090,13 +15656,12 @@
     "unicode_alternates": [],
     "name": "hear-no-evil monkey",
     "shortname": ":hear_no_evil:",
-    "category": "emoticons",
+    "category": "nature",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "animal",
       "monkey",
-      "monkey",
       "ears",
       "hear",
       "sound",
@@ -14112,7 +15677,7 @@
     ],
     "name": "heavy black heart",
     "shortname": ":heart:",
-    "category": "emoticons",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [
       "<3"
@@ -14124,7 +15689,6 @@
       "pink",
       "black",
       "heart",
-      "love",
       "passion",
       "romance",
       "intense",
@@ -14132,7 +15696,9 @@
       "death",
       "evil",
       "cold",
-      "valentines"
+      "valentines",
+      "symbol",
+      "parties"
     ]
   },
   "heart_decoration": {
@@ -14140,19 +15706,20 @@
     "unicode_alternates": [],
     "name": "heart decoration",
     "shortname": ":heart_decoration:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "like",
       "love",
-      "purple-square"
+      "purple-square",
+      "symbol"
     ],
     "moji": "💟"
   },
   "heart_exclamation": {
     "unicode": "2763",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "heavy heart exclamation mark ornament",
     "shortname": ":heart_exclamation:",
     "category": "symbols",
@@ -14163,15 +15730,17 @@
     "keywords": [
       "emotion",
       "punctuation",
-      "symbol"
-    ]
+      "symbol",
+      "love"
+    ],
+    "moji": "❣"
   },
   "heart_eyes": {
     "unicode": "1F60D",
     "unicode_alternates": [],
     "name": "smiling face with heart-shaped eyes",
     "shortname": ":heart_eyes:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -14185,10 +15754,15 @@
       "smiling",
       "heart",
       "lovestruck",
-      "love",
       "flirt",
       "smile",
-      "heart-shaped"
+      "heart-shaped",
+      "happy",
+      "smiley",
+      "sex",
+      "heart eyes",
+      "emotion",
+      "beautiful"
     ],
     "moji": "😍"
   },
@@ -14197,7 +15771,7 @@
     "unicode_alternates": [],
     "name": "smiling cat face with heart-shaped eyes",
     "shortname": ":heart_eyes_cat:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -14208,41 +15782,27 @@
       "love",
       "valentines",
       "lovestruck",
-      "love",
-      "heart"
+      "heart",
+      "heart eyes",
+      "cat",
+      "beautiful"
     ],
     "moji": "😻"
   },
-  "heart_tip": {
-    "unicode": "1F394",
-    "unicode_alternates": [],
-    "name": "heart with tip on the left",
-    "shortname": ":heart_tip:",
-    "category": "celebration",
-    "aliases": [
-      ":heart_with_tip_on_the_left:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "affection",
-      "like",
-      "love",
-      "valentines"
-    ]
-  },
   "heartbeat": {
     "unicode": "1F493",
     "unicode_alternates": [],
     "name": "beating heart",
     "shortname": ":heartbeat:",
-    "category": "emoticons",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "affection",
       "like",
       "love",
-      "valentines"
+      "valentines",
+      "symbol"
     ],
     "moji": "💓"
   },
@@ -14251,14 +15811,15 @@
     "unicode_alternates": [],
     "name": "growing heart",
     "shortname": ":heartpulse:",
-    "category": "emoticons",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "affection",
       "like",
       "love",
-      "valentines"
+      "valentines",
+      "symbol"
     ],
     "moji": "💗"
   },
@@ -14269,12 +15830,15 @@
     ],
     "name": "black heart suit",
     "shortname": ":hearts:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "cards",
-      "poker"
+      "poker",
+      "love",
+      "symbol",
+      "game"
     ],
     "moji": "♥"
   },
@@ -14285,12 +15849,13 @@
     ],
     "name": "heavy check mark",
     "shortname": ":heavy_check_mark:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "nike",
-      "ok"
+      "ok",
+      "symbol"
     ],
     "moji": "✔"
   },
@@ -14299,13 +15864,14 @@
     "unicode_alternates": [],
     "name": "heavy division sign",
     "shortname": ":heavy_division_sign:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "calculation",
       "divide",
-      "math"
+      "math",
+      "symbol"
     ],
     "moji": "➗"
   },
@@ -14314,7 +15880,7 @@
     "unicode_alternates": [],
     "name": "heavy dollar sign",
     "shortname": ":heavy_dollar_sign:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -14322,12 +15888,12 @@
       "money",
       "payment",
       "dollar",
-      "currency",
-      "money",
       "cash",
       "sale",
       "purchase",
-      "value"
+      "value",
+      "math",
+      "symbol"
     ],
     "moji": "💲"
   },
@@ -14336,12 +15902,13 @@
     "unicode_alternates": [],
     "name": "heavy minus sign",
     "shortname": ":heavy_minus_sign:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "calculation",
-      "math"
+      "math",
+      "symbol"
     ],
     "moji": "➖"
   },
@@ -14352,12 +15919,13 @@
     ],
     "name": "heavy multiplication x",
     "shortname": ":heavy_multiplication_x:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "calculation",
-      "math"
+      "math",
+      "symbol"
     ],
     "moji": "✖"
   },
@@ -14366,12 +15934,13 @@
     "unicode_alternates": [],
     "name": "heavy plus sign",
     "shortname": ":heavy_plus_sign:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "calculation",
-      "math"
+      "math",
+      "symbol"
     ],
     "moji": "➕"
   },
@@ -14380,7 +15949,7 @@
     "unicode_alternates": [],
     "name": "helicopter",
     "shortname": ":helicopter:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -14389,13 +15958,16 @@
       "helicopter",
       "helo",
       "gyro",
-      "gyrocopter"
+      "gyrocopter",
+      "plane",
+      "travel",
+      "fly"
     ],
     "moji": "🚁"
   },
   "helmet_with_cross": {
     "unicode": "26D1",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "helmet with white cross",
     "shortname": ":helmet_with_cross:",
     "category": "people",
@@ -14407,8 +15979,12 @@
       "aid",
       "face",
       "hat",
-      "person"
-    ]
+      "person",
+      "object",
+      "accessories",
+      "job"
+    ],
+    "moji": "⛑"
   },
   "herb": {
     "unicode": "1F33F",
@@ -14427,9 +16003,10 @@
       "weed",
       "herb",
       "spice",
-      "plant",
       "cook",
-      "cooking"
+      "cooking",
+      "nature",
+      "leaf"
     ],
     "moji": "🌿"
   },
@@ -14447,7 +16024,9 @@
       "vegetable",
       "hibiscus",
       "flower",
-      "warm"
+      "warm",
+      "nature",
+      "tropical"
     ],
     "moji": "🌺"
   },
@@ -14456,13 +16035,14 @@
     "unicode_alternates": [],
     "name": "high brightness symbol",
     "shortname": ":high_brightness:",
-    "category": "objects",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "light",
       "summer",
-      "sun"
+      "sun",
+      "symbol"
     ],
     "moji": "🔆"
   },
@@ -14471,45 +16051,57 @@
     "unicode_alternates": [],
     "name": "high-heeled shoe",
     "shortname": ":high_heel:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "fashion",
       "female",
-      "shoes"
+      "shoes",
+      "women",
+      "shoe",
+      "sexy",
+      "accessories",
+      "girls night"
     ],
     "moji": "👠"
   },
   "hockey": {
     "unicode": "1F3D2",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "ice hockey stick and puck",
     "shortname": ":hockey:",
     "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "game",
+      "sport",
+      "hockey"
+    ],
+    "moji": "🏒"
   },
   "hole": {
     "unicode": "1F573",
     "unicode_alternates": [],
     "name": "hole",
     "shortname": ":hole:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "pit",
-      "well"
-    ]
+      "well",
+      "object"
+    ],
+    "moji": "🕳"
   },
   "homes": {
     "unicode": "1F3D8",
     "unicode_alternates": [],
     "name": "house buildings",
     "shortname": ":homes:",
-    "category": "travel_places",
+    "category": "travel",
     "aliases": [
       ":house_buildings:"
     ],
@@ -14521,15 +16113,19 @@
       "mansion",
       "bungalow",
       "ranch",
-      "craftsman"
-    ]
+      "craftsman",
+      "places",
+      "building",
+      "house"
+    ],
+    "moji": "🏘"
   },
   "honey_pot": {
     "unicode": "1F36F",
     "unicode_alternates": [],
     "name": "honey pot",
     "shortname": ":honey_pot:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -14537,9 +16133,10 @@
       "sweet",
       "honey",
       "pot",
-      "bees",
       "pooh",
-      "bear"
+      "bear",
+      "food",
+      "vagina"
     ],
     "moji": "🍯"
   },
@@ -14553,7 +16150,8 @@
     "aliases_ascii": [],
     "keywords": [
       "animal",
-      "brown"
+      "brown",
+      "wildlife"
     ],
     "moji": "🐴"
   },
@@ -14562,7 +16160,7 @@
     "unicode_alternates": [],
     "name": "horse racing",
     "shortname": ":horse_racing:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -14573,13 +16171,16 @@
       "race",
       "racing",
       "jockey",
-      "triple crown"
+      "triple crown",
+      "men",
+      "sport",
+      "horse racing"
     ],
     "moji": "🏇"
   },
   "horse_racing_tone1": {
     "unicode": "1F3C7-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "horse racing tone 1",
     "shortname": ":horse_racing_tone1:",
     "category": "activity",
@@ -14592,11 +16193,12 @@
       "race",
       "jockey",
       "triple crown"
-    ]
+    ],
+    "moji": "🏇🏻"
   },
   "horse_racing_tone2": {
     "unicode": "1F3C7-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "horse racing tone 2",
     "shortname": ":horse_racing_tone2:",
     "category": "activity",
@@ -14609,11 +16211,12 @@
       "race",
       "jockey",
       "triple crown"
-    ]
+    ],
+    "moji": "🏇🏼"
   },
   "horse_racing_tone3": {
     "unicode": "1F3C7-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "horse racing tone 3",
     "shortname": ":horse_racing_tone3:",
     "category": "activity",
@@ -14626,11 +16229,12 @@
       "race",
       "jockey",
       "triple crown"
-    ]
+    ],
+    "moji": "🏇🏽"
   },
   "horse_racing_tone4": {
     "unicode": "1F3C7-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "horse racing tone 4",
     "shortname": ":horse_racing_tone4:",
     "category": "activity",
@@ -14643,11 +16247,12 @@
       "race",
       "jockey",
       "triple crown"
-    ]
+    ],
+    "moji": "🏇🏾"
   },
   "horse_racing_tone5": {
     "unicode": "1F3C7-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "horse racing tone 5",
     "shortname": ":horse_racing_tone5:",
     "category": "activity",
@@ -14660,21 +16265,24 @@
       "race",
       "jockey",
       "triple crown"
-    ]
+    ],
+    "moji": "🏇🏿"
   },
   "hospital": {
     "unicode": "1F3E5",
     "unicode_alternates": [],
     "name": "hospital",
     "shortname": ":hospital:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "building",
       "doctor",
       "health",
-      "surgery"
+      "surgery",
+      "places",
+      "911"
     ],
     "moji": "🏥"
   },
@@ -14683,7 +16291,7 @@
     "unicode_alternates": [],
     "name": "hot pepper",
     "shortname": ":hot_pepper:",
-    "category": "food_drink",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -14693,27 +16301,33 @@
       "chili",
       "cayenne",
       "habanero",
-      "jalapeno"
-    ]
+      "jalapeno",
+      "vegetables"
+    ],
+    "moji": "🌶"
   },
   "hotdog": {
     "unicode": "1F32D",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "hot dog",
     "shortname": ":hotdog:",
-    "category": "foods",
+    "category": "food",
     "aliases": [
       ":hot_dog:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "america",
+      "food"
+    ],
+    "moji": "🌭"
   },
   "hotel": {
     "unicode": "1F3E8",
     "unicode_alternates": [],
     "name": "hotel",
     "shortname": ":hotel:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -14724,7 +16338,9 @@
       "hotel",
       "motel",
       "holiday inn",
-      "hospital"
+      "hospital",
+      "places",
+      "vacation"
     ],
     "moji": "🏨"
   },
@@ -14735,13 +16351,14 @@
     ],
     "name": "hot springs",
     "shortname": ":hotsprings:",
-    "category": "places",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "bath",
       "relax",
-      "warm"
+      "warm",
+      "symbol"
     ],
     "moji": "♨"
   },
@@ -14758,7 +16375,8 @@
     "keywords": [
       "clock",
       "oldschool",
-      "time"
+      "time",
+      "object"
     ],
     "moji": "⌛"
   },
@@ -14773,7 +16391,8 @@
     "keywords": [
       "countdown",
       "oldschool",
-      "time"
+      "time",
+      "object"
     ],
     "moji": "⏳"
   },
@@ -14782,20 +16401,20 @@
     "unicode_alternates": [],
     "name": "house building",
     "shortname": ":house:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "building",
       "home",
       "house",
-      "home",
       "residence",
       "dwelling",
       "mansion",
       "bungalow",
       "ranch",
-      "craftsman"
+      "craftsman",
+      "places"
     ],
     "moji": "🏠"
   },
@@ -14804,7 +16423,7 @@
     "unicode_alternates": [],
     "name": "derelict house building",
     "shortname": ":house_abandoned:",
-    "category": "travel_places",
+    "category": "travel",
     "aliases": [
       ":derelict_house_building:"
     ],
@@ -14821,27 +16440,34 @@
       "abandoned",
       "vacant",
       "run down",
-      "shoddy"
-    ]
+      "shoddy",
+      "places",
+      "building",
+      "house"
+    ],
+    "moji": "🏚"
   },
   "house_with_garden": {
     "unicode": "1F3E1",
     "unicode_alternates": [],
     "name": "house with garden",
     "shortname": ":house_with_garden:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "home",
       "nature",
-      "plant"
+      "plant",
+      "places",
+      "building",
+      "house"
     ],
     "moji": "🏡"
   },
   "hugging": {
     "unicode": "1F917",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "hugging face",
     "shortname": ":hugging:",
     "category": "people",
@@ -14849,14 +16475,19 @@
       ":hugging_face:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "smiley",
+      "hug",
+      "thank you"
+    ],
+    "moji": "🤗"
   },
   "hushed": {
     "unicode": "1F62F",
     "unicode_alternates": [],
     "name": "hushed face",
     "shortname": ":hushed:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -14865,7 +16496,10 @@
       "quiet",
       "hush",
       "whisper",
-      "silent"
+      "silent",
+      "smiley",
+      "surprised",
+      "wow"
     ],
     "moji": "😯"
   },
@@ -14874,7 +16508,7 @@
     "unicode_alternates": [],
     "name": "ice cream",
     "shortname": ":ice_cream:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -14896,7 +16530,7 @@
   },
   "ice_skate": {
     "unicode": "26F8",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "ice skate",
     "shortname": ":ice_skate:",
     "category": "activity",
@@ -14905,15 +16539,18 @@
     "keywords": [
       "place",
       "sport",
-      "travel"
-    ]
+      "travel",
+      "cold",
+      "ice skating"
+    ],
+    "moji": "⛸"
   },
   "icecream": {
     "unicode": "1F366",
     "unicode_alternates": [],
     "name": "soft ice cream",
     "shortname": ":icecream:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -14935,7 +16572,7 @@
   },
   "id": {
     "unicode": "1F194",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "squared id",
     "shortname": ":id:",
     "category": "symbols",
@@ -14947,21 +16584,24 @@
       "identity",
       "symbol",
       "word"
-    ]
+    ],
+    "moji": "🆔"
   },
   "ideograph_advantage": {
     "unicode": "1F250",
     "unicode_alternates": [],
     "name": "circled ideograph advantage",
     "shortname": ":ideograph_advantage:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "chinese",
       "get",
       "kanji",
-      "obtain"
+      "obtain",
+      "japan",
+      "symbol"
     ],
     "moji": "🉐"
   },
@@ -14970,7 +16610,7 @@
     "unicode_alternates": [],
     "name": "imp",
     "shortname": ":imp:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -14979,7 +16619,9 @@
       "evil",
       "horns",
       "cute",
-      "devil"
+      "smiley",
+      "monster",
+      "wth"
     ],
     "moji": "👿"
   },
@@ -14993,7 +16635,9 @@
     "aliases_ascii": [],
     "keywords": [
       "documents",
-      "email"
+      "email",
+      "work",
+      "office"
     ],
     "moji": "📥"
   },
@@ -15007,30 +16651,17 @@
     "aliases_ascii": [],
     "keywords": [
       "email",
-      "inbox"
+      "inbox",
+      "object"
     ],
     "moji": "📨"
   },
-  "info": {
-    "unicode": "1F6C8",
-    "unicode_alternates": [],
-    "name": "circled information source",
-    "shortname": ":info:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":circled_information_source:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "icon"
-    ]
-  },
   "information_desk_person": {
     "unicode": "1F481",
     "unicode_alternates": [],
     "name": "information desk person",
     "shortname": ":information_desk_person:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -15045,13 +16676,16 @@
       "sassy",
       "unimpressed",
       "attitude",
-      "snarky"
+      "snarky",
+      "people",
+      "women",
+      "diversity"
     ],
     "moji": "💁"
   },
   "information_desk_person_tone1": {
     "unicode": "1F481-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "information desk person tone 1",
     "shortname": ":information_desk_person_tone1:",
     "category": "people",
@@ -15069,11 +16703,12 @@
       "unimpressed",
       "attitude",
       "snarky"
-    ]
+    ],
+    "moji": "💁🏻"
   },
   "information_desk_person_tone2": {
     "unicode": "1F481-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "information desk person tone 2",
     "shortname": ":information_desk_person_tone2:",
     "category": "people",
@@ -15091,11 +16726,12 @@
       "unimpressed",
       "attitude",
       "snarky"
-    ]
+    ],
+    "moji": "💁🏼"
   },
   "information_desk_person_tone3": {
     "unicode": "1F481-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "information desk person tone 3",
     "shortname": ":information_desk_person_tone3:",
     "category": "people",
@@ -15113,11 +16749,12 @@
       "unimpressed",
       "attitude",
       "snarky"
-    ]
+    ],
+    "moji": "💁🏽"
   },
   "information_desk_person_tone4": {
     "unicode": "1F481-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "information desk person tone 4",
     "shortname": ":information_desk_person_tone4:",
     "category": "people",
@@ -15135,11 +16772,12 @@
       "unimpressed",
       "attitude",
       "snarky"
-    ]
+    ],
+    "moji": "💁🏾"
   },
   "information_desk_person_tone5": {
     "unicode": "1F481-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "information desk person tone 5",
     "shortname": ":information_desk_person_tone5:",
     "category": "people",
@@ -15157,7 +16795,8 @@
       "unimpressed",
       "attitude",
       "snarky"
-    ]
+    ],
+    "moji": "💁🏿"
   },
   "information_source": {
     "unicode": "2139",
@@ -15166,13 +16805,14 @@
     ],
     "name": "information source",
     "shortname": ":information_source:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "alphabet",
       "blue-square",
-      "letter"
+      "letter",
+      "symbol"
     ],
     "moji": "ℹ"
   },
@@ -15181,7 +16821,7 @@
     "unicode_alternates": [],
     "name": "smiling face with halo",
     "shortname": ":innocent:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [
       "O:-)",
@@ -15202,12 +16842,12 @@
       "angel",
       "face",
       "halo",
-      "halo",
-      "angel",
       "innocent",
       "ring",
       "circle",
-      "heaven"
+      "heaven",
+      "smiley",
+      "emotion"
     ],
     "moji": "😇"
   },
@@ -15218,13 +16858,14 @@
     ],
     "name": "exclamation question mark",
     "shortname": ":interrobang:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "punctuation",
       "surprise",
-      "wat"
+      "wat",
+      "symbol"
     ],
     "moji": "⁉"
   },
@@ -15240,7 +16881,10 @@
       "apple",
       "dial",
       "gadgets",
-      "technology"
+      "technology",
+      "electronics",
+      "phone",
+      "selfie"
     ],
     "moji": "📱"
   },
@@ -15249,7 +16893,7 @@
     "unicode_alternates": [],
     "name": "desert island",
     "shortname": ":island:",
-    "category": "travel_places",
+    "category": "travel",
     "aliases": [
       ":desert_island:"
     ],
@@ -15257,15 +16901,22 @@
     "keywords": [
       "land",
       "solitude",
-      "alone"
-    ]
+      "alone",
+      "places",
+      "travel",
+      "vacation",
+      "tropical",
+      "beach",
+      "swim"
+    ],
+    "moji": "🏝"
   },
   "izakaya_lantern": {
     "unicode": "1F3EE",
     "unicode_alternates": [],
     "name": "izakaya lantern",
     "shortname": ":izakaya_lantern:",
-    "category": "places",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -15277,7 +16928,9 @@
       "alcohol",
       "bar",
       "sake",
-      "restaurant"
+      "restaurant",
+      "object",
+      "japan"
     ],
     "moji": "🏮"
   },
@@ -15286,14 +16939,13 @@
     "unicode_alternates": [],
     "name": "jack-o-lantern",
     "shortname": ":jack_o_lantern:",
-    "category": "objects",
+    "category": "nature",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "halloween",
       "jack-o-lantern",
       "pumpkin",
-      "halloween",
       "holiday",
       "carve",
       "autumn",
@@ -15305,7 +16957,8 @@
       "horror",
       "scary",
       "scared",
-      "dead"
+      "dead",
+      "holidays"
     ],
     "moji": "🎃"
   },
@@ -15314,11 +16967,16 @@
     "unicode_alternates": [],
     "name": "silhouette of japan",
     "shortname": ":japan:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "nation"
+      "nation",
+      "places",
+      "travel",
+      "map",
+      "vacation",
+      "tropical"
     ],
     "moji": "🗾"
   },
@@ -15327,7 +16985,7 @@
     "unicode_alternates": [],
     "name": "japanese castle",
     "shortname": ":japanese_castle:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -15339,7 +16997,10 @@
       "royalty",
       "fort",
       "fortified",
-      "fortress"
+      "fortress",
+      "places",
+      "travel",
+      "vacation"
     ],
     "moji": "🏯"
   },
@@ -15348,7 +17009,7 @@
     "unicode_alternates": [],
     "name": "japanese goblin",
     "shortname": ":japanese_goblin:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -15361,13 +17022,14 @@
       "avian",
       "demon",
       "goblin",
-      "mask",
       "theater",
       "nose",
       "frown",
       "mustache",
       "anger",
-      "frustration"
+      "frustration",
+      "angry",
+      "monster"
     ],
     "moji": "👺"
   },
@@ -15376,7 +17038,7 @@
     "unicode_alternates": [],
     "name": "japanese ogre",
     "shortname": ":japanese_ogre:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -15387,7 +17049,6 @@
       "troll",
       "ogre",
       "folklore",
-      "monster",
       "devil",
       "mask",
       "theater",
@@ -15401,7 +17062,7 @@
     "unicode_alternates": [],
     "name": "jeans",
     "shortname": ":jeans:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -15419,26 +17080,12 @@
     ],
     "moji": "👖"
   },
-  "jet_up": {
-    "unicode": "1F6E6",
-    "unicode_alternates": [],
-    "name": "up-pointing military airplane",
-    "shortname": ":jet_up:",
-    "category": "travel_places",
-    "aliases": [
-      ":up_pointing_military_airplane:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "jet"
-    ]
-  },
   "joy": {
     "unicode": "1F602",
     "unicode_alternates": [],
     "name": "face with tears of joy",
     "shortname": ":joy:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [
       ":')",
@@ -15450,11 +17097,13 @@
       "haha",
       "happy",
       "tears",
-      "tears",
-      "cry",
       "joy",
-      "happy",
-      "weep"
+      "weep",
+      "silly",
+      "smiley",
+      "laugh",
+      "emotion",
+      "sarcastic"
     ],
     "moji": "😂"
   },
@@ -15463,7 +17112,7 @@
     "unicode_alternates": [],
     "name": "cat face with tears of joy",
     "shortname": ":joy_cat:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -15472,10 +17121,12 @@
       "haha",
       "happy",
       "tears",
-      "happy",
-      "tears",
       "cry",
-      "joy"
+      "joy",
+      "silly",
+      "laugh",
+      "cat",
+      "sarcastic"
     ],
     "moji": "😹"
   },
@@ -15484,24 +17135,112 @@
     "unicode_alternates": [],
     "name": "joystick",
     "shortname": ":joystick:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "games",
       "atari",
-      "controller"
-    ]
+      "controller",
+      "electronics",
+      "game",
+      "boys night"
+    ],
+    "moji": "🕹"
+  },
+  "juggling": {
+    "unicode": "1F939",
+    "unicode_alternates": [],
+    "name": "juggling",
+    "shortname": ":juggling:",
+    "category": "activity",
+    "aliases": [
+      ":juggler:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤹"
+  },
+  "juggling_tone1": {
+    "unicode": "1F939-1F3FB",
+    "unicode_alternates": [],
+    "name": "juggling tone 1",
+    "shortname": ":juggling_tone1:",
+    "category": "activity",
+    "aliases": [
+      ":juggler_tone1:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤹🏻"
+  },
+  "juggling_tone2": {
+    "unicode": "1F939-1F3FC",
+    "unicode_alternates": [],
+    "name": "juggling tone 2",
+    "shortname": ":juggling_tone2:",
+    "category": "activity",
+    "aliases": [
+      ":juggler_tone2:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤹🏼"
+  },
+  "juggling_tone3": {
+    "unicode": "1F939-1F3FD",
+    "unicode_alternates": [],
+    "name": "juggling tone 3",
+    "shortname": ":juggling_tone3:",
+    "category": "activity",
+    "aliases": [
+      ":juggler_tone3:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤹🏽"
+  },
+  "juggling_tone4": {
+    "unicode": "1F939-1F3FE",
+    "unicode_alternates": [],
+    "name": "juggling tone 4",
+    "shortname": ":juggling_tone4:",
+    "category": "activity",
+    "aliases": [
+      ":juggler_tone4:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤹🏾"
+  },
+  "juggling_tone5": {
+    "unicode": "1F939-1F3FF",
+    "unicode_alternates": [],
+    "name": "juggling tone 5",
+    "shortname": ":juggling_tone5:",
+    "category": "activity",
+    "aliases": [
+      ":juggler_tone5:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤹🏿"
   },
   "kaaba": {
     "unicode": "1F54B",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "kaaba",
     "shortname": ":kaaba:",
     "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "places",
+      "religion",
+      "building",
+      "condolence"
+    ],
+    "moji": "🕋"
   },
   "key": {
     "unicode": "1F511",
@@ -15514,7 +17253,8 @@
     "keywords": [
       "door",
       "lock",
-      "password"
+      "password",
+      "object"
     ],
     "moji": "🔑"
   },
@@ -15523,7 +17263,7 @@
     "unicode_alternates": [],
     "name": "old key",
     "shortname": ":key2:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [
       ":old_key:"
     ],
@@ -15532,79 +17272,34 @@
       "door",
       "lock",
       "password",
-      "skeleton"
-    ]
-  },
-  "keyboard": {
-    "unicode": "1F5AE",
-    "unicode_alternates": [],
-    "name": "wired keyboard",
-    "shortname": ":keyboard:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":wired_keyboard:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "typing",
-      "keys",
-      "input",
-      "device"
-    ]
-  },
-  "keyboard_mouse": {
-    "unicode": "1F5A6",
-    "unicode_alternates": [],
-    "name": "keyboard and mouse",
-    "shortname": ":keyboard_mouse:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":keyboard_and_mouse:"
+      "skeleton",
+      "object"
     ],
-    "aliases_ascii": [],
-    "keywords": [
-      "computer",
-      "input",
-      "desktop"
-    ]
+    "moji": "🗝"
   },
-  "keyboard_with_jacks": {
-    "unicode": "1F398",
-    "unicode_alternates": [],
-    "name": "musical keyboard with jacks",
-    "shortname": ":keyboard_with_jacks:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":musical_keyboard_with_jacks:"
+  "keyboard": {
+    "unicode": "2328",
+    "unicode_alternates": [
+      "2328-FE0F"
     ],
-    "aliases_ascii": [],
-    "keywords": [
-      "music",
-      "instrument",
-      "midi"
-    ]
-  },
-  "keycap_ten": {
-    "unicode": "1F51F",
-    "unicode_alternates": [],
-    "name": "keycap ten",
-    "shortname": ":keycap_ten:",
-    "category": "other",
+    "name": "keyboard",
+    "shortname": ":keyboard:",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "10",
-      "blue-square",
-      "numbers"
+      "electronics",
+      "work",
+      "office"
     ],
-    "moji": "🔟"
+    "moji": "⌨"
   },
   "kimono": {
     "unicode": "1F458",
     "unicode_alternates": [],
     "name": "kimono",
     "shortname": ":kimono:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -15621,7 +17316,7 @@
     "unicode_alternates": [],
     "name": "kiss mark",
     "shortname": ":kiss:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -15630,7 +17325,12 @@
       "like",
       "lips",
       "love",
-      "valentines"
+      "valentines",
+      "women",
+      "sexy",
+      "lip",
+      "beautiful",
+      "girls night"
     ],
     "moji": "💋"
   },
@@ -15652,8 +17352,14 @@
       "love",
       "marriage",
       "valentines",
-      "couple"
-    ]
+      "couple",
+      "people",
+      "gay",
+      "men",
+      "sex",
+      "lgbt"
+    ],
+    "moji": "👨‍❤️‍💋‍👨"
   },
   "kiss_ww": {
     "unicode": "1F469-2764-1F48B-1F469",
@@ -15673,15 +17379,21 @@
       "love",
       "marriage",
       "valentines",
-      "couple"
-    ]
+      "couple",
+      "people",
+      "women",
+      "sex",
+      "lgbt",
+      "lesbian"
+    ],
+    "moji": "👩‍❤️‍💋‍👩"
   },
   "kissing": {
     "unicode": "1F617",
     "unicode_alternates": [],
     "name": "kissing face",
     "shortname": ":kissing:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -15695,7 +17407,9 @@
       "kiss",
       "pucker",
       "lips",
-      "smooch"
+      "smooch",
+      "smiley",
+      "sexy"
     ],
     "moji": "😗"
   },
@@ -15704,7 +17418,7 @@
     "unicode_alternates": [],
     "name": "kissing cat face with closed eyes",
     "shortname": ":kissing_cat:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -15714,7 +17428,8 @@
       "kiss",
       "puckered",
       "heart",
-      "love"
+      "love",
+      "cat"
     ],
     "moji": "😽"
   },
@@ -15723,7 +17438,7 @@
     "unicode_alternates": [],
     "name": "kissing face with closed eyes",
     "shortname": ":kissing_closed_eyes:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -15738,8 +17453,9 @@
       "passion",
       "puckered",
       "heart",
-      "love",
-      "smooch"
+      "smooch",
+      "smiley",
+      "sexy"
     ],
     "moji": "😚"
   },
@@ -15748,7 +17464,7 @@
     "unicode_alternates": [],
     "name": "face throwing a kiss",
     "shortname": ":kissing_heart:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [
       ":*",
@@ -15766,8 +17482,9 @@
       "love",
       "lips",
       "like",
-      "love",
-      "valentines"
+      "valentines",
+      "smiley",
+      "sexy"
     ],
     "moji": "😘"
   },
@@ -15776,7 +17493,7 @@
     "unicode_alternates": [],
     "name": "kissing face with smiling eyes",
     "shortname": ":kissing_smiling_eyes:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -15789,10 +17506,25 @@
       "smile",
       "pucker",
       "lips",
-      "smooch"
+      "smooch",
+      "smiley",
+      "sexy"
     ],
     "moji": "😙"
   },
+  "kiwi": {
+    "unicode": "1F95D",
+    "unicode_alternates": [],
+    "name": "kiwifruit",
+    "shortname": ":kiwi:",
+    "category": "food",
+    "aliases": [
+      ":kiwifruit:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🥝"
+  },
   "knife": {
     "unicode": "1F52A",
     "unicode_alternates": [],
@@ -15801,7 +17533,10 @@
     "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": [],
+    "keywords": [
+      "object",
+      "weapon"
+    ],
     "moji": "🔪"
   },
   "koala": {
@@ -15814,7 +17549,8 @@
     "aliases_ascii": [],
     "keywords": [
       "animal",
-      "nature"
+      "nature",
+      "wildlife"
     ],
     "moji": "🐨"
   },
@@ -15823,7 +17559,7 @@
     "unicode_alternates": [],
     "name": "squared katakana koko",
     "shortname": ":koko:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -15831,7 +17567,8 @@
       "destination",
       "here",
       "japanese",
-      "katakana"
+      "katakana",
+      "symbol"
     ],
     "moji": "🈁"
   },
@@ -15840,22 +17577,28 @@
     "unicode_alternates": [],
     "name": "label",
     "shortname": ":label:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "tag"
-    ]
+      "tag",
+      "object"
+    ],
+    "moji": "🏷"
   },
   "large_blue_circle": {
     "unicode": "1F535",
     "unicode_alternates": [],
     "name": "large blue circle",
     "shortname": ":large_blue_circle:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": [],
+    "keywords": [
+      "shapes",
+      "symbol",
+      "circle"
+    ],
     "moji": "🔵"
   },
   "large_blue_diamond": {
@@ -15863,11 +17606,13 @@
     "unicode_alternates": [],
     "name": "large blue diamond",
     "shortname": ":large_blue_diamond:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "shape"
+      "shape",
+      "shapes",
+      "symbol"
     ],
     "moji": "🔷"
   },
@@ -15876,11 +17621,13 @@
     "unicode_alternates": [],
     "name": "large orange diamond",
     "shortname": ":large_orange_diamond:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "shape"
+      "shape",
+      "shapes",
+      "symbol"
     ],
     "moji": "🔶"
   },
@@ -15900,7 +17647,8 @@
       "sky",
       "night",
       "cheese",
-      "phase"
+      "phase",
+      "space"
     ],
     "moji": "🌗"
   },
@@ -15922,7 +17670,8 @@
       "sky",
       "night",
       "cheese",
-      "phase"
+      "phase",
+      "space"
     ],
     "moji": "🌜"
   },
@@ -15931,7 +17680,7 @@
     "unicode_alternates": [],
     "name": "smiling face with open mouth and tightly-closed ey",
     "shortname": ":laughing:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [
       ":satisfied:"
     ],
@@ -15947,7 +17696,9 @@
       "lol",
       "smiling",
       "laughing",
-      "laugh"
+      "laugh",
+      "smiley",
+      "emotion"
     ],
     "moji": "😆"
   },
@@ -15984,16 +17735,97 @@
     "aliases_ascii": [],
     "keywords": [
       "notes",
-      "paper"
+      "paper",
+      "object",
+      "office",
+      "write"
     ],
     "moji": "📒"
   },
+  "left_facing_fist": {
+    "unicode": "1F91B",
+    "unicode_alternates": [],
+    "name": "left-facing fist",
+    "shortname": ":left_facing_fist:",
+    "category": "people",
+    "aliases": [
+      ":left_fist:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤛"
+  },
+  "left_facing_fist_tone1": {
+    "unicode": "1F91B-1F3FB",
+    "unicode_alternates": [],
+    "name": "left facing fist tone 1",
+    "shortname": ":left_facing_fist_tone1:",
+    "category": "people",
+    "aliases": [
+      ":left_fist_tone1:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤛🏻"
+  },
+  "left_facing_fist_tone2": {
+    "unicode": "1F91B-1F3FC",
+    "unicode_alternates": [],
+    "name": "left facing fist tone 2",
+    "shortname": ":left_facing_fist_tone2:",
+    "category": "people",
+    "aliases": [
+      ":left_fist_tone2:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤛🏼"
+  },
+  "left_facing_fist_tone3": {
+    "unicode": "1F91B-1F3FD",
+    "unicode_alternates": [],
+    "name": "left facing fist tone 3",
+    "shortname": ":left_facing_fist_tone3:",
+    "category": "people",
+    "aliases": [
+      ":left_fist_tone3:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤛🏽"
+  },
+  "left_facing_fist_tone4": {
+    "unicode": "1F91B-1F3FE",
+    "unicode_alternates": [],
+    "name": "left facing fist tone 4",
+    "shortname": ":left_facing_fist_tone4:",
+    "category": "people",
+    "aliases": [
+      ":left_fist_tone4:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤛🏾"
+  },
+  "left_facing_fist_tone5": {
+    "unicode": "1F91B-1F3FF",
+    "unicode_alternates": [],
+    "name": "left facing fist tone 5",
+    "shortname": ":left_facing_fist_tone5:",
+    "category": "people",
+    "aliases": [
+      ":left_fist_tone5:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤛🏿"
+  },
   "left_luggage": {
     "unicode": "1F6C5",
     "unicode_alternates": [],
     "name": "left luggage",
     "shortname": ":left_luggage:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -16002,26 +17834,10 @@
       "bag",
       "baggage",
       "luggage",
-      "travel"
+      "symbol"
     ],
     "moji": "🛅"
   },
-  "left_receiver": {
-    "unicode": "1F57B",
-    "unicode_alternates": [],
-    "name": "left hand telephone receiver",
-    "shortname": ":left_receiver:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":left_hand_telephone_receiver:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "communication",
-      "dial",
-      "technology"
-    ]
-  },
   "left_right_arrow": {
     "unicode": "2194",
     "unicode_alternates": [
@@ -16029,11 +17845,13 @@
     ],
     "name": "left right arrow",
     "shortname": ":left_right_arrow:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "shape"
+      "shape",
+      "arrow",
+      "symbol"
     ],
     "moji": "↔"
   },
@@ -16044,10 +17862,13 @@
     ],
     "name": "leftwards arrow with hook",
     "shortname": ":leftwards_arrow_with_hook:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": [],
+    "keywords": [
+      "arrow",
+      "symbol"
+    ],
     "moji": "↩"
   },
   "lemon": {
@@ -16055,7 +17876,7 @@
     "unicode_alternates": [],
     "name": "lemon",
     "shortname": ":lemon:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -16063,7 +17884,8 @@
       "nature",
       "lemon",
       "yellow",
-      "citrus"
+      "citrus",
+      "food"
     ],
     "moji": "🍋"
   },
@@ -16074,7 +17896,7 @@
     ],
     "name": "leo",
     "shortname": ":leo:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -16087,9 +17909,8 @@
       "zodiac",
       "sign",
       "purple-square",
-      "sign",
-      "zodiac",
-      "horoscope"
+      "horoscope",
+      "symbol"
     ],
     "moji": "♌"
   },
@@ -16108,7 +17929,9 @@
       "cat",
       "spot",
       "spotted",
-      "sexy"
+      "sexy",
+      "wildlife",
+      "roar"
     ],
     "moji": "🐆"
   },
@@ -16117,27 +17940,31 @@
     "unicode_alternates": [],
     "name": "level slider",
     "shortname": ":level_slider:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "controls"
-    ]
+    ],
+    "moji": "🎚"
   },
   "levitate": {
     "unicode": "1F574",
     "unicode_alternates": [],
     "name": "man in business suit levitating",
     "shortname": ":levitate:",
-    "category": "people",
+    "category": "activity",
     "aliases": [
       ":man_in_business_suit_levitating:"
     ],
     "aliases_ascii": [],
     "keywords": [
       "hover",
-      "exclamation"
-    ]
+      "exclamation",
+      "men",
+      "job"
+    ],
+    "moji": "🕴"
   },
   "libra": {
     "unicode": "264E",
@@ -16146,7 +17973,7 @@
     ],
     "name": "libra",
     "shortname": ":libra:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -16159,9 +17986,8 @@
       "zodiac",
       "sign",
       "purple-square",
-      "sign",
-      "zodiac",
-      "horoscope"
+      "horoscope",
+      "symbol"
     ],
     "moji": "♎"
   },
@@ -16179,12 +18005,20 @@
       "bench",
       "press",
       "squats",
-      "deadlift"
-    ]
+      "deadlift",
+      "men",
+      "workout",
+      "flex",
+      "sport",
+      "weight lifting",
+      "win",
+      "diversity"
+    ],
+    "moji": "🏋"
   },
   "lifter_tone1": {
     "unicode": "1F3CB-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "weight lifter tone 1",
     "shortname": ":lifter_tone1:",
     "category": "activity",
@@ -16197,11 +18031,12 @@
       "press",
       "squats",
       "deadlift"
-    ]
+    ],
+    "moji": "🏋🏻"
   },
   "lifter_tone2": {
     "unicode": "1F3CB-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "weight lifter tone 2",
     "shortname": ":lifter_tone2:",
     "category": "activity",
@@ -16214,11 +18049,12 @@
       "press",
       "squats",
       "deadlift"
-    ]
+    ],
+    "moji": "🏋🏼"
   },
   "lifter_tone3": {
     "unicode": "1F3CB-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "weight lifter tone 3",
     "shortname": ":lifter_tone3:",
     "category": "activity",
@@ -16231,11 +18067,12 @@
       "press",
       "squats",
       "deadlift"
-    ]
+    ],
+    "moji": "🏋🏽"
   },
   "lifter_tone4": {
     "unicode": "1F3CB-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "weight lifter tone 4",
     "shortname": ":lifter_tone4:",
     "category": "activity",
@@ -16248,11 +18085,12 @@
       "press",
       "squats",
       "deadlift"
-    ]
+    ],
+    "moji": "🏋🏾"
   },
   "lifter_tone5": {
     "unicode": "1F3CB-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "weight lifter tone 5",
     "shortname": ":lifter_tone5:",
     "category": "activity",
@@ -16265,28 +18103,15 @@
       "press",
       "squats",
       "deadlift"
-    ]
-  },
-  "light_check_mark": {
-    "unicode": "1F5F8",
-    "unicode_alternates": [],
-    "name": "light check mark",
-    "shortname": ":light_check_mark:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":light_mark:"
     ],
-    "aliases_ascii": [],
-    "keywords": [
-      "vote"
-    ]
+    "moji": "🏋🏿"
   },
   "light_rail": {
     "unicode": "1F688",
     "unicode_alternates": [],
     "name": "light rail",
     "shortname": ":light_rail:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -16294,7 +18119,8 @@
       "vehicle",
       "train",
       "rail",
-      "light"
+      "light",
+      "travel"
     ],
     "moji": "🚈"
   },
@@ -16303,18 +18129,20 @@
     "unicode_alternates": [],
     "name": "link symbol",
     "shortname": ":link:",
-    "category": "other",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "rings",
-      "url"
+      "url",
+      "symbol",
+      "office"
     ],
     "moji": "🔗"
   },
   "lion_face": {
     "unicode": "1F981",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "lion face",
     "shortname": ":lion_face:",
     "category": "nature",
@@ -16322,50 +18150,62 @@
       ":lion:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "wildlife",
+      "roar",
+      "cat",
+      "animal"
+    ],
+    "moji": "🦁"
   },
   "lips": {
     "unicode": "1F444",
     "unicode_alternates": [],
     "name": "mouth",
     "shortname": ":lips:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "kiss",
-      "mouth"
+      "mouth",
+      "women",
+      "body",
+      "sexy",
+      "lip"
     ],
     "moji": "👄"
   },
-  "lips2": {
-    "unicode": "1F5E2",
-    "unicode_alternates": [],
-    "name": "lips",
-    "shortname": ":lips2:",
-    "category": "people",
-    "aliases": [],
-    "aliases_ascii": [],
-    "keywords": [
-      "kiss",
-      "mouth"
-    ]
-  },
   "lipstick": {
     "unicode": "1F484",
     "unicode_alternates": [],
     "name": "lipstick",
     "shortname": ":lipstick:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "fashion",
       "female",
-      "girl"
+      "girl",
+      "object",
+      "women",
+      "sexy",
+      "lip"
     ],
     "moji": "💄"
   },
+  "lizard": {
+    "unicode": "1F98E",
+    "unicode_alternates": [],
+    "name": "lizard",
+    "shortname": ":lizard:",
+    "category": "nature",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🦎"
+  },
   "lock": {
     "unicode": "1F512",
     "unicode_alternates": [],
@@ -16376,7 +18216,9 @@
     "aliases_ascii": [],
     "keywords": [
       "password",
-      "security"
+      "security",
+      "object",
+      "lock"
     ],
     "moji": "🔒"
   },
@@ -16390,7 +18232,9 @@
     "aliases_ascii": [],
     "keywords": [
       "secret",
-      "security"
+      "security",
+      "object",
+      "lock"
     ],
     "moji": "🔏"
   },
@@ -16399,7 +18243,7 @@
     "unicode_alternates": [],
     "name": "lollipop",
     "shortname": ":lollipop:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -16410,9 +18254,8 @@
       "lollipop",
       "stick",
       "lick",
-      "sweet",
       "sugar",
-      "candy"
+      "halloween"
     ],
     "moji": "🍭"
   },
@@ -16421,11 +18264,12 @@
     "unicode_alternates": [],
     "name": "double curly loop",
     "shortname": ":loop:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "curly"
+      "curly",
+      "symbol"
     ],
     "moji": "➿"
   },
@@ -16434,10 +18278,13 @@
     "unicode_alternates": [],
     "name": "speaker with three sound waves",
     "shortname": ":loud_sound:",
-    "category": "objects",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": [],
+    "keywords": [
+      "alarm",
+      "symbol"
+    ],
     "moji": "🔊"
   },
   "loudspeaker": {
@@ -16445,12 +18292,15 @@
     "unicode_alternates": [],
     "name": "public address loudspeaker",
     "shortname": ":loudspeaker:",
-    "category": "objects",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "sound",
-      "volume"
+      "volume",
+      "object",
+      "alarm",
+      "symbol"
     ],
     "moji": "📢"
   },
@@ -16459,7 +18309,7 @@
     "unicode_alternates": [],
     "name": "love hotel",
     "shortname": ":love_hotel:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -16468,7 +18318,6 @@
       "like",
       "love",
       "hotel",
-      "love",
       "sex",
       "romance",
       "leisure",
@@ -16476,7 +18325,9 @@
       "prostitution",
       "hospital",
       "birth",
-      "happy"
+      "happy",
+      "places",
+      "building"
     ],
     "moji": "🏩"
   },
@@ -16485,7 +18336,7 @@
     "unicode_alternates": [],
     "name": "love letter",
     "shortname": ":love_letter:",
-    "category": "emoticons",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -16497,7 +18348,8 @@
       "love",
       "letter",
       "kiss",
-      "heart"
+      "heart",
+      "object"
     ],
     "moji": "💌"
   },
@@ -16506,15 +18358,29 @@
     "unicode_alternates": [],
     "name": "low brightness symbol",
     "shortname": ":low_brightness:",
-    "category": "objects",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "summer",
-      "sun"
+      "sun",
+      "symbol"
     ],
     "moji": "🔅"
   },
+  "lying_face": {
+    "unicode": "1F925",
+    "unicode_alternates": [],
+    "name": "lying face",
+    "shortname": ":lying_face:",
+    "category": "people",
+    "aliases": [
+      ":liar:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤥"
+  },
   "m": {
     "unicode": "24C2",
     "unicode_alternates": [
@@ -16522,13 +18388,14 @@
     ],
     "name": "circled latin capital letter m",
     "shortname": ":m:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "alphabet",
       "blue-circle",
-      "letter"
+      "letter",
+      "symbol"
     ],
     "moji": "Ⓜ"
   },
@@ -16546,7 +18413,8 @@
       "detective",
       "investigator",
       "detail",
-      "details"
+      "details",
+      "object"
     ],
     "moji": "🔍"
   },
@@ -16564,7 +18432,8 @@
       "detective",
       "investigator",
       "detail",
-      "details"
+      "details",
+      "object"
     ],
     "moji": "🔎"
   },
@@ -16575,13 +18444,15 @@
     ],
     "name": "mahjong tile red dragon",
     "shortname": ":mahjong:",
-    "category": "objects",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "chinese",
       "game",
-      "kanji"
+      "kanji",
+      "object",
+      "symbol"
     ],
     "moji": "🀄"
   },
@@ -16596,7 +18467,8 @@
     "keywords": [
       "communication",
       "email",
-      "inbox"
+      "inbox",
+      "object"
     ],
     "moji": "📫"
   },
@@ -16611,7 +18483,9 @@
     "keywords": [
       "communication",
       "email",
-      "inbox"
+      "inbox",
+      "object",
+      "office"
     ],
     "moji": "📪"
   },
@@ -16626,7 +18500,8 @@
     "keywords": [
       "communication",
       "email",
-      "inbox"
+      "inbox",
+      "object"
     ],
     "moji": "📬"
   },
@@ -16640,7 +18515,8 @@
     "aliases_ascii": [],
     "keywords": [
       "email",
-      "inbox"
+      "inbox",
+      "object"
     ],
     "moji": "📭"
   },
@@ -16649,7 +18525,7 @@
     "unicode_alternates": [],
     "name": "man",
     "shortname": ":man:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -16657,13 +18533,173 @@
       "dad",
       "father",
       "guy",
-      "mustashe"
+      "mustashe",
+      "people",
+      "men",
+      "sex",
+      "diversity",
+      "selfie",
+      "boys night"
     ],
     "moji": "👨"
   },
+  "man_dancing": {
+    "unicode": "1F57A",
+    "unicode_alternates": [],
+    "name": "man dancing",
+    "shortname": ":man_dancing:",
+    "category": "people",
+    "aliases": [
+      ":male_dancer:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🕺"
+  },
+  "man_dancing_tone1": {
+    "unicode": "1F57A-1F3FB",
+    "unicode_alternates": [],
+    "name": "man dancing tone 1",
+    "shortname": ":man_dancing_tone1:",
+    "category": "activity",
+    "aliases": [
+      ":male_dancer_tone1:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🕺🏻"
+  },
+  "man_dancing_tone2": {
+    "unicode": "1F57A-1F3FC",
+    "unicode_alternates": [],
+    "name": "man dancing tone 2",
+    "shortname": ":man_dancing_tone2:",
+    "category": "activity",
+    "aliases": [
+      ":male_dancer_tone2:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🕺🏼"
+  },
+  "man_dancing_tone3": {
+    "unicode": "1F57A-1F3FD",
+    "unicode_alternates": [],
+    "name": "man dancing tone 3",
+    "shortname": ":man_dancing_tone3:",
+    "category": "activity",
+    "aliases": [
+      ":male_dancer_tone3:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🕺🏽"
+  },
+  "man_dancing_tone4": {
+    "unicode": "1F57A-1F3FE",
+    "unicode_alternates": [],
+    "name": "man dancing tone 4",
+    "shortname": ":man_dancing_tone4:",
+    "category": "activity",
+    "aliases": [
+      ":male_dancer_tone4:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🕺🏾"
+  },
+  "man_dancing_tone5": {
+    "unicode": "1F57A-1F3FF",
+    "unicode_alternates": [],
+    "name": "man dancing tone 5",
+    "shortname": ":man_dancing_tone5:",
+    "category": "activity",
+    "aliases": [
+      ":male_dancer_tone5:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🕺🏿"
+  },
+  "man_in_tuxedo": {
+    "unicode": "1F935",
+    "unicode_alternates": [],
+    "name": "man in tuxedo",
+    "shortname": ":man_in_tuxedo:",
+    "category": "people",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤵"
+  },
+  "man_in_tuxedo_tone1": {
+    "unicode": "1F935-1F3FB",
+    "unicode_alternates": [],
+    "name": "man in tuxedo tone 1",
+    "shortname": ":man_in_tuxedo_tone1:",
+    "category": "people",
+    "aliases": [
+      ":tuxedo_tone1:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤵🏻"
+  },
+  "man_in_tuxedo_tone2": {
+    "unicode": "1F935-1F3FC",
+    "unicode_alternates": [],
+    "name": "man in tuxedo tone 2",
+    "shortname": ":man_in_tuxedo_tone2:",
+    "category": "people",
+    "aliases": [
+      ":tuxedo_tone2:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤵🏼"
+  },
+  "man_in_tuxedo_tone3": {
+    "unicode": "1F935-1F3FD",
+    "unicode_alternates": [],
+    "name": "man in tuxedo tone 3",
+    "shortname": ":man_in_tuxedo_tone3:",
+    "category": "people",
+    "aliases": [
+      ":tuxedo_tone3:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤵🏽"
+  },
+  "man_in_tuxedo_tone4": {
+    "unicode": "1F935-1F3FE",
+    "unicode_alternates": [],
+    "name": "man in tuxedo tone 4",
+    "shortname": ":man_in_tuxedo_tone4:",
+    "category": "people",
+    "aliases": [
+      ":tuxedo_tone4:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤵🏾"
+  },
+  "man_in_tuxedo_tone5": {
+    "unicode": "1F935-1F3FF",
+    "unicode_alternates": [],
+    "name": "man in tuxedo tone 5",
+    "shortname": ":man_in_tuxedo_tone5:",
+    "category": "people",
+    "aliases": [
+      ":tuxedo_tone5:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤵🏿"
+  },
   "man_tone1": {
     "unicode": "1F468-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "man tone 1",
     "shortname": ":man_tone1:",
     "category": "people",
@@ -16675,11 +18711,12 @@
       "father",
       "guy",
       "mustache"
-    ]
+    ],
+    "moji": "👨🏻"
   },
   "man_tone2": {
     "unicode": "1F468-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "man tone 2",
     "shortname": ":man_tone2:",
     "category": "people",
@@ -16691,11 +18728,12 @@
       "father",
       "guy",
       "mustache"
-    ]
+    ],
+    "moji": "👨🏼"
   },
   "man_tone3": {
     "unicode": "1F468-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "man tone 3",
     "shortname": ":man_tone3:",
     "category": "people",
@@ -16707,11 +18745,12 @@
       "father",
       "guy",
       "mustache"
-    ]
+    ],
+    "moji": "👨🏽"
   },
   "man_tone4": {
     "unicode": "1F468-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "man tone 4",
     "shortname": ":man_tone4:",
     "category": "people",
@@ -16723,11 +18762,12 @@
       "father",
       "guy",
       "mustache"
-    ]
+    ],
+    "moji": "👨🏾"
   },
   "man_tone5": {
     "unicode": "1F468-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "man tone 5",
     "shortname": ":man_tone5:",
     "category": "people",
@@ -16739,14 +18779,15 @@
       "father",
       "guy",
       "mustache"
-    ]
+    ],
+    "moji": "👨🏿"
   },
   "man_with_gua_pi_mao": {
     "unicode": "1F472",
     "unicode_alternates": [],
     "name": "man with gua pi mao",
     "shortname": ":man_with_gua_pi_mao:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -16755,13 +18796,17 @@
       "skullcap",
       "chinese",
       "asian",
-      "qing"
+      "qing",
+      "people",
+      "hat",
+      "men",
+      "diversity"
     ],
     "moji": "👲"
   },
   "man_with_gua_pi_mao_tone1": {
     "unicode": "1F472-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "man with gua pi mao tone 1",
     "shortname": ":man_with_gua_pi_mao_tone1:",
     "category": "people",
@@ -16774,11 +18819,12 @@
       "chinese",
       "asian",
       "qing"
-    ]
+    ],
+    "moji": "👲🏻"
   },
   "man_with_gua_pi_mao_tone2": {
     "unicode": "1F472-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "man with gua pi mao tone 2",
     "shortname": ":man_with_gua_pi_mao_tone2:",
     "category": "people",
@@ -16791,11 +18837,12 @@
       "chinese",
       "asian",
       "qing"
-    ]
+    ],
+    "moji": "👲🏼"
   },
   "man_with_gua_pi_mao_tone3": {
     "unicode": "1F472-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "man with gua pi mao tone 3",
     "shortname": ":man_with_gua_pi_mao_tone3:",
     "category": "people",
@@ -16808,11 +18855,12 @@
       "chinese",
       "asian",
       "qing"
-    ]
+    ],
+    "moji": "👲🏽"
   },
   "man_with_gua_pi_mao_tone4": {
     "unicode": "1F472-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "man with gua pi mao tone 4",
     "shortname": ":man_with_gua_pi_mao_tone4:",
     "category": "people",
@@ -16825,11 +18873,12 @@
       "chinese",
       "asian",
       "qing"
-    ]
+    ],
+    "moji": "👲🏾"
   },
   "man_with_gua_pi_mao_tone5": {
     "unicode": "1F472-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "man with gua pi mao tone 5",
     "shortname": ":man_with_gua_pi_mao_tone5:",
     "category": "people",
@@ -16842,14 +18891,15 @@
       "chinese",
       "asian",
       "qing"
-    ]
+    ],
+    "moji": "👲🏿"
   },
   "man_with_turban": {
     "unicode": "1F473",
     "unicode_alternates": [],
     "name": "man with turban",
     "shortname": ":man_with_turban:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -16862,13 +18912,16 @@
       "indian",
       "mummy",
       "wisdom",
-      "peace"
+      "peace",
+      "people",
+      "hat",
+      "diversity"
     ],
     "moji": "👳"
   },
   "man_with_turban_tone1": {
     "unicode": "1F473-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "man with turban tone 1",
     "shortname": ":man_with_turban_tone1:",
     "category": "people",
@@ -16884,11 +18937,12 @@
       "mummy",
       "wisdom",
       "peace"
-    ]
+    ],
+    "moji": "👳🏻"
   },
   "man_with_turban_tone2": {
     "unicode": "1F473-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "man with turban tone 2",
     "shortname": ":man_with_turban_tone2:",
     "category": "people",
@@ -16904,11 +18958,12 @@
       "mummy",
       "wisdom",
       "peace"
-    ]
+    ],
+    "moji": "👳🏼"
   },
   "man_with_turban_tone3": {
     "unicode": "1F473-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "man with turban tone 3",
     "shortname": ":man_with_turban_tone3:",
     "category": "people",
@@ -16924,11 +18979,12 @@
       "mummy",
       "wisdom",
       "peace"
-    ]
+    ],
+    "moji": "👳🏽"
   },
   "man_with_turban_tone4": {
     "unicode": "1F473-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "man with turban tone 4",
     "shortname": ":man_with_turban_tone4:",
     "category": "people",
@@ -16944,11 +19000,12 @@
       "mummy",
       "wisdom",
       "peace"
-    ]
+    ],
+    "moji": "👳🏾"
   },
   "man_with_turban_tone5": {
     "unicode": "1F473-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "man with turban tone 5",
     "shortname": ":man_with_turban_tone5:",
     "category": "people",
@@ -16964,19 +19021,22 @@
       "mummy",
       "wisdom",
       "peace"
-    ]
+    ],
+    "moji": "👳🏿"
   },
   "mans_shoe": {
     "unicode": "1F45E",
     "unicode_alternates": [],
     "name": "mans shoe",
     "shortname": ":mans_shoe:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "fashion",
-      "male"
+      "male",
+      "shoe",
+      "accessories"
     ],
     "moji": "👞"
   },
@@ -16985,7 +19045,7 @@
     "unicode_alternates": [],
     "name": "world map",
     "shortname": ":map:",
-    "category": "travel_places",
+    "category": "objects",
     "aliases": [
       ":world_map:"
     ],
@@ -16993,8 +19053,12 @@
     "keywords": [
       "atlas",
       "earth",
-      "cartography"
-    ]
+      "cartography",
+      "travel",
+      "map",
+      "vacation"
+    ],
+    "moji": "🗺"
   },
   "maple_leaf": {
     "unicode": "1F341",
@@ -17012,28 +19076,42 @@
       "maple",
       "leaf",
       "syrup",
-      "canada",
       "tree"
     ],
     "moji": "🍁"
   },
+  "martial_arts_uniform": {
+    "unicode": "1F94B",
+    "unicode_alternates": [],
+    "name": "martial arts uniform",
+    "shortname": ":martial_arts_uniform:",
+    "category": "activity",
+    "aliases": [
+      ":karate_uniform:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🥋"
+  },
   "mask": {
     "unicode": "1F637",
     "unicode_alternates": [],
     "name": "face with medical mask",
     "shortname": ":mask:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "face",
       "ill",
       "sick",
-      "sick",
       "virus",
       "flu",
       "medical",
-      "mask"
+      "mask",
+      "smiley",
+      "dead",
+      "health"
     ],
     "moji": "😷"
   },
@@ -17042,19 +19120,22 @@
     "unicode_alternates": [],
     "name": "face massage",
     "shortname": ":massage:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "female",
       "girl",
-      "woman"
+      "woman",
+      "people",
+      "women",
+      "diversity"
     ],
     "moji": "💆"
   },
   "massage_tone1": {
     "unicode": "1F486-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "face massage tone 1",
     "shortname": ":massage_tone1:",
     "category": "people",
@@ -17064,11 +19145,12 @@
       "female",
       "girl",
       "woman"
-    ]
+    ],
+    "moji": "💆🏻"
   },
   "massage_tone2": {
     "unicode": "1F486-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "face massage tone 2",
     "shortname": ":massage_tone2:",
     "category": "people",
@@ -17078,11 +19160,12 @@
       "female",
       "girl",
       "woman"
-    ]
+    ],
+    "moji": "💆🏼"
   },
   "massage_tone3": {
     "unicode": "1F486-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "face massage tone 3",
     "shortname": ":massage_tone3:",
     "category": "people",
@@ -17092,11 +19175,12 @@
       "female",
       "girl",
       "woman"
-    ]
+    ],
+    "moji": "💆🏽"
   },
   "massage_tone4": {
     "unicode": "1F486-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "face massage tone 4",
     "shortname": ":massage_tone4:",
     "category": "people",
@@ -17106,11 +19190,12 @@
       "female",
       "girl",
       "woman"
-    ]
+    ],
+    "moji": "💆🏾"
   },
   "massage_tone5": {
     "unicode": "1F486-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "face massage tone 5",
     "shortname": ":massage_tone5:",
     "category": "people",
@@ -17120,14 +19205,15 @@
       "female",
       "girl",
       "woman"
-    ]
+    ],
+    "moji": "💆🏿"
   },
   "meat_on_bone": {
     "unicode": "1F356",
     "unicode_alternates": [],
     "name": "meat on bone",
     "shortname": ":meat_on_bone:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -17160,21 +19246,27 @@
       "first",
       "show",
       "reward",
-      "achievement"
-    ]
+      "achievement",
+      "object",
+      "sport",
+      "perfect"
+    ],
+    "moji": "🏅"
   },
   "mega": {
     "unicode": "1F4E3",
     "unicode_alternates": [],
     "name": "cheering megaphone",
     "shortname": ":mega:",
-    "category": "objects",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "sound",
       "speaker",
-      "volume"
+      "volume",
+      "object",
+      "sport"
     ],
     "moji": "📣"
   },
@@ -17183,7 +19275,7 @@
     "unicode_alternates": [],
     "name": "melon",
     "shortname": ":melon:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -17192,26 +19284,34 @@
       "nature",
       "melon",
       "cantaloupe",
-      "honeydew"
+      "honeydew",
+      "boobs"
     ],
     "moji": "🍈"
   },
   "menorah": {
     "unicode": "1F54E",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "menorah with nine branches",
     "shortname": ":menorah:",
     "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "religion",
+      "object",
+      "jew",
+      "symbol",
+      "holidays"
+    ],
+    "moji": "🕎"
   },
   "mens": {
     "unicode": "1F6B9",
     "unicode_alternates": [],
     "name": "mens symbol",
     "shortname": ":mens:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -17220,17 +19320,17 @@
       "wc",
       "men",
       "bathroom",
-      "restroom",
       "sign",
       "boy",
       "male",
-      "avatar"
+      "avatar",
+      "symbol"
     ],
     "moji": "🚹"
   },
   "metal": {
     "unicode": "1F918",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "sign of the horns",
     "shortname": ":metal:",
     "category": "people",
@@ -17242,12 +19342,19 @@
       "band",
       "concert",
       "fingers",
-      "rocknroll"
-    ]
+      "rocknroll",
+      "body",
+      "hands",
+      "hi",
+      "diversity",
+      "boys night",
+      "parties"
+    ],
+    "moji": "🤘"
   },
   "metal_tone1": {
     "unicode": "1F918-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "sign of the horns tone 1",
     "shortname": ":metal_tone1:",
     "category": "people",
@@ -17260,11 +19367,12 @@
       "concert",
       "fingers",
       "rocknroll"
-    ]
+    ],
+    "moji": "🤘🏻"
   },
   "metal_tone2": {
     "unicode": "1F918-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "sign of the horns tone 2",
     "shortname": ":metal_tone2:",
     "category": "people",
@@ -17277,11 +19385,12 @@
       "concert",
       "fingers",
       "rocknroll"
-    ]
+    ],
+    "moji": "🤘🏼"
   },
   "metal_tone3": {
     "unicode": "1F918-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "sign of the horns tone 3",
     "shortname": ":metal_tone3:",
     "category": "people",
@@ -17294,11 +19403,12 @@
       "concert",
       "fingers",
       "rocknroll"
-    ]
+    ],
+    "moji": "🤘🏽"
   },
   "metal_tone4": {
     "unicode": "1F918-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "sign of the horns tone 4",
     "shortname": ":metal_tone4:",
     "category": "people",
@@ -17311,11 +19421,12 @@
       "concert",
       "fingers",
       "rocknroll"
-    ]
+    ],
+    "moji": "🤘🏾"
   },
   "metal_tone5": {
     "unicode": "1F918-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "sign of the horns tone 5",
     "shortname": ":metal_tone5:",
     "category": "people",
@@ -17328,14 +19439,15 @@
       "concert",
       "fingers",
       "rocknroll"
-    ]
+    ],
+    "moji": "🤘🏿"
   },
   "metro": {
     "unicode": "1F687",
     "unicode_alternates": [],
     "name": "metro",
     "shortname": ":metro:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -17346,8 +19458,8 @@
       "underground",
       "metro",
       "subway",
-      "underground",
-      "train"
+      "train",
+      "travel"
     ],
     "moji": "🚇"
   },
@@ -17356,7 +19468,7 @@
     "unicode_alternates": [],
     "name": "microphone",
     "shortname": ":microphone:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -17366,9 +19478,9 @@
       "microphone",
       "mic",
       "audio",
-      "sound",
       "voice",
-      "karaoke"
+      "karaoke",
+      "instruments"
     ],
     "moji": "🎤"
   },
@@ -17377,7 +19489,7 @@
     "unicode_alternates": [],
     "name": "studio microphone",
     "shortname": ":microphone2:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [
       ":studio_microphone:"
     ],
@@ -17385,8 +19497,11 @@
     "keywords": [
       "mic",
       "audio",
-      "recording"
-    ]
+      "recording",
+      "electronics",
+      "object"
+    ],
+    "moji": "🎙"
   },
   "microscope": {
     "unicode": "1F52C",
@@ -17399,7 +19514,9 @@
     "keywords": [
       "experiment",
       "laboratory",
-      "zoomin"
+      "zoomin",
+      "object",
+      "science"
     ],
     "moji": "🔬"
   },
@@ -17414,12 +19531,17 @@
     ],
     "aliases_ascii": [],
     "keywords": [
-      "fu"
-    ]
+      "fu",
+      "body",
+      "hands",
+      "middle finger",
+      "diversity"
+    ],
+    "moji": "🖕"
   },
   "middle_finger_tone1": {
     "unicode": "1F595-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "reversed hand with middle finger extended tone 1",
     "shortname": ":middle_finger_tone1:",
     "category": "people",
@@ -17429,11 +19551,12 @@
     "aliases_ascii": [],
     "keywords": [
       "fu"
-    ]
+    ],
+    "moji": "🖕🏻"
   },
   "middle_finger_tone2": {
     "unicode": "1F595-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "reversed hand with middle finger extended tone 2",
     "shortname": ":middle_finger_tone2:",
     "category": "people",
@@ -17443,11 +19566,12 @@
     "aliases_ascii": [],
     "keywords": [
       "fu"
-    ]
+    ],
+    "moji": "🖕🏼"
   },
   "middle_finger_tone3": {
     "unicode": "1F595-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "reversed hand with middle finger extended tone 3",
     "shortname": ":middle_finger_tone3:",
     "category": "people",
@@ -17457,11 +19581,12 @@
     "aliases_ascii": [],
     "keywords": [
       "fu"
-    ]
+    ],
+    "moji": "🖕🏽"
   },
   "middle_finger_tone4": {
     "unicode": "1F595-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "reversed hand with middle finger extended tone 4",
     "shortname": ":middle_finger_tone4:",
     "category": "people",
@@ -17471,11 +19596,12 @@
     "aliases_ascii": [],
     "keywords": [
       "fu"
-    ]
+    ],
+    "moji": "🖕🏾"
   },
   "middle_finger_tone5": {
     "unicode": "1F595-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "reversed hand with middle finger extended tone 5",
     "shortname": ":middle_finger_tone5:",
     "category": "people",
@@ -17485,14 +19611,15 @@
     "aliases_ascii": [],
     "keywords": [
       "fu"
-    ]
+    ],
+    "moji": "🖕🏿"
   },
   "military_medal": {
     "unicode": "1F396",
     "unicode_alternates": [],
     "name": "military medal",
     "shortname": ":military_medal:",
-    "category": "celebration",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -17500,15 +19627,32 @@
       "acknowledgment",
       "purple heart",
       "heroism",
-      "veteran"
-    ]
+      "veteran",
+      "object",
+      "award",
+      "win"
+    ],
+    "moji": "🎖"
+  },
+  "milk": {
+    "unicode": "1F95B",
+    "unicode_alternates": [],
+    "name": "glass of milk",
+    "shortname": ":milk:",
+    "category": "food",
+    "aliases": [
+      ":glass_of_milk:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🥛"
   },
   "milky_way": {
     "unicode": "1F30C",
     "unicode_alternates": [],
     "name": "milky way",
     "shortname": ":milky_way:",
-    "category": "nature",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -17519,8 +19663,10 @@
       "star",
       "stars",
       "planets",
-      "space",
-      "sky"
+      "sky",
+      "places",
+      "travel",
+      "vacation"
     ],
     "moji": "🌌"
   },
@@ -17529,7 +19675,7 @@
     "unicode_alternates": [],
     "name": "minibus",
     "shortname": ":minibus:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -17538,8 +19684,7 @@
       "vehicle",
       "bus",
       "city",
-      "transport",
-      "transportation"
+      "transport"
     ],
     "moji": "🚐"
   },
@@ -17556,7 +19701,8 @@
       "disc",
       "disk",
       "record",
-      "technology"
+      "technology",
+      "electronics"
     ],
     "moji": "💽"
   },
@@ -17565,17 +19711,18 @@
     "unicode_alternates": [],
     "name": "mobile phone off",
     "shortname": ":mobile_phone_off:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "mute"
+      "mute",
+      "symbol"
     ],
     "moji": "📴"
   },
   "money_mouth": {
     "unicode": "1F911",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "money-mouth face",
     "shortname": ":money_mouth:",
     "category": "people",
@@ -17583,7 +19730,14 @@
       ":money_mouth_face:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "smiley",
+      "win",
+      "money",
+      "emotion",
+      "boys night"
+    ],
+    "moji": "🤑"
   },
   "money_with_wings": {
     "unicode": "1F4B8",
@@ -17607,7 +19761,7 @@
       "burned",
       "gift",
       "cash",
-      "dollar"
+      "boys night"
     ],
     "moji": "💸"
   },
@@ -17622,7 +19776,10 @@
     "keywords": [
       "coins",
       "dollar",
-      "payment"
+      "payment",
+      "bag",
+      "award",
+      "money"
     ],
     "moji": "💰"
   },
@@ -17640,7 +19797,8 @@
       "monkey",
       "primate",
       "banana",
-      "silly"
+      "silly",
+      "wildlife"
     ],
     "moji": "🐒"
   },
@@ -17663,7 +19821,7 @@
     "unicode_alternates": [],
     "name": "monorail",
     "shortname": ":monorail:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -17672,66 +19830,18 @@
       "train",
       "mono",
       "rail",
-      "transport"
+      "transport",
+      "travel",
+      "vacation"
     ],
     "moji": "🚝"
   },
-  "mood_bubble": {
-    "unicode": "1F5F0",
-    "unicode_alternates": [],
-    "name": "mood bubble",
-    "shortname": ":mood_bubble:",
-    "category": "objects_symbols",
-    "aliases": [],
-    "aliases_ascii": [],
-    "keywords": [
-      "balloon",
-      "conversation",
-      "communication",
-      "comic",
-      "feeling"
-    ]
-  },
-  "mood_bubble_lightning": {
-    "unicode": "1F5F1",
-    "unicode_alternates": [],
-    "name": "lightning mood bubble",
-    "shortname": ":mood_bubble_lightning:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":lightning_mood_bubble:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "balloon",
-      "conversation",
-      "communication",
-      "comic",
-      "feeling"
-    ]
-  },
-  "mood_lightning": {
-    "unicode": "1F5F2",
-    "unicode_alternates": [],
-    "name": "lightning mood",
-    "shortname": ":mood_lightning:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":lightning_mood:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "zap",
-      "electric",
-      "current"
-    ]
-  },
   "mortar_board": {
     "unicode": "1F393",
     "unicode_alternates": [],
     "name": "graduation cap",
     "shortname": ":mortar_board:",
-    "category": "objects",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -17742,33 +19852,55 @@
       "hat",
       "school",
       "university",
-      "graduation",
-      "cap",
       "mortarboard",
       "academic",
       "education",
       "ceremony",
       "square",
-      "tassel"
+      "tassel",
+      "office",
+      "accessories"
     ],
     "moji": "🎓"
   },
   "mosque": {
     "unicode": "1F54C",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "mosque",
     "shortname": ":mosque:",
     "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "places",
+      "religion",
+      "building",
+      "vacation",
+      "condolence"
+    ],
+    "moji": "🕌"
+  },
+  "motor_scooter": {
+    "unicode": "1F6F5",
+    "unicode_alternates": [],
+    "name": "motor scooter",
+    "shortname": ":motor_scooter:",
+    "category": "travel",
+    "aliases": [
+      ":motorbike:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [
+      "moped"
+    ],
+    "moji": "🛵"
   },
   "motorboat": {
     "unicode": "1F6E5",
     "unicode_alternates": [],
     "name": "motorboat",
     "shortname": ":motorboat:",
-    "category": "travel_places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -17776,30 +19908,35 @@
       "vehicle",
       "boat",
       "speedboat",
-      "powerboat"
-    ]
+      "powerboat",
+      "travel"
+    ],
+    "moji": "🛥"
   },
   "motorcycle": {
     "unicode": "1F3CD",
     "unicode_alternates": [],
     "name": "racing motorcycle",
     "shortname": ":motorcycle:",
-    "category": "activity",
+    "category": "travel",
     "aliases": [
       ":racing_motorcycle:"
     ],
     "aliases_ascii": [],
     "keywords": [
       "bike",
-      "speed"
-    ]
+      "speed",
+      "transportation",
+      "travel"
+    ],
+    "moji": "🏍"
   },
   "motorway": {
     "unicode": "1F6E3",
     "unicode_alternates": [],
     "name": "motorway",
     "shortname": ":motorway:",
-    "category": "travel_places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -17807,43 +19944,56 @@
       "highway",
       "freeway",
       "traffic",
-      "travel"
-    ]
+      "travel",
+      "vacation",
+      "camp"
+    ],
+    "moji": "🛣"
   },
   "mount_fuji": {
     "unicode": "1F5FB",
     "unicode_alternates": [],
     "name": "mount fuji",
     "shortname": ":mount_fuji:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "japan",
       "mountain",
       "nature",
-      "photo"
+      "photo",
+      "places",
+      "travel",
+      "vacation",
+      "cold",
+      "camp"
     ],
     "moji": "🗻"
   },
   "mountain": {
     "unicode": "26F0",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "mountain",
     "shortname": ":mountain:",
     "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "place"
-    ]
+      "place",
+      "places",
+      "travel",
+      "vacation",
+      "camp"
+    ],
+    "moji": "⛰"
   },
   "mountain_bicyclist": {
     "unicode": "1F6B5",
     "unicode_alternates": [],
     "name": "mountain bicyclist",
     "shortname": ":mountain_bicyclist:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -17855,13 +20005,15 @@
       "bike",
       "pedal",
       "bicycle",
-      "transportation"
+      "men",
+      "sport",
+      "diversity"
     ],
     "moji": "🚵"
   },
   "mountain_bicyclist_tone1": {
     "unicode": "1F6B5-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "mountain bicyclist tone 1",
     "shortname": ":mountain_bicyclist_tone1:",
     "category": "activity",
@@ -17872,13 +20024,13 @@
       "transportation",
       "bike",
       "pedal",
-      "bicycle",
-      "transportation"
-    ]
+      "bicycle"
+    ],
+    "moji": "🚵🏻"
   },
   "mountain_bicyclist_tone2": {
     "unicode": "1F6B5-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "mountain bicyclist tone 2",
     "shortname": ":mountain_bicyclist_tone2:",
     "category": "activity",
@@ -17889,13 +20041,13 @@
       "transportation",
       "bike",
       "pedal",
-      "bicycle",
-      "transportation"
-    ]
+      "bicycle"
+    ],
+    "moji": "🚵🏼"
   },
   "mountain_bicyclist_tone3": {
     "unicode": "1F6B5-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "mountain bicyclist tone 3",
     "shortname": ":mountain_bicyclist_tone3:",
     "category": "activity",
@@ -17906,13 +20058,13 @@
       "transportation",
       "bike",
       "pedal",
-      "bicycle",
-      "transportation"
-    ]
+      "bicycle"
+    ],
+    "moji": "🚵🏽"
   },
   "mountain_bicyclist_tone4": {
     "unicode": "1F6B5-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "mountain bicyclist tone 4",
     "shortname": ":mountain_bicyclist_tone4:",
     "category": "activity",
@@ -17923,13 +20075,13 @@
       "transportation",
       "bike",
       "pedal",
-      "bicycle",
-      "transportation"
-    ]
+      "bicycle"
+    ],
+    "moji": "🚵🏾"
   },
   "mountain_bicyclist_tone5": {
     "unicode": "1F6B5-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "mountain bicyclist tone 5",
     "shortname": ":mountain_bicyclist_tone5:",
     "category": "activity",
@@ -17940,16 +20092,16 @@
       "transportation",
       "bike",
       "pedal",
-      "bicycle",
-      "transportation"
-    ]
+      "bicycle"
+    ],
+    "moji": "🚵🏿"
   },
   "mountain_cableway": {
     "unicode": "1F6A0",
     "unicode_alternates": [],
     "name": "mountain cableway",
     "shortname": ":mountain_cableway:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -17959,7 +20111,8 @@
       "cable",
       "rail",
       "train",
-      "railway"
+      "railway",
+      "travel"
     ],
     "moji": "🚠"
   },
@@ -17968,7 +20121,7 @@
     "unicode_alternates": [],
     "name": "mountain railway",
     "shortname": ":mountain_railway:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -17977,7 +20130,8 @@
       "railway",
       "rail",
       "train",
-      "transport"
+      "transport",
+      "travel"
     ],
     "moji": "🚞"
   },
@@ -17986,7 +20140,7 @@
     "unicode_alternates": [],
     "name": "snow capped mountain",
     "shortname": ":mountain_snow:",
-    "category": "travel_places",
+    "category": "travel",
     "aliases": [
       ":snow_capped_mountain:"
     ],
@@ -17995,8 +20149,13 @@
       "cold",
       "elevation",
       "hiking",
-      "peak"
-    ]
+      "peak",
+      "places",
+      "travel",
+      "vacation",
+      "camp"
+    ],
+    "moji": "🏔"
   },
   "mouse": {
     "unicode": "1F42D",
@@ -18029,25 +20188,9 @@
     ],
     "moji": "🐁"
   },
-  "mouse_one": {
-    "unicode": "1F5AF",
-    "unicode_alternates": [],
-    "name": "one button mouse",
-    "shortname": ":mouse_one:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":one_button_mouse:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "computer",
-      "input",
-      "device"
-    ]
-  },
   "mouse_three_button": {
     "unicode": "1F5B1",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "three button mouse",
     "shortname": ":mouse_three_button:",
     "category": "objects",
@@ -18059,8 +20202,12 @@
       "3",
       "computer",
       "object",
-      "office"
-    ]
+      "office",
+      "electronics",
+      "work",
+      "game"
+    ],
+    "moji": "🖱"
   },
   "movie_camera": {
     "unicode": "1F3A5",
@@ -18078,7 +20225,8 @@
       "camcorder",
       "video",
       "motion",
-      "picture"
+      "picture",
+      "object"
     ],
     "moji": "🎥"
   },
@@ -18087,21 +20235,101 @@
     "unicode_alternates": [],
     "name": "moyai",
     "shortname": ":moyai:",
-    "category": "places",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "island",
-      "stone"
+      "stone",
+      "travel",
+      "vacation"
     ],
     "moji": "🗿"
   },
+  "mrs_claus": {
+    "unicode": "1F936",
+    "unicode_alternates": [],
+    "name": "mother christmas",
+    "shortname": ":mrs_claus:",
+    "category": "people",
+    "aliases": [
+      ":mother_christmas:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤶"
+  },
+  "mrs_claus_tone1": {
+    "unicode": "1F936-1F3FB",
+    "unicode_alternates": [],
+    "name": "mother christmas tone 1",
+    "shortname": ":mrs_claus_tone1:",
+    "category": "people",
+    "aliases": [
+      ":mother_christmas_tone1:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤶🏻"
+  },
+  "mrs_claus_tone2": {
+    "unicode": "1F936-1F3FC",
+    "unicode_alternates": [],
+    "name": "mother christmas tone 2",
+    "shortname": ":mrs_claus_tone2:",
+    "category": "people",
+    "aliases": [
+      ":mother_christmas_tone2:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤶🏼"
+  },
+  "mrs_claus_tone3": {
+    "unicode": "1F936-1F3FD",
+    "unicode_alternates": [],
+    "name": "mother christmas tone 3",
+    "shortname": ":mrs_claus_tone3:",
+    "category": "people",
+    "aliases": [
+      ":mother_christmas_tone3:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤶🏽"
+  },
+  "mrs_claus_tone4": {
+    "unicode": "1F936-1F3FE",
+    "unicode_alternates": [],
+    "name": "mother christmas tone 4",
+    "shortname": ":mrs_claus_tone4:",
+    "category": "people",
+    "aliases": [
+      ":mother_christmas_tone4:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤶🏾"
+  },
+  "mrs_claus_tone5": {
+    "unicode": "1F936-1F3FF",
+    "unicode_alternates": [],
+    "name": "mother christmas tone 5",
+    "shortname": ":mrs_claus_tone5:",
+    "category": "people",
+    "aliases": [
+      ":mother_christmas_tone5:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤶🏿"
+  },
   "muscle": {
     "unicode": "1F4AA",
     "unicode_alternates": [],
     "name": "flexed biceps",
     "shortname": ":muscle:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -18110,13 +20338,20 @@
       "hand",
       "strong",
       "muscle",
-      "bicep"
+      "bicep",
+      "body",
+      "hands",
+      "workout",
+      "win",
+      "diversity",
+      "feminist",
+      "boys night"
     ],
     "moji": "💪"
   },
   "muscle_tone1": {
     "unicode": "1F4AA-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "flexed biceps tone 1",
     "shortname": ":muscle_tone1:",
     "category": "people",
@@ -18129,11 +20364,12 @@
       "strong",
       "muscle",
       "bicep"
-    ]
+    ],
+    "moji": "💪🏻"
   },
   "muscle_tone2": {
     "unicode": "1F4AA-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "flexed biceps tone 2",
     "shortname": ":muscle_tone2:",
     "category": "people",
@@ -18146,11 +20382,12 @@
       "strong",
       "muscle",
       "bicep"
-    ]
+    ],
+    "moji": "💪🏼"
   },
   "muscle_tone3": {
     "unicode": "1F4AA-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "flexed biceps tone 3",
     "shortname": ":muscle_tone3:",
     "category": "people",
@@ -18163,11 +20400,12 @@
       "strong",
       "muscle",
       "bicep"
-    ]
+    ],
+    "moji": "💪🏽"
   },
   "muscle_tone4": {
     "unicode": "1F4AA-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "flexed biceps tone 4",
     "shortname": ":muscle_tone4:",
     "category": "people",
@@ -18180,11 +20418,12 @@
       "strong",
       "muscle",
       "bicep"
-    ]
+    ],
+    "moji": "💪🏾"
   },
   "muscle_tone5": {
     "unicode": "1F4AA-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "flexed biceps tone 5",
     "shortname": ":muscle_tone5:",
     "category": "people",
@@ -18197,7 +20436,8 @@
       "strong",
       "muscle",
       "bicep"
-    ]
+    ],
+    "moji": "💪🏿"
   },
   "mushroom": {
     "unicode": "1F344",
@@ -18213,7 +20453,9 @@
       "mushroom",
       "fungi",
       "food",
-      "fungus"
+      "fungus",
+      "nature",
+      "drugs"
     ],
     "moji": "🍄"
   },
@@ -18222,7 +20464,7 @@
     "unicode_alternates": [],
     "name": "musical keyboard",
     "shortname": ":musical_keyboard:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -18230,10 +20472,9 @@
       "piano",
       "music",
       "keyboard",
-      "piano",
       "organ",
-      "instrument",
-      "electric"
+      "electric",
+      "instruments"
     ],
     "moji": "🎹"
   },
@@ -18242,7 +20483,7 @@
     "unicode_alternates": [],
     "name": "musical note",
     "shortname": ":musical_note:",
-    "category": "objects",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -18250,8 +20491,9 @@
       "musical",
       "music",
       "note",
-      "music",
-      "sound"
+      "sound",
+      "instruments",
+      "symbol"
     ],
     "moji": "🎵"
   },
@@ -18260,7 +20502,7 @@
     "unicode_alternates": [],
     "name": "musical score",
     "shortname": ":musical_score:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -18269,10 +20511,10 @@
       "music",
       "musical",
       "score",
-      "clef",
       "g-clef",
       "stave",
-      "staff"
+      "staff",
+      "instruments"
     ],
     "moji": "🎼"
   },
@@ -18281,12 +20523,14 @@
     "unicode_alternates": [],
     "name": "speaker with cancellation stroke",
     "shortname": ":mute:",
-    "category": "objects",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "sound",
-      "volume"
+      "volume",
+      "alarm",
+      "symbol"
     ],
     "moji": "🔇"
   },
@@ -18295,18 +20539,24 @@
     "unicode_alternates": [],
     "name": "nail polish",
     "shortname": ":nail_care:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "beauty",
-      "manicure"
+      "manicure",
+      "women",
+      "body",
+      "hands",
+      "nailpolish",
+      "diversity",
+      "girls night"
     ],
     "moji": "💅"
   },
   "nail_care_tone1": {
     "unicode": "1F485-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "nail polish tone 1",
     "shortname": ":nail_care_tone1:",
     "category": "people",
@@ -18315,11 +20565,12 @@
     "keywords": [
       "beauty",
       "manicure"
-    ]
+    ],
+    "moji": "💅🏻"
   },
   "nail_care_tone2": {
     "unicode": "1F485-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "nail polish tone 2",
     "shortname": ":nail_care_tone2:",
     "category": "people",
@@ -18328,11 +20579,12 @@
     "keywords": [
       "beauty",
       "manicure"
-    ]
+    ],
+    "moji": "💅🏼"
   },
   "nail_care_tone3": {
     "unicode": "1F485-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "nail polish tone 3",
     "shortname": ":nail_care_tone3:",
     "category": "people",
@@ -18341,11 +20593,12 @@
     "keywords": [
       "beauty",
       "manicure"
-    ]
+    ],
+    "moji": "💅🏽"
   },
   "nail_care_tone4": {
     "unicode": "1F485-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "nail polish tone 4",
     "shortname": ":nail_care_tone4:",
     "category": "people",
@@ -18354,11 +20607,12 @@
     "keywords": [
       "beauty",
       "manicure"
-    ]
+    ],
+    "moji": "💅🏾"
   },
   "nail_care_tone5": {
     "unicode": "1F485-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "nail polish tone 5",
     "shortname": ":nail_care_tone5:",
     "category": "people",
@@ -18367,28 +20621,43 @@
     "keywords": [
       "beauty",
       "manicure"
-    ]
+    ],
+    "moji": "💅🏿"
   },
   "name_badge": {
     "unicode": "1F4DB",
     "unicode_alternates": [],
     "name": "name badge",
     "shortname": ":name_badge:",
-    "category": "objects",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "fire",
-      "forbid"
+      "forbid",
+      "work"
     ],
     "moji": "📛"
   },
+  "nauseated_face": {
+    "unicode": "1F922",
+    "unicode_alternates": [],
+    "name": "nauseated face",
+    "shortname": ":nauseated_face:",
+    "category": "people",
+    "aliases": [
+      ":sick:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤢"
+  },
   "necktie": {
     "unicode": "1F454",
     "unicode_alternates": [],
     "name": "necktie",
     "shortname": ":necktie:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -18405,20 +20674,21 @@
     "unicode_alternates": [],
     "name": "negative squared cross mark",
     "shortname": ":negative_squared_cross_mark:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "deny",
       "green-square",
       "no",
-      "x"
+      "x",
+      "symbol"
     ],
     "moji": "❎"
   },
   "nerd": {
     "unicode": "1F913",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "nerd face",
     "shortname": ":nerd:",
     "category": "people",
@@ -18426,31 +20696,18 @@
       ":nerd_face:"
     ],
     "aliases_ascii": [],
-    "keywords": []
-  },
-  "network": {
-    "unicode": "1F5A7",
-    "unicode_alternates": [],
-    "name": "three networked computers",
-    "shortname": ":network:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":three_networked_computers:"
-    ],
-    "aliases_ascii": [],
     "keywords": [
-      "lan",
-      "wan",
-      "network",
-      "technology"
-    ]
+      "smiley",
+      "glasses"
+    ],
+    "moji": "🤓"
   },
   "neutral_face": {
     "unicode": "1F610",
     "unicode_alternates": [],
     "name": "neutral face",
     "shortname": ":neutral_face:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -18459,7 +20716,11 @@
       "neutral",
       "objective",
       "impartial",
-      "blank"
+      "blank",
+      "mad",
+      "smiley",
+      "shrug",
+      "emotion"
     ],
     "moji": "😐"
   },
@@ -18468,11 +20729,12 @@
     "unicode_alternates": [],
     "name": "squared new",
     "shortname": ":new:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "blue-square"
+      "blue-square",
+      "symbol"
     ],
     "moji": "🆕"
   },
@@ -18491,7 +20753,8 @@
       "sky",
       "night",
       "cheese",
-      "phase"
+      "phase",
+      "space"
     ],
     "moji": "🌑"
   },
@@ -18512,7 +20775,9 @@
       "sky",
       "night",
       "cheese",
-      "phase"
+      "phase",
+      "space",
+      "goodnight"
     ],
     "moji": "🌚"
   },
@@ -18526,7 +20791,9 @@
     "aliases_ascii": [],
     "keywords": [
       "headline",
-      "press"
+      "press",
+      "office",
+      "write"
     ],
     "moji": "📰"
   },
@@ -18535,19 +20802,22 @@
     "unicode_alternates": [],
     "name": "rolled-up newspaper",
     "shortname": ":newspaper2:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [
       ":rolled_up_newspaper:"
     ],
     "aliases_ascii": [],
     "keywords": [
       "headline",
-      "press"
-    ]
+      "press",
+      "office",
+      "write"
+    ],
+    "moji": "🗞"
   },
   "ng": {
     "unicode": "1F196",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "squared ng",
     "shortname": ":ng:",
     "category": "symbols",
@@ -18558,14 +20828,15 @@
       "no good",
       "symbol",
       "word"
-    ]
+    ],
+    "moji": "🆖"
   },
   "night_with_stars": {
     "unicode": "1F303",
     "unicode_alternates": [],
     "name": "night with stars",
     "shortname": ":night_with_stars:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -18575,7 +20846,11 @@
       "evening",
       "planets",
       "space",
-      "sky"
+      "sky",
+      "places",
+      "building",
+      "vacation",
+      "goodnight"
     ],
     "moji": "🌃"
   },
@@ -18585,15 +20860,18 @@
     "unicode_alternates": [
       "0039-FE0F-20E3"
     ],
-    "name": "digit nine",
+    "name": "keycap digit nine",
     "shortname": ":nine:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "9",
       "blue-square",
-      "numbers"
+      "numbers",
+      "number",
+      "math",
+      "symbol"
     ]
   },
   "no_bell": {
@@ -18601,13 +20879,15 @@
     "unicode_alternates": [],
     "name": "bell with cancellation stroke",
     "shortname": ":no_bell:",
-    "category": "objects",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "mute",
       "sound",
-      "volume"
+      "volume",
+      "alarm",
+      "symbol"
     ],
     "moji": "🔕"
   },
@@ -18616,7 +20896,7 @@
     "unicode_alternates": [],
     "name": "no bicycles",
     "shortname": ":no_bicycles:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -18624,7 +20904,8 @@
       "prohibited",
       "bicycle",
       "bike pedal",
-      "no"
+      "no",
+      "symbol"
     ],
     "moji": "🚳"
   },
@@ -18635,7 +20916,7 @@
     ],
     "name": "no entry",
     "shortname": ":no_entry:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -18644,7 +20925,9 @@
       "limit",
       "privacy",
       "security",
-      "stop"
+      "stop",
+      "symbol",
+      "circle"
     ],
     "moji": "⛔"
   },
@@ -18653,7 +20936,7 @@
     "unicode_alternates": [],
     "name": "no entry sign",
     "shortname": ":no_entry_sign:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -18663,8 +20946,9 @@
       "limit",
       "stop",
       "no",
-      "stop",
-      "entry"
+      "entry",
+      "symbol",
+      "circle"
     ],
     "moji": "🚫"
   },
@@ -18673,7 +20957,7 @@
     "unicode_alternates": [],
     "name": "face with no good gesture",
     "shortname": ":no_good:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -18684,13 +20968,17 @@
       "stop",
       "nope",
       "don&#039;t",
-      "not"
+      "not",
+      "people",
+      "women",
+      "diversity",
+      "girls night"
     ],
     "moji": "🙅"
   },
   "no_good_tone1": {
     "unicode": "1F645-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "face with no good gesture tone 1",
     "shortname": ":no_good_tone1:",
     "category": "people",
@@ -18708,11 +20996,12 @@
       "hand",
       "person",
       "prohibited"
-    ]
+    ],
+    "moji": "🙅🏻"
   },
   "no_good_tone2": {
     "unicode": "1F645-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "face with no good gesture tone 2",
     "shortname": ":no_good_tone2:",
     "category": "people",
@@ -18730,11 +21019,12 @@
       "hand",
       "person",
       "prohibited"
-    ]
+    ],
+    "moji": "🙅🏼"
   },
   "no_good_tone3": {
     "unicode": "1F645-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "face with no good gesture tone 3",
     "shortname": ":no_good_tone3:",
     "category": "people",
@@ -18752,11 +21042,12 @@
       "hand",
       "person",
       "prohibited"
-    ]
+    ],
+    "moji": "🙅🏽"
   },
   "no_good_tone4": {
     "unicode": "1F645-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "face with no good gesture tone 4",
     "shortname": ":no_good_tone4:",
     "category": "people",
@@ -18774,11 +21065,12 @@
       "hand",
       "person",
       "prohibited"
-    ]
+    ],
+    "moji": "🙅🏾"
   },
   "no_good_tone5": {
     "unicode": "1F645-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "face with no good gesture tone 5",
     "shortname": ":no_good_tone5:",
     "category": "people",
@@ -18796,19 +21088,22 @@
       "hand",
       "person",
       "prohibited"
-    ]
+    ],
+    "moji": "🙅🏿"
   },
   "no_mobile_phones": {
     "unicode": "1F4F5",
     "unicode_alternates": [],
     "name": "no mobile phones",
     "shortname": ":no_mobile_phones:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "iphone",
-      "mute"
+      "mute",
+      "symbol",
+      "phone"
     ],
     "moji": "📵"
   },
@@ -18817,7 +21112,7 @@
     "unicode_alternates": [],
     "name": "face without mouth",
     "shortname": ":no_mouth:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [
       ":-X",
@@ -18835,7 +21130,11 @@
       "hellokitty",
       "mouth",
       "silent",
-      "vapid"
+      "vapid",
+      "mad",
+      "smiley",
+      "neutral",
+      "emotion"
     ],
     "moji": "😶"
   },
@@ -18844,7 +21143,7 @@
     "unicode_alternates": [],
     "name": "no pedestrians",
     "shortname": ":no_pedestrians:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -18857,7 +21156,8 @@
       "stroll",
       "stride",
       "foot",
-      "feet"
+      "feet",
+      "symbol"
     ],
     "moji": "🚷"
   },
@@ -18866,20 +21166,20 @@
     "unicode_alternates": [],
     "name": "no smoking symbol",
     "shortname": ":no_smoking:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "cigarette",
       "no",
       "smoking",
-      "cigarette",
       "smoke",
       "cancer",
       "lungs",
       "inhale",
       "tar",
-      "nicotine"
+      "nicotine",
+      "symbol"
     ],
     "moji": "🚭"
   },
@@ -18888,7 +21188,7 @@
     "unicode_alternates": [],
     "name": "non-potable water symbol",
     "shortname": ":non-potable_water:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -18901,7 +21201,8 @@
       "dirty",
       "gross",
       "aqua",
-      "h20"
+      "h20",
+      "symbol"
     ],
     "moji": "🚱"
   },
@@ -18910,18 +21211,20 @@
     "unicode_alternates": [],
     "name": "nose",
     "shortname": ":nose:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "smell",
-      "sniff"
+      "sniff",
+      "body",
+      "diversity"
     ],
     "moji": "👃"
   },
   "nose_tone1": {
     "unicode": "1F443-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "nose tone 1",
     "shortname": ":nose_tone1:",
     "category": "people",
@@ -18930,11 +21233,12 @@
     "keywords": [
       "smell",
       "sniff"
-    ]
+    ],
+    "moji": "👃🏻"
   },
   "nose_tone2": {
     "unicode": "1F443-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "nose tone 2",
     "shortname": ":nose_tone2:",
     "category": "people",
@@ -18943,11 +21247,12 @@
     "keywords": [
       "smell",
       "sniff"
-    ]
+    ],
+    "moji": "👃🏼"
   },
   "nose_tone3": {
     "unicode": "1F443-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "nose tone 3",
     "shortname": ":nose_tone3:",
     "category": "people",
@@ -18956,11 +21261,12 @@
     "keywords": [
       "smell",
       "sniff"
-    ]
+    ],
+    "moji": "👃🏽"
   },
   "nose_tone4": {
     "unicode": "1F443-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "nose tone 4",
     "shortname": ":nose_tone4:",
     "category": "people",
@@ -18969,11 +21275,12 @@
     "keywords": [
       "smell",
       "sniff"
-    ]
+    ],
+    "moji": "👃🏾"
   },
   "nose_tone5": {
     "unicode": "1F443-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "nose tone 5",
     "shortname": ":nose_tone5:",
     "category": "people",
@@ -18982,37 +21289,8 @@
     "keywords": [
       "smell",
       "sniff"
-    ]
-  },
-  "note": {
-    "unicode": "1F5C9",
-    "unicode_alternates": [],
-    "name": "note page",
-    "shortname": ":note:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":note_page:"
     ],
-    "aliases_ascii": [],
-    "keywords": [
-      "stationery",
-      "post-it"
-    ]
-  },
-  "note_empty": {
-    "unicode": "1F5C6",
-    "unicode_alternates": [],
-    "name": "empty note page",
-    "shortname": ":note_empty:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":empty_note_page:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "stationery",
-      "post-it"
-    ]
+    "moji": "👃🏿"
   },
   "notebook": {
     "unicode": "1F4D3",
@@ -19026,7 +21304,10 @@
       "notes",
       "paper",
       "record",
-      "stationery"
+      "stationery",
+      "object",
+      "office",
+      "write"
     ],
     "moji": "📓"
   },
@@ -19042,71 +21323,48 @@
       "classroom",
       "notes",
       "paper",
-      "record"
+      "record",
+      "object",
+      "office",
+      "write"
     ],
     "moji": "📔"
   },
-  "notepad": {
-    "unicode": "1F5CA",
-    "unicode_alternates": [],
-    "name": "note pad",
-    "shortname": ":notepad:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":note_pad:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "stationery",
-      "post-it"
-    ]
-  },
-  "notepad_empty": {
-    "unicode": "1F5C7",
-    "unicode_alternates": [],
-    "name": "empty note pad",
-    "shortname": ":notepad_empty:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":empty_note_pad:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "stationery",
-      "post-it"
-    ]
-  },
   "notepad_spiral": {
     "unicode": "1F5D2",
     "unicode_alternates": [],
     "name": "spiral note pad",
     "shortname": ":notepad_spiral:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [
       ":spiral_note_pad:"
     ],
     "aliases_ascii": [],
     "keywords": [
-      "stationery"
-    ]
+      "stationery",
+      "work",
+      "office",
+      "write"
+    ],
+    "moji": "🗒"
   },
   "notes": {
     "unicode": "1F3B6",
     "unicode_alternates": [],
     "name": "multiple musical notes",
     "shortname": ":notes:",
-    "category": "objects",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "music",
       "score",
       "musical",
-      "music",
       "notes",
-      "music",
       "sound",
-      "melody"
+      "melody",
+      "instruments",
+      "symbol"
     ],
     "moji": "🎶"
   },
@@ -19120,7 +21378,10 @@
     "aliases_ascii": [],
     "keywords": [
       "handy",
-      "tools"
+      "tools",
+      "object",
+      "tool",
+      "nutcase"
     ],
     "moji": "🔩"
   },
@@ -19131,12 +21392,13 @@
     ],
     "name": "heavy large circle",
     "shortname": ":o:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "circle",
-      "round"
+      "round",
+      "symbol"
     ],
     "moji": "⭕"
   },
@@ -19145,13 +21407,14 @@
     "unicode_alternates": [],
     "name": "negative squared latin capital letter o",
     "shortname": ":o2:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "alphabet",
       "letter",
-      "red-square"
+      "red-square",
+      "symbol"
     ],
     "moji": "🅾"
   },
@@ -19168,13 +21431,29 @@
       "water",
       "wave",
       "ocean",
-      "wave",
       "surf",
       "beach",
-      "tide"
+      "tide",
+      "weather",
+      "boat",
+      "tropical",
+      "swim"
     ],
     "moji": "🌊"
   },
+  "octagonal_sign": {
+    "unicode": "1F6D1",
+    "unicode_alternates": [],
+    "name": "octagonal sign",
+    "shortname": ":octagonal_sign:",
+    "category": "symbols",
+    "aliases": [
+      ":stop_sign:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🛑"
+  },
   "octopus": {
     "unicode": "1F419",
     "unicode_alternates": [],
@@ -19187,7 +21466,8 @@
       "animal",
       "creature",
       "ocean",
-      "sea"
+      "sea",
+      "wildlife"
     ],
     "moji": "🐙"
   },
@@ -19196,7 +21476,7 @@
     "unicode_alternates": [],
     "name": "oden",
     "shortname": ":oden:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -19214,13 +21494,14 @@
     "unicode_alternates": [],
     "name": "office building",
     "shortname": ":office:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "building",
       "bureau",
-      "work"
+      "work",
+      "places"
     ],
     "moji": "🏢"
   },
@@ -19229,28 +21510,31 @@
     "unicode_alternates": [],
     "name": "oil drum",
     "shortname": ":oil:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [
       ":oil_drum:"
     ],
     "aliases_ascii": [],
     "keywords": [
-      "petroleum"
-    ]
+      "petroleum",
+      "object"
+    ],
+    "moji": "🛢"
   },
   "ok": {
     "unicode": "1F197",
     "unicode_alternates": [],
     "name": "squared ok",
     "shortname": ":ok:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "agree",
       "blue-square",
       "good",
-      "yes"
+      "yes",
+      "symbol"
     ],
     "moji": "🆗"
   },
@@ -19259,7 +21543,7 @@
     "unicode_alternates": [],
     "name": "ok hand sign",
     "shortname": ":ok_hand:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -19273,13 +21557,19 @@
       "marijuana",
       "joint",
       "pot",
-      "420"
+      "420",
+      "body",
+      "hands",
+      "hi",
+      "diversity",
+      "good",
+      "beautiful"
     ],
     "moji": "👌"
   },
   "ok_hand_tone1": {
     "unicode": "1F44C-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "ok hand sign tone 1",
     "shortname": ":ok_hand_tone1:",
     "category": "people",
@@ -19296,11 +21586,12 @@
       "joint",
       "pot",
       "420"
-    ]
+    ],
+    "moji": "👌🏻"
   },
   "ok_hand_tone2": {
     "unicode": "1F44C-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "ok hand sign tone 2",
     "shortname": ":ok_hand_tone2:",
     "category": "people",
@@ -19317,11 +21608,12 @@
       "joint",
       "pot",
       "420"
-    ]
+    ],
+    "moji": "👌🏼"
   },
   "ok_hand_tone3": {
     "unicode": "1F44C-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "ok hand sign tone 3",
     "shortname": ":ok_hand_tone3:",
     "category": "people",
@@ -19338,11 +21630,12 @@
       "joint",
       "pot",
       "420"
-    ]
+    ],
+    "moji": "👌🏽"
   },
   "ok_hand_tone4": {
     "unicode": "1F44C-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "ok hand sign tone 4",
     "shortname": ":ok_hand_tone4:",
     "category": "people",
@@ -19359,11 +21652,12 @@
       "joint",
       "pot",
       "420"
-    ]
+    ],
+    "moji": "👌🏾"
   },
   "ok_hand_tone5": {
     "unicode": "1F44C-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "ok hand sign tone 5",
     "shortname": ":ok_hand_tone5:",
     "category": "people",
@@ -19380,14 +21674,15 @@
       "joint",
       "pot",
       "420"
-    ]
+    ],
+    "moji": "👌🏿"
   },
   "ok_woman": {
     "unicode": "1F646",
     "unicode_alternates": [],
     "name": "face with ok gesture",
     "shortname": ":ok_woman:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [
       "*\\0/*",
@@ -19404,13 +21699,15 @@
       "yes",
       "ok",
       "okay",
-      "accept"
+      "accept",
+      "people",
+      "diversity"
     ],
     "moji": "🙆"
   },
   "ok_woman_tone1": {
     "unicode": "1F646-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "face with ok gesture tone1",
     "shortname": ":ok_woman_tone1:",
     "category": "people",
@@ -19425,11 +21722,12 @@
       "yes",
       "okay",
       "accept"
-    ]
+    ],
+    "moji": "🙆🏻"
   },
   "ok_woman_tone2": {
     "unicode": "1F646-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "face with ok gesture tone2",
     "shortname": ":ok_woman_tone2:",
     "category": "people",
@@ -19444,11 +21742,12 @@
       "yes",
       "okay",
       "accept"
-    ]
+    ],
+    "moji": "🙆🏼"
   },
   "ok_woman_tone3": {
     "unicode": "1F646-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "face with ok gesture tone3",
     "shortname": ":ok_woman_tone3:",
     "category": "people",
@@ -19463,11 +21762,12 @@
       "yes",
       "okay",
       "accept"
-    ]
+    ],
+    "moji": "🙆🏽"
   },
   "ok_woman_tone4": {
     "unicode": "1F646-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "face with ok gesture tone4",
     "shortname": ":ok_woman_tone4:",
     "category": "people",
@@ -19482,11 +21782,12 @@
       "yes",
       "okay",
       "accept"
-    ]
+    ],
+    "moji": "🙆🏾"
   },
   "ok_woman_tone5": {
     "unicode": "1F646-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "face with ok gesture tone5",
     "shortname": ":ok_woman_tone5:",
     "category": "people",
@@ -19501,26 +21802,30 @@
       "yes",
       "okay",
       "accept"
-    ]
+    ],
+    "moji": "🙆🏿"
   },
   "older_man": {
     "unicode": "1F474",
     "unicode_alternates": [],
     "name": "older man",
     "shortname": ":older_man:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "human",
       "male",
-      "men"
+      "men",
+      "people",
+      "old people",
+      "diversity"
     ],
     "moji": "👴"
   },
   "older_man_tone1": {
     "unicode": "1F474-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "older man tone 1",
     "shortname": ":older_man_tone1:",
     "category": "people",
@@ -19531,11 +21836,12 @@
       "men",
       "grandpa",
       "grandfather"
-    ]
+    ],
+    "moji": "👴🏻"
   },
   "older_man_tone2": {
     "unicode": "1F474-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "older man tone 2",
     "shortname": ":older_man_tone2:",
     "category": "people",
@@ -19546,11 +21852,12 @@
       "men",
       "grandpa",
       "grandfather"
-    ]
+    ],
+    "moji": "👴🏼"
   },
   "older_man_tone3": {
     "unicode": "1F474-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "older man tone 3",
     "shortname": ":older_man_tone3:",
     "category": "people",
@@ -19561,11 +21868,12 @@
       "men",
       "grandpa",
       "grandfather"
-    ]
+    ],
+    "moji": "👴🏽"
   },
   "older_man_tone4": {
     "unicode": "1F474-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "older man tone 4",
     "shortname": ":older_man_tone4:",
     "category": "people",
@@ -19576,11 +21884,12 @@
       "men",
       "grandpa",
       "grandfather"
-    ]
+    ],
+    "moji": "👴🏾"
   },
   "older_man_tone5": {
     "unicode": "1F474-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "older man tone 5",
     "shortname": ":older_man_tone5:",
     "category": "people",
@@ -19591,14 +21900,15 @@
       "men",
       "grandpa",
       "grandfather"
-    ]
+    ],
+    "moji": "👴🏿"
   },
   "older_woman": {
     "unicode": "1F475",
     "unicode_alternates": [],
     "name": "older woman",
     "shortname": ":older_woman:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [
       ":grandma:"
     ],
@@ -19608,13 +21918,16 @@
       "girl",
       "women",
       "grandma",
-      "grandmother"
+      "grandmother",
+      "people",
+      "old people",
+      "diversity"
     ],
     "moji": "👵"
   },
   "older_woman_tone1": {
     "unicode": "1F475-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "older woman tone 1",
     "shortname": ":older_woman_tone1:",
     "category": "people",
@@ -19628,11 +21941,12 @@
       "lady",
       "grandma",
       "grandmother"
-    ]
+    ],
+    "moji": "👵🏻"
   },
   "older_woman_tone2": {
     "unicode": "1F475-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "older woman tone 2",
     "shortname": ":older_woman_tone2:",
     "category": "people",
@@ -19646,11 +21960,12 @@
       "lady",
       "grandma",
       "grandmother"
-    ]
+    ],
+    "moji": "👵🏼"
   },
   "older_woman_tone3": {
     "unicode": "1F475-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "older woman tone 3",
     "shortname": ":older_woman_tone3:",
     "category": "people",
@@ -19664,11 +21979,12 @@
       "lady",
       "grandma",
       "grandmother"
-    ]
+    ],
+    "moji": "👵🏽"
   },
   "older_woman_tone4": {
     "unicode": "1F475-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "older woman tone 4",
     "shortname": ":older_woman_tone4:",
     "category": "people",
@@ -19682,11 +21998,12 @@
       "lady",
       "grandma",
       "grandmother"
-    ]
+    ],
+    "moji": "👵🏾"
   },
   "older_woman_tone5": {
     "unicode": "1F475-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "older woman tone 5",
     "shortname": ":older_woman_tone5:",
     "category": "people",
@@ -19700,14 +22017,15 @@
       "lady",
       "grandma",
       "grandmother"
-    ]
+    ],
+    "moji": "👵🏿"
   },
   "om_symbol": {
     "unicode": "1F549",
     "unicode_alternates": [],
     "name": "om symbol",
     "shortname": ":om_symbol:",
-    "category": "objects_symbols",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -19718,20 +22036,24 @@
       "dharmic",
       "buddhism",
       "jainism",
-      "meditate"
-    ]
+      "meditate",
+      "religion",
+      "symbol"
+    ],
+    "moji": "🕉"
   },
   "on": {
     "unicode": "1F51B",
     "unicode_alternates": [],
     "name": "on with exclamation mark with left right arrow abo",
     "shortname": ":on:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "arrow",
-      "words"
+      "words",
+      "symbol"
     ],
     "moji": "🔛"
   },
@@ -19740,7 +22062,7 @@
     "unicode_alternates": [],
     "name": "oncoming automobile",
     "shortname": ":oncoming_automobile:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -19748,8 +22070,8 @@
       "transportation",
       "vehicle",
       "sedan",
-      "car",
-      "automobile"
+      "automobile",
+      "travel"
     ],
     "moji": "🚘"
   },
@@ -19758,7 +22080,7 @@
     "unicode_alternates": [],
     "name": "oncoming bus",
     "shortname": ":oncoming_bus:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -19767,8 +22089,8 @@
       "bus",
       "school",
       "city",
-      "transportation",
-      "public"
+      "public",
+      "travel"
     ],
     "moji": "🚍"
   },
@@ -19777,7 +22099,7 @@
     "unicode_alternates": [],
     "name": "oncoming police car",
     "shortname": ":oncoming_police_car:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -19791,7 +22113,9 @@
       "citation",
       "crime",
       "help",
-      "officer"
+      "officer",
+      "transportation",
+      "911"
     ],
     "moji": "🚔"
   },
@@ -19800,7 +22124,7 @@
     "unicode_alternates": [],
     "name": "oncoming taxi",
     "shortname": ":oncoming_taxi:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -19812,7 +22136,9 @@
       "automobile",
       "city",
       "transport",
-      "service"
+      "service",
+      "transportation",
+      "travel"
     ],
     "moji": "🚖"
   },
@@ -19822,15 +22148,18 @@
     "unicode_alternates": [
       "0031-FE0F-20E3"
     ],
-    "name": "digit one",
+    "name": "keycap digit one",
     "shortname": ":one:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "1",
       "blue-square",
-      "numbers"
+      "numbers",
+      "number",
+      "math",
+      "symbol"
     ]
   },
   "open_file_folder": {
@@ -19843,7 +22172,9 @@
     "aliases_ascii": [],
     "keywords": [
       "documents",
-      "load"
+      "load",
+      "work",
+      "office"
     ],
     "moji": "📂"
   },
@@ -19852,18 +22183,22 @@
     "unicode_alternates": [],
     "name": "open hands sign",
     "shortname": ":open_hands:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "butterfly",
-      "fingers"
+      "fingers",
+      "body",
+      "hands",
+      "diversity",
+      "condolence"
     ],
     "moji": "👐"
   },
   "open_hands_tone1": {
     "unicode": "1F450-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "open hands sign tone 1",
     "shortname": ":open_hands_tone1:",
     "category": "people",
@@ -19872,11 +22207,12 @@
     "keywords": [
       "butterfly",
       "fingers"
-    ]
+    ],
+    "moji": "👐🏻"
   },
   "open_hands_tone2": {
     "unicode": "1F450-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "open hands sign tone 2",
     "shortname": ":open_hands_tone2:",
     "category": "people",
@@ -19885,11 +22221,12 @@
     "keywords": [
       "butterfly",
       "fingers"
-    ]
+    ],
+    "moji": "👐🏼"
   },
   "open_hands_tone3": {
     "unicode": "1F450-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "open hands sign tone 3",
     "shortname": ":open_hands_tone3:",
     "category": "people",
@@ -19898,11 +22235,12 @@
     "keywords": [
       "butterfly",
       "fingers"
-    ]
+    ],
+    "moji": "👐🏽"
   },
   "open_hands_tone4": {
     "unicode": "1F450-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "open hands sign tone 4",
     "shortname": ":open_hands_tone4:",
     "category": "people",
@@ -19911,11 +22249,12 @@
     "keywords": [
       "butterfly",
       "fingers"
-    ]
+    ],
+    "moji": "👐🏾"
   },
   "open_hands_tone5": {
     "unicode": "1F450-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "open hands sign tone 5",
     "shortname": ":open_hands_tone5:",
     "category": "people",
@@ -19924,14 +22263,15 @@
     "keywords": [
       "butterfly",
       "fingers"
-    ]
+    ],
+    "moji": "👐🏿"
   },
   "open_mouth": {
     "unicode": "1F62E",
     "unicode_alternates": [],
     "name": "face with open mouth",
     "shortname": ":open_mouth:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [
       ":-O",
@@ -19949,7 +22289,10 @@
       "jaw",
       "gapping",
       "surprise",
-      "wow"
+      "wow",
+      "smiley",
+      "surprised",
+      "emotion"
     ],
     "moji": "😮"
   },
@@ -19958,7 +22301,7 @@
     "unicode_alternates": [],
     "name": "ophiuchus",
     "shortname": ":ophiuchus:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -19972,28 +22315,11 @@
       "zodiac",
       "purple-square",
       "sign",
-      "horoscope"
+      "horoscope",
+      "symbol"
     ],
     "moji": "⛎"
   },
-  "optical_disk": {
-    "unicode": "1F5B8",
-    "unicode_alternates": [],
-    "name": "optical disc icon",
-    "shortname": ":optical_disk:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":optical_disc_icon:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "cd",
-      "dvd",
-      "disc",
-      "disk",
-      "technology"
-    ]
-  },
   "orange_book": {
     "unicode": "1F4D9",
     "unicode_alternates": [],
@@ -20005,13 +22331,17 @@
     "keywords": [
       "knowledge",
       "library",
-      "read"
+      "read",
+      "object",
+      "office",
+      "write",
+      "book"
     ],
     "moji": "📙"
   },
   "orthodox_cross": {
     "unicode": "2626",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "orthodox cross",
     "shortname": ":orthodox_cross:",
     "category": "symbols",
@@ -20021,7 +22351,8 @@
       "christian",
       "religion",
       "symbol"
-    ]
+    ],
+    "moji": "☦"
   },
   "outbox_tray": {
     "unicode": "1F4E4",
@@ -20033,10 +22364,23 @@
     "aliases_ascii": [],
     "keywords": [
       "email",
-      "inbox"
+      "inbox",
+      "work",
+      "office"
     ],
     "moji": "📤"
   },
+  "owl": {
+    "unicode": "1F989",
+    "unicode_alternates": [],
+    "name": "owl",
+    "shortname": ":owl:",
+    "category": "nature",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🦉"
+  },
   "ox": {
     "unicode": "1F402",
     "unicode_alternates": [],
@@ -20062,22 +22406,12 @@
     "aliases_ascii": [],
     "keywords": [
       "gift",
-      "mail"
+      "mail",
+      "object",
+      "office"
     ],
     "moji": "📦"
   },
-  "page": {
-    "unicode": "1F5CF",
-    "unicode_alternates": [],
-    "name": "page",
-    "shortname": ":page:",
-    "category": "objects_symbols",
-    "aliases": [],
-    "aliases_ascii": [],
-    "keywords": [
-      "document"
-    ]
-  },
   "page_facing_up": {
     "unicode": "1F4C4",
     "unicode_alternates": [],
@@ -20087,7 +22421,10 @@
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "documents"
+      "documents",
+      "work",
+      "office",
+      "write"
     ],
     "moji": "📄"
   },
@@ -20100,7 +22437,9 @@
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "documents"
+      "documents",
+      "office",
+      "write"
     ],
     "moji": "📃"
   },
@@ -20114,28 +22453,18 @@
     "aliases_ascii": [],
     "keywords": [
       "bbcall",
-      "oldschool"
+      "oldschool",
+      "electronics",
+      "work"
     ],
     "moji": "📟"
   },
-  "pages": {
-    "unicode": "1F5D0",
-    "unicode_alternates": [],
-    "name": "pages",
-    "shortname": ":pages:",
-    "category": "objects_symbols",
-    "aliases": [],
-    "aliases_ascii": [],
-    "keywords": [
-      "documents"
-    ]
-  },
   "paintbrush": {
     "unicode": "1F58C",
     "unicode_alternates": [],
     "name": "lower left paintbrush",
     "shortname": ":paintbrush:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [
       ":lower_left_paintbrush:"
     ],
@@ -20143,8 +22472,12 @@
     "keywords": [
       "brush",
       "art",
-      "painting"
-    ]
+      "painting",
+      "object",
+      "office",
+      "write"
+    ],
+    "moji": "🖌"
   },
   "palm_tree": {
     "unicode": "1F334",
@@ -20163,10 +22496,22 @@
       "coconuts",
       "fronds",
       "warm",
-      "tropical"
+      "tropical",
+      "trees"
     ],
     "moji": "🌴"
   },
+  "pancakes": {
+    "unicode": "1F95E",
+    "unicode_alternates": [],
+    "name": "pancakes",
+    "shortname": ":pancakes:",
+    "category": "food",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🥞"
+  },
   "panda_face": {
     "unicode": "1F43C",
     "unicode_alternates": [],
@@ -20189,7 +22534,9 @@
       "bamboo",
       "china",
       "black",
-      "white"
+      "white",
+      "wildlife",
+      "roar"
     ],
     "moji": "🐼"
   },
@@ -20203,7 +22550,10 @@
     "aliases_ascii": [],
     "keywords": [
       "documents",
-      "stationery"
+      "stationery",
+      "object",
+      "work",
+      "office"
     ],
     "moji": "📎"
   },
@@ -20212,22 +22562,26 @@
     "unicode_alternates": [],
     "name": "linked paperclips",
     "shortname": ":paperclips:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [
       ":linked_paperclips:"
     ],
     "aliases_ascii": [],
     "keywords": [
       "documents",
-      "stationery"
-    ]
+      "stationery",
+      "object",
+      "work",
+      "office"
+    ],
+    "moji": "🖇"
   },
   "park": {
     "unicode": "1F3DE",
     "unicode_alternates": [],
     "name": "national park",
     "shortname": ":park:",
-    "category": "travel_places",
+    "category": "travel",
     "aliases": [
       ":national_park:"
     ],
@@ -20238,8 +22592,13 @@
       "wildlife",
       "forest",
       "wilderness",
-      "national"
-    ]
+      "national",
+      "travel",
+      "vacation",
+      "park",
+      "camp"
+    ],
+    "moji": "🏞"
   },
   "parking": {
     "unicode": "1F17F",
@@ -20248,14 +22607,15 @@
     ],
     "name": "negative squared latin capital letter p",
     "shortname": ":parking:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "alphabet",
       "blue-square",
       "cars",
-      "letter"
+      "letter",
+      "symbol"
     ],
     "moji": "🅿"
   },
@@ -20266,7 +22626,7 @@
     ],
     "name": "part alternation mark",
     "shortname": ":part_alternation_mark:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -20279,7 +22639,8 @@
       "cue",
       "letter",
       "m",
-      "japanese"
+      "japanese",
+      "symbol"
     ],
     "moji": "〽"
   },
@@ -20297,7 +22658,9 @@
       "cloud",
       "morning",
       "nature",
-      "weather"
+      "weather",
+      "sky",
+      "sun"
     ],
     "moji": "⛅"
   },
@@ -20306,7 +22669,7 @@
     "unicode_alternates": [],
     "name": "passport control",
     "shortname": ":passport_control:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -20317,13 +22680,14 @@
       "travel",
       "control",
       "foreign",
-      "identification"
+      "identification",
+      "symbol"
     ],
     "moji": "🛂"
   },
   "pause_button": {
     "unicode": "23F8",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "double vertical bar",
     "shortname": ":pause_button:",
     "category": "symbols",
@@ -20335,11 +22699,12 @@
       "pause",
       "sound",
       "symbol"
-    ]
+    ],
+    "moji": "⏸"
   },
   "peace": {
     "unicode": "262E",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "peace symbol",
     "shortname": ":peace:",
     "category": "symbols",
@@ -20348,15 +22713,19 @@
     ],
     "aliases_ascii": [],
     "keywords": [
-      "sign"
-    ]
+      "sign",
+      "symbol",
+      "peace",
+      "drugs"
+    ],
+    "moji": "☮"
   },
   "peach": {
     "unicode": "1F351",
     "unicode_alternates": [],
     "name": "peach",
     "shortname": ":peach:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -20364,26 +22733,39 @@
       "fruit",
       "nature",
       "peach",
-      "fruit",
       "juicy",
-      "pit"
+      "pit",
+      "butt"
     ],
     "moji": "🍑"
   },
+  "peanuts": {
+    "unicode": "1F95C",
+    "unicode_alternates": [],
+    "name": "peanuts",
+    "shortname": ":peanuts:",
+    "category": "food",
+    "aliases": [
+      ":shelled_peanut:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🥜"
+  },
   "pear": {
     "unicode": "1F350",
     "unicode_alternates": [],
     "name": "pear",
     "shortname": ":pear:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "fruit",
       "nature",
       "pear",
-      "fruit",
-      "shape"
+      "shape",
+      "food"
     ],
     "moji": "🍐"
   },
@@ -20392,7 +22774,7 @@
     "unicode_alternates": [],
     "name": "lower left ballpoint pen",
     "shortname": ":pen_ballpoint:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [
       ":lower_left_ballpoint_pen:"
     ],
@@ -20400,15 +22782,18 @@
     "keywords": [
       "write",
       "bic",
-      "ink"
-    ]
+      "ink",
+      "object",
+      "office"
+    ],
+    "moji": "🖊"
   },
   "pen_fountain": {
     "unicode": "1F58B",
     "unicode_alternates": [],
     "name": "lower left fountain pen",
     "shortname": ":pen_fountain:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [
       ":lower_left_fountain_pen:"
     ],
@@ -20416,8 +22801,11 @@
     "keywords": [
       "write",
       "calligraphy",
-      "ink"
-    ]
+      "ink",
+      "object",
+      "office"
+    ],
+    "moji": "🖋"
   },
   "pencil": {
     "unicode": "1F4DD",
@@ -20433,7 +22821,9 @@
       "documents",
       "paper",
       "station",
-      "write"
+      "write",
+      "work",
+      "office"
     ],
     "moji": "📝"
   },
@@ -20450,26 +22840,12 @@
     "keywords": [
       "paper",
       "stationery",
-      "write"
+      "write",
+      "object",
+      "office"
     ],
     "moji": "✏"
   },
-  "pencil3": {
-    "unicode": "1F589",
-    "unicode_alternates": [],
-    "name": "lower left pencil",
-    "shortname": ":pencil3:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":lower_left_pencil:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "paper",
-      "stationery",
-      "write"
-    ]
-  },
   "penguin": {
     "unicode": "1F427",
     "unicode_alternates": [],
@@ -20480,46 +22856,17 @@
     "aliases_ascii": [],
     "keywords": [
       "animal",
-      "nature"
+      "nature",
+      "wildlife"
     ],
     "moji": "🐧"
   },
-  "pennant_black": {
-    "unicode": "1F3F2",
-    "unicode_alternates": [],
-    "name": "black pennant",
-    "shortname": ":pennant_black:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":black_pennant:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "flag",
-      "athletics"
-    ]
-  },
-  "pennant_white": {
-    "unicode": "1F3F1",
-    "unicode_alternates": [],
-    "name": "white pennant",
-    "shortname": ":pennant_white:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":white_pennant:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "flag",
-      "athletics"
-    ]
-  },
   "pensive": {
     "unicode": "1F614",
     "unicode_alternates": [],
     "name": "pensive face",
     "shortname": ":pensive:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -20532,7 +22879,10 @@
       "reflective",
       "wistful",
       "meditate",
-      "serious"
+      "serious",
+      "smiley",
+      "emotion",
+      "rip"
     ],
     "moji": "😔"
   },
@@ -20541,7 +22891,7 @@
     "unicode_alternates": [],
     "name": "performing arts",
     "shortname": ":performing_arts:",
-    "category": "places",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -20552,10 +22902,11 @@
       "arts",
       "performance",
       "entertainment",
-      "acting",
       "story",
       "mask",
-      "masks"
+      "masks",
+      "theatre",
+      "movie"
     ],
     "moji": "🎭"
   },
@@ -20564,7 +22915,7 @@
     "unicode_alternates": [],
     "name": "persevering face",
     "shortname": ":persevere:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [
       ">.<"
@@ -20575,7 +22926,11 @@
       "face",
       "no",
       "sick",
-      "upset"
+      "upset",
+      "sad",
+      "smiley",
+      "angry",
+      "emotion"
     ],
     "moji": "😣"
   },
@@ -20584,7 +22939,7 @@
     "unicode_alternates": [],
     "name": "person frowning",
     "shortname": ":person_frowning:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -20594,13 +22949,16 @@
       "dejected",
       "rejected",
       "sad",
-      "frown"
+      "frown",
+      "people",
+      "women",
+      "diversity"
     ],
     "moji": "🙍"
   },
   "person_frowning_tone1": {
     "unicode": "1F64D-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person frowning tone 1",
     "shortname": ":person_frowning_tone1:",
     "category": "people",
@@ -20614,11 +22972,12 @@
       "rejected",
       "sad",
       "frown"
-    ]
+    ],
+    "moji": "🙍🏻"
   },
   "person_frowning_tone2": {
     "unicode": "1F64D-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person frowning tone 2",
     "shortname": ":person_frowning_tone2:",
     "category": "people",
@@ -20632,11 +22991,12 @@
       "rejected",
       "sad",
       "frown"
-    ]
+    ],
+    "moji": "🙍🏼"
   },
   "person_frowning_tone3": {
     "unicode": "1F64D-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person frowning tone 3",
     "shortname": ":person_frowning_tone3:",
     "category": "people",
@@ -20650,11 +23010,12 @@
       "rejected",
       "sad",
       "frown"
-    ]
+    ],
+    "moji": "🙍🏽"
   },
   "person_frowning_tone4": {
     "unicode": "1F64D-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person frowning tone 4",
     "shortname": ":person_frowning_tone4:",
     "category": "people",
@@ -20668,11 +23029,12 @@
       "rejected",
       "sad",
       "frown"
-    ]
+    ],
+    "moji": "🙍🏾"
   },
   "person_frowning_tone5": {
     "unicode": "1F64D-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person frowning tone 5",
     "shortname": ":person_frowning_tone5:",
     "category": "people",
@@ -20686,14 +23048,15 @@
       "rejected",
       "sad",
       "frown"
-    ]
+    ],
+    "moji": "🙍🏿"
   },
   "person_with_blond_hair": {
     "unicode": "1F471",
     "unicode_alternates": [],
     "name": "person with blond hair",
     "shortname": ":person_with_blond_hair:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -20703,13 +23066,16 @@
       "young",
       "western",
       "westerner",
-      "occidental"
+      "occidental",
+      "people",
+      "men",
+      "diversity"
     ],
     "moji": "👱"
   },
   "person_with_blond_hair_tone1": {
     "unicode": "1F471-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person with blond hair tone 1",
     "shortname": ":person_with_blond_hair_tone1:",
     "category": "people",
@@ -20723,11 +23089,12 @@
       "western",
       "westerner",
       "occidental"
-    ]
+    ],
+    "moji": "👱🏻"
   },
   "person_with_blond_hair_tone2": {
     "unicode": "1F471-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person with blond hair tone 2",
     "shortname": ":person_with_blond_hair_tone2:",
     "category": "people",
@@ -20741,11 +23108,12 @@
       "western",
       "westerner",
       "occidental"
-    ]
+    ],
+    "moji": "👱🏼"
   },
   "person_with_blond_hair_tone3": {
     "unicode": "1F471-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person with blond hair tone 3",
     "shortname": ":person_with_blond_hair_tone3:",
     "category": "people",
@@ -20759,11 +23127,12 @@
       "western",
       "westerner",
       "occidental"
-    ]
+    ],
+    "moji": "👱🏽"
   },
   "person_with_blond_hair_tone4": {
     "unicode": "1F471-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person with blond hair tone 4",
     "shortname": ":person_with_blond_hair_tone4:",
     "category": "people",
@@ -20777,11 +23146,12 @@
       "western",
       "westerner",
       "occidental"
-    ]
+    ],
+    "moji": "👱🏾"
   },
   "person_with_blond_hair_tone5": {
     "unicode": "1F471-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person with blond hair tone 5",
     "shortname": ":person_with_blond_hair_tone5:",
     "category": "people",
@@ -20795,14 +23165,15 @@
       "western",
       "westerner",
       "occidental"
-    ]
+    ],
+    "moji": "👱🏿"
   },
   "person_with_pouting_face": {
     "unicode": "1F64E",
     "unicode_alternates": [],
     "name": "person with pouting face",
     "shortname": ":person_with_pouting_face:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -20812,13 +23183,16 @@
       "pout",
       "sexy",
       "cute",
-      "annoyed"
+      "annoyed",
+      "people",
+      "women",
+      "diversity"
     ],
     "moji": "🙎"
   },
   "person_with_pouting_face_tone1": {
     "unicode": "1F64E-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person with pouting face tone1",
     "shortname": ":person_with_pouting_face_tone1:",
     "category": "people",
@@ -20832,11 +23206,12 @@
       "sexy",
       "cute",
       "annoyed"
-    ]
+    ],
+    "moji": "🙎🏻"
   },
   "person_with_pouting_face_tone2": {
     "unicode": "1F64E-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person with pouting face tone2",
     "shortname": ":person_with_pouting_face_tone2:",
     "category": "people",
@@ -20850,11 +23225,12 @@
       "sexy",
       "cute",
       "annoyed"
-    ]
+    ],
+    "moji": "🙎🏼"
   },
   "person_with_pouting_face_tone3": {
     "unicode": "1F64E-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person with pouting face tone3",
     "shortname": ":person_with_pouting_face_tone3:",
     "category": "people",
@@ -20868,11 +23244,12 @@
       "sexy",
       "cute",
       "annoyed"
-    ]
+    ],
+    "moji": "🙎🏽"
   },
   "person_with_pouting_face_tone4": {
     "unicode": "1F64E-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person with pouting face tone4",
     "shortname": ":person_with_pouting_face_tone4:",
     "category": "people",
@@ -20886,11 +23263,12 @@
       "sexy",
       "cute",
       "annoyed"
-    ]
+    ],
+    "moji": "🙎🏾"
   },
   "person_with_pouting_face_tone5": {
     "unicode": "1F64E-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person with pouting face tone5",
     "shortname": ":person_with_pouting_face_tone5:",
     "category": "people",
@@ -20904,11 +23282,12 @@
       "sexy",
       "cute",
       "annoyed"
-    ]
+    ],
+    "moji": "🙎🏿"
   },
   "pick": {
     "unicode": "26CF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "pick",
     "shortname": ":pick:",
     "category": "objects",
@@ -20917,8 +23296,10 @@
     "keywords": [
       "mining",
       "object",
-      "tool"
-    ]
+      "tool",
+      "weapon"
+    ],
+    "moji": "⛏"
   },
   "pig": {
     "unicode": "1F437",
@@ -20976,7 +23357,6 @@
       "food",
       "eat",
       "cute",
-      "oink",
       "pink",
       "smell",
       "truffle"
@@ -20993,7 +23373,9 @@
     "aliases_ascii": [],
     "keywords": [
       "health",
-      "medicine"
+      "medicine",
+      "object",
+      "drugs"
     ],
     "moji": "💊"
   },
@@ -21002,7 +23384,7 @@
     "unicode_alternates": [],
     "name": "pineapple",
     "shortname": ":pineapple:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -21018,7 +23400,7 @@
   },
   "ping_pong": {
     "unicode": "1F3D3",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "table tennis paddle and ball",
     "shortname": ":ping_pong:",
     "category": "activity",
@@ -21026,22 +23408,13 @@
       ":table_tennis:"
     ],
     "aliases_ascii": [],
-    "keywords": []
-  },
-  "piracy": {
-    "unicode": "1F572",
-    "unicode_alternates": [],
-    "name": "no piracy",
-    "shortname": ":piracy:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":no_piracy:"
-    ],
-    "aliases_ascii": [],
     "keywords": [
-      "theft",
-      "rule"
-    ]
+      "game",
+      "ball",
+      "sport",
+      "ping pong"
+    ],
+    "moji": "🏓"
   },
   "pisces": {
     "unicode": "2653",
@@ -21050,7 +23423,7 @@
     ],
     "name": "pisces",
     "shortname": ":pisces:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -21063,9 +23436,8 @@
       "zodiac",
       "sign",
       "purple-square",
-      "sign",
-      "zodiac",
-      "horoscope"
+      "horoscope",
+      "symbol"
     ],
     "moji": "♓"
   },
@@ -21074,7 +23446,7 @@
     "unicode_alternates": [],
     "name": "slice of pizza",
     "shortname": ":pizza:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -21086,13 +23458,14 @@
       "italian",
       "italy",
       "slice",
-      "peperoni"
+      "peperoni",
+      "boys night"
     ],
     "moji": "🍕"
   },
   "place_of_worship": {
     "unicode": "1F6D0",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "place of worship",
     "shortname": ":place_of_worship:",
     "category": "symbols",
@@ -21100,11 +23473,16 @@
       ":worship_symbol:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "religion",
+      "symbol",
+      "pray"
+    ],
+    "moji": "🛐"
   },
   "play_pause": {
     "unicode": "23EF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "black right-pointing double triangle with double vertical bar",
     "shortname": ":play_pause:",
     "category": "symbols",
@@ -21117,26 +23495,30 @@
       "right",
       "sound",
       "symbol"
-    ]
+    ],
+    "moji": "⏯"
   },
   "point_down": {
     "unicode": "1F447",
     "unicode_alternates": [],
     "name": "white down pointing backhand index",
     "shortname": ":point_down:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "direction",
       "fingers",
-      "hand"
+      "hand",
+      "body",
+      "hands",
+      "diversity"
     ],
     "moji": "👇"
   },
   "point_down_tone1": {
     "unicode": "1F447-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white down pointing backhand index tone 1",
     "shortname": ":point_down_tone1:",
     "category": "people",
@@ -21146,11 +23528,12 @@
       "direction",
       "finger",
       "hand"
-    ]
+    ],
+    "moji": "👇🏻"
   },
   "point_down_tone2": {
     "unicode": "1F447-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white down pointing backhand index tone 2",
     "shortname": ":point_down_tone2:",
     "category": "people",
@@ -21160,11 +23543,12 @@
       "direction",
       "finger",
       "hand"
-    ]
+    ],
+    "moji": "👇🏼"
   },
   "point_down_tone3": {
     "unicode": "1F447-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white down pointing backhand index tone 3",
     "shortname": ":point_down_tone3:",
     "category": "people",
@@ -21174,11 +23558,12 @@
       "direction",
       "finger",
       "hand"
-    ]
+    ],
+    "moji": "👇🏽"
   },
   "point_down_tone4": {
     "unicode": "1F447-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white down pointing backhand index tone 4",
     "shortname": ":point_down_tone4:",
     "category": "people",
@@ -21188,11 +23573,12 @@
       "direction",
       "finger",
       "hand"
-    ]
+    ],
+    "moji": "👇🏾"
   },
   "point_down_tone5": {
     "unicode": "1F447-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white down pointing backhand index tone 5",
     "shortname": ":point_down_tone5:",
     "category": "people",
@@ -21202,26 +23588,31 @@
       "direction",
       "finger",
       "hand"
-    ]
+    ],
+    "moji": "👇🏿"
   },
   "point_left": {
     "unicode": "1F448",
     "unicode_alternates": [],
     "name": "white left pointing backhand index",
     "shortname": ":point_left:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "direction",
       "fingers",
-      "hand"
+      "hand",
+      "body",
+      "hands",
+      "hi",
+      "diversity"
     ],
     "moji": "👈"
   },
   "point_left_tone1": {
     "unicode": "1F448-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white left pointing backhand index tone 1",
     "shortname": ":point_left_tone1:",
     "category": "people",
@@ -21231,11 +23622,12 @@
       "direction",
       "finger",
       "hand"
-    ]
+    ],
+    "moji": "👈🏻"
   },
   "point_left_tone2": {
     "unicode": "1F448-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white left pointing backhand index tone 2",
     "shortname": ":point_left_tone2:",
     "category": "people",
@@ -21245,11 +23637,12 @@
       "direction",
       "finger",
       "hand"
-    ]
+    ],
+    "moji": "👈🏼"
   },
   "point_left_tone3": {
     "unicode": "1F448-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white left pointing backhand index tone 3",
     "shortname": ":point_left_tone3:",
     "category": "people",
@@ -21259,11 +23652,12 @@
       "direction",
       "finger",
       "hand"
-    ]
+    ],
+    "moji": "👈🏽"
   },
   "point_left_tone4": {
     "unicode": "1F448-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white left pointing backhand index tone 4",
     "shortname": ":point_left_tone4:",
     "category": "people",
@@ -21273,11 +23667,12 @@
       "direction",
       "finger",
       "hand"
-    ]
+    ],
+    "moji": "👈🏾"
   },
   "point_left_tone5": {
     "unicode": "1F448-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white left pointing backhand index tone 5",
     "shortname": ":point_left_tone5:",
     "category": "people",
@@ -21287,26 +23682,31 @@
       "direction",
       "finger",
       "hand"
-    ]
+    ],
+    "moji": "👈🏿"
   },
   "point_right": {
     "unicode": "1F449",
     "unicode_alternates": [],
     "name": "white right pointing backhand index",
     "shortname": ":point_right:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "direction",
       "fingers",
-      "hand"
+      "hand",
+      "body",
+      "hands",
+      "hi",
+      "diversity"
     ],
     "moji": "👉"
   },
   "point_right_tone1": {
     "unicode": "1F449-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white right pointing backhand index tone 1",
     "shortname": ":point_right_tone1:",
     "category": "people",
@@ -21316,11 +23716,12 @@
       "direction",
       "finger",
       "hand"
-    ]
+    ],
+    "moji": "👉🏻"
   },
   "point_right_tone2": {
     "unicode": "1F449-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white right pointing backhand index tone 2",
     "shortname": ":point_right_tone2:",
     "category": "people",
@@ -21330,11 +23731,12 @@
       "direction",
       "finger",
       "hand"
-    ]
+    ],
+    "moji": "👉🏼"
   },
   "point_right_tone3": {
     "unicode": "1F449-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white right pointing backhand index tone 3",
     "shortname": ":point_right_tone3:",
     "category": "people",
@@ -21344,11 +23746,12 @@
       "direction",
       "finger",
       "hand"
-    ]
+    ],
+    "moji": "👉🏽"
   },
   "point_right_tone4": {
     "unicode": "1F449-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white right pointing backhand index tone 4",
     "shortname": ":point_right_tone4:",
     "category": "people",
@@ -21358,11 +23761,12 @@
       "direction",
       "finger",
       "hand"
-    ]
+    ],
+    "moji": "👉🏾"
   },
   "point_right_tone5": {
     "unicode": "1F449-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white right pointing backhand index tone 5",
     "shortname": ":point_right_tone5:",
     "category": "people",
@@ -21372,7 +23776,8 @@
       "direction",
       "finger",
       "hand"
-    ]
+    ],
+    "moji": "👉🏿"
   },
   "point_up": {
     "unicode": "261D",
@@ -21381,13 +23786,17 @@
     ],
     "name": "white up pointing index",
     "shortname": ":point_up:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "direction",
       "fingers",
-      "hand"
+      "hand",
+      "body",
+      "hands",
+      "emojione",
+      "diversity"
     ],
     "moji": "☝"
   },
@@ -21396,19 +23805,22 @@
     "unicode_alternates": [],
     "name": "white up pointing backhand index",
     "shortname": ":point_up_2:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "direction",
       "fingers",
-      "hand"
+      "hand",
+      "body",
+      "hands",
+      "diversity"
     ],
     "moji": "👆"
   },
   "point_up_2_tone1": {
     "unicode": "1F446-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white up pointing backhand index tone 1",
     "shortname": ":point_up_2_tone1:",
     "category": "people",
@@ -21419,11 +23831,12 @@
       "finger",
       "hand",
       "one"
-    ]
+    ],
+    "moji": "👆🏻"
   },
   "point_up_2_tone2": {
     "unicode": "1F446-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white up pointing backhand index tone 2",
     "shortname": ":point_up_2_tone2:",
     "category": "people",
@@ -21434,11 +23847,12 @@
       "finger",
       "hand",
       "one"
-    ]
+    ],
+    "moji": "👆🏼"
   },
   "point_up_2_tone3": {
     "unicode": "1F446-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white up pointing backhand index tone 3",
     "shortname": ":point_up_2_tone3:",
     "category": "people",
@@ -21449,11 +23863,12 @@
       "finger",
       "hand",
       "one"
-    ]
+    ],
+    "moji": "👆🏽"
   },
   "point_up_2_tone4": {
     "unicode": "1F446-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white up pointing backhand index tone 4",
     "shortname": ":point_up_2_tone4:",
     "category": "people",
@@ -21464,11 +23879,12 @@
       "finger",
       "hand",
       "one"
-    ]
+    ],
+    "moji": "👆🏾"
   },
   "point_up_2_tone5": {
     "unicode": "1F446-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white up pointing backhand index tone 5",
     "shortname": ":point_up_2_tone5:",
     "category": "people",
@@ -21479,11 +23895,12 @@
       "finger",
       "hand",
       "one"
-    ]
+    ],
+    "moji": "👆🏿"
   },
   "point_up_tone1": {
     "unicode": "261D-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white up pointing index tone 1",
     "shortname": ":point_up_tone1:",
     "category": "people",
@@ -21494,11 +23911,12 @@
       "finger",
       "hand",
       "one"
-    ]
+    ],
+    "moji": "☝🏻"
   },
   "point_up_tone2": {
     "unicode": "261D-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white up pointing index tone 2",
     "shortname": ":point_up_tone2:",
     "category": "people",
@@ -21509,11 +23927,12 @@
       "finger",
       "hand",
       "one"
-    ]
+    ],
+    "moji": "☝🏼"
   },
   "point_up_tone3": {
     "unicode": "261D-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white up pointing index tone 3",
     "shortname": ":point_up_tone3:",
     "category": "people",
@@ -21524,11 +23943,12 @@
       "finger",
       "hand",
       "one"
-    ]
+    ],
+    "moji": "☝🏽"
   },
   "point_up_tone4": {
     "unicode": "261D-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white up pointing index tone 4",
     "shortname": ":point_up_tone4:",
     "category": "people",
@@ -21539,11 +23959,12 @@
       "finger",
       "hand",
       "one"
-    ]
+    ],
+    "moji": "☝🏾"
   },
   "point_up_tone5": {
     "unicode": "261D-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white up pointing index tone 5",
     "shortname": ":point_up_tone5:",
     "category": "people",
@@ -21554,14 +23975,15 @@
       "finger",
       "hand",
       "one"
-    ]
+    ],
+    "moji": "☝🏿"
   },
   "police_car": {
     "unicode": "1F693",
     "unicode_alternates": [],
     "name": "police car",
     "shortname": ":police_car:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -21577,7 +23999,8 @@
       "citation",
       "crime",
       "help",
-      "officer"
+      "officer",
+      "911"
     ],
     "moji": "🚓"
   },
@@ -21595,7 +24018,6 @@
       "dog",
       "nature",
       "poodle",
-      "dog",
       "clip",
       "showy",
       "sophisticated",
@@ -21608,7 +24030,7 @@
     "unicode_alternates": [],
     "name": "pile of poo",
     "shortname": ":poop:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [
       ":shit:",
       ":hankey:",
@@ -21620,32 +24042,41 @@
       "shit",
       "shitface",
       "turd",
-      "poo"
+      "poo",
+      "bathroom",
+      "sol",
+      "diarrhea"
     ],
     "moji": "💩"
   },
   "popcorn": {
     "unicode": "1F37F",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "popcorn",
     "shortname": ":popcorn:",
-    "category": "foods",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "food",
+      "parties"
+    ],
+    "moji": "🍿"
   },
   "post_office": {
     "unicode": "1F3E3",
     "unicode_alternates": [],
     "name": "japanese post office",
     "shortname": ":post_office:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "building",
       "communication",
-      "email"
+      "email",
+      "places",
+      "post office"
     ],
     "moji": "🏣"
   },
@@ -21659,7 +24090,8 @@
     "aliases_ascii": [],
     "keywords": [
       "instrument",
-      "music"
+      "music",
+      "object"
     ],
     "moji": "📯"
   },
@@ -21674,7 +24106,8 @@
     "keywords": [
       "email",
       "envelope",
-      "letter"
+      "letter",
+      "object"
     ],
     "moji": "📮"
   },
@@ -21683,7 +24116,7 @@
     "unicode_alternates": [],
     "name": "potable water symbol",
     "shortname": ":potable_water:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -21699,27 +24132,40 @@
       "clear",
       "clean",
       "aqua",
-      "h20"
+      "h20",
+      "symbol"
     ],
     "moji": "🚰"
   },
+  "potato": {
+    "unicode": "1F954",
+    "unicode_alternates": [],
+    "name": "potato",
+    "shortname": ":potato:",
+    "category": "food",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🥔"
+  },
   "pouch": {
     "unicode": "1F45D",
     "unicode_alternates": [],
     "name": "pouch",
     "shortname": ":pouch:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "accessories",
       "bag",
       "pouch",
-      "bag",
       "cosmetic",
       "packing",
       "grandma",
-      "makeup"
+      "makeup",
+      "women",
+      "fashion"
     ],
     "moji": "👝"
   },
@@ -21728,7 +24174,7 @@
     "unicode_alternates": [],
     "name": "poultry leg",
     "shortname": ":poultry_leg:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -21737,7 +24183,8 @@
       "poultry",
       "leg",
       "chicken",
-      "fried"
+      "fried",
+      "holidays"
     ],
     "moji": "🍗"
   },
@@ -21759,13 +24206,9 @@
       "uk",
       "pound",
       "britain",
-      "british",
       "banknote",
-      "money",
-      "currency",
       "paper",
-      "cash",
-      "bills"
+      "cash"
     ],
     "moji": "💷"
   },
@@ -21774,7 +24217,7 @@
     "unicode_alternates": [],
     "name": "pouting cat face",
     "shortname": ":pouting_cat:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -21784,7 +24227,8 @@
       "annoyed",
       "miffed",
       "glower",
-      "frown"
+      "frown",
+      "cat"
     ],
     "moji": "😾"
   },
@@ -21793,7 +24237,7 @@
     "unicode_alternates": [],
     "name": "person with folded hands",
     "shortname": ":pray:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -21807,13 +24251,19 @@
       "hands",
       "sorrow",
       "regret",
-      "sorry"
+      "sorry",
+      "body",
+      "hi",
+      "luck",
+      "thank you",
+      "diversity",
+      "scientology"
     ],
     "moji": "🙏"
   },
   "pray_tone1": {
     "unicode": "1F64F-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person with folded hands tone 1",
     "shortname": ":pray_tone1:",
     "category": "people",
@@ -21830,11 +24280,12 @@
       "sorrow",
       "regret",
       "sorry"
-    ]
+    ],
+    "moji": "🙏🏻"
   },
   "pray_tone2": {
     "unicode": "1F64F-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person with folded hands tone 2",
     "shortname": ":pray_tone2:",
     "category": "people",
@@ -21851,11 +24302,12 @@
       "sorrow",
       "regret",
       "sorry"
-    ]
+    ],
+    "moji": "🙏🏼"
   },
   "pray_tone3": {
     "unicode": "1F64F-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person with folded hands tone 3",
     "shortname": ":pray_tone3:",
     "category": "people",
@@ -21872,11 +24324,12 @@
       "sorrow",
       "regret",
       "sorry"
-    ]
+    ],
+    "moji": "🙏🏽"
   },
   "pray_tone4": {
     "unicode": "1F64F-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person with folded hands tone 4",
     "shortname": ":pray_tone4:",
     "category": "people",
@@ -21893,11 +24346,12 @@
       "sorrow",
       "regret",
       "sorry"
-    ]
+    ],
+    "moji": "🙏🏾"
   },
   "pray_tone5": {
     "unicode": "1F64F-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person with folded hands tone 5",
     "shortname": ":pray_tone5:",
     "category": "people",
@@ -21914,24 +24368,173 @@
       "sorrow",
       "regret",
       "sorry"
-    ]
+    ],
+    "moji": "🙏🏿"
   },
   "prayer_beads": {
     "unicode": "1F4FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "prayer beads",
     "shortname": ":prayer_beads:",
     "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "object",
+      "rosary"
+    ],
+    "moji": "📿"
+  },
+  "pregnant_woman": {
+    "unicode": "1F930",
+    "unicode_alternates": [],
+    "name": "pregnant woman",
+    "shortname": ":pregnant_woman:",
+    "category": "people",
+    "aliases": [
+      ":expecting_woman:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤰"
+  },
+  "pregnant_woman_tone1": {
+    "unicode": "1F930-1F3FB",
+    "unicode_alternates": [],
+    "name": "pregnant woman tone 1",
+    "shortname": ":pregnant_woman_tone1:",
+    "category": "people",
+    "aliases": [
+      ":expecting_woman_tone1:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤰🏻"
+  },
+  "pregnant_woman_tone2": {
+    "unicode": "1F930-1F3FC",
+    "unicode_alternates": [],
+    "name": "pregnant woman tone 2",
+    "shortname": ":pregnant_woman_tone2:",
+    "category": "people",
+    "aliases": [
+      ":expecting_woman_tone2:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤰🏼"
+  },
+  "pregnant_woman_tone3": {
+    "unicode": "1F930-1F3FD",
+    "unicode_alternates": [],
+    "name": "pregnant woman tone 3",
+    "shortname": ":pregnant_woman_tone3:",
+    "category": "people",
+    "aliases": [
+      ":expecting_woman_tone3:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤰🏽"
+  },
+  "pregnant_woman_tone4": {
+    "unicode": "1F930-1F3FE",
+    "unicode_alternates": [],
+    "name": "pregnant woman tone 4",
+    "shortname": ":pregnant_woman_tone4:",
+    "category": "people",
+    "aliases": [
+      ":expecting_woman_tone4:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤰🏾"
+  },
+  "pregnant_woman_tone5": {
+    "unicode": "1F930-1F3FF",
+    "unicode_alternates": [],
+    "name": "pregnant woman tone 5",
+    "shortname": ":pregnant_woman_tone5:",
+    "category": "people",
+    "aliases": [
+      ":expecting_woman_tone5:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤰🏿"
+  },
+  "prince": {
+    "unicode": "1F934",
+    "unicode_alternates": [],
+    "name": "prince",
+    "shortname": ":prince:",
+    "category": "people",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤴"
+  },
+  "prince_tone1": {
+    "unicode": "1F934-1F3FB",
+    "unicode_alternates": [],
+    "name": "prince tone 1",
+    "shortname": ":prince_tone1:",
+    "category": "people",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤴🏻"
+  },
+  "prince_tone2": {
+    "unicode": "1F934-1F3FC",
+    "unicode_alternates": [],
+    "name": "prince tone 2",
+    "shortname": ":prince_tone2:",
+    "category": "people",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤴🏼"
+  },
+  "prince_tone3": {
+    "unicode": "1F934-1F3FD",
+    "unicode_alternates": [],
+    "name": "prince tone 3",
+    "shortname": ":prince_tone3:",
+    "category": "people",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤴🏽"
+  },
+  "prince_tone4": {
+    "unicode": "1F934-1F3FE",
+    "unicode_alternates": [],
+    "name": "prince tone 4",
+    "shortname": ":prince_tone4:",
+    "category": "people",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤴🏾"
+  },
+  "prince_tone5": {
+    "unicode": "1F934-1F3FF",
+    "unicode_alternates": [],
+    "name": "prince tone 5",
+    "shortname": ":prince_tone5:",
+    "category": "people",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤴🏿"
   },
   "princess": {
     "unicode": "1F478",
     "unicode_alternates": [],
     "name": "princess",
     "shortname": ":princess:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -21947,13 +24550,18 @@
       "queen",
       "daughter",
       "disney",
-      "high-maintenance"
+      "high-maintenance",
+      "people",
+      "women",
+      "diversity",
+      "beautiful",
+      "girls night"
     ],
     "moji": "👸"
   },
   "princess_tone1": {
     "unicode": "1F478-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "princess tone 1",
     "shortname": ":princess_tone1:",
     "category": "people",
@@ -21972,11 +24580,12 @@
       "daughter",
       "disney",
       "high-maintenance"
-    ]
+    ],
+    "moji": "👸🏻"
   },
   "princess_tone2": {
     "unicode": "1F478-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "princess tone 2",
     "shortname": ":princess_tone2:",
     "category": "people",
@@ -21995,11 +24604,12 @@
       "daughter",
       "disney",
       "high-maintenance"
-    ]
+    ],
+    "moji": "👸🏼"
   },
   "princess_tone3": {
     "unicode": "1F478-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "princess tone 3",
     "shortname": ":princess_tone3:",
     "category": "people",
@@ -22018,11 +24628,12 @@
       "daughter",
       "disney",
       "high-maintenance"
-    ]
+    ],
+    "moji": "👸🏽"
   },
   "princess_tone4": {
     "unicode": "1F478-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "princess tone 4",
     "shortname": ":princess_tone4:",
     "category": "people",
@@ -22041,11 +24652,12 @@
       "daughter",
       "disney",
       "high-maintenance"
-    ]
+    ],
+    "moji": "👸🏾"
   },
   "princess_tone5": {
     "unicode": "1F478-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "princess tone 5",
     "shortname": ":princess_tone5:",
     "category": "people",
@@ -22064,49 +24676,34 @@
       "daughter",
       "disney",
       "high-maintenance"
-    ]
+    ],
+    "moji": "👸🏿"
   },
   "printer": {
     "unicode": "1F5A8",
     "unicode_alternates": [],
     "name": "printer",
     "shortname": ":printer:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "hardcopy",
       "paper",
       "inkjet",
-      "laser"
-    ]
-  },
-  "prohibited": {
-    "unicode": "1F6C7",
-    "unicode_alternates": [],
-    "name": "prohibited sign",
-    "shortname": ":prohibited:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":prohibited_sign:"
+      "laser",
+      "electronics",
+      "work",
+      "office"
     ],
-    "aliases_ascii": [],
-    "keywords": [
-      "no",
-      "not",
-      "denied",
-      "disallow",
-      "forbid",
-      "limit",
-      "stop"
-    ]
+    "moji": "🖨"
   },
   "projector": {
     "unicode": "1F4FD",
     "unicode_alternates": [],
     "name": "film projector",
     "shortname": ":projector:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [
       ":film_projector:"
     ],
@@ -22117,26 +24714,35 @@
       "motion",
       "picture",
       "8mm",
-      "16mm"
-    ]
+      "16mm",
+      "object",
+      "camera"
+    ],
+    "moji": "📽"
   },
   "punch": {
     "unicode": "1F44A",
     "unicode_alternates": [],
     "name": "fisted hand sign",
     "shortname": ":punch:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "fist",
-      "hand"
+      "hand",
+      "body",
+      "hands",
+      "hi",
+      "fist bump",
+      "diversity",
+      "boys night"
     ],
     "moji": "👊"
   },
   "punch_tone1": {
     "unicode": "1F44A-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "fisted hand sign tone 1",
     "shortname": ":punch_tone1:",
     "category": "people",
@@ -22145,11 +24751,12 @@
     "keywords": [
       "fist",
       "punch"
-    ]
+    ],
+    "moji": "👊🏻"
   },
   "punch_tone2": {
     "unicode": "1F44A-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "fisted hand sign tone 2",
     "shortname": ":punch_tone2:",
     "category": "people",
@@ -22158,11 +24765,12 @@
     "keywords": [
       "fist",
       "punch"
-    ]
+    ],
+    "moji": "👊🏼"
   },
   "punch_tone3": {
     "unicode": "1F44A-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "fisted hand sign tone 3",
     "shortname": ":punch_tone3:",
     "category": "people",
@@ -22171,11 +24779,12 @@
     "keywords": [
       "fist",
       "punch"
-    ]
+    ],
+    "moji": "👊🏽"
   },
   "punch_tone4": {
     "unicode": "1F44A-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "fisted hand sign tone 4",
     "shortname": ":punch_tone4:",
     "category": "people",
@@ -22184,11 +24793,12 @@
     "keywords": [
       "fist",
       "punch"
-    ]
+    ],
+    "moji": "👊🏾"
   },
   "punch_tone5": {
     "unicode": "1F44A-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "fisted hand sign tone 5",
     "shortname": ":punch_tone5:",
     "category": "people",
@@ -22197,14 +24807,15 @@
     "keywords": [
       "fist",
       "punch"
-    ]
+    ],
+    "moji": "👊🏿"
   },
   "purple_heart": {
     "unicode": "1F49C",
     "unicode_alternates": [],
     "name": "purple heart",
     "shortname": ":purple_heart:",
-    "category": "emoticons",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -22215,7 +24826,6 @@
       "purple",
       "violet",
       "heart",
-      "love",
       "sensitive",
       "understanding",
       "compassionate",
@@ -22224,7 +24834,8 @@
       "honor",
       "royalty",
       "veteran",
-      "sacrifice"
+      "sacrifice",
+      "symbol"
     ],
     "moji": "💜"
   },
@@ -22233,7 +24844,7 @@
     "unicode_alternates": [],
     "name": "purse",
     "shortname": ":purse:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -22246,9 +24857,9 @@
       "handbag",
       "coin bag",
       "accessory",
-      "money",
       "ladies",
-      "shopping"
+      "shopping",
+      "women"
     ],
     "moji": "👛"
   },
@@ -22261,28 +24872,18 @@
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "stationery"
+      "stationery",
+      "object",
+      "office"
     ],
     "moji": "📌"
   },
-  "pushpin_black": {
-    "unicode": "1F588",
-    "unicode_alternates": [],
-    "name": "black pushpin",
-    "shortname": ":pushpin_black:",
-    "category": "objects_symbols",
-    "aliases": [],
-    "aliases_ascii": [],
-    "keywords": [
-      "stationery"
-    ]
-  },
   "put_litter_in_its_place": {
     "unicode": "1F6AE",
     "unicode_alternates": [],
     "name": "put litter in its place symbol",
     "shortname": ":put_litter_in_its_place:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -22292,7 +24893,8 @@
       "trash",
       "garbage",
       "receptacle",
-      "can"
+      "can",
+      "symbol"
     ],
     "moji": "🚮"
   },
@@ -22301,12 +24903,15 @@
     "unicode_alternates": [],
     "name": "black question mark ornament",
     "shortname": ":question:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "confused",
-      "doubt"
+      "doubt",
+      "symbol",
+      "punctuation",
+      "wth"
     ],
     "moji": "❓"
   },
@@ -22320,7 +24925,8 @@
     "aliases_ascii": [],
     "keywords": [
       "animal",
-      "nature"
+      "nature",
+      "wildlife"
     ],
     "moji": "🐰"
   },
@@ -22339,7 +24945,8 @@
       "bunny",
       "easter",
       "reproduction",
-      "prolific"
+      "prolific",
+      "wildlife"
     ],
     "moji": "🐇"
   },
@@ -22348,7 +24955,7 @@
     "unicode_alternates": [],
     "name": "racing car",
     "shortname": ":race_car:",
-    "category": "activity",
+    "category": "travel",
     "aliases": [
       ":racing_car:"
     ],
@@ -22359,8 +24966,11 @@
       "stock",
       "nascar",
       "speed",
-      "drive"
-    ]
+      "drive",
+      "transportation",
+      "car"
+    ],
+    "moji": "🏎"
   },
   "racehorse": {
     "unicode": "1F40E",
@@ -22391,7 +25001,8 @@
       "gelding",
       "yearling",
       "thoroughbred",
-      "pony"
+      "pony",
+      "wildlife"
     ],
     "moji": "🐎"
   },
@@ -22407,7 +25018,8 @@
       "communication",
       "music",
       "podcast",
-      "program"
+      "program",
+      "electronics"
     ],
     "moji": "📻"
   },
@@ -22416,17 +25028,19 @@
     "unicode_alternates": [],
     "name": "radio button",
     "shortname": ":radio_button:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "input"
+      "input",
+      "symbol",
+      "circle"
     ],
     "moji": "🔘"
   },
   "radioactive": {
     "unicode": "2622",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "radioactive sign",
     "shortname": ":radioactive:",
     "category": "symbols",
@@ -22435,15 +25049,17 @@
     ],
     "aliases_ascii": [],
     "keywords": [
-      "symbol"
-    ]
+      "symbol",
+      "science"
+    ],
+    "moji": "☢"
   },
   "rage": {
     "unicode": "1F621",
     "unicode_alternates": [],
     "name": "pouting face",
     "shortname": ":rage:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -22454,7 +25070,9 @@
       "pout",
       "anger",
       "rage",
-      "irate"
+      "irate",
+      "smiley",
+      "emotion"
     ],
     "moji": "😡"
   },
@@ -22463,7 +25081,7 @@
     "unicode_alternates": [],
     "name": "railway car",
     "shortname": ":railway_car:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -22473,7 +25091,8 @@
       "rail",
       "car",
       "coach",
-      "train"
+      "train",
+      "travel"
     ],
     "moji": "🚃"
   },
@@ -22482,7 +25101,7 @@
     "unicode_alternates": [],
     "name": "railway track",
     "shortname": ":railway_track:",
-    "category": "travel_places",
+    "category": "travel",
     "aliases": [
       ":railroad_track:"
     ],
@@ -22492,15 +25111,18 @@
       "trolley",
       "subway",
       "locomotive",
-      "transit"
-    ]
+      "transit",
+      "travel",
+      "vacation"
+    ],
+    "moji": "🛤"
   },
   "rainbow": {
     "unicode": "1F308",
     "unicode_alternates": [],
     "name": "rainbow",
     "shortname": ":rainbow:",
-    "category": "nature",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -22516,28 +25138,114 @@
       "spectrum",
       "refract",
       "leprechaun",
-      "gold"
+      "gold",
+      "weather",
+      "gay",
+      "rain"
     ],
     "moji": "🌈"
   },
+  "raised_back_of_hand": {
+    "unicode": "1F91A",
+    "unicode_alternates": [],
+    "name": "raised back of hand",
+    "shortname": ":raised_back_of_hand:",
+    "category": "people",
+    "aliases": [
+      ":back_of_hand:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤚"
+  },
+  "raised_back_of_hand_tone1": {
+    "unicode": "1F91A-1F3FB",
+    "unicode_alternates": [],
+    "name": "raised back of hand tone 1",
+    "shortname": ":raised_back_of_hand_tone1:",
+    "category": "people",
+    "aliases": [
+      ":back_of_hand_tone1:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤚🏻"
+  },
+  "raised_back_of_hand_tone2": {
+    "unicode": "1F91A-1F3FC",
+    "unicode_alternates": [],
+    "name": "raised back of hand tone 2",
+    "shortname": ":raised_back_of_hand_tone2:",
+    "category": "people",
+    "aliases": [
+      ":back_of_hand_tone2:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤚🏼"
+  },
+  "raised_back_of_hand_tone3": {
+    "unicode": "1F91A-1F3FD",
+    "unicode_alternates": [],
+    "name": "raised back of hand tone 3",
+    "shortname": ":raised_back_of_hand_tone3:",
+    "category": "people",
+    "aliases": [
+      ":back_of_hand_tone3:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤚🏽"
+  },
+  "raised_back_of_hand_tone4": {
+    "unicode": "1F91A-1F3FE",
+    "unicode_alternates": [],
+    "name": "raised back of hand tone 4",
+    "shortname": ":raised_back_of_hand_tone4:",
+    "category": "people",
+    "aliases": [
+      ":back_of_hand_tone4:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤚🏾"
+  },
+  "raised_back_of_hand_tone5": {
+    "unicode": "1F91A-1F3FF",
+    "unicode_alternates": [],
+    "name": "raised back of hand tone 5",
+    "shortname": ":raised_back_of_hand_tone5:",
+    "category": "people",
+    "aliases": [
+      ":back_of_hand_tone5:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤚🏿"
+  },
   "raised_hand": {
     "unicode": "270B",
     "unicode_alternates": [],
     "name": "raised hand",
     "shortname": ":raised_hand:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "female",
       "girl",
-      "woman"
+      "woman",
+      "body",
+      "hands",
+      "hi",
+      "diversity",
+      "girls night"
     ],
     "moji": "✋"
   },
   "raised_hand_tone1": {
     "unicode": "270B-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "raised hand tone 1",
     "shortname": ":raised_hand_tone1:",
     "category": "people",
@@ -22547,11 +25255,12 @@
       "female",
       "girl",
       "woman"
-    ]
+    ],
+    "moji": "✋🏻"
   },
   "raised_hand_tone2": {
     "unicode": "270B-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "raised hand tone 2",
     "shortname": ":raised_hand_tone2:",
     "category": "people",
@@ -22561,11 +25270,12 @@
       "female",
       "girl",
       "woman"
-    ]
+    ],
+    "moji": "✋🏼"
   },
   "raised_hand_tone3": {
     "unicode": "270B-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "raised hand tone 3",
     "shortname": ":raised_hand_tone3:",
     "category": "people",
@@ -22575,11 +25285,12 @@
       "female",
       "girl",
       "woman"
-    ]
+    ],
+    "moji": "✋🏽"
   },
   "raised_hand_tone4": {
     "unicode": "270B-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "raised hand tone 4",
     "shortname": ":raised_hand_tone4:",
     "category": "people",
@@ -22589,11 +25300,12 @@
       "female",
       "girl",
       "woman"
-    ]
+    ],
+    "moji": "✋🏾"
   },
   "raised_hand_tone5": {
     "unicode": "270B-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "raised hand tone 5",
     "shortname": ":raised_hand_tone5:",
     "category": "people",
@@ -22603,14 +25315,15 @@
       "female",
       "girl",
       "woman"
-    ]
+    ],
+    "moji": "✋🏿"
   },
   "raised_hands": {
     "unicode": "1F64C",
     "unicode_alternates": [],
     "name": "person raising both hands in celebration",
     "shortname": ":raised_hands:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -22619,13 +25332,19 @@
       "winning",
       "woot",
       "yay",
-      "banzai"
+      "banzai",
+      "body",
+      "hands",
+      "diversity",
+      "perfect",
+      "good",
+      "parties"
     ],
     "moji": "🙌"
   },
   "raised_hands_tone1": {
     "unicode": "1F64C-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person raising both hands in celebration tone 1",
     "shortname": ":raised_hands_tone1:",
     "category": "people",
@@ -22639,11 +25358,12 @@
       "yay",
       "banzai",
       "raised"
-    ]
+    ],
+    "moji": "🙌🏻"
   },
   "raised_hands_tone2": {
     "unicode": "1F64C-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person raising both hands in celebration tone 2",
     "shortname": ":raised_hands_tone2:",
     "category": "people",
@@ -22657,11 +25377,12 @@
       "yay",
       "banzai",
       "raised"
-    ]
+    ],
+    "moji": "🙌🏼"
   },
   "raised_hands_tone3": {
     "unicode": "1F64C-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person raising both hands in celebration tone 3",
     "shortname": ":raised_hands_tone3:",
     "category": "people",
@@ -22675,11 +25396,12 @@
       "yay",
       "banzai",
       "raised"
-    ]
+    ],
+    "moji": "🙌🏽"
   },
   "raised_hands_tone4": {
     "unicode": "1F64C-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person raising both hands in celebration tone 4",
     "shortname": ":raised_hands_tone4:",
     "category": "people",
@@ -22693,11 +25415,12 @@
       "yay",
       "banzai",
       "raised"
-    ]
+    ],
+    "moji": "🙌🏾"
   },
   "raised_hands_tone5": {
     "unicode": "1F64C-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "person raising both hands in celebration tone 5",
     "shortname": ":raised_hands_tone5:",
     "category": "people",
@@ -22711,14 +25434,15 @@
       "yay",
       "banzai",
       "raised"
-    ]
+    ],
+    "moji": "🙌🏿"
   },
   "raising_hand": {
     "unicode": "1F64B",
     "unicode_alternates": [],
     "name": "happy person raising one hand",
     "shortname": ":raising_hand:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -22729,13 +25453,16 @@
       "raise",
       "notice",
       "attention",
-      "answer"
+      "answer",
+      "people",
+      "women",
+      "diversity"
     ],
     "moji": "🙋"
   },
   "raising_hand_tone1": {
     "unicode": "1F64B-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "happy person raising one hand tone1",
     "shortname": ":raising_hand_tone1:",
     "category": "people",
@@ -22749,11 +25476,12 @@
       "notice",
       "attention",
       "answer"
-    ]
+    ],
+    "moji": "🙋🏻"
   },
   "raising_hand_tone2": {
     "unicode": "1F64B-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "happy person raising one hand tone2",
     "shortname": ":raising_hand_tone2:",
     "category": "people",
@@ -22767,11 +25495,12 @@
       "notice",
       "attention",
       "answer"
-    ]
+    ],
+    "moji": "🙋🏼"
   },
   "raising_hand_tone3": {
     "unicode": "1F64B-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "happy person raising one hand tone3",
     "shortname": ":raising_hand_tone3:",
     "category": "people",
@@ -22785,11 +25514,12 @@
       "notice",
       "attention",
       "answer"
-    ]
+    ],
+    "moji": "🙋🏽"
   },
   "raising_hand_tone4": {
     "unicode": "1F64B-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "happy person raising one hand tone4",
     "shortname": ":raising_hand_tone4:",
     "category": "people",
@@ -22803,11 +25533,12 @@
       "notice",
       "attention",
       "answer"
-    ]
+    ],
+    "moji": "🙋🏾"
   },
   "raising_hand_tone5": {
     "unicode": "1F64B-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "happy person raising one hand tone5",
     "shortname": ":raising_hand_tone5:",
     "category": "people",
@@ -22821,7 +25552,8 @@
       "notice",
       "attention",
       "answer"
-    ]
+    ],
+    "moji": "🙋🏿"
   },
   "ram": {
     "unicode": "1F40F",
@@ -22836,10 +25568,10 @@
       "nature",
       "sheep",
       "ram",
-      "sheep",
       "male",
       "horn",
-      "horns"
+      "horns",
+      "wildlife"
     ],
     "moji": "🐏"
   },
@@ -22848,7 +25580,7 @@
     "unicode_alternates": [],
     "name": "steaming bowl",
     "shortname": ":ramen:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -22860,7 +25592,8 @@
       "noodles",
       "bowl",
       "steaming",
-      "soup"
+      "soup",
+      "japan"
     ],
     "moji": "🍜"
   },
@@ -22884,7 +25617,7 @@
   },
   "record_button": {
     "unicode": "23FA",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "black circle for record",
     "shortname": ":record_button:",
     "category": "symbols",
@@ -22892,8 +25625,10 @@
     "aliases_ascii": [],
     "keywords": [
       "sound",
-      "symbol"
-    ]
+      "symbol",
+      "circle"
+    ],
+    "moji": "⏺"
   },
   "recycle": {
     "unicode": "267B",
@@ -22902,14 +25637,15 @@
     ],
     "name": "black universal recycling symbol",
     "shortname": ":recycle:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "arrow",
       "environment",
       "garbage",
-      "trash"
+      "trash",
+      "symbol"
     ],
     "moji": "♻"
   },
@@ -22918,12 +25654,14 @@
     "unicode_alternates": [],
     "name": "automobile",
     "shortname": ":red_car:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "transportation",
-      "vehicle"
+      "vehicle",
+      "car",
+      "travel"
     ],
     "moji": "🚗"
   },
@@ -22932,11 +25670,14 @@
     "unicode_alternates": [],
     "name": "large red circle",
     "shortname": ":red_circle:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "shape"
+      "shape",
+      "shapes",
+      "symbol",
+      "circle"
     ],
     "moji": "🔴"
   },
@@ -22946,12 +25687,13 @@
     "unicode_alternates": [],
     "name": "registered sign",
     "shortname": ":registered:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "alphabet",
-      "circle"
+      "circle",
+      "symbol"
     ]
   },
   "relaxed": {
@@ -22961,7 +25703,7 @@
     ],
     "name": "white smiling face",
     "shortname": ":relaxed:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -22969,7 +25711,9 @@
       "face",
       "happiness",
       "massage",
-      "smile"
+      "smile",
+      "happy",
+      "smiley"
     ],
     "moji": "☺"
   },
@@ -22978,7 +25722,7 @@
     "unicode_alternates": [],
     "name": "relieved face",
     "shortname": ":relieved:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -22989,8 +25733,9 @@
       "relaxed",
       "relieved",
       "satisfied",
-      "phew",
-      "relief"
+      "relief",
+      "smiley",
+      "emotion"
     ],
     "moji": "😌"
   },
@@ -22999,24 +25744,28 @@
     "unicode_alternates": [],
     "name": "reminder ribbon",
     "shortname": ":reminder_ribbon:",
-    "category": "celebration",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "awareness"
-    ]
+      "awareness",
+      "award"
+    ],
+    "moji": "🎗"
   },
   "repeat": {
     "unicode": "1F501",
     "unicode_alternates": [],
     "name": "clockwise rightwards and leftwards open circle arr",
     "shortname": ":repeat:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "loop",
-      "record"
+      "record",
+      "arrow",
+      "symbol"
     ],
     "moji": "🔁"
   },
@@ -23025,12 +25774,14 @@
     "unicode_alternates": [],
     "name": "clockwise rightwards and leftwards open circle arr",
     "shortname": ":repeat_one:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "blue-square",
-      "loop"
+      "loop",
+      "arrow",
+      "symbol"
     ],
     "moji": "🔂"
   },
@@ -23039,7 +25790,7 @@
     "unicode_alternates": [],
     "name": "restroom",
     "shortname": ":restroom:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -23051,7 +25802,8 @@
       "restroom",
       "sign",
       "shared",
-      "toilet"
+      "toilet",
+      "symbol"
     ],
     "moji": "🚻"
   },
@@ -23060,7 +25812,7 @@
     "unicode_alternates": [],
     "name": "revolving hearts",
     "shortname": ":revolving_hearts:",
-    "category": "emoticons",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -23074,7 +25826,8 @@
       "moving",
       "circle",
       "multiple",
-      "lovers"
+      "lovers",
+      "symbol"
     ],
     "moji": "💞"
   },
@@ -23083,21 +25836,36 @@
     "unicode_alternates": [],
     "name": "black left-pointing double triangle",
     "shortname": ":rewind:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "blue-square",
-      "play"
+      "play",
+      "arrow",
+      "symbol"
     ],
     "moji": "⏪"
   },
+  "rhino": {
+    "unicode": "1F98F",
+    "unicode_alternates": [],
+    "name": "rhinoceros",
+    "shortname": ":rhino:",
+    "category": "nature",
+    "aliases": [
+      ":rhinoceros:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🦏"
+  },
   "ribbon": {
     "unicode": "1F380",
     "unicode_alternates": [],
     "name": "ribbon",
     "shortname": ":ribbon:",
-    "category": "emoticons",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -23108,7 +25876,10 @@
       "ribbon",
       "lace",
       "wrap",
-      "decorate"
+      "decorate",
+      "object",
+      "gift",
+      "birthday"
     ],
     "moji": "🎀"
   },
@@ -23117,7 +25888,7 @@
     "unicode_alternates": [],
     "name": "cooked rice",
     "shortname": ":rice:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -23125,8 +25896,9 @@
       "rice",
       "white",
       "grain",
-      "food",
-      "bowl"
+      "bowl",
+      "sushi",
+      "japan"
     ],
     "moji": "🍚"
   },
@@ -23135,7 +25907,7 @@
     "unicode_alternates": [],
     "name": "rice ball",
     "shortname": ":rice_ball:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -23146,7 +25918,8 @@
       "white",
       "nori",
       "seaweed",
-      "japanese"
+      "sushi",
+      "japan"
     ],
     "moji": "🍙"
   },
@@ -23155,7 +25928,7 @@
     "unicode_alternates": [],
     "name": "rice cracker",
     "shortname": ":rice_cracker:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -23164,8 +25937,7 @@
       "rice",
       "cracker",
       "seaweed",
-      "food",
-      "japanese"
+      "sushi"
     ],
     "moji": "🍘"
   },
@@ -23174,7 +25946,7 @@
     "unicode_alternates": [],
     "name": "moon viewing ceremony",
     "shortname": ":rice_scene:",
-    "category": "objects",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -23187,92 +25959,115 @@
       "rice",
       "scene",
       "festival",
-      "autumn"
+      "autumn",
+      "places",
+      "space",
+      "sky",
+      "travel"
     ],
     "moji": "🎑"
   },
-  "right_speaker": {
-    "unicode": "1F568",
+  "right_facing_fist": {
+    "unicode": "1F91C",
     "unicode_alternates": [],
-    "name": "right speaker",
-    "shortname": ":right_speaker:",
-    "category": "objects_symbols",
-    "aliases": [],
+    "name": "right-facing fist",
+    "shortname": ":right_facing_fist:",
+    "category": "people",
+    "aliases": [
+      ":right_fist:"
+    ],
     "aliases_ascii": [],
-    "keywords": [
-      "sound",
-      "listen",
-      "hear",
-      "noise",
-      "volume"
-    ]
+    "keywords": [],
+    "moji": "🤜"
   },
-  "right_speaker_one": {
-    "unicode": "1F569",
+  "right_facing_fist_tone1": {
+    "unicode": "1F91C-1F3FB",
     "unicode_alternates": [],
-    "name": "right speaker with one sound wave",
-    "shortname": ":right_speaker_one:",
-    "category": "objects_symbols",
+    "name": "right facing fist tone 1",
+    "shortname": ":right_facing_fist_tone1:",
+    "category": "people",
     "aliases": [
-      ":right_speaker_with_one_sound_wave:"
+      ":right_fist_tone1:"
     ],
     "aliases_ascii": [],
-    "keywords": [
-      "low",
-      "volume"
-    ]
+    "keywords": [],
+    "moji": "🤜🏻"
   },
-  "right_speaker_three": {
-    "unicode": "1F56A",
+  "right_facing_fist_tone2": {
+    "unicode": "1F91C-1F3FC",
     "unicode_alternates": [],
-    "name": "right speaker with three sound waves",
-    "shortname": ":right_speaker_three:",
-    "category": "objects_symbols",
+    "name": "right facing fist tone 2",
+    "shortname": ":right_facing_fist_tone2:",
+    "category": "people",
     "aliases": [
-      ":right_speaker_with_three_sound_waves:"
+      ":right_fist_tone2:"
     ],
     "aliases_ascii": [],
-    "keywords": [
-      "loud",
-      "high",
-      "volume"
-    ]
+    "keywords": [],
+    "moji": "🤜🏼"
+  },
+  "right_facing_fist_tone3": {
+    "unicode": "1F91C-1F3FD",
+    "unicode_alternates": [],
+    "name": "right facing fist tone 3",
+    "shortname": ":right_facing_fist_tone3:",
+    "category": "people",
+    "aliases": [
+      ":right_fist_tone3:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤜🏽"
+  },
+  "right_facing_fist_tone4": {
+    "unicode": "1F91C-1F3FE",
+    "unicode_alternates": [],
+    "name": "right facing fist tone 4",
+    "shortname": ":right_facing_fist_tone4:",
+    "category": "people",
+    "aliases": [
+      ":right_fist_tone4:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤜🏾"
+  },
+  "right_facing_fist_tone5": {
+    "unicode": "1F91C-1F3FF",
+    "unicode_alternates": [],
+    "name": "right facing fist tone 5",
+    "shortname": ":right_facing_fist_tone5:",
+    "category": "people",
+    "aliases": [
+      ":right_fist_tone5:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤜🏿"
   },
   "ring": {
     "unicode": "1F48D",
     "unicode_alternates": [],
     "name": "ring",
     "shortname": ":ring:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "marriage",
       "propose",
       "valentines",
-      "wedding"
+      "wedding",
+      "object",
+      "fashion",
+      "gem",
+      "accessories"
     ],
     "moji": "💍"
   },
-  "ringing_bell": {
-    "unicode": "1F56D",
-    "unicode_alternates": [],
-    "name": "ringing bell",
-    "shortname": ":ringing_bell:",
-    "category": "objects_symbols",
-    "aliases": [],
-    "aliases_ascii": [],
-    "keywords": [
-      "alert",
-      "ding",
-      "volume",
-      "sound",
-      "chime"
-    ]
-  },
   "robot": {
     "unicode": "1F916",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "robot face",
     "shortname": ":robot:",
     "category": "people",
@@ -23280,14 +26075,18 @@
       ":robot_face:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "monster",
+      "robot"
+    ],
+    "moji": "🤖"
   },
   "rocket": {
     "unicode": "1F680",
     "unicode_alternates": [],
     "name": "rocket",
     "shortname": ":rocket:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -23298,16 +26097,33 @@
       "space",
       "spacecraft",
       "astronaut",
-      "cosmonaut"
+      "cosmonaut",
+      "transportation",
+      "object",
+      "fly",
+      "blast"
     ],
     "moji": "🚀"
   },
+  "rofl": {
+    "unicode": "1F923",
+    "unicode_alternates": [],
+    "name": "rolling on the floor laughing",
+    "shortname": ":rofl:",
+    "category": "people",
+    "aliases": [
+      ":rolling_on_the_floor_laughing:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤣"
+  },
   "roller_coaster": {
     "unicode": "1F3A2",
     "unicode_alternates": [],
     "name": "roller coaster",
     "shortname": ":roller_coaster:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -23322,13 +26138,16 @@
       "park",
       "fair",
       "ride",
-      "entertainment"
+      "entertainment",
+      "places",
+      "vacation",
+      "roller coaster"
     ],
     "moji": "🎢"
   },
   "rolling_eyes": {
     "unicode": "1F644",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "face with rolling eyes",
     "shortname": ":rolling_eyes:",
     "category": "people",
@@ -23336,7 +26155,14 @@
       ":face_with_rolling_eyes:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "mad",
+      "smiley",
+      "rolling eyes",
+      "emotion",
+      "sarcastic"
+    ],
+    "moji": "🙄"
   },
   "rooster": {
     "unicode": "1F413",
@@ -23375,9 +26201,13 @@
       "fragrant",
       "flower",
       "thorns",
-      "love",
       "petals",
-      "romance"
+      "romance",
+      "nature",
+      "plant",
+      "rip",
+      "condolence",
+      "beautiful"
     ],
     "moji": "🌹"
   },
@@ -23386,31 +26216,21 @@
     "unicode_alternates": [],
     "name": "rosette",
     "shortname": ":rosette:",
-    "category": "objects_symbols",
-    "aliases": [],
-    "aliases_ascii": [],
-    "keywords": [
-      "flower"
-    ]
-  },
-  "rosette_black": {
-    "unicode": "1F3F6",
-    "unicode_alternates": [],
-    "name": "black rosette",
-    "shortname": ":rosette_black:",
-    "category": "objects_symbols",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "flower"
-    ]
+      "flower",
+      "tropical"
+    ],
+    "moji": "🏵"
   },
   "rotating_light": {
     "unicode": "1F6A8",
     "unicode_alternates": [],
     "name": "police cars revolving light",
     "shortname": ":rotating_light:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -23419,8 +26239,8 @@
       "emergency",
       "police",
       "light",
-      "police",
-      "emergency"
+      "transportation",
+      "object"
     ],
     "moji": "🚨"
   },
@@ -23429,11 +26249,13 @@
     "unicode_alternates": [],
     "name": "round pushpin",
     "shortname": ":round_pushpin:",
-    "category": "places",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "stationery"
+      "stationery",
+      "object",
+      "office"
     ],
     "moji": "📍"
   },
@@ -23442,7 +26264,7 @@
     "unicode_alternates": [],
     "name": "rowboat",
     "shortname": ":rowboat:",
-    "category": "places",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -23453,13 +26275,18 @@
       "boat",
       "row",
       "oar",
-      "paddle"
+      "paddle",
+      "men",
+      "workout",
+      "sport",
+      "rowing",
+      "diversity"
     ],
     "moji": "🚣"
   },
   "rowboat_tone1": {
     "unicode": "1F6A3-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "rowboat tone 1",
     "shortname": ":rowboat_tone1:",
     "category": "activity",
@@ -23473,11 +26300,12 @@
       "row",
       "oar",
       "paddle"
-    ]
+    ],
+    "moji": "🚣🏻"
   },
   "rowboat_tone2": {
     "unicode": "1F6A3-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "rowboat tone 2",
     "shortname": ":rowboat_tone2:",
     "category": "activity",
@@ -23491,11 +26319,12 @@
       "row",
       "oar",
       "paddle"
-    ]
+    ],
+    "moji": "🚣🏼"
   },
   "rowboat_tone3": {
     "unicode": "1F6A3-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "rowboat tone 3",
     "shortname": ":rowboat_tone3:",
     "category": "activity",
@@ -23509,11 +26338,12 @@
       "row",
       "oar",
       "paddle"
-    ]
+    ],
+    "moji": "🚣🏽"
   },
   "rowboat_tone4": {
     "unicode": "1F6A3-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "rowboat tone 4",
     "shortname": ":rowboat_tone4:",
     "category": "activity",
@@ -23527,11 +26357,12 @@
       "row",
       "oar",
       "paddle"
-    ]
+    ],
+    "moji": "🚣🏾"
   },
   "rowboat_tone5": {
     "unicode": "1F6A3-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "rowboat tone 5",
     "shortname": ":rowboat_tone5:",
     "category": "activity",
@@ -23545,14 +26376,15 @@
       "row",
       "oar",
       "paddle"
-    ]
+    ],
+    "moji": "🚣🏿"
   },
   "rugby_football": {
     "unicode": "1F3C9",
     "unicode_alternates": [],
     "name": "rugby football",
     "shortname": ":rugby_football:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -23562,7 +26394,8 @@
       "ball",
       "sport",
       "team",
-      "england"
+      "england",
+      "game"
     ],
     "moji": "🏉"
   },
@@ -23571,7 +26404,7 @@
     "unicode_alternates": [],
     "name": "runner",
     "shortname": ":runner:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -23581,16 +26414,19 @@
       "run",
       "runner",
       "jog",
-      "exercise",
       "sprint",
       "race",
-      "dash"
+      "dash",
+      "people",
+      "men",
+      "diversity",
+      "boys night"
     ],
     "moji": "🏃"
   },
   "runner_tone1": {
     "unicode": "1F3C3-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "runner tone 1",
     "shortname": ":runner_tone1:",
     "category": "people",
@@ -23605,11 +26441,12 @@
       "race",
       "dash",
       "marathon"
-    ]
+    ],
+    "moji": "🏃🏻"
   },
   "runner_tone2": {
     "unicode": "1F3C3-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "runner tone 2",
     "shortname": ":runner_tone2:",
     "category": "people",
@@ -23624,11 +26461,12 @@
       "race",
       "dash",
       "marathon"
-    ]
+    ],
+    "moji": "🏃🏼"
   },
   "runner_tone3": {
     "unicode": "1F3C3-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "runner tone 3",
     "shortname": ":runner_tone3:",
     "category": "people",
@@ -23643,11 +26481,12 @@
       "race",
       "dash",
       "marathon"
-    ]
+    ],
+    "moji": "🏃🏽"
   },
   "runner_tone4": {
     "unicode": "1F3C3-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "runner tone 4",
     "shortname": ":runner_tone4:",
     "category": "people",
@@ -23662,11 +26501,12 @@
       "race",
       "dash",
       "marathon"
-    ]
+    ],
+    "moji": "🏃🏾"
   },
   "runner_tone5": {
     "unicode": "1F3C3-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "runner tone 5",
     "shortname": ":runner_tone5:",
     "category": "people",
@@ -23681,14 +26521,15 @@
       "race",
       "dash",
       "marathon"
-    ]
+    ],
+    "moji": "🏃🏿"
   },
   "running_shirt_with_sash": {
     "unicode": "1F3BD",
     "unicode_alternates": [],
     "name": "running shirt with sash",
     "shortname": ":running_shirt_with_sash:",
-    "category": "emoticons",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -23699,13 +26540,14 @@
       "shirt",
       "cloths",
       "compete",
-      "sports"
+      "sports",
+      "award"
     ],
     "moji": "🎽"
   },
   "sa": {
     "unicode": "1F202",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "squared katakana sa",
     "shortname": ":sa:",
     "category": "symbols",
@@ -23716,7 +26558,8 @@
       "japanese",
       "symbol",
       "word"
-    ]
+    ],
+    "moji": "🈂"
   },
   "sagittarius": {
     "unicode": "2650",
@@ -23725,7 +26568,7 @@
     ],
     "name": "sagittarius",
     "shortname": ":sagittarius:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -23738,9 +26581,8 @@
       "stars",
       "zodiac",
       "sign",
-      "sign",
-      "zodiac",
-      "horoscope"
+      "horoscope",
+      "symbol"
     ],
     "moji": "♐"
   },
@@ -23751,12 +26593,15 @@
     ],
     "name": "sailboat",
     "shortname": ":sailboat:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "ship",
-      "transportation"
+      "transportation",
+      "travel",
+      "boat",
+      "vacation"
     ],
     "moji": "⛵"
   },
@@ -23765,7 +26610,7 @@
     "unicode_alternates": [],
     "name": "sake bottle and cup",
     "shortname": ":sake:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -23774,26 +26619,41 @@
       "drunk",
       "wine",
       "sake",
-      "wine",
       "rice",
       "ferment",
       "alcohol",
       "japanese",
-      "drink"
+      "japan",
+      "girls night"
     ],
     "moji": "🍶"
   },
+  "salad": {
+    "unicode": "1F957",
+    "unicode_alternates": [],
+    "name": "green salad",
+    "shortname": ":salad:",
+    "category": "food",
+    "aliases": [
+      ":green_salad:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🥗"
+  },
   "sandal": {
     "unicode": "1F461",
     "unicode_alternates": [],
     "name": "womans sandal",
     "shortname": ":sandal:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "fashion",
-      "shoes"
+      "shoes",
+      "shoe",
+      "accessories"
     ],
     "moji": "👡"
   },
@@ -23802,7 +26662,7 @@
     "unicode_alternates": [],
     "name": "father christmas",
     "shortname": ":santa:",
-    "category": "objects",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -23823,14 +26683,18 @@
       "nice",
       "sleigh",
       "father",
-      "christmas",
-      "holiday"
+      "holiday",
+      "people",
+      "hat",
+      "winter",
+      "holidays",
+      "diversity"
     ],
     "moji": "🎅"
   },
   "santa_tone1": {
     "unicode": "1F385-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "father christmas tone 1",
     "shortname": ":santa_tone1:",
     "category": "people",
@@ -23852,11 +26716,12 @@
       "nice",
       "sleigh",
       "holiday"
-    ]
+    ],
+    "moji": "🎅🏻"
   },
   "santa_tone2": {
     "unicode": "1F385-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "father christmas tone 2",
     "shortname": ":santa_tone2:",
     "category": "people",
@@ -23878,11 +26743,12 @@
       "nice",
       "sleigh",
       "holiday"
-    ]
+    ],
+    "moji": "🎅🏼"
   },
   "santa_tone3": {
     "unicode": "1F385-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "father christmas tone 3",
     "shortname": ":santa_tone3:",
     "category": "people",
@@ -23904,11 +26770,12 @@
       "nice",
       "sleigh",
       "holiday"
-    ]
+    ],
+    "moji": "🎅🏽"
   },
   "santa_tone4": {
     "unicode": "1F385-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "father christmas tone 4",
     "shortname": ":santa_tone4:",
     "category": "people",
@@ -23930,11 +26797,12 @@
       "nice",
       "sleigh",
       "holiday"
-    ]
+    ],
+    "moji": "🎅🏾"
   },
   "santa_tone5": {
     "unicode": "1F385-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "father christmas tone 5",
     "shortname": ":santa_tone5:",
     "category": "people",
@@ -23956,7 +26824,8 @@
       "nice",
       "sleigh",
       "holiday"
-    ]
+    ],
+    "moji": "🎅🏿"
   },
   "satellite": {
     "unicode": "1F4E1",
@@ -23967,7 +26836,8 @@
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "communication"
+      "communication",
+      "object"
     ],
     "moji": "📡"
   },
@@ -23976,21 +26846,23 @@
     "unicode_alternates": [],
     "name": "satellite",
     "shortname": ":satellite_orbital:",
-    "category": "objects_symbols",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "communication",
       "orbital",
-      "space"
-    ]
+      "space",
+      "object"
+    ],
+    "moji": "🛰"
   },
   "saxophone": {
     "unicode": "1F3B7",
     "unicode_alternates": [],
     "name": "saxophone",
     "shortname": ":saxophone:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -23998,15 +26870,14 @@
       "music",
       "saxophone",
       "sax",
-      "music",
-      "instrument",
-      "woodwind"
+      "woodwind",
+      "instruments"
     ],
     "moji": "🎷"
   },
   "scales": {
     "unicode": "2696",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "scales",
     "shortname": ":scales:",
     "category": "objects",
@@ -24020,14 +26891,15 @@
       "tool",
       "weight",
       "zodiac"
-    ]
+    ],
+    "moji": "⚖"
   },
   "school": {
     "unicode": "1F3EB",
     "unicode_alternates": [],
     "name": "school",
     "shortname": ":school:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -24039,7 +26911,8 @@
       "high",
       "college",
       "teach",
-      "education"
+      "education",
+      "places"
     ],
     "moji": "🏫"
   },
@@ -24048,7 +26921,7 @@
     "unicode_alternates": [],
     "name": "school satchel",
     "shortname": ":school_satchel:",
-    "category": "objects",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -24058,14 +26931,16 @@
       "school",
       "satchel",
       "backpack",
-      "bag",
       "packing",
       "pack",
       "hike",
-      "education",
       "adventure",
       "travel",
-      "sightsee"
+      "sightsee",
+      "fashion",
+      "office",
+      "vacation",
+      "accessories"
     ],
     "moji": "🎒"
   },
@@ -24081,19 +26956,39 @@
     "aliases_ascii": [],
     "keywords": [
       "cut",
-      "stationery"
+      "stationery",
+      "object",
+      "tool",
+      "weapon",
+      "office"
     ],
     "moji": "✂"
   },
+  "scooter": {
+    "unicode": "1F6F4",
+    "unicode_alternates": [],
+    "name": "scooter",
+    "shortname": ":scooter:",
+    "category": "travel",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🛴"
+  },
   "scorpion": {
     "unicode": "1F982",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "scorpion",
     "shortname": ":scorpion:",
     "category": "nature",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "insects",
+      "reptile",
+      "animal"
+    ],
+    "moji": "🦂"
   },
   "scorpius": {
     "unicode": "264F",
@@ -24102,7 +26997,7 @@
     ],
     "name": "scorpius",
     "shortname": ":scorpius:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -24115,9 +27010,8 @@
       "stars",
       "zodiac",
       "sign",
-      "sign",
-      "zodiac",
-      "horoscope"
+      "horoscope",
+      "symbol"
     ],
     "moji": "♏"
   },
@@ -24126,7 +27020,7 @@
     "unicode_alternates": [],
     "name": "face screaming in fear",
     "shortname": ":scream:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -24135,7 +27029,12 @@
       "scream",
       "painting",
       "artist",
-      "alien"
+      "alien",
+      "smiley",
+      "surprised",
+      "wow",
+      "emotion",
+      "omg"
     ],
     "moji": "😱"
   },
@@ -24144,7 +27043,7 @@
     "unicode_alternates": [],
     "name": "weary cat face",
     "shortname": ":scream_cat:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -24161,7 +27060,8 @@
       "exhausted",
       "scream",
       "painting",
-      "artist"
+      "artist",
+      "cat"
     ],
     "moji": "🙀"
   },
@@ -24174,7 +27074,9 @@
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "documents"
+      "documents",
+      "object",
+      "office"
     ],
     "moji": "📜"
   },
@@ -24183,14 +27085,31 @@
     "unicode_alternates": [],
     "name": "seat",
     "shortname": ":seat:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "sit"
+      "sit",
+      "transportation",
+      "object",
+      "travel",
+      "vacation"
     ],
     "moji": "💺"
   },
+  "second_place": {
+    "unicode": "1F948",
+    "unicode_alternates": [],
+    "name": "second place medal",
+    "shortname": ":second_place:",
+    "category": "activity",
+    "aliases": [
+      ":second_place_medal:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🥈"
+  },
   "secret": {
     "unicode": "3299",
     "unicode_alternates": [
@@ -24198,11 +27117,13 @@
     ],
     "name": "circled ideograph secret",
     "shortname": ":secret:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "privacy"
+      "privacy",
+      "japan",
+      "symbol"
     ],
     "moji": "㊙"
   },
@@ -24211,14 +27132,13 @@
     "unicode_alternates": [],
     "name": "see-no-evil monkey",
     "shortname": ":see_no_evil:",
-    "category": "emoticons",
+    "category": "nature",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "animal",
       "monkey",
       "nature",
-      "monkey",
       "see",
       "eyes",
       "vision",
@@ -24241,34 +27161,118 @@
       "nature",
       "plant",
       "seedling",
-      "plant",
       "new",
       "start",
-      "grow"
+      "grow",
+      "leaf"
     ],
     "moji": "🌱"
   },
+  "selfie": {
+    "unicode": "1F933",
+    "unicode_alternates": [],
+    "name": "selfie",
+    "shortname": ":selfie:",
+    "category": "people",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤳"
+  },
+  "selfie_tone1": {
+    "unicode": "1F933-1F3FB",
+    "unicode_alternates": [],
+    "name": "selfie tone 1",
+    "shortname": ":selfie_tone1:",
+    "category": "people",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤳🏻"
+  },
+  "selfie_tone2": {
+    "unicode": "1F933-1F3FC",
+    "unicode_alternates": [],
+    "name": "selfie tone 2",
+    "shortname": ":selfie_tone2:",
+    "category": "people",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤳🏼"
+  },
+  "selfie_tone3": {
+    "unicode": "1F933-1F3FD",
+    "unicode_alternates": [],
+    "name": "selfie tone 3",
+    "shortname": ":selfie_tone3:",
+    "category": "people",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤳🏽"
+  },
+  "selfie_tone4": {
+    "unicode": "1F933-1F3FE",
+    "unicode_alternates": [],
+    "name": "selfie tone 4",
+    "shortname": ":selfie_tone4:",
+    "category": "people",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤳🏾"
+  },
+  "selfie_tone5": {
+    "unicode": "1F933-1F3FF",
+    "unicode_alternates": [],
+    "name": "selfie tone 5",
+    "shortname": ":selfie_tone5:",
+    "category": "people",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤳🏿"
+  },
   "seven": {
     "moji": "7️⃣",
     "unicode": "0037-20E3",
     "unicode_alternates": [
       "0037-FE0F-20E3"
     ],
-    "name": "digit seven",
+    "name": "keycap digit seven",
     "shortname": ":seven:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "7",
       "blue-square",
       "numbers",
-      "prime"
+      "prime",
+      "number",
+      "math",
+      "symbol"
     ]
   },
+  "shallow_pan_of_food": {
+    "unicode": "1F958",
+    "unicode_alternates": [],
+    "name": "shallow pan of food",
+    "shortname": ":shallow_pan_of_food:",
+    "category": "food",
+    "aliases": [
+      ":paella:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [
+      "pan of food"
+    ],
+    "moji": "🥘"
+  },
   "shamrock": {
     "unicode": "2618",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "shamrock",
     "shortname": ":shamrock:",
     "category": "nature",
@@ -24276,15 +27280,29 @@
     "aliases_ascii": [],
     "keywords": [
       "nature",
-      "plant"
-    ]
+      "plant",
+      "luck",
+      "leaf"
+    ],
+    "moji": "☘"
+  },
+  "shark": {
+    "unicode": "1F988",
+    "unicode_alternates": [],
+    "name": "shark",
+    "shortname": ":shark:",
+    "category": "nature",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🦈"
   },
   "shaved_ice": {
     "unicode": "1F367",
     "unicode_alternates": [],
     "name": "shaved ice",
     "shortname": ":shaved_ice:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -24295,7 +27313,8 @@
       "dessert",
       "treat",
       "syrup",
-      "flavoring"
+      "flavoring",
+      "food"
     ],
     "moji": "🍧"
   },
@@ -24334,7 +27353,6 @@
       "sea",
       "shell",
       "spiral",
-      "beach",
       "sand",
       "crab",
       "nautilus"
@@ -24346,7 +27364,7 @@
     "unicode_alternates": [],
     "name": "shield",
     "shortname": ":shield:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -24354,12 +27372,13 @@
       "route",
       "sign",
       "highway",
-      "interstate"
-    ]
+      "object"
+    ],
+    "moji": "🛡"
   },
   "shinto_shrine": {
     "unicode": "26E9",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "shinto shrine",
     "shortname": ":shinto_shrine:",
     "category": "travel",
@@ -24367,15 +27386,20 @@
     "aliases_ascii": [],
     "keywords": [
       "religion",
-      "symbol"
-    ]
+      "symbol",
+      "places",
+      "building",
+      "travel",
+      "vacation"
+    ],
+    "moji": "⛩"
   },
   "ship": {
     "unicode": "1F6A2",
     "unicode_alternates": [],
     "name": "ship",
     "shortname": ":ship:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -24383,7 +27407,9 @@
       "transportation",
       "ferry",
       "ship",
-      "boat"
+      "boat",
+      "travel",
+      "vacation"
     ],
     "moji": "🚢"
   },
@@ -24392,7 +27418,7 @@
     "unicode_alternates": [],
     "name": "t-shirt",
     "shortname": ":shirt:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -24406,7 +27432,7 @@
     "unicode_alternates": [],
     "name": "shopping bags",
     "shortname": ":shopping_bags:",
-    "category": "travel_places",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -24414,8 +27440,25 @@
       "mall",
       "buy",
       "store",
-      "shop"
-    ]
+      "shop",
+      "object",
+      "birthday",
+      "parties"
+    ],
+    "moji": "🛍"
+  },
+  "shopping_cart": {
+    "unicode": "1F6D2",
+    "unicode_alternates": [],
+    "name": "shopping trolley",
+    "shortname": ":shopping_cart:",
+    "category": "objects",
+    "aliases": [
+      ":shopping_trolley:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🛒"
   },
   "shower": {
     "unicode": "1F6BF",
@@ -24433,22 +27476,100 @@
       "shower",
       "soap",
       "water",
-      "clean",
       "shampoo",
-      "lather"
+      "lather",
+      "object"
     ],
     "moji": "🚿"
   },
+  "shrimp": {
+    "unicode": "1F990",
+    "unicode_alternates": [],
+    "name": "shrimp",
+    "shortname": ":shrimp:",
+    "category": "nature",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🦐"
+  },
+  "shrug": {
+    "unicode": "1F937",
+    "unicode_alternates": [],
+    "name": "shrug",
+    "shortname": ":shrug:",
+    "category": "people",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤷"
+  },
+  "shrug_tone1": {
+    "unicode": "1F937-1F3FB",
+    "unicode_alternates": [],
+    "name": "shrug tone 1",
+    "shortname": ":shrug_tone1:",
+    "category": "people",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤷🏻"
+  },
+  "shrug_tone2": {
+    "unicode": "1F937-1F3FC",
+    "unicode_alternates": [],
+    "name": "shrug tone 2",
+    "shortname": ":shrug_tone2:",
+    "category": "people",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤷🏼"
+  },
+  "shrug_tone3": {
+    "unicode": "1F937-1F3FD",
+    "unicode_alternates": [],
+    "name": "shrug tone 3",
+    "shortname": ":shrug_tone3:",
+    "category": "people",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤷🏽"
+  },
+  "shrug_tone4": {
+    "unicode": "1F937-1F3FE",
+    "unicode_alternates": [],
+    "name": "shrug tone 4",
+    "shortname": ":shrug_tone4:",
+    "category": "people",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤷🏾"
+  },
+  "shrug_tone5": {
+    "unicode": "1F937-1F3FF",
+    "unicode_alternates": [],
+    "name": "shrug tone 5",
+    "shortname": ":shrug_tone5:",
+    "category": "people",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤷🏿"
+  },
   "signal_strength": {
     "unicode": "1F4F6",
     "unicode_alternates": [],
     "name": "antenna with bars",
     "shortname": ":signal_strength:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "blue-square"
+      "blue-square",
+      "symbol"
     ],
     "moji": "📶"
   },
@@ -24458,15 +27579,18 @@
     "unicode_alternates": [
       "0036-FE0F-20E3"
     ],
-    "name": "digit six",
+    "name": "keycap digit six",
     "shortname": ":six:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "6",
       "blue-square",
-      "numbers"
+      "numbers",
+      "number",
+      "math",
+      "symbol"
     ]
   },
   "six_pointed_star": {
@@ -24474,11 +27598,15 @@
     "unicode_alternates": [],
     "name": "six pointed star with middle dot",
     "shortname": ":six_pointed_star:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "purple-square"
+      "purple-square",
+      "religion",
+      "jew",
+      "star",
+      "symbol"
     ],
     "moji": "🔯"
   },
@@ -24487,7 +27615,7 @@
     "unicode_alternates": [],
     "name": "ski and ski boot",
     "shortname": ":ski:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -24499,18 +27627,19 @@
       "cross-country",
       "poles",
       "snow",
-      "winter",
       "mountain",
       "alpine",
       "powder",
       "slalom",
-      "freestyle"
+      "freestyle",
+      "sport",
+      "skiing"
     ],
     "moji": "🎿"
   },
   "skier": {
     "unicode": "26F7",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "skier",
     "shortname": ":skier:",
     "category": "activity",
@@ -24521,15 +27650,20 @@
       "ski",
       "snow",
       "sport",
-      "travel"
-    ]
+      "travel",
+      "hat",
+      "vacation",
+      "cold",
+      "skiing"
+    ],
+    "moji": "⛷"
   },
   "skull": {
     "unicode": "1F480",
     "unicode_alternates": [],
     "name": "skull",
     "shortname": ":skull:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [
       ":skeleton:"
     ],
@@ -24537,13 +27671,15 @@
     "keywords": [
       "dead",
       "skeleton",
-      "dying"
+      "dying",
+      "halloween",
+      "skull"
     ],
     "moji": "💀"
   },
   "skull_crossbones": {
     "unicode": "2620",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "skull and crossbones",
     "shortname": ":skull_crossbones:",
     "category": "objects",
@@ -24556,15 +27692,19 @@
       "death",
       "face",
       "monster",
-      "person"
-    ]
+      "person",
+      "symbol",
+      "dead",
+      "skull"
+    ],
+    "moji": "☠"
   },
   "sleeping": {
     "unicode": "1F634",
     "unicode_alternates": [],
     "name": "sleeping face",
     "shortname": ":sleeping:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -24572,9 +27712,11 @@
       "sleepy",
       "tired",
       "sleep",
-      "sleepy",
       "sleeping",
-      "snore"
+      "snore",
+      "smiley",
+      "emotion",
+      "goodnight"
     ],
     "moji": "😴"
   },
@@ -24583,21 +27725,23 @@
     "unicode_alternates": [],
     "name": "sleeping accommodation",
     "shortname": ":sleeping_accommodation:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "hotel",
       "motel",
-      "rest"
-    ]
+      "rest",
+      "tired"
+    ],
+    "moji": "🛌"
   },
   "sleepy": {
     "unicode": "1F62A",
     "unicode_alternates": [],
     "name": "sleepy face",
     "shortname": ":sleepy:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -24605,8 +27749,10 @@
       "rest",
       "tired",
       "sleepy",
-      "tired",
-      "exhausted"
+      "exhausted",
+      "smiley",
+      "sick",
+      "emotion"
     ],
     "moji": "😪"
   },
@@ -24624,8 +27770,12 @@
       "slight",
       "frown",
       "unhappy",
-      "disappointed"
-    ]
+      "disappointed",
+      "sad",
+      "smiley",
+      "emotion"
+    ],
+    "moji": "🙁"
   },
   "slight_smile": {
     "unicode": "1F642",
@@ -24640,15 +27790,17 @@
     "keywords": [
       "slight",
       "smile",
-      "happy"
-    ]
+      "happy",
+      "smiley"
+    ],
+    "moji": "🙂"
   },
   "slot_machine": {
     "unicode": "1F3B0",
     "unicode_alternates": [],
     "name": "slot machine",
     "shortname": ":slot_machine:",
-    "category": "places",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -24657,10 +27809,11 @@
       "vegas",
       "slot",
       "machine",
-      "gamble",
       "one-armed bandit",
       "slots",
-      "luck"
+      "luck",
+      "game",
+      "boys night"
     ],
     "moji": "🎰"
   },
@@ -24669,11 +27822,13 @@
     "unicode_alternates": [],
     "name": "small blue diamond",
     "shortname": ":small_blue_diamond:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "shape"
+      "shape",
+      "shapes",
+      "symbol"
     ],
     "moji": "🔹"
   },
@@ -24682,11 +27837,13 @@
     "unicode_alternates": [],
     "name": "small orange diamond",
     "shortname": ":small_orange_diamond:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "shape"
+      "shape",
+      "shapes",
+      "symbol"
     ],
     "moji": "🔸"
   },
@@ -24695,11 +27852,14 @@
     "unicode_alternates": [],
     "name": "up-pointing red triangle",
     "shortname": ":small_red_triangle:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "shape"
+      "shape",
+      "shapes",
+      "symbol",
+      "triangle"
     ],
     "moji": "🔺"
   },
@@ -24708,11 +27868,14 @@
     "unicode_alternates": [],
     "name": "down-pointing red triangle",
     "shortname": ":small_red_triangle_down:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "shape"
+      "shape",
+      "shapes",
+      "symbol",
+      "triangle"
     ],
     "moji": "🔻"
   },
@@ -24721,7 +27884,7 @@
     "unicode_alternates": [],
     "name": "smiling face with open mouth and smiling eyes",
     "shortname": ":smile:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [
       ":)",
@@ -24739,7 +27902,8 @@
       "laugh",
       "smile",
       "smiley",
-      "smiling"
+      "smiling",
+      "emotion"
     ],
     "moji": "😄"
   },
@@ -24748,7 +27912,7 @@
     "unicode_alternates": [],
     "name": "grinning cat face with smiling eyes",
     "shortname": ":smile_cat:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -24757,7 +27921,8 @@
       "cat",
       "smile",
       "grin",
-      "grinning"
+      "grinning",
+      "happy"
     ],
     "moji": "😸"
   },
@@ -24766,7 +27931,7 @@
     "unicode_alternates": [],
     "name": "smiling face with open mouth",
     "shortname": ":smiley:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [
       ":D",
@@ -24780,7 +27945,9 @@
       "joy",
       "smiling",
       "smile",
-      "smiley"
+      "smiley",
+      "emotion",
+      "good"
     ],
     "moji": "😃"
   },
@@ -24789,7 +27956,7 @@
     "unicode_alternates": [],
     "name": "smiling cat face with open mouth",
     "shortname": ":smiley_cat:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -24798,8 +27965,7 @@
       "happy",
       "smile",
       "smiley",
-      "cat",
-      "happy"
+      "cat"
     ],
     "moji": "😺"
   },
@@ -24808,16 +27974,19 @@
     "unicode_alternates": [],
     "name": "smiling face with horns",
     "shortname": ":smiling_imp:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "devil",
       "horns",
-      "horns",
-      "devil",
       "impish",
-      "trouble"
+      "trouble",
+      "silly",
+      "smiley",
+      "angry",
+      "monster",
+      "boys night"
     ],
     "moji": "😈"
   },
@@ -24826,7 +27995,7 @@
     "unicode_alternates": [],
     "name": "smirking face",
     "shortname": ":smirk:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -24836,10 +28005,12 @@
       "smug",
       "smirking",
       "smirk",
-      "smug",
-      "smile",
       "half-smile",
-      "conceited"
+      "conceited",
+      "silly",
+      "smiley",
+      "sexy",
+      "sarcastic"
     ],
     "moji": "😏"
   },
@@ -24848,7 +28019,7 @@
     "unicode_alternates": [],
     "name": "cat face with wry smile",
     "shortname": ":smirk_cat:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -24858,7 +28029,8 @@
       "smirking",
       "wry",
       "confident",
-      "confidence"
+      "confidence",
+      "cat"
     ],
     "moji": "😼"
   },
@@ -24875,13 +28047,14 @@
       "kills",
       "tobacco",
       "smoking",
-      "cigarette",
       "smoke",
       "cancer",
       "lungs",
       "inhale",
       "tar",
-      "nicotine"
+      "nicotine",
+      "symbol",
+      "drugs"
     ],
     "moji": "🚬"
   },
@@ -24898,10 +28071,10 @@
       "shell",
       "slow",
       "snail",
-      "slow",
       "escargot",
       "french",
-      "appetizer"
+      "appetizer",
+      "insects"
     ],
     "moji": "🐌"
   },
@@ -24915,16 +28088,32 @@
     "aliases_ascii": [],
     "keywords": [
       "animal",
-      "evil"
+      "evil",
+      "wildlife",
+      "reptile",
+      "creationism"
     ],
     "moji": "🐍"
   },
+  "sneezing_face": {
+    "unicode": "1F927",
+    "unicode_alternates": [],
+    "name": "sneezing face",
+    "shortname": ":sneezing_face:",
+    "category": "people",
+    "aliases": [
+      ":sneeze:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤧"
+  },
   "snowboarder": {
     "unicode": "1F3C2",
     "unicode_alternates": [],
     "name": "snowboarder",
     "shortname": ":snowboarder:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -24932,13 +28121,16 @@
       "winter",
       "snow",
       "boarding",
-      "sports",
       "freestyle",
       "halfpipe",
       "board",
       "mountain",
       "alpine",
-      "winter"
+      "hat",
+      "vacation",
+      "cold",
+      "sport",
+      "snowboarding"
     ],
     "moji": "🏂"
   },
@@ -24965,13 +28157,13 @@
       "droplet",
       "ice",
       "crystal",
-      "cold",
       "chilly",
-      "winter",
       "unique",
       "special",
       "below zero",
-      "elsa"
+      "elsa",
+      "sky",
+      "holidays"
     ],
     "moji": "❄"
   },
@@ -24991,13 +28183,15 @@
       "season",
       "weather",
       "winter",
-      "xmas"
+      "xmas",
+      "holidays",
+      "snow"
     ],
     "moji": "⛄"
   },
   "snowman2": {
     "unicode": "2603",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "snowman",
     "shortname": ":snowman2:",
     "category": "nature",
@@ -25007,15 +28201,19 @@
       "cold",
       "nature",
       "snow",
-      "weather"
-    ]
+      "weather",
+      "winter",
+      "holidays",
+      "christmas"
+    ],
+    "moji": "☃"
   },
   "sob": {
     "unicode": "1F62D",
     "unicode_alternates": [],
     "name": "loudly crying face",
     "shortname": ":sob:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -25024,14 +28222,14 @@
       "sad",
       "tears",
       "upset",
-      "cry",
       "sob",
-      "tears",
-      "sad",
       "melancholy",
       "morn",
       "somber",
-      "hurt"
+      "hurt",
+      "smiley",
+      "emotion",
+      "heartbreak"
     ],
     "moji": "😭"
   },
@@ -25042,7 +28240,7 @@
     ],
     "name": "soccer ball",
     "shortname": ":soccer:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -25051,7 +28249,10 @@
       "football",
       "sports",
       "european",
-      "football"
+      "game",
+      "ball",
+      "sport",
+      "soccer"
     ],
     "moji": "⚽"
   },
@@ -25060,12 +28261,13 @@
     "unicode_alternates": [],
     "name": "soon with rightwards arrow above",
     "shortname": ":soon:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "arrow",
-      "words"
+      "words",
+      "symbol"
     ],
     "moji": "🔜"
   },
@@ -25074,14 +28276,15 @@
     "unicode_alternates": [],
     "name": "squared sos",
     "shortname": ":sos:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "emergency",
       "help",
       "red-square",
-      "words"
+      "words",
+      "symbol"
     ],
     "moji": "🆘"
   },
@@ -25090,12 +28293,14 @@
     "unicode_alternates": [],
     "name": "speaker with one sound wave",
     "shortname": ":sound:",
-    "category": "objects",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "speaker",
-      "volume"
+      "volume",
+      "alarm",
+      "symbol"
     ],
     "moji": "🔉"
   },
@@ -25104,12 +28309,14 @@
     "unicode_alternates": [],
     "name": "alien monster",
     "shortname": ":space_invader:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "arcade",
-      "game"
+      "game",
+      "monster",
+      "alien"
     ],
     "moji": "👾"
   },
@@ -25120,12 +28327,14 @@
     ],
     "name": "black spade suit",
     "shortname": ":spades:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "cards",
-      "poker"
+      "poker",
+      "symbol",
+      "game"
     ],
     "moji": "♠"
   },
@@ -25134,7 +28343,7 @@
     "unicode_alternates": [],
     "name": "spaghetti",
     "shortname": ":spaghetti:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -25145,7 +28354,7 @@
       "noodles",
       "tomato",
       "sauce",
-      "italian"
+      "pasta"
     ],
     "moji": "🍝"
   },
@@ -25156,12 +28365,13 @@
     ],
     "name": "sparkle",
     "shortname": ":sparkle:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "green-square",
-      "stars"
+      "stars",
+      "symbol"
     ],
     "moji": "❇"
   },
@@ -25170,13 +28380,14 @@
     "unicode_alternates": [],
     "name": "firework sparkler",
     "shortname": ":sparkler:",
-    "category": "objects",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "night",
       "shine",
-      "stars"
+      "stars",
+      "parties"
     ],
     "moji": "🎇"
   },
@@ -25185,14 +28396,16 @@
     "unicode_alternates": [],
     "name": "sparkles",
     "shortname": ":sparkles:",
-    "category": "emoticons",
+    "category": "nature",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "cool",
       "shine",
       "shiny",
-      "stars"
+      "stars",
+      "star",
+      "girls night"
     ],
     "moji": "✨"
   },
@@ -25201,14 +28414,16 @@
     "unicode_alternates": [],
     "name": "sparkling heart",
     "shortname": ":sparkling_heart:",
-    "category": "emoticons",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "affection",
       "like",
       "love",
-      "valentines"
+      "valentines",
+      "symbol",
+      "girls night"
     ],
     "moji": "💖"
   },
@@ -25217,13 +28432,12 @@
     "unicode_alternates": [],
     "name": "speak-no-evil monkey",
     "shortname": ":speak_no_evil:",
-    "category": "emoticons",
+    "category": "nature",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "animal",
       "monkey",
-      "monkey",
       "mouth",
       "talk",
       "say",
@@ -25240,36 +28454,41 @@
     "unicode_alternates": [],
     "name": "speaker",
     "shortname": ":speaker:",
-    "category": "objects",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "sound",
       "listen",
       "hear",
-      "noise"
-    ]
+      "noise",
+      "alarm",
+      "symbol"
+    ],
+    "moji": "🔈"
   },
   "speaking_head": {
     "unicode": "1F5E3",
     "unicode_alternates": [],
     "name": "speaking head in silhouette",
     "shortname": ":speaking_head:",
-    "category": "objects_symbols",
+    "category": "people",
     "aliases": [
       ":speaking_head_in_silhouette:"
     ],
     "aliases_ascii": [],
     "keywords": [
-      "talk"
-    ]
+      "talk",
+      "people"
+    ],
+    "moji": "🗣"
   },
   "speech_balloon": {
     "unicode": "1F4AC",
     "unicode_alternates": [],
     "name": "speech balloon",
     "shortname": ":speech_balloon:",
-    "category": "emoticons",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -25281,96 +28500,18 @@
       "conversation",
       "communication",
       "comic",
-      "dialogue"
+      "dialogue",
+      "symbol",
+      "free speech"
     ],
     "moji": "💬"
   },
-  "speech_left": {
-    "unicode": "1F5E8",
-    "unicode_alternates": [],
-    "name": "left speech bubble",
-    "shortname": ":speech_left:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":left_speech_bubble:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "balloon",
-      "words",
-      "talk",
-      "conversation",
-      "communication",
-      "comic",
-      "dialogue"
-    ]
-  },
-  "speech_right": {
-    "unicode": "1F5E9",
-    "unicode_alternates": [],
-    "name": "right speech bubble",
-    "shortname": ":speech_right:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":right_speech_bubble:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "balloon",
-      "words",
-      "talk",
-      "conversation",
-      "communication",
-      "comic",
-      "dialogue"
-    ]
-  },
-  "speech_three": {
-    "unicode": "1F5EB",
-    "unicode_alternates": [],
-    "name": "three speech bubbles",
-    "shortname": ":speech_three:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":three_speech_bubbles:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "balloon",
-      "words",
-      "talk",
-      "conversation",
-      "communication",
-      "comic",
-      "dialogue"
-    ]
-  },
-  "speech_two": {
-    "unicode": "1F5EA",
-    "unicode_alternates": [],
-    "name": "two speech bubbles",
-    "shortname": ":speech_two:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":two_speech_bubbles:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "balloon",
-      "words",
-      "talk",
-      "conversation",
-      "communication",
-      "comic",
-      "dialogue"
-    ]
-  },
   "speedboat": {
     "unicode": "1F6A4",
     "unicode_alternates": [],
     "name": "speedboat",
     "shortname": ":speedboat:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -25381,7 +28522,10 @@
       "speed",
       "ski",
       "power",
-      "boat"
+      "boat",
+      "travel",
+      "vacation",
+      "tropical"
     ],
     "moji": "🚤"
   },
@@ -25395,8 +28539,12 @@
     "aliases_ascii": [],
     "keywords": [
       "arachnid",
-      "eight-legged"
-    ]
+      "eight-legged",
+      "insects",
+      "halloween",
+      "animal"
+    ],
+    "moji": "🕷"
   },
   "spider_web": {
     "unicode": "1F578",
@@ -25407,8 +28555,21 @@
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "cobweb"
-    ]
+      "cobweb",
+      "halloween"
+    ],
+    "moji": "🕸"
+  },
+  "spoon": {
+    "unicode": "1F944",
+    "unicode_alternates": [],
+    "name": "spoon",
+    "shortname": ":spoon:",
+    "category": "food",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🥄"
   },
   "spy": {
     "unicode": "1F575",
@@ -25423,12 +28584,19 @@
     "keywords": [
       "pi",
       "undercover",
-      "investigator"
-    ]
+      "investigator",
+      "people",
+      "hat",
+      "men",
+      "glasses",
+      "diversity",
+      "job"
+    ],
+    "moji": "🕵"
   },
   "spy_tone1": {
     "unicode": "1F575-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "sleuth or spy tone 1",
     "shortname": ":spy_tone1:",
     "category": "people",
@@ -25441,11 +28609,12 @@
       "undercover",
       "investigator",
       "person"
-    ]
+    ],
+    "moji": "🕵🏻"
   },
   "spy_tone2": {
     "unicode": "1F575-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "sleuth or spy tone 2",
     "shortname": ":spy_tone2:",
     "category": "people",
@@ -25458,11 +28627,12 @@
       "undercover",
       "investigator",
       "person"
-    ]
+    ],
+    "moji": "🕵🏼"
   },
   "spy_tone3": {
     "unicode": "1F575-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "sleuth or spy tone 3",
     "shortname": ":spy_tone3:",
     "category": "people",
@@ -25475,11 +28645,12 @@
       "undercover",
       "investigator",
       "person"
-    ]
+    ],
+    "moji": "🕵🏽"
   },
   "spy_tone4": {
     "unicode": "1F575-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "sleuth or spy tone 4",
     "shortname": ":spy_tone4:",
     "category": "people",
@@ -25492,11 +28663,12 @@
       "undercover",
       "investigator",
       "person"
-    ]
+    ],
+    "moji": "🕵🏾"
   },
   "spy_tone5": {
     "unicode": "1F575-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "sleuth or spy tone 5",
     "shortname": ":spy_tone5:",
     "category": "people",
@@ -25509,14 +28681,26 @@
       "undercover",
       "investigator",
       "person"
-    ]
+    ],
+    "moji": "🕵🏿"
+  },
+  "squid": {
+    "unicode": "1F991",
+    "unicode_alternates": [],
+    "name": "squid",
+    "shortname": ":squid:",
+    "category": "nature",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🦑"
   },
   "stadium": {
     "unicode": "1F3DF",
     "unicode_alternates": [],
     "name": "stadium",
     "shortname": ":stadium:",
-    "category": "travel_places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -25524,8 +28708,14 @@
       "event",
       "concert",
       "convention",
-      "game"
-    ]
+      "game",
+      "places",
+      "building",
+      "travel",
+      "vacation",
+      "boys night"
+    ],
+    "moji": "🏟"
   },
   "star": {
     "unicode": "2B50",
@@ -25539,7 +28729,10 @@
     "aliases_ascii": [],
     "keywords": [
       "night",
-      "yellow"
+      "yellow",
+      "space",
+      "sky",
+      "star"
     ],
     "moji": "⭐"
   },
@@ -25548,7 +28741,7 @@
     "unicode_alternates": [],
     "name": "glowing star",
     "shortname": ":star2:",
-    "category": "emoticons",
+    "category": "nature",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -25559,13 +28752,15 @@
       "star",
       "five",
       "points",
-      "classic"
+      "classic",
+      "space",
+      "sky"
     ],
     "moji": "🌟"
   },
   "star_and_crescent": {
     "unicode": "262A",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "star and crescent",
     "shortname": ":star_and_crescent:",
     "category": "symbols",
@@ -25576,11 +28771,12 @@
       "muslim",
       "religion",
       "symbol"
-    ]
+    ],
+    "moji": "☪"
   },
   "star_of_david": {
     "unicode": "2721",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "star of david",
     "shortname": ":star_of_david:",
     "category": "symbols",
@@ -25590,15 +28786,17 @@
       "jew",
       "jewish",
       "religion",
-      "symbol"
-    ]
+      "symbol",
+      "star"
+    ],
+    "moji": "✡"
   },
   "stars": {
     "unicode": "1F320",
     "unicode_alternates": [],
     "name": "shooting star",
     "shortname": ":stars:",
-    "category": "nature",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -25608,9 +28806,9 @@
       "shoot",
       "star",
       "sky",
-      "night",
       "comet",
-      "meteoroid"
+      "meteoroid",
+      "space"
     ],
     "moji": "🌠"
   },
@@ -25619,7 +28817,7 @@
     "unicode_alternates": [],
     "name": "station",
     "shortname": ":station:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -25628,7 +28826,8 @@
       "vehicle",
       "station",
       "train",
-      "subway"
+      "subway",
+      "travel"
     ],
     "moji": "🚉"
   },
@@ -25637,12 +28836,18 @@
     "unicode_alternates": [],
     "name": "statue of liberty",
     "shortname": ":statue_of_liberty:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "american",
-      "newyork"
+      "newyork",
+      "places",
+      "america",
+      "travel",
+      "vacation",
+      "statue of liberty",
+      "free speech"
     ],
     "moji": "🗽"
   },
@@ -25651,7 +28856,7 @@
     "unicode_alternates": [],
     "name": "steam locomotive",
     "shortname": ":steam_locomotive:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -25660,35 +28865,17 @@
       "vehicle",
       "locomotive",
       "steam",
-      "train",
-      "engine"
+      "engine",
+      "travel"
     ],
     "moji": "🚂"
   },
-  "stereo": {
-    "unicode": "1F4FE",
-    "unicode_alternates": [],
-    "name": "portable stereo",
-    "shortname": ":stereo:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":portable_stereo:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "communication",
-      "music",
-      "program",
-      "boom",
-      "box"
-    ]
-  },
   "stew": {
     "unicode": "1F372",
     "unicode_alternates": [],
     "name": "pot of food",
     "shortname": ":stew:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -25699,28 +28886,14 @@
       "soup",
       "thick",
       "hot",
-      "pot"
+      "pot",
+      "steam"
     ],
     "moji": "🍲"
   },
-  "stock_chart": {
-    "unicode": "1F5E0",
-    "unicode_alternates": [],
-    "name": "stock chart",
-    "shortname": ":stock_chart:",
-    "category": "objects_symbols",
-    "aliases": [],
-    "aliases_ascii": [],
-    "keywords": [
-      "graph",
-      "presentation",
-      "stats",
-      "business"
-    ]
-  },
   "stop_button": {
     "unicode": "23F9",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "black square for stop",
     "shortname": ":stop_button:",
     "category": "symbols",
@@ -25728,12 +28901,14 @@
     "aliases_ascii": [],
     "keywords": [
       "sound",
-      "symbol"
-    ]
+      "symbol",
+      "square"
+    ],
+    "moji": "⏹"
   },
   "stopwatch": {
     "unicode": "23F1",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "stopwatch",
     "shortname": ":stopwatch:",
     "category": "objects",
@@ -25742,8 +28917,10 @@
     "keywords": [
       "clock",
       "object",
-      "time"
-    ]
+      "time",
+      "electronics"
+    ],
+    "moji": "⏱"
   },
   "straight_ruler": {
     "unicode": "1F4CF",
@@ -25754,7 +28931,10 @@
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "stationery"
+      "stationery",
+      "object",
+      "tool",
+      "office"
     ],
     "moji": "📏"
   },
@@ -25763,7 +28943,7 @@
     "unicode_alternates": [],
     "name": "strawberry",
     "shortname": ":strawberry:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -25782,7 +28962,7 @@
     "unicode_alternates": [],
     "name": "face with stuck-out tongue",
     "shortname": ":stuck_out_tongue:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [
       ":P",
@@ -25807,8 +28987,10 @@
       "prank",
       "tongue",
       "silly",
-      "playful",
-      "cheeky"
+      "cheeky",
+      "smiley",
+      "sex",
+      "emotion"
     ],
     "moji": "😛"
   },
@@ -25817,7 +28999,7 @@
     "unicode_alternates": [],
     "name": "face with stuck-out tongue and tightly-closed eyes",
     "shortname": ":stuck_out_tongue_closed_eyes:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -25828,8 +29010,10 @@
       "tongue",
       "kidding",
       "silly",
-      "playful",
-      "ecstatic"
+      "ecstatic",
+      "happy",
+      "smiley",
+      "emotion"
     ],
     "moji": "😝"
   },
@@ -25838,7 +29022,7 @@
     "unicode_alternates": [],
     "name": "face with stuck-out tongue and winking eye",
     "shortname": ":stuck_out_tongue_winking_eye:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [
       ">:P",
@@ -25856,11 +29040,27 @@
       "winking",
       "kidding",
       "silly",
-      "playful",
-      "crazy"
+      "crazy",
+      "happy",
+      "smiley",
+      "emotion",
+      "parties"
     ],
     "moji": "😜"
   },
+  "stuffed_flatbread": {
+    "unicode": "1F959",
+    "unicode_alternates": [],
+    "name": "stuffed flatbread",
+    "shortname": ":stuffed_flatbread:",
+    "category": "food",
+    "aliases": [
+      ":stuffed_pita:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🥙"
+  },
   "sun_with_face": {
     "unicode": "1F31E",
     "unicode_alternates": [],
@@ -25874,7 +29074,9 @@
       "sun",
       "anthropomorphic",
       "face",
-      "sky"
+      "sky",
+      "day",
+      "hump day"
     ],
     "moji": "🌞"
   },
@@ -25902,7 +29104,7 @@
     "unicode_alternates": [],
     "name": "smiling face with sunglasses",
     "shortname": ":sunglasses:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [
       "B-)",
@@ -25920,8 +29122,11 @@
       "sun",
       "glasses",
       "sunny",
-      "cool",
-      "smooth"
+      "smooth",
+      "silly",
+      "smiley",
+      "emojione",
+      "boys night"
     ],
     "moji": "😎"
   },
@@ -25937,15 +29142,21 @@
     "aliases_ascii": [],
     "keywords": [
       "brightness",
-      "weather"
-    ]
+      "weather",
+      "sky",
+      "day",
+      "sun",
+      "hot",
+      "morning"
+    ],
+    "moji": "☀"
   },
   "sunrise": {
     "unicode": "1F305",
     "unicode_alternates": [],
     "name": "sunrise",
     "shortname": ":sunrise:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -25955,9 +29166,13 @@
       "view",
       "sunrise",
       "sun",
-      "morning",
       "color",
-      "sky"
+      "sky",
+      "places",
+      "travel",
+      "tropical",
+      "day",
+      "hump day"
     ],
     "moji": "🌅"
   },
@@ -25966,7 +29181,7 @@
     "unicode_alternates": [],
     "name": "sunrise over mountains",
     "shortname": ":sunrise_over_mountains:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -25979,7 +29194,11 @@
       "mountain",
       "rural",
       "color",
-      "sky"
+      "sky",
+      "places",
+      "travel",
+      "day",
+      "camp"
     ],
     "moji": "🌄"
   },
@@ -25988,7 +29207,7 @@
     "unicode_alternates": [],
     "name": "surfer",
     "shortname": ":surfer:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -25998,15 +29217,19 @@
       "surfer",
       "surf",
       "wave",
-      "ocean",
       "ride",
-      "swell"
+      "swell",
+      "men",
+      "vacation",
+      "tropical",
+      "sport",
+      "diversity"
     ],
     "moji": "🏄"
   },
   "surfer_tone1": {
     "unicode": "1F3C4-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "surfer tone 1",
     "shortname": ":surfer_tone1:",
     "category": "activity",
@@ -26018,14 +29241,14 @@
       "sport",
       "surf",
       "wave",
-      "ocean",
       "ride",
       "swell"
-    ]
+    ],
+    "moji": "🏄🏻"
   },
   "surfer_tone2": {
     "unicode": "1F3C4-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "surfer tone 2",
     "shortname": ":surfer_tone2:",
     "category": "activity",
@@ -26037,14 +29260,14 @@
       "sport",
       "surf",
       "wave",
-      "ocean",
       "ride",
       "swell"
-    ]
+    ],
+    "moji": "🏄🏼"
   },
   "surfer_tone3": {
     "unicode": "1F3C4-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "surfer tone 3",
     "shortname": ":surfer_tone3:",
     "category": "activity",
@@ -26056,14 +29279,14 @@
       "sport",
       "surf",
       "wave",
-      "ocean",
       "ride",
       "swell"
-    ]
+    ],
+    "moji": "🏄🏽"
   },
   "surfer_tone4": {
     "unicode": "1F3C4-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "surfer tone 4",
     "shortname": ":surfer_tone4:",
     "category": "activity",
@@ -26075,14 +29298,14 @@
       "sport",
       "surf",
       "wave",
-      "ocean",
       "ride",
       "swell"
-    ]
+    ],
+    "moji": "🏄🏾"
   },
   "surfer_tone5": {
     "unicode": "1F3C4-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "surfer tone 5",
     "shortname": ":surfer_tone5:",
     "category": "activity",
@@ -26094,17 +29317,17 @@
       "sport",
       "surf",
       "wave",
-      "ocean",
       "ride",
       "swell"
-    ]
+    ],
+    "moji": "🏄🏿"
   },
   "sushi": {
     "unicode": "1F363",
     "unicode_alternates": [],
     "name": "sushi",
     "shortname": ":sushi:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -26114,7 +29337,7 @@
       "fish",
       "raw",
       "nigiri",
-      "japanese"
+      "japan"
     ],
     "moji": "🍣"
   },
@@ -26123,7 +29346,7 @@
     "unicode_alternates": [],
     "name": "suspension railway",
     "shortname": ":suspension_railway:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -26133,7 +29356,7 @@
       "railway",
       "rail",
       "train",
-      "transportation"
+      "travel"
     ],
     "moji": "🚟"
   },
@@ -26142,7 +29365,7 @@
     "unicode_alternates": [],
     "name": "face with cold sweat",
     "shortname": ":sweat:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [
       "':(",
@@ -26158,7 +29381,11 @@
       "clammy",
       "diaphoresis",
       "face",
-      "hot"
+      "hot",
+      "sad",
+      "smiley",
+      "stressed",
+      "emotion"
     ],
     "moji": "😓"
   },
@@ -26167,11 +29394,14 @@
     "unicode_alternates": [],
     "name": "splashing sweat symbol",
     "shortname": ":sweat_drops:",
-    "category": "emoticons",
+    "category": "nature",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "water"
+      "water",
+      "rain",
+      "stressed",
+      "sweat"
     ],
     "moji": "💦"
   },
@@ -26180,7 +29410,7 @@
     "unicode_alternates": [],
     "name": "smiling face with open mouth and cold sweat",
     "shortname": ":sweat_smile:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [
       "':)",
@@ -26197,7 +29427,10 @@
       "smiling",
       "cold",
       "sweat",
-      "perspiration"
+      "perspiration",
+      "smiley",
+      "workout",
+      "emotion"
     ],
     "moji": "😅"
   },
@@ -26206,7 +29439,7 @@
     "unicode_alternates": [],
     "name": "roasted sweet potato",
     "shortname": ":sweet_potato:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -26216,7 +29449,8 @@
       "potato",
       "potassium",
       "roasted",
-      "roast"
+      "roast",
+      "vegetables"
     ],
     "moji": "🍠"
   },
@@ -26225,7 +29459,7 @@
     "unicode_alternates": [],
     "name": "swimmer",
     "shortname": ":swimmer:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -26238,13 +29472,16 @@
       "freestyle",
       "butterfly",
       "breaststroke",
-      "backstroke"
+      "backstroke",
+      "workout",
+      "sport",
+      "diversity"
     ],
     "moji": "🏊"
   },
   "swimmer_tone1": {
     "unicode": "1F3CA-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "swimmer tone 1",
     "shortname": ":swimmer_tone1:",
     "category": "activity",
@@ -26260,11 +29497,12 @@
       "butterfly",
       "breaststroke",
       "backstroke"
-    ]
+    ],
+    "moji": "🏊🏻"
   },
   "swimmer_tone2": {
     "unicode": "1F3CA-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "swimmer tone 2",
     "shortname": ":swimmer_tone2:",
     "category": "activity",
@@ -26280,11 +29518,12 @@
       "butterfly",
       "breaststroke",
       "backstroke"
-    ]
+    ],
+    "moji": "🏊🏼"
   },
   "swimmer_tone3": {
     "unicode": "1F3CA-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "swimmer tone 3",
     "shortname": ":swimmer_tone3:",
     "category": "activity",
@@ -26300,11 +29539,12 @@
       "butterfly",
       "breaststroke",
       "backstroke"
-    ]
+    ],
+    "moji": "🏊🏽"
   },
   "swimmer_tone4": {
     "unicode": "1F3CA-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "swimmer tone 4",
     "shortname": ":swimmer_tone4:",
     "category": "activity",
@@ -26320,11 +29560,12 @@
       "butterfly",
       "breaststroke",
       "backstroke"
-    ]
+    ],
+    "moji": "🏊🏾"
   },
   "swimmer_tone5": {
     "unicode": "1F3CA-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "swimmer tone 5",
     "shortname": ":swimmer_tone5:",
     "category": "activity",
@@ -26340,30 +29581,40 @@
       "butterfly",
       "breaststroke",
       "backstroke"
-    ]
+    ],
+    "moji": "🏊🏿"
   },
   "symbols": {
     "unicode": "1F523",
     "unicode_alternates": [],
     "name": "input symbol for symbols",
     "shortname": ":symbols:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "blue-square"
+      "blue-square",
+      "symbol"
     ],
     "moji": "🔣"
   },
   "synagogue": {
     "unicode": "1F54D",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "synagogue",
     "shortname": ":synagogue:",
     "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "places",
+      "religion",
+      "building",
+      "travel",
+      "vacation",
+      "condolence"
+    ],
+    "moji": "🕍"
   },
   "syringe": {
     "unicode": "1F489",
@@ -26379,19 +29630,26 @@
       "health",
       "hospital",
       "medicine",
-      "needle"
+      "needle",
+      "object",
+      "weapon"
     ],
     "moji": "💉"
   },
   "taco": {
     "unicode": "1F32E",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "taco",
     "shortname": ":taco:",
-    "category": "foods",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "food",
+      "mexican",
+      "vagina"
+    ],
+    "moji": "🌮"
   },
   "tada": {
     "unicode": "1F389",
@@ -26404,14 +29662,21 @@
     "keywords": [
       "contulations",
       "party",
-      "party",
       "popper",
       "tada",
       "celebration",
       "victory",
       "announcement",
       "climax",
-      "congratulations"
+      "congratulations",
+      "object",
+      "birthday",
+      "holidays",
+      "cheers",
+      "good",
+      "girls night",
+      "boys night",
+      "parties"
     ],
     "moji": "🎉"
   },
@@ -26420,7 +29685,7 @@
     "unicode_alternates": [],
     "name": "tanabata tree",
     "shortname": ":tanabata_tree:",
-    "category": "objects",
+    "category": "nature",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -26431,7 +29696,8 @@
       "festival",
       "star",
       "wish",
-      "holiday"
+      "holiday",
+      "trees"
     ],
     "moji": "🎋"
   },
@@ -26440,7 +29706,7 @@
     "unicode_alternates": [],
     "name": "tangerine",
     "shortname": ":tangerine:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -26460,7 +29726,7 @@
     ],
     "name": "taurus",
     "shortname": ":taurus:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -26473,9 +29739,8 @@
       "constellation",
       "stars",
       "zodiac",
-      "sign",
-      "zodiac",
-      "horoscope"
+      "horoscope",
+      "symbol"
     ],
     "moji": "♉"
   },
@@ -26484,7 +29749,7 @@
     "unicode_alternates": [],
     "name": "taxi",
     "shortname": ":taxi:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -26497,7 +29762,8 @@
       "automobile",
       "city",
       "transport",
-      "service"
+      "service",
+      "travel"
     ],
     "moji": "🚕"
   },
@@ -26506,7 +29772,7 @@
     "unicode_alternates": [],
     "name": "teacup without handle",
     "shortname": ":tea:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -26517,10 +29783,13 @@
       "green",
       "tea",
       "leaf",
-      "drink",
       "teacup",
       "hot",
-      "beverage"
+      "beverage",
+      "japan",
+      "caffeine",
+      "steam",
+      "morning"
     ],
     "moji": "🍵"
   },
@@ -26537,26 +29806,12 @@
     "keywords": [
       "communication",
       "dial",
-      "technology"
+      "technology",
+      "electronics",
+      "phone"
     ],
     "moji": "☎"
   },
-  "telephone_black": {
-    "unicode": "1F57F",
-    "unicode_alternates": [],
-    "name": "black touchtone telephone",
-    "shortname": ":telephone_black:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":black_touchtone_telephone:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "communication",
-      "dial",
-      "technology"
-    ]
-  },
   "telephone_receiver": {
     "unicode": "1F4DE",
     "unicode_alternates": [],
@@ -26568,26 +29823,12 @@
     "keywords": [
       "communication",
       "dial",
-      "technology"
+      "technology",
+      "electronics",
+      "phone"
     ],
     "moji": "📞"
   },
-  "telephone_white": {
-    "unicode": "1F57E",
-    "unicode_alternates": [],
-    "name": "white touchtone telephone",
-    "shortname": ":telephone_white:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":white_touchtone_telephone:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "communication",
-      "dial",
-      "technology"
-    ]
-  },
   "telescope": {
     "unicode": "1F52D",
     "unicode_alternates": [],
@@ -26598,13 +29839,15 @@
     "aliases_ascii": [],
     "keywords": [
       "space",
-      "stars"
+      "stars",
+      "object",
+      "science"
     ],
     "moji": "🔭"
   },
   "ten": {
     "unicode": "1F51F",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "keycap ten",
     "shortname": ":ten:",
     "category": "symbols",
@@ -26615,15 +29858,18 @@
       "blue-square",
       "numbers",
       "symbol",
-      "word"
-    ]
+      "word",
+      "number",
+      "math"
+    ],
+    "moji": "🔟"
   },
   "tennis": {
     "unicode": "1F3BE",
     "unicode_alternates": [],
     "name": "tennis racquet and ball",
     "shortname": ":tennis:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -26637,7 +29883,8 @@
       "game",
       "net",
       "court",
-      "love"
+      "love",
+      "sport"
     ],
     "moji": "🎾"
   },
@@ -26648,13 +29895,16 @@
     ],
     "name": "tent",
     "shortname": ":tent:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "camp",
       "outdoors",
-      "photo"
+      "photo",
+      "places",
+      "travel",
+      "vacation"
     ],
     "moji": "⛺"
   },
@@ -26663,16 +29913,21 @@
     "unicode_alternates": [],
     "name": "thermometer",
     "shortname": ":thermometer:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "temperature"
-    ]
+      "temperature",
+      "object",
+      "science",
+      "health",
+      "hot"
+    ],
+    "moji": "🌡"
   },
   "thermometer_face": {
     "unicode": "1F912",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "face with thermometer",
     "shortname": ":thermometer_face:",
     "category": "people",
@@ -26680,11 +29935,17 @@
       ":face_with_thermometer:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "smiley",
+      "health",
+      "sick",
+      "emotion"
+    ],
+    "moji": "🤒"
   },
   "thinking": {
     "unicode": "1F914",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "thinking face",
     "shortname": ":thinking:",
     "category": "people",
@@ -26692,14 +29953,32 @@
       ":thinking_face:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "smiley",
+      "thinking",
+      "boys night"
+    ],
+    "moji": "🤔"
+  },
+  "third_place": {
+    "unicode": "1F949",
+    "unicode_alternates": [],
+    "name": "third place medal",
+    "shortname": ":third_place:",
+    "category": "activity",
+    "aliases": [
+      ":third_place_medal:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🥉"
   },
   "thought_balloon": {
     "unicode": "1F4AD",
     "unicode_alternates": [],
     "name": "thought balloon",
     "shortname": ":thought_balloon:",
-    "category": "emoticons",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -26711,98 +29990,30 @@
       "comic",
       "think",
       "day dream",
-      "wonder"
+      "wonder",
+      "symbol"
     ],
     "moji": "💭"
   },
-  "thought_left": {
-    "unicode": "1F5EC",
-    "unicode_alternates": [],
-    "name": "left thought bubble",
-    "shortname": ":thought_left:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":left_thought_bubble:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "balloon",
-      "cloud",
-      "comic",
-      "think",
-      "day dream",
-      "wonder"
-    ]
-  },
-  "thought_right": {
-    "unicode": "1F5ED",
-    "unicode_alternates": [],
-    "name": "right thought bubble",
-    "shortname": ":thought_right:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":right_thought_bubble:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "balloon",
-      "cloud",
-      "comic",
-      "think",
-      "day dream",
-      "wonder"
-    ]
-  },
   "three": {
     "moji": "3️⃣",
     "unicode": "0033-20E3",
     "unicode_alternates": [
       "0033-FE0F-20E3"
     ],
-    "name": "digit three",
+    "name": "keycap digit three",
     "shortname": ":three:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "3",
       "blue-square",
       "numbers",
-      "prime"
-    ]
-  },
-  "thumbs_down_reverse": {
-    "unicode": "1F593",
-    "unicode_alternates": [],
-    "name": "reversed thumbs down sign",
-    "shortname": ":thumbs_down_reverse:",
-    "category": "people",
-    "aliases": [
-      ":reversed_thumbs_down_sign:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "hand",
-      "no",
-      "-1"
-    ]
-  },
-  "thumbs_up_reverse": {
-    "unicode": "1F592",
-    "unicode_alternates": [],
-    "name": "reversed thumbs up sign",
-    "shortname": ":thumbs_up_reverse:",
-    "category": "people",
-    "aliases": [
-      ":reversed_thumbs_up_sign:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "cool",
-      "hand",
-      "like",
-      "yes",
-      "+1"
+      "prime",
+      "number",
+      "math",
+      "symbol"
     ]
   },
   "thumbsdown": {
@@ -26810,20 +30021,23 @@
     "unicode_alternates": [],
     "name": "thumbs down sign",
     "shortname": ":thumbsdown:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [
       ":-1:"
     ],
     "aliases_ascii": [],
     "keywords": [
       "hand",
-      "no"
+      "no",
+      "body",
+      "hands",
+      "diversity"
     ],
     "moji": "👎"
   },
   "thumbsdown_tone1": {
     "unicode": "1F44E-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "thumbs down sign tone 1",
     "shortname": ":thumbsdown_tone1:",
     "category": "people",
@@ -26835,11 +30049,12 @@
       "hand",
       "no",
       "-1"
-    ]
+    ],
+    "moji": "👎🏻"
   },
   "thumbsdown_tone2": {
     "unicode": "1F44E-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "thumbs down sign tone 2",
     "shortname": ":thumbsdown_tone2:",
     "category": "people",
@@ -26851,11 +30066,12 @@
       "hand",
       "no",
       "-1"
-    ]
+    ],
+    "moji": "👎🏼"
   },
   "thumbsdown_tone3": {
     "unicode": "1F44E-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "thumbs down sign tone 3",
     "shortname": ":thumbsdown_tone3:",
     "category": "people",
@@ -26867,11 +30083,12 @@
       "hand",
       "no",
       "-1"
-    ]
+    ],
+    "moji": "👎🏽"
   },
   "thumbsdown_tone4": {
     "unicode": "1F44E-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "thumbs down sign tone 4",
     "shortname": ":thumbsdown_tone4:",
     "category": "people",
@@ -26883,11 +30100,12 @@
       "hand",
       "no",
       "-1"
-    ]
+    ],
+    "moji": "👎🏾"
   },
   "thumbsdown_tone5": {
     "unicode": "1F44E-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "thumbs down sign tone 5",
     "shortname": ":thumbsdown_tone5:",
     "category": "people",
@@ -26899,14 +30117,15 @@
       "hand",
       "no",
       "-1"
-    ]
+    ],
+    "moji": "👎🏿"
   },
   "thumbsup": {
     "unicode": "1F44D",
     "unicode_alternates": [],
     "name": "thumbs up sign",
     "shortname": ":thumbsup:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [
       ":+1:"
     ],
@@ -26915,13 +30134,22 @@
       "cool",
       "hand",
       "like",
-      "yes"
+      "yes",
+      "body",
+      "hands",
+      "hi",
+      "luck",
+      "thank you",
+      "diversity",
+      "perfect",
+      "good",
+      "beautiful"
     ],
     "moji": "👍"
   },
   "thumbsup_tone1": {
     "unicode": "1F44D-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "thumbs up sign tone 1",
     "shortname": ":thumbsup_tone1:",
     "category": "people",
@@ -26935,11 +30163,12 @@
       "like",
       "yes",
       "+1"
-    ]
+    ],
+    "moji": "👍🏻"
   },
   "thumbsup_tone2": {
     "unicode": "1F44D-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "thumbs up sign tone 2",
     "shortname": ":thumbsup_tone2:",
     "category": "people",
@@ -26953,11 +30182,12 @@
       "like",
       "yes",
       "+1"
-    ]
+    ],
+    "moji": "👍🏼"
   },
   "thumbsup_tone3": {
     "unicode": "1F44D-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "thumbs up sign tone 3",
     "shortname": ":thumbsup_tone3:",
     "category": "people",
@@ -26971,11 +30201,12 @@
       "like",
       "yes",
       "+1"
-    ]
+    ],
+    "moji": "👍🏽"
   },
   "thumbsup_tone4": {
     "unicode": "1F44D-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "thumbs up sign tone 4",
     "shortname": ":thumbsup_tone4:",
     "category": "people",
@@ -26989,11 +30220,12 @@
       "like",
       "yes",
       "+1"
-    ]
+    ],
+    "moji": "👍🏾"
   },
   "thumbsup_tone5": {
     "unicode": "1F44D-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "thumbs up sign tone 5",
     "shortname": ":thumbsup_tone5:",
     "category": "people",
@@ -27007,11 +30239,12 @@
       "like",
       "yes",
       "+1"
-    ]
+    ],
+    "moji": "👍🏿"
   },
   "thunder_cloud_rain": {
     "unicode": "26C8",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "thunder cloud and rain",
     "shortname": ":thunder_cloud_rain:",
     "category": "nature",
@@ -27021,15 +30254,20 @@
     "aliases_ascii": [],
     "keywords": [
       "nature",
-      "weather"
-    ]
+      "weather",
+      "sky",
+      "cloud",
+      "cold",
+      "rain"
+    ],
+    "moji": "⛈"
   },
   "ticket": {
     "unicode": "1F3AB",
     "unicode_alternates": [],
     "name": "ticket",
     "shortname": ":ticket:",
-    "category": "places",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -27042,7 +30280,10 @@
       "stub",
       "admission",
       "proof",
-      "purchase"
+      "purchase",
+      "theatre",
+      "movie",
+      "parties"
     ],
     "moji": "🎫"
   },
@@ -27064,8 +30305,12 @@
       "entertainment",
       "stub",
       "proof",
-      "purchase"
-    ]
+      "purchase",
+      "theatre",
+      "movie",
+      "parties"
+    ],
+    "moji": "🎟"
   },
   "tiger": {
     "unicode": "1F42F",
@@ -27076,7 +30321,10 @@
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "animal"
+      "animal",
+      "wildlife",
+      "roar",
+      "cat"
     ],
     "moji": "🐯"
   },
@@ -27096,13 +30344,15 @@
       "striped",
       "tony",
       "tigger",
-      "hobs"
+      "hobs",
+      "wildlife",
+      "roar"
     ],
     "moji": "🐅"
   },
   "timer": {
     "unicode": "23F2",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "timer clock",
     "shortname": ":timer:",
     "category": "objects",
@@ -27113,14 +30363,15 @@
     "keywords": [
       "object",
       "time"
-    ]
+    ],
+    "moji": "⏲"
   },
   "tired_face": {
     "unicode": "1F62B",
     "unicode_alternates": [],
     "name": "tired face",
     "shortname": ":tired_face:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -27131,13 +30382,18 @@
       "whine",
       "exhausted",
       "sleepy",
-      "tired"
+      "tired",
+      "sad",
+      "smiley",
+      "emotion"
     ],
     "moji": "😫"
   },
   "tm": {
     "unicode": "2122",
-    "unicode_alternates": "2122-fe0f",
+    "unicode_alternates": [
+      "2122-FE0F"
+    ],
     "name": "trade mark sign",
     "shortname": ":tm:",
     "category": "symbols",
@@ -27149,7 +30405,8 @@
       "symbol",
       "tm",
       "word"
-    ]
+    ],
+    "moji": "™"
   },
   "toilet": {
     "unicode": "1F6BD",
@@ -27168,7 +30425,8 @@
       "porcelain",
       "waste",
       "flush",
-      "plumbing"
+      "plumbing",
+      "object"
     ],
     "moji": "🚽"
   },
@@ -27177,12 +30435,16 @@
     "unicode_alternates": [],
     "name": "tokyo tower",
     "shortname": ":tokyo_tower:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "japan",
-      "photo"
+      "photo",
+      "places",
+      "travel",
+      "vacation",
+      "eiffel tower"
     ],
     "moji": "🗼"
   },
@@ -27191,7 +30453,7 @@
     "unicode_alternates": [],
     "name": "tomato",
     "shortname": ":tomato:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -27200,80 +30462,83 @@
       "nature",
       "vegetable",
       "tomato",
-      "fruit",
       "sauce",
-      "italian"
+      "italian",
+      "vegetables"
     ],
     "moji": "🍅"
   },
   "tone1": {
     "unicode": "1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "emoji modifier Fitzpatrick type-1-2",
     "shortname": ":tone1:",
     "category": "modifier",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [],
+    "moji": "🏻"
   },
   "tone2": {
     "unicode": "1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "emoji modifier Fitzpatrick type-3",
     "shortname": ":tone2:",
     "category": "modifier",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [],
+    "moji": "🏼"
   },
   "tone3": {
     "unicode": "1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "emoji modifier Fitzpatrick type-4",
     "shortname": ":tone3:",
     "category": "modifier",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [],
+    "moji": "🏽"
   },
   "tone4": {
     "unicode": "1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "emoji modifier Fitzpatrick type-5",
     "shortname": ":tone4:",
     "category": "modifier",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [],
+    "moji": "🏾"
   },
   "tone5": {
     "unicode": "1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "emoji modifier Fitzpatrick type-6",
     "shortname": ":tone5:",
     "category": "modifier",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [],
+    "moji": "🏿"
   },
   "tongue": {
     "unicode": "1F445",
     "unicode_alternates": [],
     "name": "tongue",
     "shortname": ":tongue:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "mouth",
       "playful",
       "tongue",
-      "mouth",
       "taste",
       "buds",
       "food",
       "silly",
-      "playful",
       "tease",
       "kiss",
       "french kiss",
@@ -27281,7 +30546,10 @@
       "tasty",
       "playfulness",
       "silliness",
-      "intimacy"
+      "intimacy",
+      "body",
+      "sexy",
+      "lip"
     ],
     "moji": "👅"
   },
@@ -27290,26 +30558,31 @@
     "unicode_alternates": [],
     "name": "hammer and wrench",
     "shortname": ":tools:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [
       ":hammer_and_wrench:"
     ],
     "aliases_ascii": [],
     "keywords": [
-      "tools"
-    ]
+      "tools",
+      "object",
+      "tool"
+    ],
+    "moji": "🛠"
   },
   "top": {
     "unicode": "1F51D",
     "unicode_alternates": [],
     "name": "top with upwards arrow above",
     "shortname": ":top:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "blue-square",
-      "words"
+      "words",
+      "arrow",
+      "symbol"
     ],
     "moji": "🔝"
   },
@@ -27318,7 +30591,7 @@
     "unicode_alternates": [],
     "name": "top hat",
     "shortname": ":tophat:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -27337,14 +30610,15 @@
       "topper",
       "london",
       "period piece",
-      "magic",
-      "magician"
+      "magician",
+      "fashion",
+      "accessories"
     ],
     "moji": "🎩"
   },
   "track_next": {
     "unicode": "23ED",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "black right-pointing double triangle with vertical bar",
     "shortname": ":track_next:",
     "category": "symbols",
@@ -27358,11 +30632,12 @@
       "next track",
       "sound",
       "symbol"
-    ]
+    ],
+    "moji": "⏭"
   },
   "track_previous": {
     "unicode": "23EE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "black left-pointing double triangle with vertical bar",
     "shortname": ":track_previous:",
     "category": "symbols",
@@ -27376,28 +30651,34 @@
       "previous track",
       "sound",
       "symbol"
-    ]
+    ],
+    "moji": "⏮"
   },
   "trackball": {
     "unicode": "1F5B2",
     "unicode_alternates": [],
     "name": "trackball",
     "shortname": ":trackball:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "input",
       "device",
-      "gadget"
-    ]
+      "gadget",
+      "electronics",
+      "work",
+      "game",
+      "office"
+    ],
+    "moji": "🖲"
   },
   "tractor": {
     "unicode": "1F69C",
     "unicode_alternates": [],
     "name": "tractor",
     "shortname": ":tractor:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -27409,7 +30690,8 @@
       "farm",
       "construction",
       "machine",
-      "digger"
+      "digger",
+      "transportation"
     ],
     "moji": "🚜"
   },
@@ -27418,18 +30700,19 @@
     "unicode_alternates": [],
     "name": "horizontal traffic light",
     "shortname": ":traffic_light:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "traffic",
       "transportation",
-      "traffic",
       "light",
       "stop",
       "go",
       "yield",
-      "horizontal"
+      "horizontal",
+      "object",
+      "stop light"
     ],
     "moji": "🚥"
   },
@@ -27438,20 +30721,24 @@
     "unicode_alternates": [],
     "name": "Tram Car",
     "shortname": ":train:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "tram",
-      "rail"
-    ]
+      "rail",
+      "transportation",
+      "travel",
+      "train"
+    ],
+    "moji": "🚋"
   },
   "train2": {
     "unicode": "1F686",
     "unicode_alternates": [],
     "name": "train",
     "shortname": ":train2:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -27459,66 +30746,35 @@
       "vehicle",
       "train",
       "locomotive",
-      "rail"
+      "rail",
+      "travel"
     ],
     "moji": "🚆"
   },
-  "train_diesel": {
-    "unicode": "1F6F2",
-    "unicode_alternates": [],
-    "name": "diesel locomotive",
-    "shortname": ":train_diesel:",
-    "category": "travel_places",
-    "aliases": [
-      ":diesel_locomotive:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "train",
-      "transportation",
-      "engine",
-      "rail"
-    ]
-  },
   "tram": {
     "unicode": "1F68A",
     "unicode_alternates": [],
     "name": "tram",
     "shortname": ":tram:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "transportation",
       "vehicle",
       "tram",
-      "transportation",
-      "transport"
+      "transport",
+      "travel",
+      "train"
     ],
     "moji": "🚊"
   },
-  "triangle_round": {
-    "unicode": "1F6C6",
-    "unicode_alternates": [],
-    "name": "triangle with rounded corners",
-    "shortname": ":triangle_round:",
-    "category": "objects_symbols",
-    "aliases": [
-      ":triangle_with_rounded_corners:"
-    ],
-    "aliases_ascii": [],
-    "keywords": [
-      "caution",
-      "warning",
-      "alert"
-    ]
-  },
   "triangular_flag_on_post": {
     "unicode": "1F6A9",
     "unicode_alternates": [],
     "name": "triangular flag on post",
     "shortname": ":triangular_flag_on_post:",
-    "category": "places",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -27527,7 +30783,8 @@
       "flag",
       "golf",
       "post",
-      "flagpole"
+      "flagpole",
+      "object"
     ],
     "moji": "🚩"
   },
@@ -27543,7 +30800,10 @@
       "architect",
       "math",
       "sketch",
-      "stationery"
+      "stationery",
+      "object",
+      "tool",
+      "office"
     ],
     "moji": "📐"
   },
@@ -27552,12 +30812,14 @@
     "unicode_alternates": [],
     "name": "trident emblem",
     "shortname": ":trident:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "spear",
-      "weapon"
+      "weapon",
+      "object",
+      "symbol"
     ],
     "moji": "🔱"
   },
@@ -27566,7 +30828,7 @@
     "unicode_alternates": [],
     "name": "face with look of triumph",
     "shortname": ":triumph:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -27575,7 +30837,11 @@
       "phew",
       "triumph",
       "steam",
-      "breath"
+      "breath",
+      "mad",
+      "smiley",
+      "angry",
+      "emotion"
     ],
     "moji": "😤"
   },
@@ -27584,7 +30850,7 @@
     "unicode_alternates": [],
     "name": "trolleybus",
     "shortname": ":trolleybus:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -27595,7 +30861,7 @@
       "bus",
       "city",
       "transport",
-      "transportation"
+      "travel"
     ],
     "moji": "🚎"
   },
@@ -27604,7 +30870,7 @@
     "unicode_alternates": [],
     "name": "trophy",
     "shortname": ":trophy:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -27617,11 +30883,13 @@
       "trophy",
       "first",
       "show",
-      "place",
-      "win",
       "reward",
       "achievement",
-      "medal"
+      "medal",
+      "object",
+      "game",
+      "perfect",
+      "parties"
     ],
     "moji": "🏆"
   },
@@ -27630,7 +30898,7 @@
     "unicode_alternates": [],
     "name": "tropical drink",
     "shortname": ":tropical_drink:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -27642,7 +30910,9 @@
       "coconut",
       "pina",
       "fruit",
-      "umbrella"
+      "umbrella",
+      "cocktail",
+      "alcohol"
     ],
     "moji": "🍹"
   },
@@ -27656,7 +30926,8 @@
     "aliases_ascii": [],
     "keywords": [
       "animal",
-      "swim"
+      "swim",
+      "wildlife"
     ],
     "moji": "🐠"
   },
@@ -27665,7 +30936,7 @@
     "unicode_alternates": [],
     "name": "delivery truck",
     "shortname": ":truck:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -27682,16 +30953,15 @@
     "unicode_alternates": [],
     "name": "trumpet",
     "shortname": ":trumpet:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "brass",
       "music",
       "trumpet",
-      "brass",
-      "music",
-      "instrument"
+      "instrument",
+      "instruments"
     ],
     "moji": "🎺"
   },
@@ -27711,34 +30981,40 @@
       "flower",
       "bulb",
       "spring",
-      "easter"
+      "easter",
+      "vagina",
+      "girls night"
     ],
     "moji": "🌷"
   },
+  "tumbler_glass": {
+    "unicode": "1F943",
+    "unicode_alternates": [],
+    "name": "tumbler glass",
+    "shortname": ":tumbler_glass:",
+    "category": "food",
+    "aliases": [
+      ":whisky:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [
+      "booze"
+    ],
+    "moji": "🥃"
+  },
   "turkey": {
     "unicode": "1F983",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "turkey",
     "shortname": ":turkey:",
     "category": "nature",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": []
-  },
-  "turned_ok_hand": {
-    "unicode": "1F58F",
-    "unicode_alternates": [],
-    "name": "turned ok hand sign",
-    "shortname": ":turned_ok_hand:",
-    "category": "people",
-    "aliases": [
-      ":turned_ok_hand_sign:"
-    ],
-    "aliases_ascii": [],
     "keywords": [
-      "perfect",
-      "okay"
-    ]
+      "wildlife",
+      "animal"
+    ],
+    "moji": "🦃"
   },
   "turtle": {
     "unicode": "1F422",
@@ -27756,15 +31032,15 @@
       "tortoise",
       "chelonian",
       "reptile",
-      "slow",
       "snap",
-      "steady"
+      "steady",
+      "wildlife"
     ],
     "moji": "🐢"
   },
   "tv": {
     "unicode": "1F4FA",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "television",
     "shortname": ":tv:",
     "category": "objects",
@@ -27778,19 +31054,23 @@
       "tv",
       "entertainment",
       "object",
-      "video"
-    ]
+      "video",
+      "electronics"
+    ],
+    "moji": "📺"
   },
   "twisted_rightwards_arrows": {
     "unicode": "1F500",
     "unicode_alternates": [],
     "name": "twisted rightwards arrows",
     "shortname": ":twisted_rightwards_arrows:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "blue-square"
+      "blue-square",
+      "arrow",
+      "symbol"
     ],
     "moji": "🔀"
   },
@@ -27800,16 +31080,19 @@
     "unicode_alternates": [
       "0032-FE0F-20E3"
     ],
-    "name": "digit two",
+    "name": "keycap digit two",
     "shortname": ":two:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "2",
       "blue-square",
       "numbers",
-      "prime"
+      "prime",
+      "number",
+      "math",
+      "symbol"
     ]
   },
   "two_hearts": {
@@ -27817,7 +31100,7 @@
     "unicode_alternates": [],
     "name": "two hearts",
     "shortname": ":two_hearts:",
-    "category": "emoticons",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -27828,8 +31111,8 @@
       "heart",
       "hearts",
       "two",
-      "love",
-      "emotion"
+      "emotion",
+      "symbol"
     ],
     "moji": "💕"
   },
@@ -27838,7 +31121,7 @@
     "unicode_alternates": [],
     "name": "two men holding hands",
     "shortname": ":two_men_holding_hands:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -27850,11 +31133,13 @@
       "men",
       "gay",
       "homosexual",
-      "friends",
       "hands",
       "holding",
       "team",
-      "unity"
+      "unity",
+      "people",
+      "sex",
+      "lgbt"
     ],
     "moji": "👬"
   },
@@ -27863,7 +31148,7 @@
     "unicode_alternates": [],
     "name": "two women holding hands",
     "shortname": ":two_women_holding_hands:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -27875,14 +31160,17 @@
       "women",
       "hands",
       "girlfriends",
-      "friends",
       "sisters",
       "mother",
       "daughter",
       "gay",
       "homosexual",
-      "couple",
-      "unity"
+      "unity",
+      "people",
+      "sex",
+      "lgbt",
+      "lesbian",
+      "girls night"
     ],
     "moji": "👭"
   },
@@ -27891,7 +31179,7 @@
     "unicode_alternates": [],
     "name": "squared cjk unified ideograph-5272",
     "shortname": ":u5272:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -27899,7 +31187,8 @@
       "cut",
       "divide",
       "kanji",
-      "pink"
+      "pink",
+      "symbol"
     ],
     "moji": "🈹"
   },
@@ -27908,14 +31197,16 @@
     "unicode_alternates": [],
     "name": "squared cjk unified ideograph-5408",
     "shortname": ":u5408:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "chinese",
       "japanese",
       "join",
-      "kanji"
+      "kanji",
+      "japan",
+      "symbol"
     ],
     "moji": "🈴"
   },
@@ -27924,12 +31215,13 @@
     "unicode_alternates": [],
     "name": "squared cjk unified ideograph-55b6",
     "shortname": ":u55b6:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "japanese",
-      "opening hours"
+      "opening hours",
+      "symbol"
     ],
     "moji": "🈺"
   },
@@ -27940,14 +31232,15 @@
     ],
     "name": "squared cjk unified ideograph-6307",
     "shortname": ":u6307:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "chinese",
       "green-square",
       "kanji",
-      "point"
+      "point",
+      "symbol"
     ],
     "moji": "🈯"
   },
@@ -27956,7 +31249,7 @@
     "unicode_alternates": [],
     "name": "squared cjk unified ideograph-6708",
     "shortname": ":u6708:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -27964,7 +31257,8 @@
       "japanese",
       "kanji",
       "moon",
-      "orange-square"
+      "orange-square",
+      "symbol"
     ],
     "moji": "🈷"
   },
@@ -27973,14 +31267,15 @@
     "unicode_alternates": [],
     "name": "squared cjk unified ideograph-6709",
     "shortname": ":u6709:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "chinese",
       "have",
       "kanji",
-      "orange-square"
+      "orange-square",
+      "symbol"
     ],
     "moji": "🈶"
   },
@@ -27989,7 +31284,7 @@
     "unicode_alternates": [],
     "name": "squared cjk unified ideograph-6e80",
     "shortname": ":u6e80:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -27997,7 +31292,9 @@
       "full",
       "japanese",
       "kanji",
-      "red-square"
+      "red-square",
+      "japan",
+      "symbol"
     ],
     "moji": "🈵"
   },
@@ -28008,7 +31305,7 @@
     ],
     "name": "squared cjk unified ideograph-7121",
     "shortname": ":u7121:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -28017,7 +31314,8 @@
       "kanji",
       "no",
       "nothing",
-      "orange-square"
+      "orange-square",
+      "symbol"
     ],
     "moji": "🈚"
   },
@@ -28026,13 +31324,14 @@
     "unicode_alternates": [],
     "name": "squared cjk unified ideograph-7533",
     "shortname": ":u7533:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "chinese",
       "japanese",
-      "kanji"
+      "kanji",
+      "symbol"
     ],
     "moji": "🈸"
   },
@@ -28041,7 +31340,7 @@
     "unicode_alternates": [],
     "name": "squared cjk unified ideograph-7981",
     "shortname": ":u7981:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -28050,7 +31349,9 @@
       "japanese",
       "kanji",
       "limit",
-      "restricted"
+      "restricted",
+      "japan",
+      "symbol"
     ],
     "moji": "🈲"
   },
@@ -28059,14 +31360,15 @@
     "unicode_alternates": [],
     "name": "squared cjk unified ideograph-7a7a",
     "shortname": ":u7a7a:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "chinese",
       "empty",
       "japanese",
-      "kanji"
+      "kanji",
+      "symbol"
     ],
     "moji": "🈳"
   },
@@ -28082,13 +31384,15 @@
     "aliases_ascii": [],
     "keywords": [
       "rain",
-      "weather"
+      "weather",
+      "sky",
+      "cold"
     ],
     "moji": "☔"
   },
   "umbrella2": {
     "unicode": "2602",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "umbrella",
     "shortname": ":umbrella2:",
     "category": "nature",
@@ -28098,15 +31402,19 @@
       "clothing",
       "nature",
       "rain",
-      "weather"
-    ]
+      "weather",
+      "object",
+      "sky",
+      "cold"
+    ],
+    "moji": "☂"
   },
   "unamused": {
     "unicode": "1F612",
     "unicode_alternates": [],
     "name": "unamused face",
     "shortname": ":unamused:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -28120,7 +31428,12 @@
       "depressed",
       "unhappy",
       "disapprove",
-      "lame"
+      "lame",
+      "sad",
+      "mad",
+      "smiley",
+      "tired",
+      "emotion"
     ],
     "moji": "😒"
   },
@@ -28129,20 +31442,21 @@
     "unicode_alternates": [],
     "name": "no one under eighteen symbol",
     "shortname": ":underage:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "18",
       "drink",
       "night",
-      "pub"
+      "pub",
+      "symbol"
     ],
     "moji": "🔞"
   },
   "unicorn": {
     "unicode": "1F984",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "unicorn face",
     "shortname": ":unicorn:",
     "category": "nature",
@@ -28150,7 +31464,10 @@
       ":unicorn_face:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "animal"
+    ],
+    "moji": "🦄"
   },
   "unlock": {
     "unicode": "1F513",
@@ -28162,7 +31479,9 @@
     "aliases_ascii": [],
     "keywords": [
       "privacy",
-      "security"
+      "security",
+      "object",
+      "lock"
     ],
     "moji": "🔓"
   },
@@ -28171,17 +31490,18 @@
     "unicode_alternates": [],
     "name": "squared up with exclamation mark",
     "shortname": ":up:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "blue-square"
+      "blue-square",
+      "symbol"
     ],
     "moji": "🆙"
   },
   "upside_down": {
     "unicode": "1F643",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "upside-down face",
     "shortname": ":upside_down:",
     "category": "people",
@@ -28189,11 +31509,16 @@
       ":upside_down_face:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "silly",
+      "smiley",
+      "sarcastic"
+    ],
+    "moji": "🙃"
   },
   "urn": {
     "unicode": "26B1",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "funeral urn",
     "shortname": ":urn:",
     "category": "objects",
@@ -28203,8 +31528,11 @@
     "aliases_ascii": [],
     "keywords": [
       "death",
-      "object"
-    ]
+      "object",
+      "dead",
+      "rip"
+    ],
+    "moji": "⚱"
   },
   "v": {
     "unicode": "270C",
@@ -28213,7 +31541,7 @@
     ],
     "name": "victory hand",
     "shortname": ":v:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -28222,13 +31550,19 @@
       "ohyeah",
       "peace",
       "two",
-      "victory"
+      "victory",
+      "body",
+      "hands",
+      "hi",
+      "thank you",
+      "diversity",
+      "girls night"
     ],
     "moji": "✌"
   },
   "v_tone1": {
     "unicode": "270C-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "victory hand tone 1",
     "shortname": ":v_tone1:",
     "category": "people",
@@ -28240,11 +31574,12 @@
       "peace",
       "two",
       "v"
-    ]
+    ],
+    "moji": "✌🏻"
   },
   "v_tone2": {
     "unicode": "270C-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "victory hand tone 2",
     "shortname": ":v_tone2:",
     "category": "people",
@@ -28256,11 +31591,12 @@
       "peace",
       "two",
       "v"
-    ]
+    ],
+    "moji": "✌🏼"
   },
   "v_tone3": {
     "unicode": "270C-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "victory hand tone 3",
     "shortname": ":v_tone3:",
     "category": "people",
@@ -28272,11 +31608,12 @@
       "peace",
       "two",
       "v"
-    ]
+    ],
+    "moji": "✌🏽"
   },
   "v_tone4": {
     "unicode": "270C-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "victory hand tone 4",
     "shortname": ":v_tone4:",
     "category": "people",
@@ -28288,11 +31625,12 @@
       "peace",
       "two",
       "v"
-    ]
+    ],
+    "moji": "✌🏾"
   },
   "v_tone5": {
     "unicode": "270C-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "victory hand tone 5",
     "shortname": ":v_tone5:",
     "category": "people",
@@ -28304,14 +31642,15 @@
       "peace",
       "two",
       "v"
-    ]
+    ],
+    "moji": "✌🏿"
   },
   "vertical_traffic_light": {
     "unicode": "1F6A6",
     "unicode_alternates": [],
     "name": "vertical traffic light",
     "shortname": ":vertical_traffic_light:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -28321,7 +31660,9 @@
       "stop",
       "go",
       "yield",
-      "vertical"
+      "vertical",
+      "object",
+      "stop light"
     ],
     "moji": "🚦"
   },
@@ -28336,7 +31677,8 @@
     "keywords": [
       "oldschool",
       "record",
-      "video"
+      "video",
+      "electronics"
     ],
     "moji": "📼"
   },
@@ -28345,12 +31687,13 @@
     "unicode_alternates": [],
     "name": "vibration mode",
     "shortname": ":vibration_mode:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "orange-square",
-      "phone"
+      "phone",
+      "symbol"
     ],
     "moji": "📳"
   },
@@ -28364,7 +31707,10 @@
     "aliases_ascii": [],
     "keywords": [
       "film",
-      "record"
+      "record",
+      "electronics",
+      "camera",
+      "movie"
     ],
     "moji": "📹"
   },
@@ -28373,7 +31719,7 @@
     "unicode_alternates": [],
     "name": "video game",
     "shortname": ":video_game:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -28383,11 +31729,11 @@
       "play",
       "video",
       "game",
-      "console",
-      "controller",
       "nintendo",
       "xbox",
-      "playstation"
+      "playstation",
+      "electronics",
+      "boys night"
     ],
     "moji": "🎮"
   },
@@ -28396,7 +31742,7 @@
     "unicode_alternates": [],
     "name": "violin",
     "shortname": ":violin:",
-    "category": "objects",
+    "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -28404,8 +31750,8 @@
       "music",
       "violin",
       "fiddle",
-      "music",
-      "instrument"
+      "instruments",
+      "sarcastic"
     ],
     "moji": "🎻"
   },
@@ -28416,7 +31762,7 @@
     ],
     "name": "virgo",
     "shortname": ":virgo:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -28428,9 +31774,8 @@
       "constellation",
       "stars",
       "zodiac",
-      "sign",
-      "zodiac",
-      "horoscope"
+      "horoscope",
+      "symbol"
     ],
     "moji": "♍"
   },
@@ -28439,7 +31784,7 @@
     "unicode_alternates": [],
     "name": "volcano",
     "shortname": ":volcano:",
-    "category": "nature",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -28449,31 +31794,40 @@
       "lava",
       "magma",
       "hot",
-      "explode"
+      "explode",
+      "places",
+      "tropical"
     ],
     "moji": "🌋"
   },
   "volleyball": {
     "unicode": "1F3D0",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "volleyball",
     "shortname": ":volleyball:",
     "category": "activity",
     "aliases": [],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "game",
+      "ball",
+      "sport",
+      "volleyball"
+    ],
+    "moji": "🏐"
   },
   "vs": {
     "unicode": "1F19A",
     "unicode_alternates": [],
     "name": "squared vs",
     "shortname": ":vs:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "orange-square",
-      "words"
+      "words",
+      "symbol"
     ],
     "moji": "🆚"
   },
@@ -28493,12 +31847,17 @@
       "leonard",
       "nimoy",
       "star trek",
-      "live long"
-    ]
+      "live long",
+      "body",
+      "hands",
+      "hi",
+      "diversity"
+    ],
+    "moji": "🖖"
   },
   "vulcan_tone1": {
     "unicode": "1F596-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "raised hand with part between middle and ring fingers tone 1",
     "shortname": ":vulcan_tone1:",
     "category": "people",
@@ -28513,11 +31872,12 @@
       "nimoy",
       "star trek",
       "live long"
-    ]
+    ],
+    "moji": "🖖🏻"
   },
   "vulcan_tone2": {
     "unicode": "1F596-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "raised hand with part between middle and ring fingers tone 2",
     "shortname": ":vulcan_tone2:",
     "category": "people",
@@ -28532,11 +31892,12 @@
       "nimoy",
       "star trek",
       "live long"
-    ]
+    ],
+    "moji": "🖖🏼"
   },
   "vulcan_tone3": {
     "unicode": "1F596-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "raised hand with part between middle and ring fingers tone 3",
     "shortname": ":vulcan_tone3:",
     "category": "people",
@@ -28551,11 +31912,12 @@
       "nimoy",
       "star trek",
       "live long"
-    ]
+    ],
+    "moji": "🖖🏽"
   },
   "vulcan_tone4": {
     "unicode": "1F596-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "raised hand with part between middle and ring fingers tone 4",
     "shortname": ":vulcan_tone4:",
     "category": "people",
@@ -28570,11 +31932,12 @@
       "nimoy",
       "star trek",
       "live long"
-    ]
+    ],
+    "moji": "🖖🏾"
   },
   "vulcan_tone5": {
     "unicode": "1F596-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "raised hand with part between middle and ring fingers tone 5",
     "shortname": ":vulcan_tone5:",
     "category": "people",
@@ -28589,14 +31952,15 @@
       "nimoy",
       "star trek",
       "live long"
-    ]
+    ],
+    "moji": "🖖🏿"
   },
   "walking": {
     "unicode": "1F6B6",
     "unicode_alternates": [],
     "name": "pedestrian",
     "shortname": ":walking:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -28607,13 +31971,16 @@
       "stroll",
       "stride",
       "foot",
-      "feet"
+      "feet",
+      "people",
+      "men",
+      "diversity"
     ],
     "moji": "🚶"
   },
   "walking_tone1": {
     "unicode": "1F6B6-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "pedestrian tone 1",
     "shortname": ":walking_tone1:",
     "category": "people",
@@ -28626,11 +31993,12 @@
       "stride",
       "hiking",
       "hike"
-    ]
+    ],
+    "moji": "🚶🏻"
   },
   "walking_tone2": {
     "unicode": "1F6B6-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "pedestrian tone 2",
     "shortname": ":walking_tone2:",
     "category": "people",
@@ -28643,11 +32011,12 @@
       "stride",
       "hiking",
       "hike"
-    ]
+    ],
+    "moji": "🚶🏼"
   },
   "walking_tone3": {
     "unicode": "1F6B6-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "pedestrian tone 3",
     "shortname": ":walking_tone3:",
     "category": "people",
@@ -28660,11 +32029,12 @@
       "stride",
       "hiking",
       "hike"
-    ]
+    ],
+    "moji": "🚶🏽"
   },
   "walking_tone4": {
     "unicode": "1F6B6-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "pedestrian tone 4",
     "shortname": ":walking_tone4:",
     "category": "people",
@@ -28677,11 +32047,12 @@
       "stride",
       "hiking",
       "hike"
-    ]
+    ],
+    "moji": "🚶🏾"
   },
   "walking_tone5": {
     "unicode": "1F6B6-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "pedestrian tone 5",
     "shortname": ":walking_tone5:",
     "category": "people",
@@ -28694,7 +32065,8 @@
       "stride",
       "hiking",
       "hike"
-    ]
+    ],
+    "moji": "🚶🏿"
   },
   "waning_crescent_moon": {
     "unicode": "1F318",
@@ -28712,7 +32084,8 @@
       "sky",
       "night",
       "cheese",
-      "phase"
+      "phase",
+      "space"
     ],
     "moji": "🌘"
   },
@@ -28732,7 +32105,8 @@
       "sky",
       "night",
       "cheese",
-      "phase"
+      "phase",
+      "space"
     ],
     "moji": "🌖"
   },
@@ -28743,12 +32117,14 @@
     ],
     "name": "warning sign",
     "shortname": ":warning:",
-    "category": "places",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "exclamation",
-      "wip"
+      "wip",
+      "symbol",
+      "punctuation"
     ],
     "moji": "⚠"
   },
@@ -28757,14 +32133,17 @@
     "unicode_alternates": [],
     "name": "wastebasket",
     "shortname": ":wastebasket:",
-    "category": "objects_symbols",
+    "category": "objects",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "trash",
       "garbage",
-      "dispose"
-    ]
+      "dispose",
+      "object",
+      "work"
+    ],
+    "moji": "🗑"
   },
   "watch": {
     "unicode": "231A",
@@ -28778,7 +32157,8 @@
     "aliases_ascii": [],
     "keywords": [
       "accessories",
-      "time"
+      "time",
+      "electronics"
     ],
     "moji": "⌚"
   },
@@ -28800,16 +32180,83 @@
       "asia",
       "bovine",
       "milk",
-      "dairy"
+      "dairy",
+      "wildlife"
     ],
     "moji": "🐃"
   },
+  "water_polo": {
+    "unicode": "1F93D",
+    "unicode_alternates": [],
+    "name": "water polo",
+    "shortname": ":water_polo:",
+    "category": "activity",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤽"
+  },
+  "water_polo_tone1": {
+    "unicode": "1F93D-1F3FB",
+    "unicode_alternates": [],
+    "name": "water polo tone 1",
+    "shortname": ":water_polo_tone1:",
+    "category": "activity",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤽🏻"
+  },
+  "water_polo_tone2": {
+    "unicode": "1F93D-1F3FC",
+    "unicode_alternates": [],
+    "name": "water polo tone 2",
+    "shortname": ":water_polo_tone2:",
+    "category": "activity",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤽🏼"
+  },
+  "water_polo_tone3": {
+    "unicode": "1F93D-1F3FD",
+    "unicode_alternates": [],
+    "name": "water polo tone 3",
+    "shortname": ":water_polo_tone3:",
+    "category": "activity",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤽🏽"
+  },
+  "water_polo_tone4": {
+    "unicode": "1F93D-1F3FE",
+    "unicode_alternates": [],
+    "name": "water polo tone 4",
+    "shortname": ":water_polo_tone4:",
+    "category": "activity",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤽🏾"
+  },
+  "water_polo_tone5": {
+    "unicode": "1F93D-1F3FF",
+    "unicode_alternates": [],
+    "name": "water polo tone 5",
+    "shortname": ":water_polo_tone5:",
+    "category": "activity",
+    "aliases": [],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤽🏿"
+  },
   "watermelon": {
     "unicode": "1F349",
     "unicode_alternates": [],
     "name": "watermelon",
     "shortname": ":watermelon:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -28818,7 +32265,6 @@
       "melon",
       "watermelon",
       "summer",
-      "fruit",
       "large"
     ],
     "moji": "🍉"
@@ -28828,7 +32274,7 @@
     "unicode_alternates": [],
     "name": "waving hand sign",
     "shortname": ":wave:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -28836,13 +32282,16 @@
       "gesture",
       "goodbye",
       "hands",
-      "solong"
+      "solong",
+      "body",
+      "hi",
+      "diversity"
     ],
     "moji": "👋"
   },
   "wave_tone1": {
     "unicode": "1F44B-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "waving hand sign tone 1",
     "shortname": ":wave_tone1:",
     "category": "people",
@@ -28855,11 +32304,12 @@
       "solong",
       "hi",
       "wave"
-    ]
+    ],
+    "moji": "👋🏻"
   },
   "wave_tone2": {
     "unicode": "1F44B-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "waving hand sign tone 2",
     "shortname": ":wave_tone2:",
     "category": "people",
@@ -28872,11 +32322,12 @@
       "solong",
       "hi",
       "wave"
-    ]
+    ],
+    "moji": "👋🏼"
   },
   "wave_tone3": {
     "unicode": "1F44B-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "waving hand sign tone 3",
     "shortname": ":wave_tone3:",
     "category": "people",
@@ -28889,11 +32340,12 @@
       "solong",
       "hi",
       "wave"
-    ]
+    ],
+    "moji": "👋🏽"
   },
   "wave_tone4": {
     "unicode": "1F44B-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "waving hand sign tone 4",
     "shortname": ":wave_tone4:",
     "category": "people",
@@ -28906,11 +32358,12 @@
       "solong",
       "hi",
       "wave"
-    ]
+    ],
+    "moji": "👋🏾"
   },
   "wave_tone5": {
     "unicode": "1F44B-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "waving hand sign tone 5",
     "shortname": ":wave_tone5:",
     "category": "people",
@@ -28923,19 +32376,21 @@
       "solong",
       "hi",
       "wave"
-    ]
+    ],
+    "moji": "👋🏿"
   },
   "wavy_dash": {
     "unicode": "3030",
     "unicode_alternates": [],
     "name": "wavy dash",
     "shortname": ":wavy_dash:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "draw",
-      "line"
+      "line",
+      "symbol"
     ],
     "moji": "〰"
   },
@@ -28954,7 +32409,8 @@
       "sky",
       "night",
       "cheese",
-      "phase"
+      "phase",
+      "space"
     ],
     "moji": "🌒"
   },
@@ -28967,7 +32423,10 @@
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "nature"
+      "nature",
+      "space",
+      "sky",
+      "moon"
     ],
     "moji": "🌔"
   },
@@ -28976,7 +32435,7 @@
     "unicode_alternates": [],
     "name": "water closet",
     "shortname": ":wc:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -28985,13 +32444,13 @@
       "toilet",
       "water",
       "closet",
-      "toilet",
       "bathroom",
       "throne",
       "porcelain",
       "waste",
       "flush",
-      "plumbing"
+      "plumbing",
+      "symbol"
     ],
     "moji": "🚾"
   },
@@ -29000,7 +32459,7 @@
     "unicode_alternates": [],
     "name": "weary face",
     "shortname": ":weary:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -29010,13 +32469,14 @@
       "sleepy",
       "tired",
       "weary",
-      "sleepy",
-      "tired",
       "tiredness",
       "study",
       "finals",
       "school",
-      "exhausted"
+      "exhausted",
+      "smiley",
+      "stressed",
+      "emotion"
     ],
     "moji": "😩"
   },
@@ -29025,7 +32485,7 @@
     "unicode_alternates": [],
     "name": "wedding",
     "shortname": ":wedding:",
-    "category": "places",
+    "category": "travel",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -29035,7 +32495,11 @@
       "groom",
       "like",
       "love",
-      "marriage"
+      "marriage",
+      "places",
+      "wedding",
+      "building",
+      "parties"
     ],
     "moji": "💒"
   },
@@ -29051,7 +32515,10 @@
       "animal",
       "nature",
       "ocean",
-      "sea"
+      "sea",
+      "wildlife",
+      "tropical",
+      "whales"
     ],
     "moji": "🐳"
   },
@@ -29073,13 +32540,16 @@
       "bloated",
       "fat",
       "large",
-      "massive"
+      "massive",
+      "wildlife",
+      "tropical",
+      "whales"
     ],
     "moji": "🐋"
   },
   "wheel_of_dharma": {
     "unicode": "2638",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "wheel of dharma",
     "shortname": ":wheel_of_dharma:",
     "category": "symbols",
@@ -29089,7 +32559,8 @@
       "buddhist",
       "religion",
       "symbol"
-    ]
+    ],
+    "moji": "☸"
   },
   "wheelchair": {
     "unicode": "267F",
@@ -29098,12 +32569,13 @@
     ],
     "name": "wheelchair symbol",
     "shortname": ":wheelchair:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "blue-square",
-      "disabled"
+      "disabled",
+      "symbol"
     ],
     "moji": "♿"
   },
@@ -29112,13 +32584,14 @@
     "unicode_alternates": [],
     "name": "white heavy check mark",
     "shortname": ":white_check_mark:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "agree",
       "green-square",
-      "ok"
+      "ok",
+      "symbol"
     ],
     "moji": "✅"
   },
@@ -29129,11 +32602,14 @@
     ],
     "name": "medium white circle",
     "shortname": ":white_circle:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "shape"
+      "shape",
+      "shapes",
+      "symbol",
+      "circle"
     ],
     "moji": "⚪"
   },
@@ -29142,7 +32618,7 @@
     "unicode_alternates": [],
     "name": "white flower",
     "shortname": ":white_flower:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -29158,7 +32634,8 @@
       "homework",
       "student",
       "assignment",
-      "praise"
+      "praise",
+      "symbol"
     ],
     "moji": "💮"
   },
@@ -29169,11 +32646,14 @@
     ],
     "name": "white large square",
     "shortname": ":white_large_square:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "shape"
+      "shape",
+      "shapes",
+      "symbol",
+      "square"
     ],
     "moji": "⬜"
   },
@@ -29184,11 +32664,14 @@
     ],
     "name": "white medium small square",
     "shortname": ":white_medium_small_square:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "shape"
+      "shape",
+      "shapes",
+      "symbol",
+      "square"
     ],
     "moji": "◽"
   },
@@ -29199,11 +32682,14 @@
     ],
     "name": "white medium square",
     "shortname": ":white_medium_square:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "shape"
+      "shape",
+      "shapes",
+      "symbol",
+      "square"
     ],
     "moji": "◻"
   },
@@ -29214,11 +32700,14 @@
     ],
     "name": "white small square",
     "shortname": ":white_small_square:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "shape"
+      "shape",
+      "shapes",
+      "symbol",
+      "square"
     ],
     "moji": "▫"
   },
@@ -29227,17 +32716,20 @@
     "unicode_alternates": [],
     "name": "white square button",
     "shortname": ":white_square_button:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
-      "shape"
+      "shape",
+      "shapes",
+      "symbol",
+      "square"
     ],
     "moji": "🔳"
   },
   "white_sun_cloud": {
     "unicode": "1F325",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white sun behind cloud",
     "shortname": ":white_sun_cloud:",
     "category": "nature",
@@ -29247,12 +32739,17 @@
     "aliases_ascii": [],
     "keywords": [
       "nature",
-      "weather"
-    ]
+      "weather",
+      "sky",
+      "cloud",
+      "cold",
+      "sun"
+    ],
+    "moji": "🌥"
   },
   "white_sun_rain_cloud": {
     "unicode": "1F326",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white sun behind cloud with rain",
     "shortname": ":white_sun_rain_cloud:",
     "category": "nature",
@@ -29262,12 +32759,18 @@
     "aliases_ascii": [],
     "keywords": [
       "nature",
-      "weather"
-    ]
+      "weather",
+      "sky",
+      "cloud",
+      "cold",
+      "rain",
+      "sun"
+    ],
+    "moji": "🌦"
   },
   "white_sun_small_cloud": {
     "unicode": "1F324",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "white sun with small cloud",
     "shortname": ":white_sun_small_cloud:",
     "category": "nature",
@@ -29277,8 +32780,25 @@
     "aliases_ascii": [],
     "keywords": [
       "nature",
-      "weather"
-    ]
+      "weather",
+      "sky",
+      "cloud",
+      "sun"
+    ],
+    "moji": "🌤"
+  },
+  "wilted_rose": {
+    "unicode": "1F940",
+    "unicode_alternates": [],
+    "name": "wilted flower",
+    "shortname": ":wilted_rose:",
+    "category": "nature",
+    "aliases": [
+      ":wilted_flower:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🥀"
   },
   "wind_blowing_face": {
     "unicode": "1F32C",
@@ -29290,8 +32810,11 @@
     "aliases_ascii": [],
     "keywords": [
       "mother",
-      "nature"
-    ]
+      "nature",
+      "weather",
+      "cold"
+    ],
+    "moji": "🌬"
   },
   "wind_chime": {
     "unicode": "1F390",
@@ -29314,7 +32837,9 @@
       "soothing",
       "protective",
       "spiritual",
-      "sound"
+      "sound",
+      "object",
+      "japan"
     ],
     "moji": "🎐"
   },
@@ -29323,7 +32848,7 @@
     "unicode_alternates": [],
     "name": "wine glass",
     "shortname": ":wine_glass:",
-    "category": "objects",
+    "category": "food",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -29338,7 +32863,10 @@
       "grapes",
       "tasting",
       "wine",
-      "winery"
+      "winery",
+      "italian",
+      "girls night",
+      "parties"
     ],
     "moji": "🍷"
   },
@@ -29347,7 +32875,7 @@
     "unicode_alternates": [],
     "name": "winking face",
     "shortname": ":wink:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [
       ";)",
@@ -29367,7 +32895,10 @@
       "wink",
       "winking",
       "friendly",
-      "joke"
+      "joke",
+      "silly",
+      "smiley",
+      "emotion"
     ],
     "moji": "😉"
   },
@@ -29381,7 +32912,9 @@
     "aliases_ascii": [],
     "keywords": [
       "animal",
-      "nature"
+      "nature",
+      "wildlife",
+      "roar"
     ],
     "moji": "🐺"
   },
@@ -29390,18 +32923,25 @@
     "unicode_alternates": [],
     "name": "woman",
     "shortname": ":woman:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "female",
-      "girls"
+      "girls",
+      "people",
+      "women",
+      "sex",
+      "diversity",
+      "feminist",
+      "selfie",
+      "girls night"
     ],
     "moji": "👩"
   },
   "woman_tone1": {
     "unicode": "1F469-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "woman tone 1",
     "shortname": ":woman_tone1:",
     "category": "people",
@@ -29411,11 +32951,12 @@
       "female",
       "girl",
       "lady"
-    ]
+    ],
+    "moji": "👩🏻"
   },
   "woman_tone2": {
     "unicode": "1F469-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "woman tone 2",
     "shortname": ":woman_tone2:",
     "category": "people",
@@ -29425,11 +32966,12 @@
       "female",
       "girl",
       "lady"
-    ]
+    ],
+    "moji": "👩🏼"
   },
   "woman_tone3": {
     "unicode": "1F469-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "woman tone 3",
     "shortname": ":woman_tone3:",
     "category": "people",
@@ -29439,11 +32981,12 @@
       "female",
       "girl",
       "lady"
-    ]
+    ],
+    "moji": "👩🏽"
   },
   "woman_tone4": {
     "unicode": "1F469-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "woman tone 4",
     "shortname": ":woman_tone4:",
     "category": "people",
@@ -29453,11 +32996,12 @@
       "female",
       "girl",
       "lady"
-    ]
+    ],
+    "moji": "👩🏾"
   },
   "woman_tone5": {
     "unicode": "1F469-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "woman tone 5",
     "shortname": ":woman_tone5:",
     "category": "people",
@@ -29467,14 +33011,15 @@
       "female",
       "girl",
       "lady"
-    ]
+    ],
+    "moji": "👩🏿"
   },
   "womans_clothes": {
     "unicode": "1F45A",
     "unicode_alternates": [],
     "name": "womans clothes",
     "shortname": ":womans_clothes:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -29490,7 +33035,8 @@
       "shopping",
       "shop",
       "dressing",
-      "dressed"
+      "dressed",
+      "women"
     ],
     "moji": "👚"
   },
@@ -29499,13 +33045,14 @@
     "unicode_alternates": [],
     "name": "womans hat",
     "shortname": ":womans_hat:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "accessories",
       "fashion",
-      "female"
+      "female",
+      "women"
     ],
     "moji": "👒"
   },
@@ -29514,7 +33061,7 @@
     "unicode_alternates": [],
     "name": "womens symbol",
     "shortname": ":womens:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -29525,7 +33072,8 @@
       "sign",
       "girl",
       "female",
-      "avatar"
+      "avatar",
+      "symbol"
     ],
     "moji": "🚺"
   },
@@ -29534,7 +33082,7 @@
     "unicode_alternates": [],
     "name": "worried face",
     "shortname": ":worried:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -29544,8 +33092,10 @@
       "worried",
       "anxious",
       "distressed",
-      "nervous",
-      "tense"
+      "tense",
+      "sad",
+      "smiley",
+      "emotion"
     ],
     "moji": "😟"
   },
@@ -29560,30 +33110,111 @@
     "keywords": [
       "diy",
       "ikea",
-      "tools"
+      "tools",
+      "object",
+      "tool"
     ],
     "moji": "🔧"
   },
-  "writing_hand": {
-    "unicode": "1F58E",
+  "wrestlers": {
+    "unicode": "1F93C",
     "unicode_alternates": [],
-    "name": "left writing hand",
-    "shortname": ":writing_hand:",
-    "category": "people",
+    "name": "wrestlers",
+    "shortname": ":wrestlers:",
+    "category": "activity",
+    "aliases": [
+      ":wrestling:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤼"
+  },
+  "wrestlers_tone1": {
+    "unicode": "1F93C-1F3FB",
+    "unicode_alternates": [],
+    "name": "wrestlers tone 1",
+    "shortname": ":wrestlers_tone1:",
+    "category": "activity",
+    "aliases": [
+      ":wrestling_tone1:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤼🏻"
+  },
+  "wrestlers_tone2": {
+    "unicode": "1F93C-1F3FC",
+    "unicode_alternates": [],
+    "name": "wrestlers tone 2",
+    "shortname": ":wrestlers_tone2:",
+    "category": "activity",
     "aliases": [
-      ":left_writing_hand:"
+      ":wrestling_tone2:"
     ],
     "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤼🏼"
+  },
+  "wrestlers_tone3": {
+    "unicode": "1F93C-1F3FD",
+    "unicode_alternates": [],
+    "name": "wrestlers tone 3",
+    "shortname": ":wrestlers_tone3:",
+    "category": "activity",
+    "aliases": [
+      ":wrestling_tone3:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤼🏽"
+  },
+  "wrestlers_tone4": {
+    "unicode": "1F93C-1F3FE",
+    "unicode_alternates": [],
+    "name": "wrestlers tone 4",
+    "shortname": ":wrestlers_tone4:",
+    "category": "activity",
+    "aliases": [
+      ":wrestling_tone4:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤼🏾"
+  },
+  "wrestlers_tone5": {
+    "unicode": "1F93C-1F3FF",
+    "unicode_alternates": [],
+    "name": "wrestlers tone 5",
+    "shortname": ":wrestlers_tone5:",
+    "category": "activity",
+    "aliases": [
+      ":wrestling_tone5:"
+    ],
+    "aliases_ascii": [],
+    "keywords": [],
+    "moji": "🤼🏿"
+  },
+  "writing_hand": {
+    "unicode": "270D",
+    "unicode_alternates": [
+      "270D-FE0F"
+    ],
+    "name": "writing hand",
+    "shortname": ":writing_hand:",
+    "category": "people",
+    "aliases": [],
+    "aliases_ascii": [],
     "keywords": [
+      "body",
+      "hands",
       "write",
-      "sign",
-      "signature",
-      "draw"
-    ]
+      "diversity"
+    ],
+    "moji": "✍"
   },
   "writing_hand_tone1": {
     "unicode": "270D-1F3FB",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "writing hand tone 1",
     "shortname": ":writing_hand_tone1:",
     "category": "people",
@@ -29594,11 +33225,12 @@
       "sign",
       "signature",
       "draw"
-    ]
+    ],
+    "moji": "✍🏻"
   },
   "writing_hand_tone2": {
     "unicode": "270D-1F3FC",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "writing hand tone 2",
     "shortname": ":writing_hand_tone2:",
     "category": "people",
@@ -29609,11 +33241,12 @@
       "sign",
       "signature",
       "draw"
-    ]
+    ],
+    "moji": "✍🏼"
   },
   "writing_hand_tone3": {
     "unicode": "270D-1F3FD",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "writing hand tone 3",
     "shortname": ":writing_hand_tone3:",
     "category": "people",
@@ -29624,11 +33257,12 @@
       "sign",
       "signature",
       "draw"
-    ]
+    ],
+    "moji": "✍🏽"
   },
   "writing_hand_tone4": {
     "unicode": "270D-1F3FE",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "writing hand tone 4",
     "shortname": ":writing_hand_tone4:",
     "category": "people",
@@ -29639,11 +33273,12 @@
       "sign",
       "signature",
       "draw"
-    ]
+    ],
+    "moji": "✍🏾"
   },
   "writing_hand_tone5": {
     "unicode": "270D-1F3FF",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "writing hand tone 5",
     "shortname": ":writing_hand_tone5:",
     "category": "people",
@@ -29654,20 +33289,23 @@
       "sign",
       "signature",
       "draw"
-    ]
+    ],
+    "moji": "✍🏿"
   },
   "x": {
     "unicode": "274C",
     "unicode_alternates": [],
     "name": "cross mark",
     "shortname": ":x:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "delete",
       "no",
-      "remove"
+      "remove",
+      "symbol",
+      "sol"
     ],
     "moji": "❌"
   },
@@ -29676,7 +33314,7 @@
     "unicode_alternates": [],
     "name": "yellow heart",
     "shortname": ":yellow_heart:",
-    "category": "emoticons",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -29687,7 +33325,6 @@
       "yellow",
       "gold",
       "heart",
-      "love",
       "friendship",
       "happy",
       "happiness",
@@ -29696,7 +33333,8 @@
       "respectful",
       "honest",
       "caring",
-      "selfless"
+      "selfless",
+      "symbol"
     ],
     "moji": "💛"
   },
@@ -29715,10 +33353,7 @@
       "money",
       "yen",
       "japan",
-      "japanese",
       "banknote",
-      "money",
-      "currency",
       "paper",
       "cash",
       "bill"
@@ -29727,7 +33362,7 @@
   },
   "yin_yang": {
     "unicode": "262F",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "yin yang",
     "shortname": ":yin_yang:",
     "category": "symbols",
@@ -29739,14 +33374,15 @@
       "symbol",
       "tao",
       "taoist"
-    ]
+    ],
+    "moji": "☯"
   },
   "yum": {
     "unicode": "1F60B",
     "unicode_alternates": [],
     "name": "face savouring delicious food",
     "shortname": ":yum:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
@@ -29762,7 +33398,12 @@
       "yummy",
       "yum",
       "tasty",
-      "savory"
+      "savory",
+      "silly",
+      "smiley",
+      "emotion",
+      "sarcastic",
+      "good"
     ],
     "moji": "😋"
   },
@@ -29779,7 +33420,9 @@
     "keywords": [
       "lightning bolt",
       "thunder",
-      "weather"
+      "weather",
+      "sky",
+      "diarrhea"
     ],
     "moji": "⚡"
   },
@@ -29789,20 +33432,23 @@
     "unicode_alternates": [
       "0030-FE0F-20E3"
     ],
-    "name": "digit zero",
+    "name": "keycap digit zero",
     "shortname": ":zero:",
-    "category": "other",
+    "category": "symbols",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "blue-square",
       "null",
-      "numbers"
+      "numbers",
+      "number",
+      "math",
+      "symbol"
     ]
   },
   "zipper_mouth": {
     "unicode": "1F910",
-    "unicode_alternates": "",
+    "unicode_alternates": [],
     "name": "zipper-mouth face",
     "shortname": ":zipper_mouth:",
     "category": "people",
@@ -29810,19 +33456,24 @@
       ":zipper_mouth_face:"
     ],
     "aliases_ascii": [],
-    "keywords": []
+    "keywords": [
+      "mad",
+      "smiley"
+    ],
+    "moji": "🤐"
   },
   "zzz": {
     "unicode": "1F4A4",
     "unicode_alternates": [],
     "name": "sleeping symbol",
     "shortname": ":zzz:",
-    "category": "emoticons",
+    "category": "people",
     "aliases": [],
     "aliases_ascii": [],
     "keywords": [
       "sleepy",
-      "tired"
+      "tired",
+      "goodnight"
     ],
     "moji": "💤"
   }
diff --git a/generator_templates/active_record/migration/create_table_migration.rb b/generator_templates/active_record/migration/create_table_migration.rb
index 27acc75dcc4..aad8626a720 100644
--- a/generator_templates/active_record/migration/create_table_migration.rb
+++ b/generator_templates/active_record/migration/create_table_migration.rb
@@ -4,6 +4,14 @@
 class <%= migration_class_name %> < ActiveRecord::Migration
   include Gitlab::Database::MigrationHelpers
 
+  # Set this constant to true if this migration requires downtime.
+  DOWNTIME = false
+
+  # When a migration requires downtime you **must** uncomment the following
+  # constant and define a short and easy to understand explanation as to why the
+  # migration requires downtime.
+  # DOWNTIME_REASON = ''
+
   # When using the methods "add_concurrent_index" or "add_column_with_default"
   # you must disable the use of transactions as these methods can not run in an
   # existing transaction. When using "add_concurrent_index" make sure that this
diff --git a/generator_templates/active_record/migration/migration.rb b/generator_templates/active_record/migration/migration.rb
index 06bdea11367..825bc8bdf61 100644
--- a/generator_templates/active_record/migration/migration.rb
+++ b/generator_templates/active_record/migration/migration.rb
@@ -4,6 +4,14 @@
 class <%= migration_class_name %> < ActiveRecord::Migration
   include Gitlab::Database::MigrationHelpers
 
+  # Set this constant to true if this migration requires downtime.
+  DOWNTIME = false
+
+  # When a migration requires downtime you **must** uncomment the following
+  # constant and define a short and easy to understand explanation as to why the
+  # migration requires downtime.
+  # DOWNTIME_REASON = ''
+
   # When using the methods "add_concurrent_index" or "add_column_with_default"
   # you must disable the use of transactions as these methods can not run in an
   # existing transaction. When using "add_concurrent_index" make sure that this
diff --git a/lib/api/award_emoji.rb b/lib/api/award_emoji.rb
index c4fa1838b5a..2efe7e3adf3 100644
--- a/lib/api/award_emoji.rb
+++ b/lib/api/award_emoji.rb
@@ -56,9 +56,9 @@ module API
 
             not_found!('Award Emoji') unless can_read_awardable?
 
-            award = awardable.award_emoji.new(name: params[:name], user: current_user)
+            award = awardable.create_award_emoji(params[:name], current_user)
 
-            if award.save
+            if award.persisted?
               present award, with: Entities::AwardEmoji
             else
               not_found!("Award Emoji #{award.errors.messages}")
diff --git a/lib/api/branches.rb b/lib/api/branches.rb
index d467eb9d474..66b853eb342 100644
--- a/lib/api/branches.rb
+++ b/lib/api/branches.rb
@@ -15,7 +15,8 @@ module API
       #   GET /projects/:id/repository/branches
       get ":id/repository/branches" do
         branches = user_project.repository.branches.sort_by(&:name)
-        present branches, with: Entities::RepoObject, project: user_project
+
+        present branches, with: Entities::RepoBranch, project: user_project
       end
 
       # Get a single branch
@@ -28,7 +29,8 @@ module API
       get ':id/repository/branches/:branch', requirements: { branch: /.+/ } do
         @branch = user_project.repository.branches.find { |item| item.name == params[:branch] }
         not_found!("Branch") unless @branch
-        present @branch, with: Entities::RepoObject, project: user_project
+
+        present @branch, with: Entities::RepoBranch, project: user_project
       end
 
       # Protect a single branch
@@ -36,6 +38,8 @@ module API
       # Parameters:
       #   id (required) - The ID of a project
       #   branch (required) - The name of the branch
+      #   developers_can_push (optional) - Flag if developers can push to that branch
+      #   developers_can_merge (optional) - Flag if developers can merge to that branch
       # Example Request:
       #   PUT /projects/:id/repository/branches/:branch/protect
       put ':id/repository/branches/:branch/protect',
@@ -43,11 +47,22 @@ module API
         authorize_admin_project
 
         @branch = user_project.repository.find_branch(params[:branch])
-        not_found!("Branch") unless @branch
+        not_found!('Branch') unless @branch
         protected_branch = user_project.protected_branches.find_by(name: @branch.name)
-        user_project.protected_branches.create(name: @branch.name) unless protected_branch
+        developers_can_push = to_boolean(params[:developers_can_push])
+        developers_can_merge = to_boolean(params[:developers_can_merge])
+
+        if protected_branch
+          protected_branch.developers_can_push = developers_can_push unless developers_can_push.nil?
+          protected_branch.developers_can_merge = developers_can_merge unless developers_can_merge.nil?
+          protected_branch.save
+        else
+          user_project.protected_branches.create(name: @branch.name,
+                                                 developers_can_push: developers_can_push || false,
+                                                 developers_can_merge: developers_can_merge || false)
+        end
 
-        present @branch, with: Entities::RepoObject, project: user_project
+        present @branch, with: Entities::RepoBranch, project: user_project
       end
 
       # Unprotect a single branch
@@ -66,7 +81,7 @@ module API
         protected_branch = user_project.protected_branches.find_by(name: @branch.name)
         protected_branch.destroy if protected_branch
 
-        present @branch, with: Entities::RepoObject, project: user_project
+        present @branch, with: Entities::RepoBranch, project: user_project
       end
 
       # Create branch
@@ -84,7 +99,7 @@ module API
 
         if result[:status] == :success
           present result[:branch],
-                  with: Entities::RepoObject,
+                  with: Entities::RepoBranch,
                   project: user_project
         else
           render_api_error!(result[:message], 400)
diff --git a/lib/api/builds.rb b/lib/api/builds.rb
index d36047acd1f..be5a3484ec8 100644
--- a/lib/api/builds.rb
+++ b/lib/api/builds.rb
@@ -52,8 +52,7 @@ module API
       get ':id/builds/:build_id' do
         authorize_read_builds!
 
-        build = get_build(params[:build_id])
-        return not_found!(build) unless build
+        build = get_build!(params[:build_id])
 
         present build, with: Entities::Build,
                        user_can_download_artifacts: can?(current_user, :read_build, user_project)
@@ -69,18 +68,27 @@ module API
       get ':id/builds/:build_id/artifacts' do
         authorize_read_builds!
 
-        build = get_build(params[:build_id])
-        return not_found!(build) unless build
+        build = get_build!(params[:build_id])
 
-        artifacts_file = build.artifacts_file
+        present_artifacts!(build.artifacts_file)
+      end
 
-        unless artifacts_file.file_storage?
-          return redirect_to build.artifacts_file.url
-        end
+      # Download the artifacts file from ref_name and job
+      #
+      # Parameters:
+      #   id (required) - The ID of a project
+      #   ref_name (required) - The ref from repository
+      #   job (required) - The name for the build
+      # Example Request:
+      #   GET /projects/:id/builds/artifacts/:ref_name/download?job=name
+      get ':id/builds/artifacts/:ref_name/download',
+        requirements: { ref_name: /.+/ } do
+        authorize_read_builds!
 
-        return not_found! unless artifacts_file.exists?
+        builds = user_project.latest_successful_builds_for(params[:ref_name])
+        latest_build = builds.find_by!(name: params[:job])
 
-        present_file!(artifacts_file.path, artifacts_file.filename)
+        present_artifacts!(latest_build.artifacts_file)
       end
 
       # Get a trace of a specific build of a project
@@ -97,8 +105,7 @@ module API
       get ':id/builds/:build_id/trace' do
         authorize_read_builds!
 
-        build = get_build(params[:build_id])
-        return not_found!(build) unless build
+        build = get_build!(params[:build_id])
 
         header 'Content-Disposition', "infile; filename=\"#{build.id}.log\""
         content_type 'text/plain'
@@ -118,8 +125,7 @@ module API
       post ':id/builds/:build_id/cancel' do
         authorize_update_builds!
 
-        build = get_build(params[:build_id])
-        return not_found!(build) unless build
+        build = get_build!(params[:build_id])
 
         build.cancel
 
@@ -137,8 +143,7 @@ module API
       post ':id/builds/:build_id/retry' do
         authorize_update_builds!
 
-        build = get_build(params[:build_id])
-        return not_found!(build) unless build
+        build = get_build!(params[:build_id])
         return forbidden!('Build is not retryable') unless build.retryable?
 
         build = Ci::Build.retry(build, current_user)
@@ -157,8 +162,7 @@ module API
       post ':id/builds/:build_id/erase' do
         authorize_update_builds!
 
-        build = get_build(params[:build_id])
-        return not_found!(build) unless build
+        build = get_build!(params[:build_id])
         return forbidden!('Build is not erasable!') unless build.erasable?
 
         build.erase(erased_by: current_user)
@@ -176,8 +180,8 @@ module API
       post ':id/builds/:build_id/artifacts/keep' do
         authorize_update_builds!
 
-        build = get_build(params[:build_id])
-        return not_found!(build) unless build && build.artifacts?
+        build = get_build!(params[:build_id])
+        return not_found!(build) unless build.artifacts?
 
         build.keep_artifacts!
 
@@ -192,6 +196,20 @@ module API
         user_project.builds.find_by(id: id.to_i)
       end
 
+      def get_build!(id)
+        get_build(id) || not_found!
+      end
+
+      def present_artifacts!(artifacts_file)
+        if !artifacts_file.file_storage?
+          redirect_to(build.artifacts_file.url)
+        elsif artifacts_file.exists?
+          present_file!(artifacts_file.path, artifacts_file.filename)
+        else
+          not_found!
+        end
+      end
+
       def filter_builds(builds, scope)
         return builds if scope.nil? || scope.empty?
 
diff --git a/lib/api/commit_statuses.rb b/lib/api/commit_statuses.rb
index 323a7086890..4df6ca8333e 100644
--- a/lib/api/commit_statuses.rb
+++ b/lib/api/commit_statuses.rb
@@ -24,7 +24,7 @@ module API
 
         pipelines = user_project.pipelines.where(sha: params[:sha])
         statuses = ::CommitStatus.where(pipeline: pipelines)
-        statuses = statuses.latest unless parse_boolean(params[:all])
+        statuses = statuses.latest unless to_boolean(params[:all])
         statuses = statuses.where(ref: params[:ref]) if params[:ref].present?
         statuses = statuses.where(stage: params[:stage]) if params[:stage].present?
         statuses = statuses.where(name: params[:name]) if params[:name].present?
@@ -64,7 +64,7 @@ module API
           ref = branches.first
         end
 
-        pipeline = @project.ensure_pipeline(commit.sha, ref)
+        pipeline = @project.ensure_pipeline(commit.sha, ref, current_user)
 
         name = params[:name] || params[:context]
         status = GenericCommitStatus.running_or_pending.find_by(pipeline: pipeline, name: name, ref: params[:ref])
diff --git a/lib/api/deploy_keys.rb b/lib/api/deploy_keys.rb
index 06eb7756841..5c570b5e5ca 100644
--- a/lib/api/deploy_keys.rb
+++ b/lib/api/deploy_keys.rb
@@ -2,74 +2,87 @@ module API
   # Projects API
   class DeployKeys < Grape::API
     before { authenticate! }
-    before { authorize_admin_project }
+
+    get "deploy_keys" do
+      authenticated_as_admin!
+
+      keys = DeployKey.all
+      present keys, with: Entities::SSHKey
+    end
 
     resource :projects do
-      # Get a specific project's keys
-      #
-      # Example Request:
-      #   GET /projects/:id/keys
-      get ":id/keys" do
-        present user_project.deploy_keys, with: Entities::SSHKey
-      end
+      before { authorize_admin_project }
 
-      # Get single key owned by currently authenticated user
+      # Routing "projects/:id/keys/..." is DEPRECATED and WILL BE REMOVED in version 9.0
+      # Use "projects/:id/deploy_keys/..." instead.
       #
-      # Example Request:
-      #   GET /projects/:id/keys/:id
-      get ":id/keys/:key_id" do
-        key = user_project.deploy_keys.find params[:key_id]
-        present key, with: Entities::SSHKey
-      end
+      %w(keys deploy_keys).each do |path|
+        # Get a specific project's deploy keys
+        #
+        # Example Request:
+        #   GET /projects/:id/deploy_keys
+        get ":id/#{path}" do
+          present user_project.deploy_keys, with: Entities::SSHKey
+        end
 
-      # Add new ssh key to currently authenticated user
-      # If deploy key already exists - it will be joined to project
-      # but only if original one was is accessible by same user
-      #
-      # Parameters:
-      #   key (required) - New SSH Key
-      #   title (required) - New SSH Key's title
-      # Example Request:
-      #   POST /projects/:id/keys
-      post ":id/keys" do
-        attrs = attributes_for_keys [:title, :key]
+        # Get single deploy key owned by currently authenticated user
+        #
+        # Example Request:
+        #   GET /projects/:id/deploy_keys/:key_id
+        get ":id/#{path}/:key_id" do
+          key = user_project.deploy_keys.find params[:key_id]
+          present key, with: Entities::SSHKey
+        end
 
-        if attrs[:key].present?
-          attrs[:key].strip!
+        # Add new deploy key to currently authenticated user
+        # If deploy key already exists - it will be joined to project
+        # but only if original one was accessible by same user
+        #
+        # Parameters:
+        #   key (required) - New deploy Key
+        #   title (required) - New deploy Key's title
+        # Example Request:
+        #   POST /projects/:id/deploy_keys
+        post ":id/#{path}" do
+          attrs = attributes_for_keys [:title, :key]
 
-          # check if key already exist in project
-          key = user_project.deploy_keys.find_by(key: attrs[:key])
-          if key
-            present key, with: Entities::SSHKey
-            return
+          if attrs[:key].present?
+            attrs[:key].strip!
+
+            # check if key already exist in project
+            key = user_project.deploy_keys.find_by(key: attrs[:key])
+            if key
+              present key, with: Entities::SSHKey
+              next
+            end
+
+            # Check for available deploy keys in other projects
+            key = current_user.accessible_deploy_keys.find_by(key: attrs[:key])
+            if key
+              user_project.deploy_keys << key
+              present key, with: Entities::SSHKey
+              next
+            end
           end
 
-          # Check for available deploy keys in other projects
-          key = current_user.accessible_deploy_keys.find_by(key: attrs[:key])
-          if key
-            user_project.deploy_keys << key
+          key = DeployKey.new attrs
+
+          if key.valid? && user_project.deploy_keys << key
             present key, with: Entities::SSHKey
-            return
+          else
+            render_validation_error!(key)
           end
         end
 
-        key = DeployKey.new attrs
-
-        if key.valid? && user_project.deploy_keys << key
-          present key, with: Entities::SSHKey
-        else
-          render_validation_error!(key)
+        # Delete existing deploy key of currently authenticated user
+        #
+        # Example Request:
+        #   DELETE /projects/:id/deploy_keys/:key_id
+        delete ":id/#{path}/:key_id" do
+          key = user_project.deploy_keys.find params[:key_id]
+          key.destroy
         end
       end
-
-      # Delete existed ssh key of currently authenticated user
-      #
-      # Example Request:
-      #   DELETE /projects/:id/keys/:id
-      delete ":id/keys/:key_id" do
-        key = user_project.deploy_keys.find params[:key_id]
-        key.destroy
-      end
     end
   end
 end
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 8e03c08f47b..fbf0d74663f 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -114,21 +114,23 @@ module API
       end
     end
 
-    class RepoObject < Grape::Entity
+    class RepoBranch < Grape::Entity
       expose :name
 
-      expose :commit do |repo_obj, options|
-        if repo_obj.respond_to?(:commit)
-          repo_obj.commit
-        elsif options[:project]
-          options[:project].repository.commit(repo_obj.target)
-        end
+      expose :commit do |repo_branch, options|
+        options[:project].repository.commit(repo_branch.target)
       end
 
-      expose :protected do |repo, options|
-        if options[:project]
-          options[:project].protected_branch? repo.name
-        end
+      expose :protected do |repo_branch, options|
+        options[:project].protected_branch? repo_branch.name
+      end
+
+      expose :developers_can_push do |repo_branch, options|
+        options[:project].developers_can_push_to_protected_branch? repo_branch.name
+      end
+
+      expose :developers_can_merge do |repo_branch, options|
+        options[:project].developers_can_merge_to_protected_branch? repo_branch.name
       end
     end
 
@@ -187,6 +189,7 @@ module API
       end
       expose :user_notes_count
       expose :upvotes, :downvotes
+      expose :due_date
     end
 
     class ExternalIssue < Grape::Entity
@@ -411,7 +414,9 @@ module API
       expose :default_project_visibility
       expose :default_snippet_visibility
       expose :default_group_visibility
-      expose :restricted_signup_domains
+      expose :domain_whitelist
+      expose :domain_blacklist_enabled
+      expose :domain_blacklist
       expose :user_oauth_applications
       expose :after_sign_out_path
       expose :container_registry_token_expire_delay
@@ -424,27 +429,14 @@ module API
     end
 
     class RepoTag < Grape::Entity
-      expose :name
-      expose :message do |repo_obj, _options|
-        if repo_obj.respond_to?(:message)
-          repo_obj.message
-        else
-          nil
-        end
-      end
+      expose :name, :message
 
-      expose :commit do |repo_obj, options|
-        if repo_obj.respond_to?(:commit)
-          repo_obj.commit
-        elsif options[:project]
-          options[:project].repository.commit(repo_obj.target)
-        end
+      expose :commit do |repo_tag, options|
+        options[:project].repository.commit(repo_tag.target)
       end
 
-      expose :release, using: Entities::Release do |repo_obj, options|
-        if options[:project]
-          options[:project].releases.find_by(tag: repo_obj.name)
-        end
+      expose :release, using: Entities::Release do |repo_tag, options|
+        options[:project].releases.find_by(tag: repo_tag.name)
       end
     end
 
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 77e407b54c5..130509cdad6 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -5,8 +5,11 @@ module API
     SUDO_HEADER = "HTTP_SUDO"
     SUDO_PARAM = :sudo
 
-    def parse_boolean(value)
-      [ true, 1, '1', 't', 'T', 'true', 'TRUE', 'on', 'ON' ].include?(value)
+    def to_boolean(value)
+      return true if value =~ /^(true|t|yes|y|1|on)$/i
+      return false if value =~ /^(false|f|no|n|0|off)$/i
+
+      nil
     end
 
     def find_user_by_private_token
@@ -17,7 +20,7 @@ module API
     def current_user
       @current_user ||= (find_user_by_private_token || doorkeeper_guard)
 
-      unless @current_user && Gitlab::UserAccess.allowed?(@current_user)
+      unless @current_user && Gitlab::UserAccess.new(@current_user).allowed?
         return nil
       end
 
@@ -290,7 +293,7 @@ module API
     def filter_projects(projects)
       # If the archived parameter is passed, limit results accordingly
       if params[:archived].present?
-        projects = projects.where(archived: parse_boolean(params[:archived]))
+        projects = projects.where(archived: to_boolean(params[:archived]))
       end
 
       if params[:search].present?
diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index d5dfba5e0cc..959b700de78 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -63,7 +63,12 @@ module API
         if access_status.status
           # Return the repository full path so that gitlab-shell has it when
           # handling ssh commands
-          response[:repository_path] = project.repository.path_to_repo
+          response[:repository_path] =
+            if wiki?
+              project.wiki.repository.path_to_repo
+            else
+              project.repository.path_to_repo
+            end
         end
 
         response
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index 8a03a41e9c5..c588103e517 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -152,12 +152,13 @@ module API
       #   milestone_id (optional) - The ID of a milestone to assign issue
       #   labels (optional)       - The labels of an issue
       #   created_at (optional)   - Date time string, ISO 8601 formatted
+      #   due_date (optional)     - Date time string in the format YEAR-MONTH-DAY
       # Example Request:
       #   POST /projects/:id/issues
-      post ":id/issues" do
+      post ':id/issues' do
         required_attributes! [:title]
 
-        keys = [:title, :description, :assignee_id, :milestone_id]
+        keys = [:title, :description, :assignee_id, :milestone_id, :due_date]
         keys << :created_at if current_user.admin? || user_project.owner == current_user
         attrs = attributes_for_keys(keys)
 
@@ -201,12 +202,13 @@ module API
       #   labels (optional) - The labels of an issue
       #   state_event (optional) - The state event of an issue (close|reopen)
       #   updated_at (optional) - Date time string, ISO 8601 formatted
+      #   due_date (optional)     - Date time string in the format YEAR-MONTH-DAY
       # Example Request:
       #   PUT /projects/:id/issues/:issue_id
-      put ":id/issues/:issue_id" do
+      put ':id/issues/:issue_id' do
         issue = user_project.issues.find(params[:issue_id])
         authorize! :update_issue, issue
-        keys = [:title, :description, :assignee_id, :milestone_id, :state_event]
+        keys = [:title, :description, :assignee_id, :milestone_id, :state_event, :due_date]
         keys << :updated_at if current_user.admin? || user_project.owner == current_user
         attrs = attributes_for_keys(keys)
 
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 4fcdf8968c9..2b685621da9 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -242,7 +242,7 @@ module API
             should_remove_source_branch: params[:should_remove_source_branch]
           }
 
-          if parse_boolean(params[:merge_when_build_succeeds]) && merge_request.pipeline && merge_request.pipeline.active?
+          if to_boolean(params[:merge_when_build_succeeds]) && merge_request.pipeline && merge_request.pipeline.active?
             ::MergeRequests::MergeWhenBuildSucceedsService.new(merge_request.target_project, current_user, merge_params).
               execute(merge_request)
           else
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 6d2a6f3946c..8fed7db8803 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -8,7 +8,7 @@ module API
         def map_public_to_visibility_level(attrs)
           publik = attrs.delete(:public)
           if publik.present? && !attrs[:visibility_level].present?
-            publik = parse_boolean(publik)
+            publik = to_boolean(publik)
             # Since setting the public attribute to private could mean either
             # private or internal, use the more conservative option, private.
             attrs[:visibility_level] = (publik == true) ? Gitlab::VisibilityLevel::PUBLIC : Gitlab::VisibilityLevel::PRIVATE
diff --git a/lib/api/todos.rb b/lib/api/todos.rb
index 2a6bfa98ca4..26c24c3baff 100644
--- a/lib/api/todos.rb
+++ b/lib/api/todos.rb
@@ -75,7 +75,7 @@ module API
         todos = find_todos
         todos.each(&:done)
 
-        present paginate(Kaminari.paginate_array(todos)), with: Entities::Todo, current_user: current_user
+        todos.length
       end
     end
   end
diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb
index b9773f98d75..1f5917b8127 100644
--- a/lib/backup/repository.rb
+++ b/lib/backup/repository.rb
@@ -54,10 +54,10 @@ module Backup
         # Move repos dir to 'repositories.old' dir
         bk_repos_path = File.join(path, '..', 'repositories.old.' + Time.now.to_i.to_s)
         FileUtils.mv(path, bk_repos_path)
+        # This is expected from gitlab:check
+        FileUtils.mkdir_p(path, mode: 2770)
       end
 
-      FileUtils.mkdir_p(repos_path)
-
       Project.find_each(batch_size: 1000) do |project|
         $progress.print " * #{project.path_with_namespace} ... "
 
diff --git a/lib/banzai/filter/autolink_filter.rb b/lib/banzai/filter/autolink_filter.rb
index fac7dad3243..9ed45707515 100644
--- a/lib/banzai/filter/autolink_filter.rb
+++ b/lib/banzai/filter/autolink_filter.rb
@@ -56,6 +56,8 @@ module Banzai
         # period (e.g., http://localhost:3000/)
         rinku = Rinku.auto_link(html, :urls, options, IGNORE_PARENTS.to_a, 1)
 
+        return if rinku == html
+
         # Rinku returns a String, so parse it back to a Nokogiri::XML::Document
         # for further processing.
         @doc = parse_html(rinku)
diff --git a/lib/banzai/filter/relative_link_filter.rb b/lib/banzai/filter/relative_link_filter.rb
index c78da404607..21ed0410f7f 100644
--- a/lib/banzai/filter/relative_link_filter.rb
+++ b/lib/banzai/filter/relative_link_filter.rb
@@ -112,8 +112,7 @@ module Banzai
       end
 
       def current_commit
-        @current_commit ||= context[:commit] ||
-          ref ? repository.commit(ref) : repository.head_commit
+        @current_commit ||= context[:commit] || ref ? repository.commit(ref) : repository.head_commit
       end
 
       def relative_url_root
diff --git a/lib/banzai/filter/syntax_highlight_filter.rb b/lib/banzai/filter/syntax_highlight_filter.rb
index 536b478979f..91f0159f9a1 100644
--- a/lib/banzai/filter/syntax_highlight_filter.rb
+++ b/lib/banzai/filter/syntax_highlight_filter.rb
@@ -19,14 +19,22 @@ module Banzai
         language = node.attr('class')
         code     = node.text
 
+        css_classes = "code highlight"
+
+        lexer = Rouge::Lexer.find_fancy(language) || Rouge::Lexers::PlainText
+        formatter = Rouge::Formatters::HTML.new
+
         begin
-          highlighted = block_code(code, language)
+          code = formatter.format(lexer.lex(code))
+
+          css_classes << " js-syntax-highlight #{lexer.tag}"
         rescue
           # Gracefully handle syntax highlighter bugs/errors to ensure
           # users can still access an issue/comment/etc.
-          highlighted = "<pre>#{code}</pre>"
         end
 
+        highlighted = %(<pre class="#{css_classes}"><code>#{code}</code></pre>)
+
         # Extracted to a method to measure it
         replace_parent_pre_element(node, highlighted)
       end
@@ -40,8 +48,7 @@ module Banzai
 
       # Override Rouge::Plugins::Redcarpet#rouge_formatter
       def rouge_formatter(lexer)
-        Rouge::Formatters::HTMLGitlab.new(
-          cssclass: "code highlight js-syntax-highlight #{lexer.tag}")
+        Rouge::Formatters::HTML.new
       end
     end
   end
diff --git a/lib/banzai/filter/user_reference_filter.rb b/lib/banzai/filter/user_reference_filter.rb
index 5b0a6d8541b..e1ca7f4d24b 100644
--- a/lib/banzai/filter/user_reference_filter.rb
+++ b/lib/banzai/filter/user_reference_filter.rb
@@ -112,7 +112,7 @@ module Banzai
         data = data_attribute(project: project.id, author: author.try(:id))
         text = link_text || User.reference_prefix + 'all'
 
-        link_tag(url, data, text)
+        link_tag(url, data, text, 'All Project and Group Members')
       end
 
       def link_to_namespace(namespace, link_text: nil)
@@ -128,7 +128,7 @@ module Banzai
         data = data_attribute(group: namespace.id)
         text = link_text || Group.reference_prefix + group
 
-        link_tag(url, data, text)
+        link_tag(url, data, text, namespace.name)
       end
 
       def link_to_user(user, namespace, link_text: nil)
@@ -136,11 +136,11 @@ module Banzai
         data = data_attribute(user: namespace.owner_id)
         text = link_text || User.reference_prefix + user
 
-        link_tag(url, data, text)
+        link_tag(url, data, text, namespace.owner_name)
       end
 
-      def link_tag(url, data, text)
-        %(<a href="#{url}" #{data} class="#{link_class}">#{escape_once(text)}</a>)
+      def link_tag(url, data, text, title)
+        %(<a href="#{url}" #{data} class="#{link_class}" title="#{escape_once(title)}">#{escape_once(text)}</a>)
       end
     end
   end
diff --git a/lib/banzai/filter/video_link_filter.rb b/lib/banzai/filter/video_link_filter.rb
new file mode 100644
index 00000000000..fd8b9a6f0cc
--- /dev/null
+++ b/lib/banzai/filter/video_link_filter.rb
@@ -0,0 +1,59 @@
+module Banzai
+  module Filter
+
+    # Find every image that isn't already wrapped in an `a` tag, and that has
+    # a `src` attribute ending with a video extension, add a new video node and
+    # a "Download" link in the case the video cannot be played.
+    class VideoLinkFilter < HTML::Pipeline::Filter
+
+      def call
+        doc.xpath(query).each do |el|
+          el.replace(video_node(doc, el))
+        end
+
+        doc
+      end
+
+      private
+
+      def query
+        @query ||= begin
+          src_query = UploaderHelper::VIDEO_EXT.map do |ext|
+            "'.#{ext}' = substring(@src, string-length(@src) - #{ext.size})"
+          end
+
+          "descendant-or-self::img[not(ancestor::a) and (#{src_query.join(' or ')})]"
+        end
+      end
+
+      def video_node(doc, element)
+        container = doc.document.create_element(
+          'div',
+          class: 'video-container'
+        )
+
+        video = doc.document.create_element(
+          'video',
+          src: element['src'],
+          width: '400',
+          controls: true,
+          'data-setup' => '{}')
+
+        link = doc.document.create_element(
+          'a',
+          element['title'] || element['alt'],
+          href: element['src'],
+          target: '_blank',
+          title: "Download '#{element['title'] || element['alt']}'")
+        download_paragraph = doc.document.create_element('p')
+        download_paragraph.children = link
+
+        container.add_child(video)
+        container.add_child(download_paragraph)
+
+        container
+      end
+    end
+
+  end
+end
diff --git a/lib/banzai/pipeline/gfm_pipeline.rb b/lib/banzai/pipeline/gfm_pipeline.rb
index b27ecf3c923..8d94b199c66 100644
--- a/lib/banzai/pipeline/gfm_pipeline.rb
+++ b/lib/banzai/pipeline/gfm_pipeline.rb
@@ -7,6 +7,7 @@ module Banzai
           Filter::SanitizationFilter,
 
           Filter::UploadLinkFilter,
+          Filter::VideoLinkFilter,
           Filter::ImageLinkFilter,
           Filter::EmojiFilter,
           Filter::TableOfContentsFilter,
diff --git a/lib/banzai/reference_extractor.rb b/lib/banzai/reference_extractor.rb
index bf366962aef..b26a41a1f3b 100644
--- a/lib/banzai/reference_extractor.rb
+++ b/lib/banzai/reference_extractor.rb
@@ -2,11 +2,11 @@ module Banzai
   # Extract possible GFM references from an arbitrary String for further processing.
   class ReferenceExtractor
     def initialize
-      @texts = []
+      @texts_and_contexts = []
     end
 
     def analyze(text, context = {})
-      @texts << Renderer.render(text, context)
+      @texts_and_contexts << { text: text, context: context }
     end
 
     def references(type, project, current_user = nil)
@@ -21,9 +21,10 @@ module Banzai
     def html_documents
       # This ensures that we don't memoize anything until we have a number of
       # text blobs to parse.
-      return [] if @texts.empty?
+      return [] if @texts_and_contexts.empty?
 
-      @html_documents ||= @texts.map { |html| Nokogiri::HTML.fragment(html) }
+      @html_documents ||= Renderer.cache_collection_render(@texts_and_contexts)
+        .map { |html| Nokogiri::HTML.fragment(html) }
     end
   end
 end
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 01ef13df57a..83afed9f49f 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -31,28 +31,62 @@ module Ci
       raise ValidationError, e.message
     end
 
-    def builds_for_stage_and_ref(stage, ref, tag = false, trigger_request = nil)
-      builds.select do |build|
-        build[:stage] == stage &&
-          process?(build[:only], build[:except], ref, tag, trigger_request)
+    def jobs_for_ref(ref, tag = false, trigger_request = nil)
+      @jobs.select do |_, job|
+        process?(job[:only], job[:except], ref, tag, trigger_request)
       end
     end
 
-    def builds
-      @jobs.map do |name, job|
-        build_job(name, job)
+    def jobs_for_stage_and_ref(stage, ref, tag = false, trigger_request = nil)
+      jobs_for_ref(ref, tag, trigger_request).select do |_, job|
+        job[:stage] == stage
       end
     end
 
-    def global_variables
-      @variables
+    def builds_for_ref(ref, tag = false, trigger_request = nil)
+      jobs_for_ref(ref, tag, trigger_request).map do |name, _|
+        build_attributes(name)
+      end
     end
 
-    def job_variables(name)
-      job = @jobs[name.to_sym]
-      return [] unless job
+    def builds_for_stage_and_ref(stage, ref, tag = false, trigger_request = nil)
+      jobs_for_stage_and_ref(stage, ref, tag, trigger_request).map do |name, _|
+        build_attributes(name)
+      end
+    end
 
-      job[:variables] || []
+    def builds
+      @jobs.map do |name, _|
+        build_attributes(name)
+      end
+    end
+
+    def build_attributes(name)
+      job = @jobs[name.to_sym] || {}
+      {
+        stage_idx: @stages.index(job[:stage]),
+        stage: job[:stage],
+        ##
+        # Refactoring note:
+        #  - before script behaves differently than after script
+        #  - after script returns an array of commands
+        #  - before script should be a concatenated command
+        commands: [job[:before_script] || @before_script, job[:script]].flatten.compact.join("\n"),
+        tag_list: job[:tags] || [],
+        name: name,
+        allow_failure: job[:allow_failure] || false,
+        when: job[:when] || 'on_success',
+        environment: job[:environment],
+        yaml_variables: yaml_variables(name),
+        options: {
+          image: job[:image] || @image,
+          services: job[:services] || @services,
+          artifacts: job[:artifacts],
+          cache: job[:cache] || @cache,
+          dependencies: job[:dependencies],
+          after_script: job[:after_script] || @after_script,
+        }.compact
+      }
     end
 
     private
@@ -83,32 +117,22 @@ module Ci
       @jobs[name] = { stage: stage }.merge(job)
     end
 
-    def build_job(name, job)
-      {
-        stage_idx: @stages.index(job[:stage]),
-        stage: job[:stage],
-        ##
-        # Refactoring note:
-        #  - before script behaves differently than after script
-        #  - after script returns an array of commands
-        #  - before script should be a concatenated command
-        commands: [job[:before_script] || @before_script, job[:script]].flatten.compact.join("\n"),
-        tag_list: job[:tags] || [],
-        name: name,
-        only: job[:only],
-        except: job[:except],
-        allow_failure: job[:allow_failure] || false,
-        when: job[:when] || 'on_success',
-        environment: job[:environment],
-        options: {
-          image: job[:image] || @image,
-          services: job[:services] || @services,
-          artifacts: job[:artifacts],
-          cache: job[:cache] || @cache,
-          dependencies: job[:dependencies],
-          after_script: job[:after_script] || @after_script,
-        }.compact
-      }
+    def yaml_variables(name)
+      variables = global_variables.merge(job_variables(name))
+      variables.map do |key, value|
+        { key: key, value: value, public: true }
+      end
+    end
+
+    def global_variables
+      @variables || {}
+    end
+
+    def job_variables(name)
+      job = @jobs[name.to_sym]
+      return {} unless job
+
+      job[:variables] || {}
     end
 
     def validate!
@@ -171,8 +195,8 @@ module Ci
         raise ValidationError, "#{name} job: allow_failure parameter should be an boolean"
       end
 
-      if job[:when] && !job[:when].in?(%w[on_success on_failure always])
-        raise ValidationError, "#{name} job: when parameter should be on_success, on_failure or always"
+      if job[:when] && !job[:when].in?(%w[on_success on_failure always manual])
+        raise ValidationError, "#{name} job: when parameter should be on_success, on_failure, always or manual"
       end
 
       if job[:environment] && !validate_environment(job[:environment])
diff --git a/lib/container_registry/client.rb b/lib/container_registry/client.rb
index 42232b7129d..2edddb84fc3 100644
--- a/lib/container_registry/client.rb
+++ b/lib/container_registry/client.rb
@@ -7,62 +7,91 @@ module ContainerRegistry
 
     MANIFEST_VERSION = 'application/vnd.docker.distribution.manifest.v2+json'
 
+    # Taken from: FaradayMiddleware::FollowRedirects
+    REDIRECT_CODES = Set.new [301, 302, 303, 307]
+
     def initialize(base_uri, options = {})
       @base_uri = base_uri
-      @faraday = Faraday.new(@base_uri) do |conn|
-        initialize_connection(conn, options)
-      end
+      @options = options
     end
 
     def repository_tags(name)
-      response_body @faraday.get("/v2/#{name}/tags/list")
+      response_body faraday.get("/v2/#{name}/tags/list")
     end
 
     def repository_manifest(name, reference)
-      response_body @faraday.get("/v2/#{name}/manifests/#{reference}")
+      response_body faraday.get("/v2/#{name}/manifests/#{reference}")
     end
 
     def repository_tag_digest(name, reference)
-      response = @faraday.head("/v2/#{name}/manifests/#{reference}")
+      response = faraday.head("/v2/#{name}/manifests/#{reference}")
       response.headers['docker-content-digest'] if response.success?
     end
 
     def delete_repository_tag(name, reference)
-      @faraday.delete("/v2/#{name}/manifests/#{reference}").success?
+      faraday.delete("/v2/#{name}/manifests/#{reference}").success?
     end
 
     def blob(name, digest, type = nil)
-      headers = {}
-      headers['Accept'] = type if type
-      response_body @faraday.get("/v2/#{name}/blobs/#{digest}", nil, headers)
+      type ||= 'application/octet-stream'
+      response_body faraday_blob.get("/v2/#{name}/blobs/#{digest}", nil, 'Accept' => type), allow_redirect: true
     end
 
     def delete_blob(name, digest)
-      @faraday.delete("/v2/#{name}/blobs/#{digest}").success?
+      faraday.delete("/v2/#{name}/blobs/#{digest}").success?
     end
-    
+
     private
-    
+
     def initialize_connection(conn, options)
       conn.request :json
+
+      if options[:user] && options[:password]
+        conn.request(:basic_auth, options[:user].to_s, options[:password].to_s)
+      elsif options[:token]
+        conn.request(:authorization, :bearer, options[:token].to_s)
+      end
+
+      conn.adapter :net_http
+    end
+
+    def accept_manifest(conn)
       conn.headers['Accept'] = MANIFEST_VERSION
 
       conn.response :json, content_type: 'application/json'
       conn.response :json, content_type: 'application/vnd.docker.distribution.manifest.v1+prettyjws'
       conn.response :json, content_type: 'application/vnd.docker.distribution.manifest.v1+json'
       conn.response :json, content_type: 'application/vnd.docker.distribution.manifest.v2+json'
+    end
 
-      if options[:user] && options[:password]
-        conn.request(:basic_auth, options[:user].to_s, options[:password].to_s)
-      elsif options[:token]
-        conn.request(:authorization, :bearer, options[:token].to_s)
+    def response_body(response, allow_redirect: false)
+      if allow_redirect && REDIRECT_CODES.include?(response.status)
+        response = redirect_response(response.headers['location'])
       end
 
-      conn.adapter :net_http
+      response.body if response && response.success?
+    end
+
+    def redirect_response(location)
+      return unless location
+
+      # We explicitly remove authorization token
+      faraday_blob.get(location) do |req|
+        req['Authorization'] = ''
+      end
     end
 
-    def response_body(response)
-      response.body if response.success?
+    def faraday
+      @faraday ||= Faraday.new(@base_uri) do |conn|
+        initialize_connection(conn, @options)
+        accept_manifest(conn)
+      end
+    end
+
+    def faraday_blob
+      @faraday_blob ||= Faraday.new(@base_uri) do |conn|
+        initialize_connection(conn, @options)
+      end
     end
   end
 end
diff --git a/lib/container_registry/tag.rb b/lib/container_registry/tag.rb
index 708d01b95a1..59040199920 100644
--- a/lib/container_registry/tag.rb
+++ b/lib/container_registry/tag.rb
@@ -53,7 +53,7 @@ module ContainerRegistry
     def config
       return unless config_blob
 
-      @config ||= ContainerRegistry::Config.new(self, config_blob)
+      @config ||= ContainerRegistry::Config.new(self, config_blob) if config_blob.data
     end
 
     def created_at
diff --git a/lib/gitlab/access.rb b/lib/gitlab/access.rb
index 831f1e635ba..de41ea415a6 100644
--- a/lib/gitlab/access.rb
+++ b/lib/gitlab/access.rb
@@ -14,9 +14,10 @@ module Gitlab
     OWNER     = 50
 
     # Branch protection settings
-    PROTECTION_NONE         = 0
-    PROTECTION_DEV_CAN_PUSH = 1
-    PROTECTION_FULL         = 2
+    PROTECTION_NONE          = 0
+    PROTECTION_DEV_CAN_PUSH  = 1
+    PROTECTION_FULL          = 2
+    PROTECTION_DEV_CAN_MERGE = 3
 
     class << self
       def values
@@ -54,6 +55,7 @@ module Gitlab
       def protection_options
         {
           "Not protected: Both developers and masters can push new commits, force push, or delete the branch." => PROTECTION_NONE,
+          "Protected against pushes: Developers cannot push new commits, but are allowed to accept merge requests to the branch." => PROTECTION_DEV_CAN_MERGE,
           "Partially protected: Developers can push new commits, but cannot force push or delete the branch. Masters can do all of those." => PROTECTION_DEV_CAN_PUSH,
           "Fully protected: Developers cannot push new commits, force push, or delete the branch. Only masters can do any of those." => PROTECTION_FULL,
         }
diff --git a/lib/gitlab/award_emoji.rb b/lib/gitlab/award_emoji.rb
index c94bfc0e65f..39b43ab5489 100644
--- a/lib/gitlab/award_emoji.rb
+++ b/lib/gitlab/award_emoji.rb
@@ -1,24 +1,14 @@
 module Gitlab
   class AwardEmoji
     CATEGORIES = {
-      other: "Other",
       objects: "Objects",
-      places: "Places",
-      travel_places: "Travel",
-      emoticons: "Emoticons",
-      objects_symbols: "Symbols",
+      travel: "Travel",
+      symbols: "Symbols",
       nature: "Nature",
-      celebration: "Celebration",
       people: "People",
       activity: "Activity",
       flags: "Flags",
-      food_drink: "Food"
-    }.with_indifferent_access
-
-    CATEGORY_ALIASES = {
-      symbols: "objects_symbols",
-      foods: "food_drink",
-      travel: "travel_places"
+      food: "Food"
     }.with_indifferent_access
 
     def self.normalize_emoji_name(name)
@@ -35,7 +25,7 @@ module Gitlab
           # Skip Fitzpatrick(tone) modifiers
           next if data["category"] == "modifier"
 
-          category = CATEGORY_ALIASES[data["category"]] || data["category"]
+          category = data["category"]
 
           @emoji_by_category[category] << data
         end
@@ -57,9 +47,9 @@ module Gitlab
     def self.aliases
       @aliases ||=
         begin
-         json_path = File.join(Rails.root, 'fixtures', 'emojis', 'aliases.json' )
-         JSON.parse(File.read(json_path))
-       end
+          json_path = File.join(Rails.root, 'fixtures', 'emojis', 'aliases.json')
+          JSON.parse(File.read(json_path))
+        end
     end
 
     # Returns an Array of Emoji names and their asset URLs.
diff --git a/lib/gitlab/backend/grack_auth.rb b/lib/gitlab/backend/grack_auth.rb
index 478f145bfed..ab94abeda77 100644
--- a/lib/gitlab/backend/grack_auth.rb
+++ b/lib/gitlab/backend/grack_auth.rb
@@ -63,7 +63,7 @@ module Grack
     def ci_request?(login, password)
       matched_login = /(?<s>^[a-zA-Z]*-ci)-token$/.match(login)
 
-      if project && matched_login.present? && git_cmd == 'git-upload-pack'
+      if project && matched_login.present?
         underscored_service = matched_login['s'].underscore
 
         if underscored_service == 'gitlab_ci'
diff --git a/lib/gitlab/checks/change_access.rb b/lib/gitlab/checks/change_access.rb
new file mode 100644
index 00000000000..5551fac4b8b
--- /dev/null
+++ b/lib/gitlab/checks/change_access.rb
@@ -0,0 +1,96 @@
+module Gitlab
+  module Checks
+    class ChangeAccess
+      attr_reader :user_access, :project
+
+      def initialize(change, user_access:, project:)
+        @oldrev, @newrev, @ref = change.split(' ')
+        @branch_name = branch_name(@ref)
+        @user_access = user_access
+        @project = project
+      end
+
+      def exec
+        error = protected_branch_checks || tag_checks || push_checks
+
+        if error
+          GitAccessStatus.new(false, error)
+        else
+          GitAccessStatus.new(true)
+        end
+      end
+
+      protected
+
+      def protected_branch_checks
+        return unless project.protected_branch?(@branch_name)
+
+        if forced_push? && user_access.cannot_do_action?(:force_push_code_to_protected_branches)
+          return "You are not allowed to force push code to a protected branch on this project."
+        elsif Gitlab::Git.blank_ref?(@newrev) && user_access.cannot_do_action?(:remove_protected_branches)
+          return "You are not allowed to delete protected branches from this project."
+        end
+
+        if matching_merge_request?
+          if user_access.can_merge_to_branch?(@branch_name) || user_access.can_push_to_branch?(@branch_name)
+            return
+          else
+            "You are not allowed to merge code into protected branches on this project."
+          end
+        else
+          if user_access.can_push_to_branch?(@branch_name)
+            return
+          else
+            "You are not allowed to push code to protected branches on this project."
+          end
+        end
+      end
+
+      def tag_checks
+        tag_ref = tag_name(@ref)
+
+        if tag_ref && protected_tag?(tag_ref) && user_access.cannot_do_action?(:admin_project)
+          "You are not allowed to change existing tags on this project."
+        end
+      end
+
+      def push_checks
+        if user_access.cannot_do_action?(:push_code)
+          "You are not allowed to push code to this project."
+        end
+      end
+
+      private
+
+      def protected_tag?(tag_name)
+        project.repository.tag_exists?(tag_name)
+      end
+
+      def forced_push?
+        Gitlab::Checks::ForcePush.force_push?(@project, @oldrev, @newrev)
+      end
+
+      def matching_merge_request?
+        Checks::MatchingMergeRequest.new(@newrev, @branch_name, @project).match?
+      end
+
+      def branch_name(ref)
+        ref = @ref.to_s
+        if Gitlab::Git.branch_ref?(ref)
+          Gitlab::Git.ref_name(ref)
+        else
+          nil
+        end
+      end
+
+      def tag_name(ref)
+        ref = @ref.to_s
+        if Gitlab::Git.tag_ref?(ref)
+          Gitlab::Git.ref_name(ref)
+        else
+          nil
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/checks/force_push.rb b/lib/gitlab/checks/force_push.rb
new file mode 100644
index 00000000000..5fe86553bd0
--- /dev/null
+++ b/lib/gitlab/checks/force_push.rb
@@ -0,0 +1,17 @@
+module Gitlab
+  module Checks
+    class ForcePush
+      def self.force_push?(project, oldrev, newrev)
+        return false if project.empty_repo?
+
+        # Created or deleted branch
+        if Gitlab::Git.blank_ref?(oldrev) || Gitlab::Git.blank_ref?(newrev)
+          false
+        else
+          missed_ref, _ = Gitlab::Popen.popen(%W(#{Gitlab.config.git.bin_path} --git-dir=#{project.repository.path_to_repo} rev-list --max-count=1 #{oldrev} ^#{newrev}))
+          missed_ref.present?
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/checks/matching_merge_request.rb b/lib/gitlab/checks/matching_merge_request.rb
new file mode 100644
index 00000000000..849848515da
--- /dev/null
+++ b/lib/gitlab/checks/matching_merge_request.rb
@@ -0,0 +1,18 @@
+module Gitlab
+  module Checks
+    class MatchingMergeRequest
+      def initialize(newrev, branch_name, project)
+        @newrev = newrev
+        @branch_name = branch_name
+        @project = project
+      end
+
+      def match?
+        @project.merge_requests
+          .with_state(:locked)
+          .where(in_progress_merge_commit_sha: @newrev, target_branch: @branch_name)
+          .exists?
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index ffc1814b29d..735331df66c 100644
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -39,7 +39,7 @@ module Gitlab
         session_expire_delay: Settings.gitlab['session_expire_delay'],
         default_project_visibility: Settings.gitlab.default_projects_features['visibility_level'],
         default_snippet_visibility: Settings.gitlab.default_projects_features['visibility_level'],
-        restricted_signup_domains: Settings.gitlab['restricted_signup_domains'],
+        domain_whitelist: Settings.gitlab['domain_whitelist'],
         import_sources: %w[github bitbucket gitlab gitorious google_code fogbugz git gitlab_project],
         shared_runners_enabled: Settings.gitlab_ci['shared_runners_enabled'],
         max_artifacts_size: Settings.artifacts['max_size'],
diff --git a/lib/gitlab/diff/file.rb b/lib/gitlab/diff/file.rb
index 7e01f7b61fb..b09ca1fb8b0 100644
--- a/lib/gitlab/diff/file.rb
+++ b/lib/gitlab/diff/file.rb
@@ -5,7 +5,7 @@ module Gitlab
 
       delegate :new_file, :deleted_file, :renamed_file,
         :old_path, :new_path, :a_mode, :b_mode,
-        :submodule?, :too_large?, to: :diff, prefix: false
+        :submodule?, :too_large?, :collapsed?, to: :diff, prefix: false
 
       def initialize(diff, repository:, diff_refs: nil)
         @diff = diff
@@ -68,10 +68,6 @@ module Gitlab
         @lines ||= Gitlab::Diff::Parser.new.parse(raw_diff.each_line).to_a
       end
 
-      def collapsed_by_default?
-        diff.diff.bytesize > 10240 # 10 KB
-      end
-
       def highlighted_diff_lines
         @highlighted_diff_lines ||= Gitlab::Diff::Highlight.new(self, repository: self.repository).highlight
       end
diff --git a/lib/gitlab/diff/parallel_diff.rb b/lib/gitlab/diff/parallel_diff.rb
index b069afdd28c..481536a380b 100644
--- a/lib/gitlab/diff/parallel_diff.rb
+++ b/lib/gitlab/diff/parallel_diff.rb
@@ -8,72 +8,35 @@ module Gitlab
       end
 
       def parallelize
-
         i = 0
         free_right_index = nil
 
         lines = []
         highlighted_diff_lines = diff_file.highlighted_diff_lines
         highlighted_diff_lines.each do |line|
-          line_code = diff_file.line_code(line)
-          position = diff_file.position(line)
-
-          case line.type
-          when 'match', nil
+          if line.meta? || line.unchanged?
             # line in the right panel is the same as in the left one
             lines << {
-              left: {
-                type:       line.type,
-                number:     line.old_pos,
-                text:       line.text,
-                line_code:  line_code,
-                position:   position
-              },
-              right: {
-                type:       line.type,
-                number:     line.new_pos,
-                text:       line.text,
-                line_code:  line_code,
-                position:   position
-              }
+              left: line,
+              right: line
             }
 
             free_right_index = nil
             i += 1
-          when 'old'
+          elsif line.removed?
             lines << {
-              left: {
-                type:       line.type,
-                number:     line.old_pos,
-                text:       line.text,
-                line_code:  line_code,
-                position:   position
-              },
-              right: {
-                type:       nil,
-                number:     nil,
-                text:       "",
-                line_code:  line_code,
-                position:   position
-              }
+              left: line,
+              right: nil
             }
 
             # Once we come upon a new line it can be put on the right of this old line
             free_right_index ||= i
             i += 1
-          when 'new'
-            data = {
-              type:       line.type,
-              number:     line.new_pos,
-              text:       line.text,
-              line_code:  line_code,
-              position:   position
-            }
-
+          elsif line.added?
             if free_right_index
               # If an old line came before this without a line on the right, this
               # line can be put to the right of it.
-              lines[free_right_index][:right] = data
+              lines[free_right_index][:right] = line
 
               # If there are any other old lines on the left that don't yet have
               # a new counterpart on the right, update the free_right_index
@@ -81,14 +44,8 @@ module Gitlab
               free_right_index = next_free_right_index < i ? next_free_right_index : nil
             else
               lines << {
-                left: {
-                  type:       nil,
-                  number:     nil,
-                  text:       "",
-                  line_code:  line_code,
-                  position:   position
-                },
-                right: data
+                left: nil,
+                right: line
               }
 
               free_right_index = nil
diff --git a/lib/gitlab/diff/position.rb b/lib/gitlab/diff/position.rb
index 989fff8918e..2fdcf8d7838 100644
--- a/lib/gitlab/diff/position.rb
+++ b/lib/gitlab/diff/position.rb
@@ -73,8 +73,8 @@ module Gitlab
           diff_refs.complete?
       end
 
-      def to_json
-        JSON.generate(self.to_h)
+      def to_json(opts = nil)
+        JSON.generate(self.to_h, opts)
       end
 
       def type
diff --git a/lib/gitlab/downtime_check.rb b/lib/gitlab/downtime_check.rb
new file mode 100644
index 00000000000..ab9537ed7d7
--- /dev/null
+++ b/lib/gitlab/downtime_check.rb
@@ -0,0 +1,71 @@
+module Gitlab
+  # Checks if a set of migrations requires downtime or not.
+  class DowntimeCheck
+    # The constant containing the boolean that indicates if downtime is needed
+    # or not.
+    DOWNTIME_CONST = :DOWNTIME
+
+    # The constant that specifies the reason for the migration requiring
+    # downtime.
+    DOWNTIME_REASON_CONST = :DOWNTIME_REASON
+
+    # Checks the given migration paths and returns an Array of
+    # `Gitlab::DowntimeCheck::Message` instances.
+    #
+    # migrations - The migration file paths to check.
+    def check(migrations)
+      migrations.map do |path|
+        require(path)
+
+        migration_class = class_for_migration_file(path)
+
+        unless migration_class.const_defined?(DOWNTIME_CONST)
+          raise "The migration in #{path} does not specify if it requires " \
+            "downtime or not"
+        end
+
+        if online?(migration_class)
+          Message.new(path)
+        else
+          reason = downtime_reason(migration_class)
+
+          unless reason
+            raise "The migration in #{path} requires downtime but no reason " \
+              "was given"
+          end
+
+          Message.new(path, true, reason)
+        end
+      end
+    end
+
+    # Checks the given migrations and prints the results to STDOUT/STDERR.
+    #
+    # migrations - The migration file paths to check.
+    def check_and_print(migrations)
+      check(migrations).each do |message|
+        puts message.to_s # rubocop: disable Rails/Output
+      end
+    end
+
+    # Returns the class for the given migration file path.
+    def class_for_migration_file(path)
+      File.basename(path, File.extname(path)).split('_', 2).last.camelize.
+        constantize
+    end
+
+    # Returns true if the given migration can be performed without downtime.
+    def online?(migration)
+      migration.const_get(DOWNTIME_CONST) == false
+    end
+
+    # Returns the downtime reason, or nil if none was defined.
+    def downtime_reason(migration)
+      if migration.const_defined?(DOWNTIME_REASON_CONST)
+        migration.const_get(DOWNTIME_REASON_CONST)
+      else
+        nil
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/downtime_check/message.rb b/lib/gitlab/downtime_check/message.rb
new file mode 100644
index 00000000000..4446e921e0d
--- /dev/null
+++ b/lib/gitlab/downtime_check/message.rb
@@ -0,0 +1,28 @@
+module Gitlab
+  class DowntimeCheck
+    class Message
+      attr_reader :path, :offline, :reason
+
+      OFFLINE = "\e[32moffline\e[0m"
+      ONLINE = "\e[31monline\e[0m"
+
+      # path - The file path of the migration.
+      # offline - When set to `true` the migration will require downtime.
+      # reason - The reason as to why the migration requires downtime.
+      def initialize(path, offline = false, reason = nil)
+        @path = path
+        @offline = offline
+        @reason = reason
+      end
+
+      def to_s
+        label = offline ? OFFLINE : ONLINE
+
+        message = "[#{label}]: #{path}"
+        message += ": #{reason}" if reason
+
+        message
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/force_push_check.rb b/lib/gitlab/force_push_check.rb
deleted file mode 100644
index 93c6a5bb7f5..00000000000
--- a/lib/gitlab/force_push_check.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module Gitlab
-  class ForcePushCheck
-    def self.force_push?(project, oldrev, newrev)
-      return false if project.empty_repo?
-
-      # Created or deleted branch
-      if Gitlab::Git.blank_ref?(oldrev) || Gitlab::Git.blank_ref?(newrev)
-        false
-      else
-        missed_refs, _ = Gitlab::Popen.popen(%W(#{Gitlab.config.git.bin_path} --git-dir=#{project.repository.path_to_repo} rev-list #{oldrev} ^#{newrev}))
-        missed_refs.split("\n").size > 0
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb
index 7679c7e4bb8..8e8f39d9cb2 100644
--- a/lib/gitlab/git_access.rb
+++ b/lib/gitlab/git_access.rb
@@ -1,52 +1,17 @@
+# Check a user's access to perform a git action. All public methods in this
+# class return an instance of `GitlabAccessStatus`
 module Gitlab
   class GitAccess
     DOWNLOAD_COMMANDS = %w{ git-upload-pack git-upload-archive }
     PUSH_COMMANDS = %w{ git-receive-pack }
 
-    attr_reader :actor, :project, :protocol
+    attr_reader :actor, :project, :protocol, :user_access
 
     def initialize(actor, project, protocol)
       @actor    = actor
       @project  = project
       @protocol = protocol
-    end
-
-    def user
-      return @user if defined?(@user)
-
-      @user =
-        case actor
-        when User
-          actor
-        when DeployKey
-          nil
-        when Key
-          actor.user
-        end
-    end
-
-    def deploy_key
-      actor if actor.is_a?(DeployKey)
-    end
-
-    def can_push_to_branch?(ref)
-      return false unless user
-
-      if project.protected_branch?(ref) && !project.developers_can_push_to_protected_branch?(ref)
-        user.can?(:push_code_to_protected_branches, project)
-      else
-        user.can?(:push_code, project)
-      end
-    end
-
-    def can_read_project?
-      if user
-        user.can?(:read_project, project)
-      elsif deploy_key
-        deploy_key.projects.include?(project)
-      else
-        false
-      end
+      @user_access = UserAccess.new(user, project: project)
     end
 
     def check(cmd, changes = nil)
@@ -56,11 +21,11 @@ module Gitlab
         return build_status_object(false, "No user or key was provided.")
       end
 
-      if user && !user_allowed?
+      if user && !user_access.allowed?
         return build_status_object(false, "Your account has been blocked.")
       end
 
-      unless project && can_read_project?
+      unless project && (user_access.can_read_project? || deploy_key_can_read_project?)
         return build_status_object(false, 'The project you were looking for could not be found.')
       end
 
@@ -95,7 +60,7 @@ module Gitlab
     end
 
     def user_download_access_check
-      unless user.can?(:download_code, project)
+      unless user_access.can_do_action?(:download_code)
         return build_status_object(false, "You are not allowed to download code from this project.")
       end
 
@@ -125,46 +90,8 @@ module Gitlab
       build_status_object(true)
     end
 
-    def can_user_do_action?(action)
-      @permission_cache ||= {}
-      @permission_cache[action] ||= user.can?(action, project)
-    end
-
     def change_access_check(change)
-      oldrev, newrev, ref = change.split(' ')
-
-      action =
-        if project.protected_branch?(branch_name(ref))
-          protected_branch_action(oldrev, newrev, branch_name(ref))
-        elsif (tag_ref = tag_name(ref)) && protected_tag?(tag_ref)
-          # Prevent any changes to existing git tag unless user has permissions
-          :admin_project
-        else
-          :push_code
-        end
-
-      unless can_user_do_action?(action)
-        status =
-          case action
-          when :force_push_code_to_protected_branches
-            build_status_object(false, "You are not allowed to force push code to a protected branch on this project.")
-          when :remove_protected_branches
-            build_status_object(false, "You are not allowed to deleted protected branches from this project.")
-          when :push_code_to_protected_branches
-            build_status_object(false, "You are not allowed to push code to protected branches on this project.")
-          when :admin_project
-            build_status_object(false, "You are not allowed to change existing tags on this project.")
-          else # :push_code
-            build_status_object(false, "You are not allowed to push code to this project.")
-          end
-        return status
-      end
-
-      build_status_object(true)
-    end
-
-    def forced_push?(oldrev, newrev)
-      Gitlab::ForcePushCheck.force_push?(project, oldrev, newrev)
+      Checks::ChangeAccess.new(change, user_access: user_access, project: project).exec
     end
 
     def protocol_allowed?
@@ -173,48 +100,39 @@ module Gitlab
 
     private
 
-    def protected_branch_action(oldrev, newrev, branch_name)
-      # we dont allow force push to protected branch
-      if forced_push?(oldrev, newrev)
-        :force_push_code_to_protected_branches
-      elsif Gitlab::Git.blank_ref?(newrev)
-        # and we dont allow remove of protected branch
-        :remove_protected_branches
-      elsif project.developers_can_push_to_protected_branch?(branch_name)
-        :push_code
-      else
-        :push_code_to_protected_branches
-      end
+    def matching_merge_request?(newrev, branch_name)
+      Checks::MatchingMergeRequest.new(newrev, branch_name, project).match?
     end
 
-    def protected_tag?(tag_name)
-      project.repository.tag_exists?(tag_name)
-    end
-
-    def user_allowed?
-      Gitlab::UserAccess.allowed?(user)
-    end
-
-    def branch_name(ref)
-      ref = ref.to_s
-      if Gitlab::Git.branch_ref?(ref)
-        Gitlab::Git.ref_name(ref)
-      else
-        nil
-      end
+    def deploy_key
+      actor if actor.is_a?(DeployKey)
     end
 
-    def tag_name(ref)
-      ref = ref.to_s
-      if Gitlab::Git.tag_ref?(ref)
-        Gitlab::Git.ref_name(ref)
+    def deploy_key_can_read_project?
+      if deploy_key
+        return true if project.public?
+        deploy_key.projects.include?(project)
       else
-        nil
+        false
       end
     end
 
     protected
 
+    def user
+      return @user if defined?(@user)
+
+      @user =
+        case actor
+        when User
+          actor
+        when DeployKey
+          nil
+        when Key
+          actor.user
+        end
+    end
+
     def build_status_object(status, message = '')
       GitAccessStatus.new(status, message)
     end
diff --git a/lib/gitlab/git_access_status.rb b/lib/gitlab/git_access_status.rb
index 5a806ff6e0d..09bb01be694 100644
--- a/lib/gitlab/git_access_status.rb
+++ b/lib/gitlab/git_access_status.rb
@@ -8,8 +8,8 @@ module Gitlab
       @message = message
     end
 
-    def to_json
-      { status: @status, message: @message }.to_json
+    def to_json(opts = nil)
+      { status: @status, message: @message }.to_json(opts)
     end
   end
 end
diff --git a/lib/gitlab/git_access_wiki.rb b/lib/gitlab/git_access_wiki.rb
index 8672cbc0ec4..f71d3575909 100644
--- a/lib/gitlab/git_access_wiki.rb
+++ b/lib/gitlab/git_access_wiki.rb
@@ -1,7 +1,7 @@
 module Gitlab
   class GitAccessWiki < GitAccess
     def change_access_check(change)
-      if user.can?(:create_wiki, project)
+      if user_access.can_do_action?(:create_wiki)
         build_status_object(true)
       else
         build_status_object(false, "You are not allowed to write to this project's wiki.")
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb
index d4f12cb1df9..c5a11148d33 100644
--- a/lib/gitlab/gon_helper.rb
+++ b/lib/gitlab/gon_helper.rb
@@ -5,7 +5,7 @@ module Gitlab
       gon.default_avatar_url     = URI::join(Gitlab.config.gitlab.url, ActionController::Base.helpers.image_path('no_avatar.png')).to_s
       gon.max_file_size          = current_application_settings.max_attachment_size
       gon.relative_url_root      = Gitlab.config.gitlab.relative_url_root
-      gon.shortcuts_path         = help_shortcuts_path
+      gon.shortcuts_path         = help_page_path('shortcuts')
       gon.user_color_scheme      = Gitlab::ColorSchemes.for_user(current_user).css_class
       gon.award_menu_url         = emojis_path
 
diff --git a/lib/gitlab/highlight.rb b/lib/gitlab/highlight.rb
index 41296415e35..9360afedfcb 100644
--- a/lib/gitlab/highlight.rb
+++ b/lib/gitlab/highlight.rb
@@ -1,7 +1,7 @@
 module Gitlab
   class Highlight
-    def self.highlight(blob_name, blob_content, repository: nil, nowrap: true, plain: false)
-      new(blob_name, blob_content, nowrap: nowrap, repository: repository).
+    def self.highlight(blob_name, blob_content, repository: nil, plain: false)
+      new(blob_name, blob_content, repository: repository).
         highlight(blob_content, continue: false, plain: plain)
     end
 
@@ -13,30 +13,34 @@ module Gitlab
       highlight(file_name, blob.data, repository: repository).lines.map!(&:html_safe)
     end
 
-    attr_reader :lexer
-    def initialize(blob_name, blob_content, repository: nil, nowrap: true)
+    def initialize(blob_name, blob_content, repository: nil)
+      @formatter = Rouge::Formatters::HTMLGitlab.new
+      @repository = repository
       @blob_name = blob_name
       @blob_content = blob_content
-      @repository = repository
-      @formatter = rouge_formatter(nowrap: nowrap)
-
-      @lexer = custom_language || begin
-        Rouge::Lexer.guess(filename: blob_name, source: blob_content).new
-      rescue Rouge::Lexer::AmbiguousGuess => e
-        e.alternatives.sort_by(&:tag).first
-      end
     end
 
     def highlight(text, continue: true, plain: false)
       if plain
-        @formatter.format(Rouge::Lexers::PlainText.lex(text)).html_safe
+        hl_lexer = Rouge::Lexers::PlainText
+        continue = false
       else
-        @formatter.format(@lexer.lex(text, continue: continue)).html_safe
+        hl_lexer = self.lexer
       end
+
+      @formatter.format(hl_lexer.lex(text, continue: continue)).html_safe
     rescue
       @formatter.format(Rouge::Lexers::PlainText.lex(text)).html_safe
     end
 
+    def lexer
+      @lexer ||= custom_language || begin
+        Rouge::Lexer.guess(filename: @blob_name, source: @blob_content).new
+      rescue Rouge::Guesser::Ambiguous => e
+        e.alternatives.sort_by(&:tag).first
+      end
+    end
+
     private
 
     def custom_language
@@ -46,16 +50,5 @@ module Gitlab
 
       Rouge::Lexer.find_fancy(language_name)
     end
-
-    def rouge_formatter(options = {})
-      options = options.reverse_merge(
-        nowrap: true,
-        cssclass: 'code highlight',
-        lineanchors: true,
-        lineanchorsid: 'LC'
-      )
-
-      Rouge::Formatters::HTMLGitlab.new(options)
-    end
   end
 end
diff --git a/lib/gitlab/import_export.rb b/lib/gitlab/import_export.rb
index 588647e5adb..d6d14bd98a0 100644
--- a/lib/gitlab/import_export.rb
+++ b/lib/gitlab/import_export.rb
@@ -2,7 +2,8 @@ module Gitlab
   module ImportExport
     extend self
 
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
+    FILENAME_LIMIT = 50
 
     def export_path(relative_path:)
       File.join(storage_path, relative_path)
@@ -28,6 +29,12 @@ module Gitlab
       'VERSION'
     end
 
+    def export_filename(project:)
+      basename = "#{Time.now.strftime('%Y-%m-%d_%H-%M-%3N')}_#{project.namespace.path}_#{project.path}"
+
+      "#{basename[0..FILENAME_LIMIT]}_export.tar.gz"
+    end
+
     def version
       VERSION
     end
diff --git a/lib/gitlab/import_export/avatar_restorer.rb b/lib/gitlab/import_export/avatar_restorer.rb
new file mode 100644
index 00000000000..352539eb594
--- /dev/null
+++ b/lib/gitlab/import_export/avatar_restorer.rb
@@ -0,0 +1,31 @@
+module Gitlab
+  module ImportExport
+    class AvatarRestorer
+
+      def initialize(project:, shared:)
+        @project = project
+        @shared = shared
+      end
+
+      def restore
+        return true unless avatar_export_file
+
+        @project.avatar = File.open(avatar_export_file)
+        @project.save!
+      rescue => e
+        @shared.error(e)
+        false
+      end
+
+      private
+
+      def avatar_export_file
+        @avatar_export_file ||= Dir["#{avatar_export_path}/*"].first
+      end
+
+      def avatar_export_path
+        File.join(@shared.export_path, 'avatar')
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/import_export/avatar_saver.rb b/lib/gitlab/import_export/avatar_saver.rb
new file mode 100644
index 00000000000..998c21e2586
--- /dev/null
+++ b/lib/gitlab/import_export/avatar_saver.rb
@@ -0,0 +1,31 @@
+module Gitlab
+  module ImportExport
+    class AvatarSaver
+      include Gitlab::ImportExport::CommandLineUtil
+
+      def initialize(project:, shared:)
+        @project = project
+        @shared = shared
+      end
+
+      def save
+        return true unless @project.avatar.exists?
+
+        copy_files(avatar_path, avatar_export_path)
+      rescue => e
+        @shared.error(e)
+        false
+      end
+
+      private
+
+      def avatar_export_path
+        File.join(@shared.export_path, 'avatar', @project.avatar_identifier)
+      end
+
+      def avatar_path
+        @project.avatar.path
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/import_export/command_line_util.rb b/lib/gitlab/import_export/command_line_util.rb
index 2249904145c..5dd0e34c18e 100644
--- a/lib/gitlab/import_export/command_line_util.rb
+++ b/lib/gitlab/import_export/command_line_util.rb
@@ -36,6 +36,15 @@ module Gitlab
       def git_bin_path
         Gitlab.config.git.bin_path
       end
+
+      def copy_files(source, destination)
+        # if we are copying files, create the destination folder
+        destination_folder = File.file?(source) ? File.dirname(destination) : destination
+
+        FileUtils.mkdir_p(destination_folder)
+        FileUtils.copy_entry(source, destination)
+        true
+      end
     end
   end
 end
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml
index 05f4ad527ac..15afe8174a4 100644
--- a/lib/gitlab/import_export/import_export.yml
+++ b/lib/gitlab/import_export/import_export.yml
@@ -53,7 +53,11 @@ included_attributes:
 excluded_attributes:
   snippets:
     - :expired_at
+  merge_request_diff:
+    - :st_diffs
 
 methods:
   statuses:
-    - :type
\ No newline at end of file
+    - :type
+  merge_request_diff:
+    - :utf8_st_diffs
\ No newline at end of file
diff --git a/lib/gitlab/import_export/importer.rb b/lib/gitlab/import_export/importer.rb
index 8f66f48cbfe..e9ee47fc090 100644
--- a/lib/gitlab/import_export/importer.rb
+++ b/lib/gitlab/import_export/importer.rb
@@ -9,7 +9,7 @@ module Gitlab
       end
 
       def execute
-        if import_file && check_version! && [project_tree, repo_restorer, wiki_restorer, uploads_restorer].all?(&:restore)
+        if import_file && check_version! && [project_tree, avatar_restorer, repo_restorer, wiki_restorer, uploads_restorer].all?(&:restore)
           project_tree.restored_project
         else
           raise Projects::ImportService::Error.new(@shared.errors.join(', '))
@@ -35,6 +35,10 @@ module Gitlab
                                                                         project: @project)
       end
 
+      def avatar_restorer
+        Gitlab::ImportExport::AvatarRestorer.new(project: project_tree.restored_project, shared: @shared)
+      end
+
       def repo_restorer
         Gitlab::ImportExport::RepoRestorer.new(path_to_bundle: repo_path,
                                                shared: @shared,
@@ -44,8 +48,7 @@ module Gitlab
       def wiki_restorer
         Gitlab::ImportExport::RepoRestorer.new(path_to_bundle: wiki_repo_path,
                                                shared: @shared,
-                                               project: ProjectWiki.new(project_tree.restored_project),
-                                               wiki: true)
+                                               project: ProjectWiki.new(project_tree.restored_project))
       end
 
       def uploads_restorer
diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb
index 9824df3f274..e41c7e6bf4f 100644
--- a/lib/gitlab/import_export/relation_factory.rb
+++ b/lib/gitlab/import_export/relation_factory.rb
@@ -33,6 +33,7 @@ module Gitlab
         update_project_references
         reset_ci_tokens if @relation_name == 'Ci::Trigger'
         @relation_hash['data'].deep_symbolize_keys! if @relation_name == :events && @relation_hash['data']
+        set_st_diffs if @relation_name == :merge_request_diff
 
         generate_imported_object
       end
@@ -87,7 +88,7 @@ module Gitlab
         project_id = @relation_hash.delete('project_id')
 
         # project_id may not be part of the export, but we always need to populate it if required.
-        @relation_hash['project_id'] = project_id if relation_class.column_names.include?('project_id')
+        @relation_hash['project_id'] = project_id
         @relation_hash['gl_project_id'] = project_id if @relation_hash['gl_project_id']
         @relation_hash['target_project_id'] = project_id if @relation_hash['target_project_id']
         @relation_hash['source_project_id'] = -1 if @relation_hash['source_project_id']
@@ -111,7 +112,7 @@ module Gitlab
       end
 
       def imported_object
-        imported_object = relation_class.new(@relation_hash)
+        imported_object = relation_class.new(parsed_relation_hash)
         yield(imported_object) if block_given?
         imported_object.importing = true if imported_object.respond_to?(:importing)
         imported_object
@@ -125,6 +126,14 @@ module Gitlab
       def admin_user?
         @user.is_admin?
       end
+
+      def parsed_relation_hash
+        @relation_hash.reject { |k, _v| !relation_class.attribute_method?(k) }
+      end
+
+      def set_st_diffs
+        @relation_hash['st_diffs'] = @relation_hash.delete('utf8_st_diffs')
+      end
     end
   end
 end
diff --git a/lib/gitlab/import_export/repo_restorer.rb b/lib/gitlab/import_export/repo_restorer.rb
index 546dae4d122..f84de652a57 100644
--- a/lib/gitlab/import_export/repo_restorer.rb
+++ b/lib/gitlab/import_export/repo_restorer.rb
@@ -3,15 +3,14 @@ module Gitlab
     class RepoRestorer
       include Gitlab::ImportExport::CommandLineUtil
 
-      def initialize(project:, shared:, path_to_bundle:, wiki: false)
+      def initialize(project:, shared:, path_to_bundle:)
         @project = project
         @path_to_bundle = path_to_bundle
         @shared = shared
-        @wiki = wiki
       end
 
       def restore
-        return wiki? unless File.exist?(@path_to_bundle)
+        return true unless File.exist?(@path_to_bundle)
 
         FileUtils.mkdir_p(path_to_repo)
 
@@ -30,10 +29,6 @@ module Gitlab
       def path_to_repo
         @project.repository.path_to_repo
       end
-
-      def wiki?
-        @wiki
-      end
     end
   end
 end
diff --git a/lib/gitlab/import_export/repo_saver.rb b/lib/gitlab/import_export/repo_saver.rb
index cce43fe994b..331e14021e6 100644
--- a/lib/gitlab/import_export/repo_saver.rb
+++ b/lib/gitlab/import_export/repo_saver.rb
@@ -11,7 +11,7 @@ module Gitlab
       end
 
       def save
-        return false if @project.empty_repo?
+        return true if @project.empty_repo? # it's ok to have no repo
 
         @full_path = File.join(@shared.export_path, ImportExport.project_bundle_filename)
         bundle_to_disk
diff --git a/lib/gitlab/import_export/saver.rb b/lib/gitlab/import_export/saver.rb
index 6a60b65071f..6130c124dd1 100644
--- a/lib/gitlab/import_export/saver.rb
+++ b/lib/gitlab/import_export/saver.rb
@@ -7,7 +7,8 @@ module Gitlab
         new(*args).save
       end
 
-      def initialize(shared:)
+      def initialize(project:, shared:)
+        @project = project
         @shared = shared
       end
 
@@ -36,7 +37,7 @@ module Gitlab
       end
 
       def archive_file
-        @archive_file ||= File.join(@shared.export_path, '..', "#{Time.now.strftime('%Y-%m-%d_%H-%M-%3N')}_project_export.tar.gz")
+        @archive_file ||= File.join(@shared.export_path, '..', Gitlab::ImportExport.export_filename(project: @project))
       end
     end
   end
diff --git a/lib/gitlab/import_export/uploads_saver.rb b/lib/gitlab/import_export/uploads_saver.rb
index d6f4fa57510..62a2553675c 100644
--- a/lib/gitlab/import_export/uploads_saver.rb
+++ b/lib/gitlab/import_export/uploads_saver.rb
@@ -1,6 +1,8 @@
 module Gitlab
   module ImportExport
     class UploadsSaver
+      include Gitlab::ImportExport::CommandLineUtil
+
       def initialize(project:, shared:)
         @project = project
         @shared = shared
@@ -17,12 +19,6 @@ module Gitlab
 
       private
 
-      def copy_files(source, destination)
-        FileUtils.mkdir_p(destination)
-        FileUtils.copy_entry(source, destination)
-        true
-      end
-
       def uploads_export_path
         File.join(@shared.export_path, 'uploads')
       end
diff --git a/lib/gitlab/import_export/wiki_repo_saver.rb b/lib/gitlab/import_export/wiki_repo_saver.rb
index 1eedae39f8a..6107420e4dd 100644
--- a/lib/gitlab/import_export/wiki_repo_saver.rb
+++ b/lib/gitlab/import_export/wiki_repo_saver.rb
@@ -4,6 +4,7 @@ module Gitlab
       def save
         @wiki = ProjectWiki.new(@project)
         return true unless wiki_repository_exists? # it's okay to have no Wiki
+
         bundle_to_disk(File.join(@shared.export_path, project_filename))
       end
 
diff --git a/lib/gitlab/lfs/response.rb b/lib/gitlab/lfs/response.rb
index 811363405a8..a1ee1aa81ff 100644
--- a/lib/gitlab/lfs/response.rb
+++ b/lib/gitlab/lfs/response.rb
@@ -47,6 +47,8 @@ module Gitlab
       end
 
       def render_storage_upload_store_response(oid, size, tmp_file_name)
+        return render_forbidden unless tmp_file_name
+
         render_response_to_push do
           render_lfs_upload_ok(oid, size, tmp_file_name)
         end
diff --git a/lib/gitlab/lfs/router.rb b/lib/gitlab/lfs/router.rb
index 69bd5e62305..f2a76a56b8f 100644
--- a/lib/gitlab/lfs/router.rb
+++ b/lib/gitlab/lfs/router.rb
@@ -74,8 +74,6 @@ module Gitlab
           lfs.render_storage_upload_authorize_response(oid, size)
         else
           tmp_file_name = sanitize_tmp_filename(@request.env['HTTP_X_GITLAB_LFS_TMP'])
-          return nil unless tmp_file_name
-
           lfs.render_storage_upload_store_response(oid, size, tmp_file_name)
         end
       end
diff --git a/lib/gitlab/user_access.rb b/lib/gitlab/user_access.rb
index d1b42c1f9b9..c0f85e9b3a8 100644
--- a/lib/gitlab/user_access.rb
+++ b/lib/gitlab/user_access.rb
@@ -1,7 +1,23 @@
 module Gitlab
-  module UserAccess
-    def self.allowed?(user)
-      return false if user.blocked?
+  class UserAccess
+    attr_reader :user, :project
+
+    def initialize(user, project: nil)
+      @user = user
+      @project = project
+    end
+
+    def can_do_action?(action)
+      @permission_cache ||= {}
+      @permission_cache[action] ||= user.can?(action, project)
+    end
+
+    def cannot_do_action?(action)
+      !can_do_action?(action)
+    end
+
+    def allowed?
+      return false if user.blank? || user.blocked?
 
       if user.requires_ldap_check? && user.try_obtain_ldap_lease
         return false unless Gitlab::LDAP::Access.allowed?(user)
@@ -9,5 +25,31 @@ module Gitlab
 
       true
     end
+
+    def can_push_to_branch?(ref)
+      return false unless user
+
+      if project.protected_branch?(ref) && !project.developers_can_push_to_protected_branch?(ref)
+        user.can?(:push_code_to_protected_branches, project)
+      else
+        user.can?(:push_code, project)
+      end
+    end
+
+    def can_merge_to_branch?(ref)
+      return false unless user
+
+      if project.protected_branch?(ref) && !project.developers_can_merge_to_protected_branch?(ref)
+        user.can?(:push_code_to_protected_branches, project)
+      else
+        user.can?(:push_code, project)
+      end
+    end
+
+    def can_read_project?
+      return false unless user
+
+      user.can?(:read_project, project)
+    end
   end
 end
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index 6aeb49c0219..c6826a09bd2 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -4,6 +4,7 @@ require 'json'
 module Gitlab
   class Workhorse
     SEND_DATA_HEADER = 'Gitlab-Workhorse-Send-Data'
+    VERSION_FILE = 'GITLAB_WORKHORSE_VERSION'
 
     class << self
       def git_http_ok(repository, user)
@@ -75,6 +76,11 @@ module Gitlab
         ]
       end
 
+      def version
+        path = Rails.root.join(VERSION_FILE)
+        path.readable? ? path.read.chomp : 'unknown'
+      end
+
       protected
 
       def encode(hash)
diff --git a/lib/repository_cache.rb b/lib/repository_cache.rb
index 8ddc3511293..068a95790c0 100644
--- a/lib/repository_cache.rb
+++ b/lib/repository_cache.rb
@@ -1,14 +1,15 @@
 # Interface to the Redis-backed cache store used by the Repository model
 class RepositoryCache
-  attr_reader :namespace, :backend
+  attr_reader :namespace, :backend, :project_id
 
-  def initialize(namespace, backend = Rails.cache)
+  def initialize(namespace, project_id, backend = Rails.cache)
     @namespace = namespace
     @backend = backend
+    @project_id = project_id
   end
 
   def cache_key(type)
-    "#{type}:#{namespace}"
+    "#{type}:#{namespace}:#{project_id}"
   end
 
   def expire(key)
diff --git a/lib/rouge/formatters/html_gitlab.rb b/lib/rouge/formatters/html_gitlab.rb
index 3358ed6773e..f818dc78d34 100644
--- a/lib/rouge/formatters/html_gitlab.rb
+++ b/lib/rouge/formatters/html_gitlab.rb
@@ -1,171 +1,27 @@
-require 'cgi'
-
 module Rouge
   module Formatters
-    class HTMLGitlab < Rouge::Formatter
+    class HTMLGitlab < Rouge::Formatters::HTML
       tag 'html_gitlab'
 
       # Creates a new <tt>Rouge::Formatter::HTMLGitlab</tt> instance.
       #
-      # [+nowrap+]          If set to True, don't wrap the output at all, not
-      #                     even inside a <tt><pre></tt> tag (default: false).
-      # [+cssclass+]        CSS class for the wrapping <tt><div></tt> tag
-      #                     (default: 'highlight').
-      # [+linenos+]         If set to 'table', output line numbers as a table
-      #                     with two cells, one containing the line numbers,
-      #                     the other the whole code. This is copy paste friendly,
-      #                     but may cause alignment problems with some browsers
-      #                     or fonts. If set to 'inline', the line numbers will
-      #                     be integrated in the <tt><pre></tt> tag that contains
-      #                     the code (default: nil).
       # [+linenostart+]     The line number for the first line (default: 1).
-      # [+lineanchors+]     If set to true the formatter will wrap each output
-      #                     line in an anchor tag with a name of L-linenumber.
-      #                     This allows easy linking to certain lines
-      #                     (default: false).
-      # [+lineanchorsid+]   If lineanchors is true the name of the anchors can
-      #                     be changed with lineanchorsid to e.g. foo-linenumber
-      #                     (default: 'L').
-      # [+anchorlinenos+]   If set to true, will wrap line numbers in <tt><a></tt>
-      #                     tags. Used in combination with linenos and lineanchors
-      #                     (default: false).
-      # [+inline_theme+]    Inline CSS styles for the <pre> tag (default: false).
-      def initialize(
-          nowrap: false,
-          cssclass: 'highlight',
-          linenos: nil,
-          linenostart: 1,
-          lineanchors: false,
-          lineanchorsid: 'L',
-          anchorlinenos: false,
-          inline_theme: nil
-      )
-        @nowrap = nowrap
-        @cssclass = cssclass
-        @linenos = linenos
+      def initialize(linenostart: 1)
         @linenostart = linenostart
-        @lineanchors = lineanchors
-        @lineanchorsid = lineanchorsid
-        @anchorlinenos = anchorlinenos
-        @inline_theme = Theme.find(inline_theme).new if inline_theme.is_a?(String)
-      end
-
-      def render(tokens)
-        case @linenos
-        when 'table'
-          render_tableized(tokens)
-        when 'inline'
-          render_untableized(tokens)
-        else
-          render_untableized(tokens)
-        end
-      end
-
-      alias_method :format, :render
-
-      private
-
-      def render_untableized(tokens)
-        data = process_tokens(tokens)
-
-        html = ''
-        html << "<pre class=\"#{@cssclass}\"><code>" unless @nowrap
-        html << wrap_lines(data[:code])
-        html << "</code></pre>\n" unless @nowrap
-        html
+        @line_number = linenostart
       end
 
-      def render_tableized(tokens)
-        data = process_tokens(tokens)
-
-        html = ''
-        html << "<div class=\"#{@cssclass}\">" unless @nowrap
-        html << '<table><tbody>'
-        html << "<td class=\"linenos\"><pre>"
-        html << wrap_linenos(data[:numbers])
-        html << '</pre></td>'
-        html << "<td class=\"lines\"><pre><code>"
-        html << wrap_lines(data[:code])
-        html << '</code></pre></td>'
-        html << '</tbody></table>'
-        html << '</div>' unless @nowrap
-        html
-      end
-
-      def process_tokens(tokens)
-        rendered = []
-        current_line = ''
-
-        tokens.each do |tok, val|
-          # In the case of multi-line values (e.g. comments), we need to apply
-          # styling to each line since span elements are inline.
-          val.lines.each do |line|
-            stripped = line.chomp
-            current_line << span(tok, stripped)
-
-            if line.end_with?("\n")
-              rendered << current_line
-              current_line = ''
-            end
-          end
-        end
-
-        # Add leftover text
-        rendered << current_line if current_line.present?
-
-        num_lines = rendered.size
-        numbers = (@linenostart..num_lines + @linenostart - 1).to_a
-
-        { numbers: numbers, code: rendered }
-      end
-
-      def wrap_linenos(numbers)
-        if @anchorlinenos
-          numbers.map! do |number|
-            "<a href=\"##{@lineanchorsid}#{number}\">#{number}</a>"
-          end
-        end
-        numbers.join("\n")
-      end
-
-      def wrap_lines(lines)
-        if @lineanchors
-          lines = lines.each_with_index.map do |line, index|
-            number = index + @linenostart
-
-            if @linenos == 'inline'
-              "<a name=\"L#{number}\"></a>" \
-              "<span class=\"linenos\">#{number}</span>" \
-              "<span id=\"#{@lineanchorsid}#{number}\" class=\"line\">#{line}" \
-              '</span>'
-            else
-              "<span id=\"#{@lineanchorsid}#{number}\" class=\"line\">#{line}" \
-              '</span>'
-            end
-          end
-        elsif @linenos == 'inline'
-          lines = lines.each_with_index.map do |line, index|
-            number = index + @linenostart
-            "<span class=\"linenos\">#{number}</span>#{line}"
-          end
-        end
-
-        lines.join("\n")
-      end
+      def stream(tokens, &b)
+        is_first = true
+        token_lines(tokens) do |line|
+          yield "\n" unless is_first
+          is_first = false
 
-      def span(tok, val)
-        # http://stackoverflow.com/a/1600584/2587286
-        val = CGI.escapeHTML(val)
+          yield %(<span id="LC#{@line_number}" class="line">)
+          line.each { |token, value| yield span(token, value) }
+          yield %(</span>)
 
-        if tok.shortname.empty?
-          val
-        else
-          if @inline_theme
-            rules = @inline_theme.style_for(tok).rendered_rules
-            "<span style=\"#{rules.to_a.join(';')}\"#{val}</span>"
-          else
-            "<span class=\"#{tok.shortname}\">#{val}</span>"
-          end
+          @line_number += 1
         end
       end
     end
diff --git a/lib/tasks/downtime_check.rake b/lib/tasks/downtime_check.rake
new file mode 100644
index 00000000000..30a2e9be5ce
--- /dev/null
+++ b/lib/tasks/downtime_check.rake
@@ -0,0 +1,26 @@
+desc 'Checks if migrations in a branch require downtime'
+task downtime_check: :environment do
+  # First we'll want to make sure we're comparing with the right upstream
+  # repository/branch.
+  current_branch = `git rev-parse --abbrev-ref HEAD`.strip
+
+  # Either the developer ran this task directly on the master branch, or they're
+  # making changes directly on the master branch.
+  if current_branch == 'master'
+    if defined?(Gitlab::License)
+      repo = 'gitlab-ee'
+    else
+      repo = 'gitlab-ce'
+    end
+
+    `git fetch https://gitlab.com/gitlab-org/#{repo}.git --depth 1`
+
+    compare_with = 'FETCH_HEAD'
+  # The developer is working on a different branch, in this case we can just
+  # compare with the master branch.
+  else
+    compare_with = 'master'
+  end
+
+  Rake::Task['gitlab:db:downtime_check'].invoke(compare_with)
+end
diff --git a/lib/tasks/gemojione.rake b/lib/tasks/gemojione.rake
index e930ace1041..993112aee3b 100644
--- a/lib/tasks/gemojione.rake
+++ b/lib/tasks/gemojione.rake
@@ -4,7 +4,7 @@ namespace :gemojione do
     require 'digest/sha2'
     require 'json'
 
-    dir = Gemojione.index.images_path
+    dir = Gemojione.images_path
     digests = []
     aliases = Hash.new { |hash, key| hash[key] = [] }
     aliases_path = File.join(Rails.root, 'fixtures', 'emojis', 'aliases.json')
@@ -50,9 +50,14 @@ namespace :gemojione do
     SIZE   = 20
     RETINA = SIZE * 2
 
+    # Update these values to the width and height of the spritesheet when
+    # new emoji are added.
+    SPRITESHEET_WIDTH = 860
+    SPRITESHEET_HEIGHT = 840
+
     Dir.mktmpdir do |tmpdir|
       # Copy the Gemojione assets to the temporary folder for resizing
-      FileUtils.cp_r(Gemojione.index.images_path, tmpdir)
+      FileUtils.cp_r(Gemojione.images_path, tmpdir)
 
       Dir.chdir(tmpdir) do
         Dir["**/*.png"].each do |png|
@@ -64,7 +69,7 @@ namespace :gemojione do
 
       # Combine the resized assets into a packed sprite and re-generate the SCSS
       SpriteFactory.cssurl = "image-url('$IMAGE')"
-      SpriteFactory.run!(File.join(tmpdir, 'images'), {
+      SpriteFactory.run!(File.join(tmpdir, 'png'), {
         output_style: style_path,
         output_image: "app/assets/images/emoji.png",
         selector:     '.emoji-',
@@ -97,7 +102,7 @@ namespace :gemojione do
                  only screen and (min-resolution: 192dpi),
                  only screen and (min-resolution: 2dppx) {
             background-image: image-url('emoji@2x.png');
-            background-size: 840px 820px;
+            background-size: #{SPRITESHEET_WIDTH}px #{SPRITESHEET_HEIGHT}px;
           }
         }
         CSS
@@ -107,7 +112,7 @@ namespace :gemojione do
     # Now do it again but for Retina
     Dir.mktmpdir do |tmpdir|
       # Copy the Gemojione assets to the temporary folder for resizing
-      FileUtils.cp_r(Gemojione.index.images_path, tmpdir)
+      FileUtils.cp_r(Gemojione.images_path, tmpdir)
 
       Dir.chdir(tmpdir) do
         Dir["**/*.png"].each do |png|
@@ -116,7 +121,7 @@ namespace :gemojione do
       end
 
       # Combine the resized assets into a packed sprite and re-generate the SCSS
-      SpriteFactory.run!(File.join(tmpdir, 'images'), {
+      SpriteFactory.run!(File.join(tmpdir), {
         output_image: "app/assets/images/emoji@2x.png",
         style:        false,
         nocomments:   true,
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index e9a4e37ec48..60f4636e737 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -784,7 +784,7 @@ namespace :gitlab do
       servers.each do |server|
         puts "Server: #{server}"
         Gitlab::LDAP::Adapter.open(server) do |adapter|
-          users = adapter.users(adapter.config.uid, '*', 100)
+          users = adapter.users(adapter.config.uid, '*', limit)
           users.each do |user|
             puts "\tDN: #{user.dn}\t #{adapter.config.uid}: #{user.uid}"
           end
diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake
index 7230b9485be..0ec19e1a625 100644
--- a/lib/tasks/gitlab/db.rake
+++ b/lib/tasks/gitlab/db.rake
@@ -46,5 +46,20 @@ namespace :gitlab do
         Rake::Task['db:seed_fu'].invoke
       end
     end
+
+    desc 'Checks if migrations require downtime or not'
+    task :downtime_check, [:ref] => :environment do |_, args|
+      abort 'You must specify a Git reference to compare with' unless args[:ref]
+
+      require 'shellwords'
+
+      ref = Shellwords.escape(args[:ref])
+
+      migrations = `git diff #{ref}.. --name-only -- db/migrate`.lines.
+        map { |file| Rails.root.join(file.strip).to_s }.
+        select { |file| File.file?(file) }
+
+      Gitlab::DowntimeCheck.new.check_and_print(migrations)
+    end
   end
 end
diff --git a/lib/tasks/gitlab/track_deployment.rake b/lib/tasks/gitlab/track_deployment.rake
new file mode 100644
index 00000000000..84aa2e8507a
--- /dev/null
+++ b/lib/tasks/gitlab/track_deployment.rake
@@ -0,0 +1,9 @@
+namespace :gitlab do
+  desc 'GitLab | Tracks a deployment in GitLab Performance Monitoring'
+  task track_deployment: :environment do
+    metric = Gitlab::Metrics::Metric.
+      new('deployments', version: Gitlab::VERSION)
+
+    Gitlab::Metrics.submit_metrics([metric.to_hash])
+  end
+end
diff --git a/spec/controllers/help_controller_spec.rb b/spec/controllers/help_controller_spec.rb
index 267d511c2db..33c75e7584f 100644
--- a/spec/controllers/help_controller_spec.rb
+++ b/spec/controllers/help_controller_spec.rb
@@ -36,7 +36,7 @@ describe HelpController do
       context 'when requested file exists' do
         it 'renders the raw file' do
           get :show,
-              path: 'workflow/protected_branches/protected_branches1',
+              path: 'user/project/img/labels_filter',
               format: :png
           expect(response).to be_success
           expect(response.content_type).to eq 'image/png'
@@ -63,4 +63,13 @@ describe HelpController do
       end
     end
   end
+
+  describe 'GET #ui' do
+    context 'for UI Development Kit' do
+      it 'renders found' do
+        get :ui
+        expect(response).to have_http_status(200)
+      end
+    end
+  end
 end
diff --git a/spec/controllers/projects/uploads_controller_spec.rb b/spec/controllers/projects/uploads_controller_spec.rb
index 0893ee89f6a..71d0e4be834 100644
--- a/spec/controllers/projects/uploads_controller_spec.rb
+++ b/spec/controllers/projects/uploads_controller_spec.rb
@@ -14,9 +14,9 @@ describe Projects::UploadsController do
 
     context "without params['file']" do
       it "returns an error" do
-        post :create, 
+        post :create,
           namespace_id: project.namespace.to_param,
-          project_id: project.to_param, 
+          project_id: project.to_param,
           format: :json
         expect(response).to have_http_status(422)
       end
@@ -34,23 +34,21 @@ describe Projects::UploadsController do
       it 'returns a content with original filename, new link, and correct type.' do
         expect(response.body).to match '\"alt\":\"rails_sample\"'
         expect(response.body).to match "\"url\":\"/uploads"
-        expect(response.body).to match '\"is_image\":true'
       end
     end
 
     context 'with valid non-image file' do
       before do
-        post :create, 
+        post :create,
           namespace_id: project.namespace.to_param,
-          project_id: project.to_param, 
-          file: txt, 
+          project_id: project.to_param,
+          file: txt,
           format: :json
       end
 
       it 'returns a content with original filename, new link, and correct type.' do
         expect(response.body).to match '\"alt\":\"doc_sample.txt\"'
         expect(response.body).to match "\"url\":\"/uploads"
-        expect(response.body).to match '\"is_image\":false'
       end
     end
   end
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 1b1b1bdf52d..3edce4d339c 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -43,6 +43,26 @@ describe ProjectsController do
       end
     end
 
+    context "project with empty repo" do
+      let(:empty_project) { create(:project_empty_repo, :public) }
+
+      before { sign_in(user) }
+
+      User.project_views.keys.each do |project_view|
+        context "with #{project_view} view set" do
+          before do
+            user.update_attributes(project_view: project_view)
+
+            get :show, namespace_id: empty_project.namespace.path, id: empty_project.path
+          end
+
+          it "renders the empty project view" do
+            expect(response).to render_template('empty')
+          end
+        end
+      end
+    end
+
     context "rendering default project view" do
       render_views
 
diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index fe05a0cfc00..5e19e403c6b 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -3,6 +3,8 @@ include ActionDispatch::TestProcess
 FactoryGirl.define do
   factory :ci_build, class: Ci::Build do
     name 'test'
+    stage 'test'
+    stage_idx 0
     ref 'master'
     tag false
     created_at 'Di 29. Okt 09:50:00 CET 2013'
@@ -15,6 +17,11 @@ FactoryGirl.define do
         services: ["postgres"]
       }
     end
+    yaml_variables do
+      [
+        { key: :DB_NAME, value: 'postgres', public: true }
+      ]
+    end
 
     pipeline factory: :ci_pipeline
 
@@ -38,6 +45,11 @@ FactoryGirl.define do
       status 'pending'
     end
 
+    trait :manual do
+      status 'skipped'
+      self.when 'manual'
+    end
+
     trait :allowed_to_fail do
       allow_failure true
     end
diff --git a/spec/factories/issues.rb b/spec/factories/issues.rb
index e72aa9479b7..2c0a2dd94ca 100644
--- a/spec/factories/issues.rb
+++ b/spec/factories/issues.rb
@@ -18,5 +18,15 @@ FactoryGirl.define do
 
     factory :closed_issue, traits: [:closed]
     factory :reopened_issue, traits: [:reopened]
+
+    factory :labeled_issue do
+      transient do
+        labels []
+      end
+
+      after(:create) do |issue, evaluator|
+        issue.update_attributes(labels: evaluator.labels)
+      end
+    end
   end
 end
diff --git a/spec/features/admin/admin_builds_spec.rb b/spec/features/admin/admin_builds_spec.rb
index a6198389f04..e177059d959 100644
--- a/spec/features/admin/admin_builds_spec.rb
+++ b/spec/features/admin/admin_builds_spec.rb
@@ -36,12 +36,45 @@ describe 'Admin Builds' do
       end
     end
 
+    context 'Pending tab' do
+      context 'when have pending builds' do
+        it 'shows pending builds' do
+          build1 = create(:ci_build, pipeline: pipeline, status: :pending)
+          build2 = create(:ci_build, pipeline: pipeline, status: :running)
+          build3 = create(:ci_build, pipeline: pipeline, status: :success)
+          build4 = create(:ci_build, pipeline: pipeline, status: :failed)
+
+          visit admin_builds_path(scope: :pending)
+
+          expect(page).to have_selector('.nav-links li.active', text: 'Pending')
+          expect(page.find('.build-link')).to have_content(build1.id)
+          expect(page.find('.build-link')).not_to have_content(build2.id)
+          expect(page.find('.build-link')).not_to have_content(build3.id)
+          expect(page.find('.build-link')).not_to have_content(build4.id)
+          expect(page).to have_link 'Cancel all'
+        end
+      end
+
+      context 'when have no builds pending' do
+        it 'shows a message' do
+          create(:ci_build, pipeline: pipeline, status: :success)
+
+          visit admin_builds_path(scope: :pending)
+
+          expect(page).to have_selector('.nav-links li.active', text: 'Pending')
+          expect(page).to have_content 'No builds to show'
+          expect(page).not_to have_link 'Cancel all'
+        end
+      end
+    end
+
     context 'Running tab' do
       context 'when have running builds' do
         it 'shows running builds' do
-          build1 = create(:ci_build, pipeline: pipeline, status: :pending)
+          build1 = create(:ci_build, pipeline: pipeline, status: :running)
           build2 = create(:ci_build, pipeline: pipeline, status: :success)
           build3 = create(:ci_build, pipeline: pipeline, status: :failed)
+          build4 = create(:ci_build, pipeline: pipeline, status: :pending)
 
           visit admin_builds_path(scope: :running)
 
@@ -49,6 +82,7 @@ describe 'Admin Builds' do
           expect(page.find('.build-link')).to have_content(build1.id)
           expect(page.find('.build-link')).not_to have_content(build2.id)
           expect(page.find('.build-link')).not_to have_content(build3.id)
+          expect(page.find('.build-link')).not_to have_content(build4.id)
           expect(page).to have_link 'Cancel all'
         end
       end
diff --git a/spec/features/builds_spec.rb b/spec/features/builds_spec.rb
index 16832c297ac..cab3dc1d167 100644
--- a/spec/features/builds_spec.rb
+++ b/spec/features/builds_spec.rb
@@ -13,17 +13,33 @@ describe "Builds" do
   end
 
   describe "GET /:project/builds" do
+    context "Pending scope" do
+      before do
+        visit namespace_project_builds_path(@project.namespace, @project, scope: :pending)
+      end
+
+      it "shows Pending tab builds" do
+        expect(page).to have_link 'Cancel running'
+        expect(page).to have_selector('.nav-links li.active', text: 'Pending')
+        expect(page).to have_content @build.short_sha
+        expect(page).to have_content @build.ref
+        expect(page).to have_content @build.name
+      end
+    end
+
     context "Running scope" do
       before do
         @build.run!
         visit namespace_project_builds_path(@project.namespace, @project, scope: :running)
       end
 
-      it { expect(page).to have_selector('.nav-links li.active', text: 'Running') }
-      it { expect(page).to have_link 'Cancel running' }
-      it { expect(page).to have_content @build.short_sha }
-      it { expect(page).to have_content @build.ref }
-      it { expect(page).to have_content @build.name }
+      it "shows Running tab builds" do
+        expect(page).to have_selector('.nav-links li.active', text: 'Running')
+        expect(page).to have_link 'Cancel running'
+        expect(page).to have_content @build.short_sha
+        expect(page).to have_content @build.ref
+        expect(page).to have_content @build.name
+      end
     end
 
     context "Finished scope" do
@@ -32,9 +48,11 @@ describe "Builds" do
         visit namespace_project_builds_path(@project.namespace, @project, scope: :finished)
       end
 
-      it { expect(page).to have_selector('.nav-links li.active', text: 'Finished') }
-      it { expect(page).to have_content 'No builds to show' }
-      it { expect(page).to have_link 'Cancel running' }
+      it "shows Finished tab builds" do
+        expect(page).to have_selector('.nav-links li.active', text: 'Finished')
+        expect(page).to have_content 'No builds to show'
+        expect(page).to have_link 'Cancel running'
+      end
     end
 
     context "All builds" do
@@ -43,11 +61,13 @@ describe "Builds" do
         visit namespace_project_builds_path(@project.namespace, @project)
       end
 
-      it { expect(page).to have_selector('.nav-links li.active', text: 'All') }
-      it { expect(page).to have_content @build.short_sha }
-      it { expect(page).to have_content @build.ref }
-      it { expect(page).to have_content @build.name }
-      it { expect(page).not_to have_link 'Cancel running' }
+      it "shows All tab builds" do
+        expect(page).to have_selector('.nav-links li.active', text: 'All')
+        expect(page).to have_content @build.short_sha
+        expect(page).to have_content @build.ref
+        expect(page).to have_content @build.name
+        expect(page).not_to have_link 'Cancel running'
+      end
     end
   end
 
diff --git a/spec/features/environments_spec.rb b/spec/features/environments_spec.rb
index 7fb28f4174b..a7d9f2a0c72 100644
--- a/spec/features/environments_spec.rb
+++ b/spec/features/environments_spec.rb
@@ -13,6 +13,7 @@ feature 'Environments', feature: true do
   describe 'when showing environments' do
     given!(:environment) { }
     given!(:deployment) { }
+    given!(:manual) { }
 
     before do
       visit namespace_project_environments_path(project.namespace, project)
@@ -43,6 +44,24 @@ feature 'Environments', feature: true do
         scenario 'does show deployment SHA' do
           expect(page).to have_link(deployment.short_sha)
         end
+
+        context 'with build and manual actions' do
+          given(:pipeline) { create(:ci_pipeline, project: project) }
+          given(:build) { create(:ci_build, pipeline: pipeline) }
+          given(:deployment) { create(:deployment, environment: environment, deployable: build) }
+          given(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'deploy to production') }
+
+          scenario 'does show a play button' do
+            expect(page).to have_link(manual.name.humanize)
+          end
+
+          scenario 'does allow to play manual action' do
+            expect(manual).to be_skipped
+            expect{ click_link(manual.name.humanize) }.not_to change { Ci::Pipeline.count }
+            expect(page).to have_content(manual.name)
+            expect(manual.reload).to be_pending
+          end
+        end
       end
     end
 
@@ -54,6 +73,7 @@ feature 'Environments', feature: true do
   describe 'when showing the environment' do
     given(:environment) { create(:environment, project: project) }
     given!(:deployment) { }
+    given!(:manual) { }
 
     before do
       visit namespace_project_environment_path(project.namespace, project, environment)
@@ -72,20 +92,36 @@ feature 'Environments', feature: true do
         expect(page).to have_link(deployment.short_sha)
       end
 
-      scenario 'does not show a retry button for deployment without build' do
-        expect(page).not_to have_link('Retry')
+      scenario 'does not show a re-deploy button for deployment without build' do
+        expect(page).not_to have_link('Re-deploy')
       end
 
       context 'with build' do
-        given(:build) { create(:ci_build, project: project) }
+        given(:pipeline) { create(:ci_pipeline, project: project) }
+        given(:build) { create(:ci_build, pipeline: pipeline) }
         given(:deployment) { create(:deployment, environment: environment, deployable: build) }
 
         scenario 'does show build name' do
           expect(page).to have_link("#{build.name} (##{build.id})")
         end
 
-        scenario 'does show retry button' do
-          expect(page).to have_link('Retry')
+        scenario 'does show re-deploy button' do
+          expect(page).to have_link('Re-deploy')
+        end
+
+        context 'with manual action' do
+          given(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'deploy to production') }
+
+          scenario 'does show a play button' do
+            expect(page).to have_link(manual.name.humanize)
+          end
+
+          scenario 'does allow to play manual action' do
+            expect(manual).to be_skipped
+            expect{ click_link(manual.name.humanize) }.not_to change { Ci::Pipeline.count }
+            expect(page).to have_content(manual.name)
+            expect(manual.reload).to be_pending
+          end
         end
       end
     end
diff --git a/spec/features/expand_collapse_diffs_spec.rb b/spec/features/expand_collapse_diffs_spec.rb
index 78bc888f2a6..688f68d3cff 100644
--- a/spec/features/expand_collapse_diffs_spec.rb
+++ b/spec/features/expand_collapse_diffs_spec.rb
@@ -3,10 +3,11 @@ require 'spec_helper'
 feature 'Expand and collapse diffs', js: true, feature: true do
   include WaitForAjax
 
+  let(:branch) { 'expand-collapse-diffs' }
+
   before do
     login_as :admin
     project = create(:project)
-    branch = 'expand-collapse-diffs'
 
     # Ensure that undiffable.md is in .gitattributes
     project.repository.copy_gitattributes(branch)
@@ -167,6 +168,46 @@ feature 'Expand and collapse diffs', js: true, feature: true do
     end
   end
 
+  context 'visiting a commit without collapsed diffs' do
+    let(:branch) { 'feature' }
+
+    it 'does not show Expand all button' do
+      expect(page).not_to have_link('Expand all')
+    end
+  end
+
+  context 'visiting a commit with more than safe files' do
+    let(:branch) { 'expand-collapse-files' }
+
+    # safe-files -> 100 | safe-lines -> 5000 | commit-files -> 105
+    it 'does collapsing from the safe number of files to the end on small files' do
+      expect(page).to have_link('Expand all')
+
+      expect(page).to have_selector('.diff-content', count: 105)
+      expect(page).to have_selector('.diff-collapsed', count: 5)
+
+      %w(file-95.txt file-96.txt file-97.txt file-98.txt file-99.txt).each do |filename|
+        expect(find("[data-blob-diff-path*='#{filename}']")).to have_selector('.diff-collapsed')
+      end
+    end
+  end
+
+  context 'visiting a commit with more than safe lines' do
+    let(:branch) { 'expand-collapse-lines' }
+
+    # safe-files -> 100 | safe-lines -> 5000 | commit_files -> 8 (each 1250 lines)
+    it 'does collapsing from the safe number of lines to the end' do
+      expect(page).to have_link('Expand all')
+
+      expect(page).to have_selector('.diff-content', count: 6)
+      expect(page).to have_selector('.diff-collapsed', count: 2)
+
+      %w(file-4.txt file-5.txt).each do |filename|
+        expect(find("[data-blob-diff-path*='#{filename}']")).to have_selector('.diff-collapsed')
+      end
+    end
+  end
+
   context 'expanding all diffs' do
     before do
       click_link('Expand all')
diff --git a/spec/features/groups/members/user_requests_access_spec.rb b/spec/features/groups/members/user_requests_access_spec.rb
index d1a6a98ab72..b3baa2ab57c 100644
--- a/spec/features/groups/members/user_requests_access_spec.rb
+++ b/spec/features/groups/members/user_requests_access_spec.rb
@@ -12,6 +12,13 @@ feature 'Groups > Members > User requests access', feature: true do
     visit group_path(group)
   end
 
+  scenario 'request access feature is disabled' do
+    group.update_attributes(request_access_enabled: false)
+    visit group_path(group)
+
+    expect(page).not_to have_content 'Request Access'
+  end
+
   scenario 'user can request access to a group' do
     perform_enqueued_jobs { click_link 'Request Access' }
 
diff --git a/spec/features/groups_spec.rb b/spec/features/groups_spec.rb
index 891df65216d..2d8b59472e8 100644
--- a/spec/features/groups_spec.rb
+++ b/spec/features/groups_spec.rb
@@ -1,14 +1,26 @@
 require 'spec_helper'
 
 feature 'Group', feature: true do
+  before do
+    login_as(:admin)
+  end
+
+  describe 'creating a group with space in group path' do
+    it 'renders new group form with validation errors' do
+      visit new_group_path
+      fill_in 'Group path', with: 'space group'
+
+      click_button 'Create group'
+
+      expect(current_path).to eq(groups_path)
+      expect(page).to have_content("Path can contain only letters, digits, '_', '-' and '.'. Cannot start with '-' or end in '.'.")
+    end
+  end
+
   describe 'description' do
     let(:group) { create(:group) }
     let(:path)  { group_path(group) }
 
-    before do
-      login_as(:admin)
-    end
-
     it 'parses Markdown' do
       group.update_attribute(:description, 'This is **my** group')
       visit path
diff --git a/spec/features/issues/filter_by_labels_spec.rb b/spec/features/issues/filter_by_labels_spec.rb
index 5ea02b8d39c..cb117d2476f 100644
--- a/spec/features/issues/filter_by_labels_spec.rb
+++ b/spec/features/issues/filter_by_labels_spec.rb
@@ -205,7 +205,7 @@ feature 'Issue filtering by Labels', feature: true do
       page.within '.labels-filter' do
         click_button 'Label'
         wait_for_ajax
-        fill_in 'label-name', with: 'bug'
+        find('.dropdown-input input').set 'bug'
 
         page.within '.dropdown-content' do
           expect(page).not_to have_content 'enhancement'
diff --git a/spec/features/issues/move_spec.rb b/spec/features/issues/move_spec.rb
index 055210399a7..7773c486b4e 100644
--- a/spec/features/issues/move_spec.rb
+++ b/spec/features/issues/move_spec.rb
@@ -55,7 +55,7 @@ feature 'issue move to another project' do
         first('.select2-choice').click
       end
 
-      fill_in('s2id_autogen1_search', with: new_project_search.name)
+      fill_in('s2id_autogen2_search', with: new_project_search.name)
 
       page.within '.select2-drop' do
         expect(page).to have_content(new_project_search.name)
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index 3fec75a07df..d51c9abea19 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -50,8 +50,9 @@ describe 'Issues', feature: true do
 
       expect(page).to have_content "Assignee #{@user.name}"
 
-      first('.js-user-search').click
-      click_link 'Unassigned'
+      first('#s2id_issue_assignee_id').click
+      sleep 2 # wait for ajax stuff to complete
+      first('.user-result').click
 
       click_button 'Save changes'
 
@@ -120,17 +121,6 @@ describe 'Issues', feature: true do
           expect(page).to have_content date.to_s(:medium)
         end
       end
-
-      it 'warns about version conflict' do
-        issue.update(title: "New title")
-
-        fill_in 'issue_title', with: 'bug 345'
-        fill_in 'issue_description', with: 'bug description'
-
-        click_button 'Save changes'
-
-        expect(page).to have_content 'Someone edited the issue the same time you did'
-      end
     end
   end
 
diff --git a/spec/features/markdown_spec.rb b/spec/features/markdown_spec.rb
index 09ccc77c101..32159559c37 100644
--- a/spec/features/markdown_spec.rb
+++ b/spec/features/markdown_spec.rb
@@ -236,6 +236,14 @@ describe 'GitLab Markdown', feature: true do
     it 'includes TaskListFilter' do
       expect(doc).to parse_task_lists
     end
+
+    it 'includes InlineDiffFilter' do
+      expect(doc).to parse_inline_diffs
+    end
+
+    it 'includes VideoLinkFilter' do
+      expect(doc).to parse_video_links
+    end
   end
 
   context 'wiki pipeline' do
@@ -293,6 +301,10 @@ describe 'GitLab Markdown', feature: true do
     it 'includes InlineDiffFilter' do
       expect(doc).to parse_inline_diffs
     end
+
+    it 'includes VideoLinkFilter' do
+      expect(doc).to parse_video_links
+    end
   end
 
   # Fake a `current_user` helper
diff --git a/spec/features/merge_requests/edit_mr_spec.rb b/spec/features/merge_requests/edit_mr_spec.rb
index 8ad884492d1..9e007ab7635 100644
--- a/spec/features/merge_requests/edit_mr_spec.rb
+++ b/spec/features/merge_requests/edit_mr_spec.rb
@@ -17,16 +17,5 @@ feature 'Edit Merge Request', feature: true do
     it 'form should have class js-quick-submit' do
       expect(page).to have_selector('.js-quick-submit')
     end
-
-    it 'warns about version conflict' do
-      merge_request.update(title: "New title")
-
-      fill_in 'merge_request_title', with: 'bug 345'
-      fill_in 'merge_request_description', with: 'bug description'
-
-      click_button 'Save changes'
-
-      expect(page).to have_content 'Someone edited the merge request the same time you did'
-    end
   end
 end
diff --git a/spec/features/pipelines_settings_spec.rb b/spec/features/pipelines_settings_spec.rb
new file mode 100644
index 00000000000..dcc364a3d01
--- /dev/null
+++ b/spec/features/pipelines_settings_spec.rb
@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+feature "Pipelines settings", feature: true do
+  include GitlabRoutingHelper
+
+  let(:project) { create(:empty_project) }
+  let(:user) { create(:user) }
+  let(:role) { :developer }
+
+  background do
+    login_as(user)
+    project.team << [user, role]
+    visit namespace_project_pipelines_settings_path(project.namespace, project)
+  end
+
+  context 'for developer' do
+    given(:role) { :developer }
+
+    scenario 'to be disallowed to view' do
+      expect(page.status_code).to eq(404)
+    end
+  end
+
+  context 'for master' do
+    given(:role) { :master }
+
+    scenario 'be allowed to change' do
+      fill_in('Test coverage parsing', with: 'coverage_regex')
+      click_on 'Save changes'
+
+      expect(page.status_code).to eq(200)
+      expect(page).to have_field('Test coverage parsing', with: 'coverage_regex')
+    end
+  end
+end
diff --git a/spec/features/pipelines_spec.rb b/spec/features/pipelines_spec.rb
index e7ee0aaea3c..7f861db1969 100644
--- a/spec/features/pipelines_spec.rb
+++ b/spec/features/pipelines_spec.rb
@@ -62,6 +62,20 @@ describe "Pipelines" do
       end
     end
 
+    context 'with manual actions' do
+      let!(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'manual build', stage: 'test', commands: 'test') }
+
+      before { visit namespace_project_pipelines_path(project.namespace, project) }
+
+      it { expect(page).to have_link('Manual build') }
+
+      context 'when playing' do
+        before { click_link('Manual build') }
+
+        it { expect(manual.reload).to be_pending }
+      end
+    end
+
     context 'for generic statuses' do
       context 'when running' do
         let!(:running) { create(:generic_commit_status, status: 'running', pipeline: pipeline, stage: 'test') }
@@ -117,6 +131,7 @@ describe "Pipelines" do
       @success = create(:ci_build, :success, pipeline: pipeline, stage: 'build', name: 'build')
       @failed = create(:ci_build, :failed, pipeline: pipeline, stage: 'test', name: 'test', commands: 'test')
       @running = create(:ci_build, :running, pipeline: pipeline, stage: 'deploy', name: 'deploy')
+      @manual = create(:ci_build, :manual, pipeline: pipeline, stage: 'deploy', name: 'manual build')
       @external = create(:generic_commit_status, status: 'success', pipeline: pipeline, name: 'jenkins', stage: 'external')
     end
 
@@ -131,6 +146,7 @@ describe "Pipelines" do
       expect(page).to have_content(@external.id)
       expect(page).to have_content('Retry failed')
       expect(page).to have_content('Cancel running')
+      expect(page).to have_link('Play')
     end
 
     context 'retrying builds' do
@@ -154,6 +170,12 @@ describe "Pipelines" do
         it { expect(page).to have_selector('.ci-canceled') }
       end
     end
+
+    context 'playing manual build' do
+      before { click_link('Play') }
+
+      it { expect(@manual.reload).to be_pending }
+    end
   end
 
   describe 'POST /:project/pipelines' do
diff --git a/spec/features/projects/badges/list_spec.rb b/spec/features/projects/badges/list_spec.rb
index 01e90618a98..75166bca119 100644
--- a/spec/features/projects/badges/list_spec.rb
+++ b/spec/features/projects/badges/list_spec.rb
@@ -6,7 +6,7 @@ feature 'list of badges' do
     project = create(:project)
     project.team << [user, :master]
     login_as(user)
-    visit namespace_project_badges_path(project.namespace, project)
+    visit namespace_project_pipelines_settings_path(project.namespace, project)
   end
 
   scenario 'user displays list of badges' do
diff --git a/spec/features/projects/branches_spec.rb b/spec/features/projects/branches_spec.rb
new file mode 100644
index 00000000000..79abba21854
--- /dev/null
+++ b/spec/features/projects/branches_spec.rb
@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe 'Branches', feature: true do
+  let(:project) { create(:project) }
+  let(:repository) { project.repository }
+
+  before do
+    login_as :user
+    project.team << [@user, :developer]
+  end
+
+  describe 'Initial branches page' do
+    it 'shows all the branches' do
+      visit namespace_project_branches_path(project.namespace, project)
+
+      repository.branches { |branch| expect(page).to have_content("#{branch.name}") }
+      expect(page).to have_content("Protected branches can be managed in project settings")
+    end
+  end
+
+  describe 'Find branches' do
+    it 'shows filtered branches', js: true do
+      visit namespace_project_branches_path(project.namespace, project, project.id)
+
+      fill_in 'branch-search', with: 'fix'
+      find('#branch-search').native.send_keys(:enter)
+
+      expect(page).to have_content('fix')
+      expect(find('.all-branches')).to have_selector('li', count: 1)
+    end
+  end
+end
diff --git a/spec/features/projects/branches_spec.rb~HEAD b/spec/features/projects/branches_spec.rb~HEAD
new file mode 100644
index 00000000000..79abba21854
--- /dev/null
+++ b/spec/features/projects/branches_spec.rb~HEAD
@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe 'Branches', feature: true do
+  let(:project) { create(:project) }
+  let(:repository) { project.repository }
+
+  before do
+    login_as :user
+    project.team << [@user, :developer]
+  end
+
+  describe 'Initial branches page' do
+    it 'shows all the branches' do
+      visit namespace_project_branches_path(project.namespace, project)
+
+      repository.branches { |branch| expect(page).to have_content("#{branch.name}") }
+      expect(page).to have_content("Protected branches can be managed in project settings")
+    end
+  end
+
+  describe 'Find branches' do
+    it 'shows filtered branches', js: true do
+      visit namespace_project_branches_path(project.namespace, project, project.id)
+
+      fill_in 'branch-search', with: 'fix'
+      find('#branch-search').native.send_keys(:enter)
+
+      expect(page).to have_content('fix')
+      expect(find('.all-branches')).to have_selector('li', count: 1)
+    end
+  end
+end
diff --git a/spec/features/projects/import_export/import_file_spec.rb b/spec/features/projects/import_export/import_file_spec.rb
index bc3bf53fe9d..2d1e3bbebe5 100644
--- a/spec/features/projects/import_export/import_file_spec.rb
+++ b/spec/features/projects/import_export/import_file_spec.rb
@@ -59,6 +59,21 @@ feature 'project import', feature: true, js: true do
     end
   end
 
+  scenario 'project with no name' do
+    create(:project, namespace_id: 2)
+
+    visit new_project_path
+
+    select2('2', from: '#project_namespace_id')
+
+    # click on disabled element
+    find(:link, 'GitLab export').trigger('click')
+
+    page.within('.flash-container') do
+      expect(page).to have_content('Please enter path and name')
+    end
+  end
+
   def wiki_exists?
     wiki = ProjectWiki.new(project)
     File.exist?(wiki.repository.path_to_repo) && !wiki.repository.empty?
diff --git a/spec/features/projects/members/user_requests_access_spec.rb b/spec/features/projects/members/user_requests_access_spec.rb
index f2fe3ef364d..56ede8eb5be 100644
--- a/spec/features/projects/members/user_requests_access_spec.rb
+++ b/spec/features/projects/members/user_requests_access_spec.rb
@@ -11,6 +11,13 @@ feature 'Projects > Members > User requests access', feature: true do
     visit namespace_project_path(project.namespace, project)
   end
 
+  scenario 'request access feature is disabled' do
+    project.update_attributes(request_access_enabled: false)
+    visit namespace_project_path(project.namespace, project)
+
+    expect(page).not_to have_content 'Request Access'
+  end
+
   scenario 'user can request access to a project' do
     perform_enqueued_jobs { click_link 'Request Access' }
 
diff --git a/spec/features/projects/slack_service/slack_service_spec.rb b/spec/features/projects/slack_service/slack_service_spec.rb
new file mode 100644
index 00000000000..16541f51d98
--- /dev/null
+++ b/spec/features/projects/slack_service/slack_service_spec.rb
@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+feature 'Projects > Slack service > Setup events', feature: true do
+  let(:user) { create(:user) }
+  let(:service) { SlackService.new }
+  let(:project) { create(:project, slack_service: service) }
+
+  background do
+    service.fields
+    service.update_attributes(push_channel: 1, issue_channel: 2, merge_request_channel: 3, note_channel: 4, tag_push_channel: 5, build_channel: 6, wiki_page_channel: 7)
+    project.team << [user, :master]
+    login_as(user)
+  end
+
+  scenario 'user can filter events by channel' do
+    visit edit_namespace_project_service_path(project.namespace, project, service)
+
+    expect(page.find_field("service_push_channel").value).to have_content '1'
+    expect(page.find_field("service_issue_channel").value).to have_content '2'
+    expect(page.find_field("service_merge_request_channel").value).to have_content '3'
+    expect(page.find_field("service_note_channel").value).to have_content '4'
+    expect(page.find_field("service_tag_push_channel").value).to have_content '5'
+    expect(page.find_field("service_build_channel").value).to have_content '6'
+    expect(page.find_field("service_wiki_page_channel").value).to have_content '7'
+  end
+end
diff --git a/spec/features/projects/wiki/markdown_preview_spec.rb b/spec/features/projects/wiki/markdown_preview_spec.rb
new file mode 100644
index 00000000000..a1c386ddc18
--- /dev/null
+++ b/spec/features/projects/wiki/markdown_preview_spec.rb
@@ -0,0 +1,140 @@
+require 'spec_helper'
+
+feature 'Projects > Wiki > User previews markdown changes', feature: true, js: true do
+  let(:user) { create(:user) }
+  let(:project) { create(:project, namespace: user.namespace) }
+  let(:wiki_content) do
+    <<-HEREDOC
+[regular link](regular)
+[relative link 1](../relative)
+[relative link 2](./relative)
+[relative link 3](./e/f/relative)
+    HEREDOC
+  end
+
+  background do
+    project.team << [user, :master]
+    login_as(user)
+
+    visit namespace_project_path(project.namespace, project)
+    click_link 'Wiki'
+    WikiPages::CreateService.new(project, user, title: 'home', content: 'Home page').execute
+  end
+
+  context "while creating a new wiki page" do
+    context "when there are no spaces or hyphens in the page name" do
+      it "rewrites relative links as expected" do
+        click_link 'New Page'
+        fill_in :new_wiki_path, with: 'a/b/c/d'
+        click_button 'Create Page'
+
+        fill_in :wiki_content, with: wiki_content
+        click_on "Preview"
+
+        expect(page).to have_content("regular link")
+
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/regular\">regular link</a>")
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/a/b/relative\">relative link 1</a>")
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/a/b/c/relative\">relative link 2</a>")
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/a/b/c/e/f/relative\">relative link 3</a>")
+      end
+    end
+
+    context "when there are spaces in the page name" do
+      it "rewrites relative links as expected" do
+        click_link 'New Page'
+        fill_in :new_wiki_path, with: 'a page/b page/c page/d page'
+        click_button 'Create Page'
+
+        fill_in :wiki_content, with: wiki_content
+        click_on "Preview"
+
+        expect(page).to have_content("regular link")
+
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/regular\">regular link</a>")
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/a-page/b-page/relative\">relative link 1</a>")
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/a-page/b-page/c-page/relative\">relative link 2</a>")
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/a-page/b-page/c-page/e/f/relative\">relative link 3</a>")
+      end
+    end
+
+    context "when there are hyphens in the page name" do
+      it "rewrites relative links as expected" do
+        click_link 'New Page'
+        fill_in :new_wiki_path, with: 'a-page/b-page/c-page/d-page'
+        click_button 'Create Page'
+
+        fill_in :wiki_content, with: wiki_content
+        click_on "Preview"
+
+        expect(page).to have_content("regular link")
+
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/regular\">regular link</a>")
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/a-page/b-page/relative\">relative link 1</a>")
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/a-page/b-page/c-page/relative\">relative link 2</a>")
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/a-page/b-page/c-page/e/f/relative\">relative link 3</a>")
+      end
+    end
+  end
+
+  context "while editing a wiki page" do
+    def create_wiki_page(path)
+      click_link 'New Page'
+      fill_in :new_wiki_path, with: path
+      click_button 'Create Page'
+      fill_in :wiki_content, with: 'content'
+      click_on "Create page"
+    end
+
+    context "when there are no spaces or hyphens in the page name" do
+      it "rewrites relative links as expected" do
+        create_wiki_page 'a/b/c/d'
+        click_link 'Edit'
+
+        fill_in :wiki_content, with: wiki_content
+        click_on "Preview"
+
+        expect(page).to have_content("regular link")
+
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/regular\">regular link</a>")
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/a/b/relative\">relative link 1</a>")
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/a/b/c/relative\">relative link 2</a>")
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/a/b/c/e/f/relative\">relative link 3</a>")
+      end
+    end
+
+    context "when there are spaces in the page name" do
+      it "rewrites relative links as expected" do
+        create_wiki_page 'a page/b page/c page/d page'
+        click_link 'Edit'
+
+        fill_in :wiki_content, with: wiki_content
+        click_on "Preview"
+
+        expect(page).to have_content("regular link")
+
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/regular\">regular link</a>")
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/a-page/b-page/relative\">relative link 1</a>")
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/a-page/b-page/c-page/relative\">relative link 2</a>")
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/a-page/b-page/c-page/e/f/relative\">relative link 3</a>")
+      end
+    end
+
+    context "when there are hyphens in the page name" do
+      it "rewrites relative links as expected" do
+        create_wiki_page 'a-page/b-page/c-page/d-page'
+        click_link 'Edit'
+
+        fill_in :wiki_content, with: wiki_content
+        click_on "Preview"
+
+        expect(page).to have_content("regular link")
+
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/regular\">regular link</a>")
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/a-page/b-page/relative\">relative link 1</a>")
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/a-page/b-page/c-page/relative\">relative link 2</a>")
+        expect(page.html).to include("<a href=\"/#{project.path_with_namespace}/wikis/a-page/b-page/c-page/e/f/relative\">relative link 3</a>")
+      end
+    end
+  end
+end
diff --git a/spec/features/projects/wiki/user_creates_wiki_page_spec.rb b/spec/features/projects/wiki/user_creates_wiki_page_spec.rb
index 7e6eef65873..7afd83b7250 100644
--- a/spec/features/projects/wiki/user_creates_wiki_page_spec.rb
+++ b/spec/features/projects/wiki/user_creates_wiki_page_spec.rb
@@ -30,18 +30,48 @@ feature 'Projects > Wiki > User creates wiki page', feature: true do
         WikiPages::CreateService.new(project, user, title: 'home', content: 'Home page').execute
       end
 
-      scenario 'via the "new wiki page" page', js: true do
-        click_link 'New Page'
+      context 'via the "new wiki page" page' do
+        scenario 'when the wiki page has a single word name', js: true do
+          click_link 'New Page'
 
-        fill_in :new_wiki_path, with: 'foo'
-        click_button 'Create Page'
+          fill_in :new_wiki_path, with: 'foo'
+          click_button 'Create Page'
 
-        fill_in :wiki_content, with: 'My awesome wiki!'
-        click_button 'Create page'
+          fill_in :wiki_content, with: 'My awesome wiki!'
+          click_button 'Create page'
 
-        expect(page).to have_content('Foo')
-        expect(page).to have_content("last edited by #{user.name}")
-        expect(page).to have_content('My awesome wiki!')
+          expect(page).to have_content('Foo')
+          expect(page).to have_content("last edited by #{user.name}")
+          expect(page).to have_content('My awesome wiki!')
+        end
+
+        scenario 'when the wiki page has spaces in the name', js: true do
+          click_link 'New Page'
+
+          fill_in :new_wiki_path, with: 'Spaces in the name'
+          click_button 'Create Page'
+
+          fill_in :wiki_content, with: 'My awesome wiki!'
+          click_button 'Create page'
+
+          expect(page).to have_content('Spaces in the name')
+          expect(page).to have_content("last edited by #{user.name}")
+          expect(page).to have_content('My awesome wiki!')
+        end
+
+        scenario 'when the wiki page has hyphens in the name', js: true do
+          click_link 'New Page'
+
+          fill_in :new_wiki_path, with: 'hyphens-in-the-name'
+          click_button 'Create Page'
+
+          fill_in :wiki_content, with: 'My awesome wiki!'
+          click_button 'Create page'
+
+          expect(page).to have_content('Hyphens in the name')
+          expect(page).to have_content("last edited by #{user.name}")
+          expect(page).to have_content('My awesome wiki!')
+        end
       end
     end
   end
diff --git a/spec/features/security/project/internal_access_spec.rb b/spec/features/security/project/internal_access_spec.rb
index 13d980a326f..b6acc509342 100644
--- a/spec/features/security/project/internal_access_spec.rb
+++ b/spec/features/security/project/internal_access_spec.rb
@@ -426,4 +426,23 @@ describe "Internal Project Access", feature: true  do
     it { is_expected.to be_denied_for :external }
     it { is_expected.to be_denied_for :visitor }
   end
+
+  describe "GET /:project_path/container_registry" do
+    before do
+      stub_container_registry_tags('latest')
+      stub_container_registry_config(enabled: true)
+    end
+
+    subject { namespace_project_container_registry_index_path(project.namespace, project) }
+
+    it { is_expected.to be_allowed_for :admin }
+    it { is_expected.to be_allowed_for owner }
+    it { is_expected.to be_allowed_for master }
+    it { is_expected.to be_allowed_for developer }
+    it { is_expected.to be_allowed_for reporter }
+    it { is_expected.to be_allowed_for guest }
+    it { is_expected.to be_allowed_for :user }
+    it { is_expected.to be_denied_for :external }
+    it { is_expected.to be_denied_for :visitor }
+  end
 end
diff --git a/spec/features/security/project/private_access_spec.rb b/spec/features/security/project/private_access_spec.rb
index ac9690cc127..ccb5c06dab0 100644
--- a/spec/features/security/project/private_access_spec.rb
+++ b/spec/features/security/project/private_access_spec.rb
@@ -362,4 +362,23 @@ describe "Private Project Access", feature: true  do
     it { is_expected.to be_denied_for :external }
     it { is_expected.to be_denied_for :visitor }
   end
+
+  describe "GET /:project_path/container_registry" do
+    before do
+      stub_container_registry_tags('latest')
+      stub_container_registry_config(enabled: true)
+    end
+
+    subject { namespace_project_container_registry_index_path(project.namespace, project) }
+
+    it { is_expected.to be_allowed_for :admin }
+    it { is_expected.to be_allowed_for owner }
+    it { is_expected.to be_allowed_for master }
+    it { is_expected.to be_allowed_for developer }
+    it { is_expected.to be_allowed_for reporter }
+    it { is_expected.to be_denied_for guest }
+    it { is_expected.to be_denied_for :user }
+    it { is_expected.to be_denied_for :external }
+    it { is_expected.to be_denied_for :visitor }
+  end
 end
diff --git a/spec/features/security/project/public_access_spec.rb b/spec/features/security/project/public_access_spec.rb
index 737897de52b..985663e7c98 100644
--- a/spec/features/security/project/public_access_spec.rb
+++ b/spec/features/security/project/public_access_spec.rb
@@ -426,4 +426,23 @@ describe "Public Project Access", feature: true  do
     it { is_expected.to be_denied_for :external }
     it { is_expected.to be_denied_for :visitor }
   end
+
+  describe "GET /:project_path/container_registry" do
+    before do
+      stub_container_registry_tags('latest')
+      stub_container_registry_config(enabled: true)
+    end
+
+    subject { namespace_project_container_registry_index_path(project.namespace, project) }
+
+    it { is_expected.to be_allowed_for :admin }
+    it { is_expected.to be_allowed_for owner }
+    it { is_expected.to be_allowed_for master }
+    it { is_expected.to be_allowed_for developer }
+    it { is_expected.to be_allowed_for reporter }
+    it { is_expected.to be_allowed_for guest }
+    it { is_expected.to be_allowed_for :user }
+    it { is_expected.to be_allowed_for :external }
+    it { is_expected.to be_allowed_for :visitor }
+  end
 end
diff --git a/spec/features/u2f_spec.rb b/spec/features/u2f_spec.rb
index 14613754f74..9335f5bf120 100644
--- a/spec/features/u2f_spec.rb
+++ b/spec/features/u2f_spec.rb
@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', feature: true, js: true do
+  before { allow_any_instance_of(U2fHelper).to receive(:inject_u2f_api?).and_return(true) }
+
   def register_u2f_device(u2f_device = nil)
     u2f_device ||= FakeU2fDevice.new(page)
     u2f_device.respond_to_u2f_registration
@@ -208,21 +210,52 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', feature:
         expect(page.body).to match('Authentication via U2F device failed')
       end
     end
-  end
 
-  describe "when two-factor authentication is disabled" do
-    let(:user) { create(:user) }
+    describe "when more than one device has been registered by the same user" do
+      it "allows logging in with either device" do
+        # Register first device
+        user = login_as(:user)
+        user.update_attribute(:otp_required_for_login, true)
+        visit profile_two_factor_auth_path
+        expect(page).to have_content("Your U2F device needs to be set up.")
+        first_device = register_u2f_device
+
+        # Register second device
+        visit profile_two_factor_auth_path
+        expect(page).to have_content("Your U2F device needs to be set up.")
+        second_device = register_u2f_device
+        logout
+
+        # Authenticate as both devices
+        [first_device, second_device].each do |device|
+          login_as(user)
+          device.respond_to_u2f_authentication
+          click_on "Login Via U2F Device"
+          expect(page.body).to match('We heard back from your U2F device')
+          click_on "Authenticate via U2F Device"
 
-    before do
-      login_as(user)
-      user.update_attribute(:otp_required_for_login, true)
-      visit profile_account_path
-      click_on 'Manage Two-Factor Authentication'
-      register_u2f_device
+          expect(page.body).to match('Signed in successfully')
+
+          logout
+        end
+      end
     end
 
-    it "deletes u2f registrations" do
-      expect { click_on "Disable" }.to change { U2fRegistration.count }.from(1).to(0)
+    describe "when two-factor authentication is disabled" do
+      let(:user) { create(:user) }
+
+      before do
+        user = login_as(:user)
+        user.update_attribute(:otp_required_for_login, true)
+        visit profile_account_path
+        click_on 'Manage Two-Factor Authentication'
+        expect(page).to have_content("Your U2F device needs to be set up.")
+        register_u2f_device
+      end
+
+      it "deletes u2f registrations" do
+        expect { click_on "Disable" }.to change { U2fRegistration.count }.by(-1)
+      end
     end
   end
 end
diff --git a/spec/finders/branches_finder_spec.rb b/spec/finders/branches_finder_spec.rb
new file mode 100644
index 00000000000..9c9763d746b
--- /dev/null
+++ b/spec/finders/branches_finder_spec.rb
@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+describe BranchesFinder do
+  let(:user) { create(:user) }
+  let(:project) { create(:project) }
+  let(:repository) { project.repository }
+
+  describe '#execute' do
+    context 'sort only' do
+      it 'sorts by name' do
+        branches_finder = described_class.new(repository, {})
+
+        result = branches_finder.execute
+
+        expect(result.first.name).to eq("'test'")
+      end
+
+      it 'sorts by recently_updated' do
+        branches_finder = described_class.new(repository, { sort: 'recently_updated' })
+
+        result = branches_finder.execute
+
+        expect(result.first.name).to eq('expand-collapse-lines')
+      end
+
+      it 'sorts by last_updated' do
+        branches_finder = described_class.new(repository, { sort: 'last_updated' })
+
+        result = branches_finder.execute
+
+        expect(result.first.name).to eq('feature')
+      end
+    end
+
+    context 'filter only' do
+      it 'filters branches by name' do
+        branches_finder = described_class.new(repository, { search: 'fix' })
+
+        result = branches_finder.execute
+
+        expect(result.first.name).to eq('fix')
+        expect(result.count).to eq(1)
+      end
+
+      it 'does not find any branch with that name' do
+        branches_finder = described_class.new(repository, { search: 'random' })
+
+        result = branches_finder.execute
+
+        expect(result.count).to eq(0)
+      end
+    end
+
+    context 'filter and sort' do
+      it 'filters branches by name and sorts by recently_updated' do
+        params = { sort: 'recently_updated', search: 'feature' }
+        branches_finder = described_class.new(repository, params)
+
+        result = branches_finder.execute
+
+        expect(result.first.name).to eq('feature_conflict')
+        expect(result.count).to eq(2)
+      end
+
+      it 'filters branches by name and sorts by last_updated' do
+        params = { sort: 'last_updated', search: 'feature' }
+        branches_finder = described_class.new(repository, params)
+
+        result = branches_finder.execute
+
+        expect(result.first.name).to eq('feature')
+        expect(result.count).to eq(2)
+      end
+    end
+  end
+end
diff --git a/spec/fixtures/domain_blacklist.txt b/spec/fixtures/domain_blacklist.txt
new file mode 100644
index 00000000000..baeb11eda9a
--- /dev/null
+++ b/spec/fixtures/domain_blacklist.txt
@@ -0,0 +1,3 @@
+example.com
+test.com
+foo.bar
\ No newline at end of file
diff --git a/spec/fixtures/markdown.md.erb b/spec/fixtures/markdown.md.erb
index c75d28d9801..f3e7c2d1a9f 100644
--- a/spec/fixtures/markdown.md.erb
+++ b/spec/fixtures/markdown.md.erb
@@ -256,3 +256,7 @@ However the wrapping tags can not be mixed as such -
 - [+ additions +}
 - {- delletions -]
 - [- delletions -}
+
+### Videos
+
+![My Video](/assets/videos/gitlab-demo.mp4)
diff --git a/spec/fixtures/parallel_diff_result.yml b/spec/fixtures/parallel_diff_result.yml
deleted file mode 100644
index 333eda1191a..00000000000
--- a/spec/fixtures/parallel_diff_result.yml
+++ /dev/null
@@ -1,800 +0,0 @@
----
-- :left:
-    :type: match
-    :number: 6
-    :text: "@@ -6,12 +6,18 @@ module Popen"
-    :line_code:
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line:
-        :new_line:
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type: match
-    :number: 6
-    :text: "@@ -6,12 +6,18 @@ module Popen"
-    :line_code:
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line:
-        :new_line:
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type:
-    :number: 6
-    :text: |2
-       <span id="LC6" class="line"></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_6_6
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 6
-        :new_line: 6
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type:
-    :number: 6
-    :text: |2
-       <span id="LC6" class="line"></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_6_6
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 6
-        :new_line: 6
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type:
-    :number: 7
-    :text: |2
-       <span id="LC7" class="line">  <span class="k">def</span> <span class="nf">popen</span><span class="p">(</span><span class="n">cmd</span><span class="p">,</span> <span class="n">path</span><span class="o">=</span><span class="kp">nil</span><span class="p">)</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_7_7
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 7
-        :new_line: 7
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type:
-    :number: 7
-    :text: |2
-       <span id="LC7" class="line">  <span class="k">def</span> <span class="nf">popen</span><span class="p">(</span><span class="n">cmd</span><span class="p">,</span> <span class="n">path</span><span class="o">=</span><span class="kp">nil</span><span class="p">)</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_7_7
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 7
-        :new_line: 7
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type:
-    :number: 8
-    :text: |2
-       <span id="LC8" class="line">    <span class="k">unless</span> <span class="n">cmd</span><span class="p">.</span><span class="nf">is_a?</span><span class="p">(</span><span class="no">Array</span><span class="p">)</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_8_8
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 8
-        :new_line: 8
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type:
-    :number: 8
-    :text: |2
-       <span id="LC8" class="line">    <span class="k">unless</span> <span class="n">cmd</span><span class="p">.</span><span class="nf">is_a?</span><span class="p">(</span><span class="no">Array</span><span class="p">)</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_8_8
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 8
-        :new_line: 8
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type: old
-    :number: 9
-    :text: |
-      -<span id="LC9" class="line">      <span class="k">raise</span> <span class="s2">&quot;System commands must be given as an array of strings&quot;</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_9_9
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 9
-        :new_line:
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type: new
-    :number: 9
-    :text: |
-      +<span id="LC9" class="line">      <span class="k">raise</span> <span class="no"><span class='idiff left'>RuntimeError</span></span><span class="p"><span class='idiff'>,</span></span><span class='idiff right'> </span><span class="s2">&quot;System commands must be given as an array of strings&quot;</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_10_9
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line:
-        :new_line: 9
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type:
-    :number: 10
-    :text: |2
-       <span id="LC10" class="line">    <span class="k">end</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_10_10
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 10
-        :new_line: 10
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type:
-    :number: 10
-    :text: |2
-       <span id="LC10" class="line">    <span class="k">end</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_10_10
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 10
-        :new_line: 10
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type:
-    :number: 11
-    :text: |2
-       <span id="LC11" class="line"></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_11_11
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 11
-        :new_line: 11
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type:
-    :number: 11
-    :text: |2
-       <span id="LC11" class="line"></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_11_11
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 11
-        :new_line: 11
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type:
-    :number: 12
-    :text: |2
-       <span id="LC12" class="line">    <span class="n">path</span> <span class="o">||=</span> <span class="no">Dir</span><span class="p">.</span><span class="nf">pwd</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_12_12
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 12
-        :new_line: 12
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type:
-    :number: 12
-    :text: |2
-       <span id="LC12" class="line">    <span class="n">path</span> <span class="o">||=</span> <span class="no">Dir</span><span class="p">.</span><span class="nf">pwd</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_12_12
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 12
-        :new_line: 12
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type: old
-    :number: 13
-    :text: |
-      -<span id="LC13" class="line">    <span class="n">vars</span> <span class="o">=</span> <span class="p">{</span> <span class="s2">&quot;PWD&quot;</span> <span class="o">=&gt;</span> <span class="n">path</span> <span class="p">}</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_13_13
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 13
-        :new_line:
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type: new
-    :number: 13
-    :text: |
-      +<span id="LC13" class="line"></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_13
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line:
-        :new_line: 13
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type: old
-    :number: 14
-    :text: |
-      -<span id="LC14" class="line">    <span class="n">options</span> <span class="o">=</span> <span class="p">{</span> <span class="ss">chdir: </span><span class="n">path</span> <span class="p">}</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_14_13
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 14
-        :new_line:
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type: new
-    :number: 14
-    :text: |
-      +<span id="LC14" class="line">    <span class="n">vars</span> <span class="o">=</span> <span class="p">{</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_14
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line:
-        :new_line: 14
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type:
-    :number:
-    :text: ''
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_15
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line:
-        :new_line: 15
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type: new
-    :number: 15
-    :text: |
-      +<span id="LC15" class="line">      <span class="s2">&quot;PWD&quot;</span> <span class="o">=&gt;</span> <span class="n">path</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_15
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line:
-        :new_line: 15
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type:
-    :number:
-    :text: ''
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_16
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line:
-        :new_line: 16
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type: new
-    :number: 16
-    :text: |
-      +<span id="LC16" class="line">    <span class="p">}</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_16
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line:
-        :new_line: 16
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type:
-    :number:
-    :text: ''
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_17
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line:
-        :new_line: 17
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type: new
-    :number: 17
-    :text: |
-      +<span id="LC17" class="line"></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_17
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line:
-        :new_line: 17
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type:
-    :number:
-    :text: ''
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_18
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line:
-        :new_line: 18
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type: new
-    :number: 18
-    :text: |
-      +<span id="LC18" class="line">    <span class="n">options</span> <span class="o">=</span> <span class="p">{</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_18
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line:
-        :new_line: 18
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type:
-    :number:
-    :text: ''
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_19
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line:
-        :new_line: 19
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type: new
-    :number: 19
-    :text: |
-      +<span id="LC19" class="line">      <span class="ss">chdir: </span><span class="n">path</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_19
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line:
-        :new_line: 19
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type:
-    :number:
-    :text: ''
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_20
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line:
-        :new_line: 20
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type: new
-    :number: 20
-    :text: |
-      +<span id="LC20" class="line">    <span class="p">}</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_20
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line:
-        :new_line: 20
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type:
-    :number: 15
-    :text: |2
-       <span id="LC21" class="line"></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_21
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 15
-        :new_line: 21
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type:
-    :number: 21
-    :text: |2
-       <span id="LC21" class="line"></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_21
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 15
-        :new_line: 21
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type:
-    :number: 16
-    :text: |2
-       <span id="LC22" class="line">    <span class="k">unless</span> <span class="no">File</span><span class="p">.</span><span class="nf">directory?</span><span class="p">(</span><span class="n">path</span><span class="p">)</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_16_22
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 16
-        :new_line: 22
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type:
-    :number: 22
-    :text: |2
-       <span id="LC22" class="line">    <span class="k">unless</span> <span class="no">File</span><span class="p">.</span><span class="nf">directory?</span><span class="p">(</span><span class="n">path</span><span class="p">)</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_16_22
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 16
-        :new_line: 22
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type:
-    :number: 17
-    :text: |2
-       <span id="LC23" class="line">      <span class="no">FileUtils</span><span class="p">.</span><span class="nf">mkdir_p</span><span class="p">(</span><span class="n">path</span><span class="p">)</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_17_23
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 17
-        :new_line: 23
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type:
-    :number: 23
-    :text: |2
-       <span id="LC23" class="line">      <span class="no">FileUtils</span><span class="p">.</span><span class="nf">mkdir_p</span><span class="p">(</span><span class="n">path</span><span class="p">)</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_17_23
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 17
-        :new_line: 23
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type: match
-    :number: 19
-    :text: "@@ -19,6 +25,7 @@ module Popen"
-    :line_code:
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line:
-        :new_line:
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type: match
-    :number: 25
-    :text: "@@ -19,6 +25,7 @@ module Popen"
-    :line_code:
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line:
-        :new_line:
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type:
-    :number: 19
-    :text: |2
-       <span id="LC25" class="line"></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_19_25
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 19
-        :new_line: 25
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type:
-    :number: 25
-    :text: |2
-       <span id="LC25" class="line"></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_19_25
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 19
-        :new_line: 25
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type:
-    :number: 20
-    :text: |2
-       <span id="LC26" class="line">    <span class="vi">@cmd_output</span> <span class="o">=</span> <span class="s2">&quot;&quot;</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_20_26
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 20
-        :new_line: 26
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type:
-    :number: 26
-    :text: |2
-       <span id="LC26" class="line">    <span class="vi">@cmd_output</span> <span class="o">=</span> <span class="s2">&quot;&quot;</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_20_26
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 20
-        :new_line: 26
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type:
-    :number: 21
-    :text: |2
-       <span id="LC27" class="line">    <span class="vi">@cmd_status</span> <span class="o">=</span> <span class="mi">0</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_21_27
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 21
-        :new_line: 27
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type:
-    :number: 27
-    :text: |2
-       <span id="LC27" class="line">    <span class="vi">@cmd_status</span> <span class="o">=</span> <span class="mi">0</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_21_27
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 21
-        :new_line: 27
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type:
-    :number:
-    :text: ''
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_22_28
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line:
-        :new_line: 28
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type: new
-    :number: 28
-    :text: |
-      +<span id="LC28" class="line"></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_22_28
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line:
-        :new_line: 28
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type:
-    :number: 22
-    :text: |2
-       <span id="LC29" class="line">    <span class="no">Open3</span><span class="p">.</span><span class="nf">popen3</span><span class="p">(</span><span class="n">vars</span><span class="p">,</span> <span class="o">*</span><span class="n">cmd</span><span class="p">,</span> <span class="n">options</span><span class="p">)</span> <span class="k">do</span> <span class="o">|</span><span class="n">stdin</span><span class="p">,</span> <span class="n">stdout</span><span class="p">,</span> <span class="n">stderr</span><span class="p">,</span> <span class="n">wait_thr</span><span class="o">|</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_22_29
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 22
-        :new_line: 29
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type:
-    :number: 29
-    :text: |2
-       <span id="LC29" class="line">    <span class="no">Open3</span><span class="p">.</span><span class="nf">popen3</span><span class="p">(</span><span class="n">vars</span><span class="p">,</span> <span class="o">*</span><span class="n">cmd</span><span class="p">,</span> <span class="n">options</span><span class="p">)</span> <span class="k">do</span> <span class="o">|</span><span class="n">stdin</span><span class="p">,</span> <span class="n">stdout</span><span class="p">,</span> <span class="n">stderr</span><span class="p">,</span> <span class="n">wait_thr</span><span class="o">|</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_22_29
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 22
-        :new_line: 29
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type:
-    :number: 23
-    :text: |2
-       <span id="LC30" class="line">      <span class="vi">@cmd_output</span> <span class="o">&lt;&lt;</span> <span class="n">stdout</span><span class="p">.</span><span class="nf">read</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_23_30
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 23
-        :new_line: 30
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type:
-    :number: 30
-    :text: |2
-       <span id="LC30" class="line">      <span class="vi">@cmd_output</span> <span class="o">&lt;&lt;</span> <span class="n">stdout</span><span class="p">.</span><span class="nf">read</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_23_30
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 23
-        :new_line: 30
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-- :left:
-    :type:
-    :number: 24
-    :text: |2
-       <span id="LC31" class="line">      <span class="vi">@cmd_output</span> <span class="o">&lt;&lt;</span> <span class="n">stderr</span><span class="p">.</span><span class="nf">read</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_24_31
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 24
-        :new_line: 31
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-  :right:
-    :type:
-    :number: 31
-    :text: |2
-       <span id="LC31" class="line">      <span class="vi">@cmd_output</span> <span class="o">&lt;&lt;</span> <span class="n">stderr</span><span class="p">.</span><span class="nf">read</span></span>
-    :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_24_31
-    :position: !ruby/object:Gitlab::Diff::Position
-      attributes:
-        :old_path: files/ruby/popen.rb
-        :new_path: files/ruby/popen.rb
-        :old_line: 24
-        :new_line: 31
-        :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-        :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d
diff --git a/spec/fixtures/video_sample.mp4 b/spec/fixtures/video_sample.mp4
new file mode 100644
index 00000000000..acd45190998
--- /dev/null
+++ b/spec/fixtures/video_sample.mp4
diff --git a/spec/helpers/blob_helper_spec.rb b/spec/helpers/blob_helper_spec.rb
index 6d1c02db297..bd0108f9938 100644
--- a/spec/helpers/blob_helper_spec.rb
+++ b/spec/helpers/blob_helper_spec.rb
@@ -16,19 +16,19 @@ describe BlobHelper do
 
   describe '#highlight' do
     it 'should return plaintext for unknown lexer context' do
-      result = helper.highlight(blob_name, no_context_content, nowrap: true)
-      expect(result).to eq('<span id="LC1" class="line">:type &quot;assem&quot;))</span>')
+      result = helper.highlight(blob_name, no_context_content)
+      expect(result).to eq(%[<pre class="code highlight"><code><span id="LC1" class="line">:type "assem"))</span></code></pre>])
     end
 
     it 'should highlight single block' do
-      expected = %Q[<span id="LC1" class="line"><span class="p">(</span><span class="nb">make-pathname</span> <span class="ss">:defaults</span> <span class="nv">name</span></span>
-<span id="LC2" class="line"><span class="ss">:type</span> <span class="s">&quot;assem&quot;</span><span class="p">))</span></span>]
+      expected = %Q[<pre class="code highlight"><code><span id="LC1" class="line"><span class="p">(</span><span class="nb">make-pathname</span> <span class="ss">:defaults</span> <span class="nv">name</span></span>
+<span id="LC2" class="line"><span class="ss">:type</span> <span class="s">"assem"</span><span class="p">))</span></span></code></pre>]
 
-      expect(helper.highlight(blob_name, blob_content, nowrap: true)).to eq(expected)
+      expect(helper.highlight(blob_name, blob_content)).to eq(expected)
     end
 
     it 'should highlight multi-line comments' do
-      result = helper.highlight(blob_name, multiline_content, nowrap: true)
+      result = helper.highlight(blob_name, multiline_content)
       html = Nokogiri::HTML(result)
       lines = html.search('.s')
       expect(lines.count).to eq(3)
@@ -41,33 +41,19 @@ describe BlobHelper do
       let(:blob_name) { 'test.diff' }
       let(:blob_content) { "+aaa\n+bbb\n- ccc\n ddd\n"}
       let(:expected) do
-        %q(<span id="LC1" class="line"><span class="gi">+aaa</span></span>
+        %q(<pre class="code highlight"><code><span id="LC1" class="line"><span class="gi">+aaa</span></span>
 <span id="LC2" class="line"><span class="gi">+bbb</span></span>
 <span id="LC3" class="line"><span class="gd">- ccc</span></span>
-<span id="LC4" class="line"> ddd</span>)
+<span id="LC4" class="line"> ddd</span></code></pre>)
       end
 
       it 'should highlight each line properly' do
-        result = helper.highlight(blob_name, blob_content, nowrap: true)
+        result = helper.highlight(blob_name, blob_content)
         expect(result).to eq(expected)
       end
     end
   end
 
-  describe "#highlighter" do
-    it 'should highlight continued blocks' do
-      # Both lines have LC1 as ID since formatter doesn't support continue at the moment
-      expected = [
-        '<span id="LC1" class="line"><span class="p">(</span><span class="nb">make-pathname</span> <span class="ss">:defaults</span> <span class="nv">name</span></span>',
-        '<span id="LC1" class="line"><span class="ss">:type</span> <span class="s">&quot;assem&quot;</span><span class="p">))</span></span>'
-      ]
-
-      highlighter = helper.highlighter(blob_name, blob_content, nowrap: true)
-      result = split_content.map{ |content| highlighter.highlight(content) }
-      expect(result).to eq(expected)
-    end
-  end
-
   describe "#sanitize_svg" do
     let(:input_svg_path) { File.join(Rails.root, 'spec', 'fixtures', 'unsanitized.svg') }
     let(:data) { open(input_svg_path).read }
diff --git a/spec/helpers/ci_status_helper_spec.rb b/spec/helpers/ci_status_helper_spec.rb
index 45199d0f09d..637b02d9388 100644
--- a/spec/helpers/ci_status_helper_spec.rb
+++ b/spec/helpers/ci_status_helper_spec.rb
@@ -7,7 +7,13 @@ describe CiStatusHelper do
   let(:failed_commit) { double("Ci::Pipeline", status: 'failed') }
 
   describe 'ci_icon_for_status' do
-    it { expect(helper.ci_icon_for_status(success_commit.status)).to include('fa-check') }
-    it { expect(helper.ci_icon_for_status(failed_commit.status)).to include('fa-close') }
+    it 'renders to correct svg on success' do
+      expect(helper).to receive(:render).with('shared/icons/icon_status_success.svg', anything)
+      helper.ci_icon_for_status(success_commit.status)
+    end
+    it 'renders the correct svg on failure' do
+      expect(helper).to receive(:render).with('shared/icons/icon_status_failed.svg', anything)
+      helper.ci_icon_for_status(failed_commit.status)
+    end
   end
 end
diff --git a/spec/helpers/diff_helper_spec.rb b/spec/helpers/diff_helper_spec.rb
index 4b134a48410..c2fd2c8a533 100644
--- a/spec/helpers/diff_helper_spec.rb
+++ b/spec/helpers/diff_helper_spec.rb
@@ -30,12 +30,31 @@ describe DiffHelper do
       expect(helper.diff_view).to eq 'inline'
     end
   end
-
+  
   describe 'diff_options' do
-    it 'should return hard limit for a diff' do
+    it 'should return hard limit for a diff if force diff is true' do
       allow(controller).to receive(:params) { { force_show_diff: true } }
       expect(diff_options).to include(Commit.max_diff_options)
     end
+
+    it 'should return hard limit for a diff if expand_all_diffs is true' do
+      allow(controller).to receive(:params) { { expand_all_diffs: true } }
+      expect(diff_options).to include(Commit.max_diff_options)
+    end
+
+    it 'should return no collapse false' do
+      expect(diff_options).to include(no_collapse: false)
+    end
+
+    it 'should return no collapse true if expand_all_diffs' do
+      allow(controller).to receive(:params) { { expand_all_diffs: true } }
+      expect(diff_options).to include(no_collapse: true)
+    end
+
+    it 'should return no collapse true if action name diff_for_path' do
+      allow(controller).to receive(:action_name) { 'diff_for_path' }
+      expect(diff_options).to include(no_collapse: true)
+    end
   end
 
   describe 'unfold_bottom_class' do
diff --git a/spec/helpers/events_helper_spec.rb b/spec/helpers/events_helper_spec.rb
index c0d2be98e85..6b5e3d93d48 100644
--- a/spec/helpers/events_helper_spec.rb
+++ b/spec/helpers/events_helper_spec.rb
@@ -57,7 +57,7 @@ describe EventsHelper do
       expected = '<pre class="code highlight js-syntax-highlight ruby">' \
         "<code><span class=\"k\">def</span> <span class=\"nf\">test</span>\n" \
         "  <span class=\"s1\">\'hello world\'</span>\n" \
-        "<span class=\"k\">end</span>" \
+        "<span class=\"k\">end</span>\n" \
         '</code></pre>'
       expect(helper.event_note(input)).to eq(expected)
     end
diff --git a/spec/helpers/time_helper_spec.rb b/spec/helpers/time_helper_spec.rb
index 3f62527c5bb..bf3ed5c094c 100644
--- a/spec/helpers/time_helper_spec.rb
+++ b/spec/helpers/time_helper_spec.rb
@@ -1,36 +1,34 @@
 require 'spec_helper'
 
 describe TimeHelper do
-  describe "#duration_in_words" do
+  describe "#time_interval_in_words" do
     it "returns minutes and seconds" do
       intervals_in_words = {
         100 => "1 minute 40 seconds",
+        100.32 => "1 minute 40 seconds",
         121 => "2 minutes 1 second",
         3721 => "62 minutes 1 second",
         0 => "0 seconds"
       }
 
       intervals_in_words.each do |interval, expectation|
-        expect(duration_in_words(Time.now + interval, Time.now)).to eq(expectation)
+        expect(time_interval_in_words(interval)).to eq(expectation)
       end
     end
-
-    it "calculates interval from now if there is no finished_at" do
-      expect(duration_in_words(nil, Time.now - 5)).to eq("5 seconds")
-    end
   end
 
-  describe "#time_interval_in_words" do
+  describe "#duration_in_numbers" do
     it "returns minutes and seconds" do
-      intervals_in_words = {
-        100 => "1 minute 40 seconds",
-        121 => "2 minutes 1 second",
-        3721 => "62 minutes 1 second",
-        0 => "0 seconds"
+      duration_in_numbers = {
+        [100, 0] => "01:40",
+        [121, 0] => "02:01",
+        [3721, 0] => "01:02:01",
+        [0, 0] => "00:00",
+        [nil, Time.now.to_i - 42] => "00:42"
       }
 
-      intervals_in_words.each do |interval, expectation|
-        expect(time_interval_in_words(interval)).to eq(expectation)
+      duration_in_numbers.each do |interval, expectation|
+        expect(duration_in_numbers(*interval)).to eq(expectation)
       end
     end
   end
diff --git a/spec/initializers/6_validations_spec.rb b/spec/initializers/6_validations_spec.rb
index 5178bd130f4..baab30f482f 100644
--- a/spec/initializers/6_validations_spec.rb
+++ b/spec/initializers/6_validations_spec.rb
@@ -1,41 +1,58 @@
 require 'spec_helper'
+require_relative '../../config/initializers/6_validations.rb'
 
 describe '6_validations', lib: true do
+  before :all do
+    FileUtils.mkdir_p('tmp/tests/paths/a/b/c/d')
+    FileUtils.mkdir_p('tmp/tests/paths/a/b/c2')
+    FileUtils.mkdir_p('tmp/tests/paths/a/b/d')
+  end
+
+  after :all do
+    FileUtils.rm_rf('tmp/tests/paths')
+  end
+
   context 'with correct settings' do
     before do
-      mock_storages('foo' => '/a/b/c', 'bar' => 'a/b/d')
+      mock_storages('foo' => 'tmp/tests/paths/a/b/c', 'bar' => 'tmp/tests/paths/a/b/d')
     end
 
     it 'passes through' do
-      expect { load_validations }.not_to raise_error
+      expect { validate_storages }.not_to raise_error
     end
   end
 
   context 'with invalid storage names' do
     before do
-      mock_storages('name with spaces' => '/a/b/c')
+      mock_storages('name with spaces' => 'tmp/tests/paths/a/b/c')
     end
 
     it 'throws an error' do
-      expect { load_validations }.to raise_error('"name with spaces" is not a valid storage name. Please fix this in your gitlab.yml before starting GitLab.')
+      expect { validate_storages }.to raise_error('"name with spaces" is not a valid storage name. Please fix this in your gitlab.yml before starting GitLab.')
     end
   end
 
   context 'with nested storage paths' do
     before do
-      mock_storages('foo' => '/a/b/c', 'bar' => '/a/b/c/d')
+      mock_storages('foo' => 'tmp/tests/paths/a/b/c', 'bar' => 'tmp/tests/paths/a/b/c/d')
     end
 
     it 'throws an error' do
-      expect { load_validations }.to raise_error('bar is a nested path of foo. Nested paths are not supported for repository storages. Please fix this in your gitlab.yml before starting GitLab.')
+      expect { validate_storages }.to raise_error('bar is a nested path of foo. Nested paths are not supported for repository storages. Please fix this in your gitlab.yml before starting GitLab.')
     end
   end
 
-  def mock_storages(storages)
-    allow(Gitlab.config.repositories).to receive(:storages).and_return(storages)
+  context 'with similar but un-nested storage paths' do
+    before do
+      mock_storages('foo' => 'tmp/tests/paths/a/b/c', 'bar' => 'tmp/tests/paths/a/b/c2')
+    end
+
+    it 'passes through' do
+      expect { validate_storages }.not_to raise_error
+    end
   end
 
-  def load_validations
-    load File.join(__dir__, '../../config/initializers/6_validations.rb')
+  def mock_storages(storages)
+    allow(Gitlab.config.repositories).to receive(:storages).and_return(storages)
   end
 end
diff --git a/spec/initializers/trusted_proxies_spec.rb b/spec/initializers/trusted_proxies_spec.rb
index 14c8df954a6..52d5a7dffc9 100644
--- a/spec/initializers/trusted_proxies_spec.rb
+++ b/spec/initializers/trusted_proxies_spec.rb
@@ -17,6 +17,12 @@ describe 'trusted_proxies', lib: true do
       expect(request.remote_ip).to eq('10.1.5.89')
       expect(request.ip).to eq('10.1.5.89')
     end
+
+    it 'filters out bad values' do
+      request = stub_request('HTTP_X_FORWARDED_FOR' => '(null), 10.1.5.89')
+      expect(request.remote_ip).to eq('10.1.5.89')
+      expect(request.ip).to eq('10.1.5.89')
+    end
   end
 
   context 'with private IP ranges added' do
diff --git a/spec/javascripts/application_spec.js b/spec/javascripts/application_spec.js
new file mode 100644
index 00000000000..b48026c3b77
--- /dev/null
+++ b/spec/javascripts/application_spec.js
@@ -0,0 +1,32 @@
+
+/*= require lib/utils/common_utils */
+
+(function() {
+  describe('Application', function() {
+    return describe('disable buttons', function() {
+      fixture.preload('application.html');
+      beforeEach(function() {
+        return fixture.load('application.html');
+      });
+      it('should prevent default action for disabled buttons', function() {
+        var $button, isClicked;
+        gl.utils.preventDisabledButtons();
+        isClicked = false;
+        $button = $('#test-button');
+        $button.click(function() {
+          return isClicked = true;
+        });
+        $button.trigger('click');
+        return expect(isClicked).toBe(false);
+      });
+      return it('should be on the same page if a disabled link clicked', function() {
+        var locationBeforeLinkClick;
+        locationBeforeLinkClick = window.location.href;
+        gl.utils.preventDisabledButtons();
+        $('#test-link').click();
+        return expect(window.location.href).toBe(locationBeforeLinkClick);
+      });
+    });
+  });
+
+}).call(this);
diff --git a/spec/javascripts/application_spec.js.coffee b/spec/javascripts/application_spec.js.coffee
deleted file mode 100644
index 4b6a2bb5440..00000000000
--- a/spec/javascripts/application_spec.js.coffee
+++ /dev/null
@@ -1,30 +0,0 @@
-#= require lib/utils/common_utils
-
-describe 'Application', ->
-  describe 'disable buttons', ->
-    fixture.preload('application.html')
-
-    beforeEach ->
-      fixture.load('application.html')
-
-    it 'should prevent default action for disabled buttons', ->
-
-      gl.utils.preventDisabledButtons()
-
-      isClicked = false
-      $button   = $ '#test-button'
-
-      $button.click -> isClicked = true
-      $button.trigger 'click'
-
-      expect(isClicked).toBe false
-
-
-    it 'should be on the same page if a disabled link clicked', ->
-
-      locationBeforeLinkClick = window.location.href
-      gl.utils.preventDisabledButtons()
-
-      $('#test-link').click()
-
-      expect(window.location.href).toBe locationBeforeLinkClick
diff --git a/spec/javascripts/awards_handler_spec.js b/spec/javascripts/awards_handler_spec.js
new file mode 100644
index 00000000000..3ddc163033e
--- /dev/null
+++ b/spec/javascripts/awards_handler_spec.js
@@ -0,0 +1,187 @@
+
+/*= require awards_handler */
+
+
+/*= require jquery */
+
+
+/*= require jquery.cookie */
+
+
+/*= require ./fixtures/emoji_menu */
+
+(function() {
+  var awardsHandler, lazyAssert;
+
+  awardsHandler = null;
+
+  window.gl || (window.gl = {});
+
+  window.gon || (window.gon = {});
+
+  gl.emojiAliases = function() {
+    return {
+      '+1': 'thumbsup',
+      '-1': 'thumbsdown'
+    };
+  };
+
+  gon.award_menu_url = '/emojis';
+
+  lazyAssert = function(done, assertFn) {
+    return setTimeout(function() {
+      assertFn();
+      return done();
+    }, 333);
+  };
+
+  describe('AwardsHandler', function() {
+    fixture.preload('awards_handler.html');
+    beforeEach(function() {
+      fixture.load('awards_handler.html');
+      awardsHandler = new AwardsHandler;
+      spyOn(awardsHandler, 'postEmoji').and.callFake((function(_this) {
+        return function(url, emoji, cb) {
+          return cb();
+        };
+      })(this));
+      return spyOn(jQuery, 'get').and.callFake(function(req, cb) {
+        return cb(window.emojiMenu);
+      });
+    });
+    describe('::showEmojiMenu', function() {
+      it('should show emoji menu when Add emoji button clicked', function(done) {
+        $('.js-add-award').eq(0).click();
+        return lazyAssert(done, function() {
+          var $emojiMenu;
+          $emojiMenu = $('.emoji-menu');
+          expect($emojiMenu.length).toBe(1);
+          expect($emojiMenu.hasClass('is-visible')).toBe(true);
+          expect($emojiMenu.find('#emoji_search').length).toBe(1);
+          return expect($('.js-awards-block.current').length).toBe(1);
+        });
+      });
+      it('should also show emoji menu for the smiley icon in notes', function(done) {
+        $('.note-action-button').click();
+        return lazyAssert(done, function() {
+          var $emojiMenu;
+          $emojiMenu = $('.emoji-menu');
+          return expect($emojiMenu.length).toBe(1);
+        });
+      });
+      return it('should remove emoji menu when body is clicked', function(done) {
+        $('.js-add-award').eq(0).click();
+        return lazyAssert(done, function() {
+          var $emojiMenu;
+          $emojiMenu = $('.emoji-menu');
+          $('body').click();
+          expect($emojiMenu.length).toBe(1);
+          expect($emojiMenu.hasClass('is-visible')).toBe(false);
+          return expect($('.js-awards-block.current').length).toBe(0);
+        });
+      });
+    });
+    describe('::addAwardToEmojiBar', function() {
+      it('should add emoji to votes block', function() {
+        var $emojiButton, $votesBlock;
+        $votesBlock = $('.js-awards-block').eq(0);
+        awardsHandler.addAwardToEmojiBar($votesBlock, 'heart', false);
+        $emojiButton = $votesBlock.find('[data-emoji=heart]');
+        expect($emojiButton.length).toBe(1);
+        expect($emojiButton.next('.js-counter').text()).toBe('1');
+        return expect($votesBlock.hasClass('hidden')).toBe(false);
+      });
+      it('should remove the emoji when we click again', function() {
+        var $emojiButton, $votesBlock;
+        $votesBlock = $('.js-awards-block').eq(0);
+        awardsHandler.addAwardToEmojiBar($votesBlock, 'heart', false);
+        awardsHandler.addAwardToEmojiBar($votesBlock, 'heart', false);
+        $emojiButton = $votesBlock.find('[data-emoji=heart]');
+        return expect($emojiButton.length).toBe(0);
+      });
+      return it('should decrement the emoji counter', function() {
+        var $emojiButton, $votesBlock;
+        $votesBlock = $('.js-awards-block').eq(0);
+        awardsHandler.addAwardToEmojiBar($votesBlock, 'heart', false);
+        $emojiButton = $votesBlock.find('[data-emoji=heart]');
+        $emojiButton.next('.js-counter').text(5);
+        awardsHandler.addAwardToEmojiBar($votesBlock, 'heart', false);
+        expect($emojiButton.length).toBe(1);
+        return expect($emojiButton.next('.js-counter').text()).toBe('4');
+      });
+    });
+    describe('::getAwardUrl', function() {
+      return it('should return the url for request', function() {
+        return expect(awardsHandler.getAwardUrl()).toBe('/gitlab-org/gitlab-test/issues/8/toggle_award_emoji');
+      });
+    });
+    describe('::addAward and ::checkMutuality', function() {
+      return it('should handle :+1: and :-1: mutuality', function() {
+        var $thumbsDownEmoji, $thumbsUpEmoji, $votesBlock, awardUrl;
+        awardUrl = awardsHandler.getAwardUrl();
+        $votesBlock = $('.js-awards-block').eq(0);
+        $thumbsUpEmoji = $votesBlock.find('[data-emoji=thumbsup]').parent();
+        $thumbsDownEmoji = $votesBlock.find('[data-emoji=thumbsdown]').parent();
+        awardsHandler.addAward($votesBlock, awardUrl, 'thumbsup', false);
+        expect($thumbsUpEmoji.hasClass('active')).toBe(true);
+        expect($thumbsDownEmoji.hasClass('active')).toBe(false);
+        $thumbsUpEmoji.tooltip();
+        $thumbsDownEmoji.tooltip();
+        awardsHandler.addAward($votesBlock, awardUrl, 'thumbsdown', true);
+        expect($thumbsUpEmoji.hasClass('active')).toBe(false);
+        return expect($thumbsDownEmoji.hasClass('active')).toBe(true);
+      });
+    });
+    describe('::removeEmoji', function() {
+      return it('should remove emoji', function() {
+        var $votesBlock, awardUrl;
+        awardUrl = awardsHandler.getAwardUrl();
+        $votesBlock = $('.js-awards-block').eq(0);
+        awardsHandler.addAward($votesBlock, awardUrl, 'fire', false);
+        expect($votesBlock.find('[data-emoji=fire]').length).toBe(1);
+        awardsHandler.removeEmoji($votesBlock.find('[data-emoji=fire]').closest('button'));
+        return expect($votesBlock.find('[data-emoji=fire]').length).toBe(0);
+      });
+    });
+    describe('search', function() {
+      return it('should filter the emoji', function() {
+        $('.js-add-award').eq(0).click();
+        expect($('[data-emoji=angel]').is(':visible')).toBe(true);
+        expect($('[data-emoji=anger]').is(':visible')).toBe(true);
+        $('#emoji_search').val('ali').trigger('keyup');
+        expect($('[data-emoji=angel]').is(':visible')).toBe(false);
+        expect($('[data-emoji=anger]').is(':visible')).toBe(false);
+        return expect($('[data-emoji=alien]').is(':visible')).toBe(true);
+      });
+    });
+    return describe('emoji menu', function() {
+      var openEmojiMenuAndAddEmoji, selector;
+      selector = '[data-emoji=sunglasses]';
+      openEmojiMenuAndAddEmoji = function() {
+        var $block, $emoji, $menu;
+        $('.js-add-award').eq(0).click();
+        $menu = $('.emoji-menu');
+        $block = $('.js-awards-block');
+        $emoji = $menu.find(".emoji-menu-list-item " + selector);
+        expect($emoji.length).toBe(1);
+        expect($block.find(selector).length).toBe(0);
+        $emoji.click();
+        expect($menu.hasClass('.is-visible')).toBe(false);
+        return expect($block.find(selector).length).toBe(1);
+      };
+      it('should add selected emoji to awards block', function() {
+        return openEmojiMenuAndAddEmoji();
+      });
+      return it('should remove already selected emoji', function() {
+        var $block, $emoji;
+        openEmojiMenuAndAddEmoji();
+        $('.js-add-award').eq(0).click();
+        $block = $('.js-awards-block');
+        $emoji = $('.emoji-menu').find(".emoji-menu-list-item " + selector);
+        $emoji.click();
+        return expect($block.find(selector).length).toBe(0);
+      });
+    });
+  });
+
+}).call(this);
diff --git a/spec/javascripts/awards_handler_spec.js.coffee b/spec/javascripts/awards_handler_spec.js.coffee
deleted file mode 100644
index d7f9c6fc076..00000000000
--- a/spec/javascripts/awards_handler_spec.js.coffee
+++ /dev/null
@@ -1,200 +0,0 @@
-#= require awards_handler
-#= require jquery
-#= require jquery.cookie
-#= require ./fixtures/emoji_menu
-
-awardsHandler      = null
-window.gl        or= {}
-window.gon       or= {}
-gl.emojiAliases    = -> return { '+1': 'thumbsup', '-1': 'thumbsdown' }
-gon.award_menu_url = '/emojis'
-
-
-lazyAssert = (done, assertFn) ->
-
-  setTimeout -> # Maybe jasmine.clock here?
-    assertFn()
-    done()
-  , 333
-
-
-describe 'AwardsHandler', ->
-
-  fixture.preload 'awards_handler.html'
-
-  beforeEach ->
-    fixture.load 'awards_handler.html'
-    awardsHandler = new AwardsHandler
-    spyOn(awardsHandler, 'postEmoji').and.callFake (url, emoji, cb) => cb()
-    spyOn(jQuery, 'get').and.callFake (req, cb) -> cb window.emojiMenu
-
-
-  describe '::showEmojiMenu', ->
-
-    it 'should show emoji menu when Add emoji button clicked', (done) ->
-
-      $('.js-add-award').eq(0).click()
-
-      lazyAssert done, ->
-        $emojiMenu = $ '.emoji-menu'
-        expect($emojiMenu.length).toBe 1
-        expect($emojiMenu.hasClass('is-visible')).toBe yes
-        expect($emojiMenu.find('#emoji_search').length).toBe 1
-        expect($('.js-awards-block.current').length).toBe 1
-
-
-    it 'should also show emoji menu for the smiley icon in notes', (done) ->
-
-      $('.note-action-button').click()
-
-      lazyAssert done, ->
-        $emojiMenu = $ '.emoji-menu'
-        expect($emojiMenu.length).toBe 1
-
-
-    it 'should remove emoji menu when body is clicked', (done) ->
-
-      $('.js-add-award').eq(0).click()
-
-      lazyAssert done, ->
-        $emojiMenu = $('.emoji-menu')
-        $('body').click()
-        expect($emojiMenu.length).toBe 1
-        expect($emojiMenu.hasClass('is-visible')).toBe no
-        expect($('.js-awards-block.current').length).toBe 0
-
-
-  describe '::addAwardToEmojiBar', ->
-
-    it 'should add emoji to votes block', ->
-
-      $votesBlock = $('.js-awards-block').eq 0
-      awardsHandler.addAwardToEmojiBar $votesBlock, 'heart', no
-
-      $emojiButton = $votesBlock.find '[data-emoji=heart]'
-
-      expect($emojiButton.length).toBe 1
-      expect($emojiButton.next('.js-counter').text()).toBe '1'
-      expect($votesBlock.hasClass('hidden')).toBe no
-
-
-    it 'should remove the emoji when we click again', ->
-
-      $votesBlock = $('.js-awards-block').eq 0
-      awardsHandler.addAwardToEmojiBar $votesBlock, 'heart', no
-      awardsHandler.addAwardToEmojiBar $votesBlock, 'heart', no
-      $emojiButton = $votesBlock.find '[data-emoji=heart]'
-
-      expect($emojiButton.length).toBe 0
-
-
-    it 'should decrement the emoji counter', ->
-
-      $votesBlock = $('.js-awards-block').eq 0
-      awardsHandler.addAwardToEmojiBar $votesBlock, 'heart', no
-
-      $emojiButton = $votesBlock.find '[data-emoji=heart]'
-      $emojiButton.next('.js-counter').text 5
-
-      awardsHandler.addAwardToEmojiBar $votesBlock, 'heart', no
-
-      expect($emojiButton.length).toBe 1
-      expect($emojiButton.next('.js-counter').text()).toBe '4'
-
-
-  describe '::getAwardUrl', ->
-
-    it 'should return the url for request', ->
-
-      expect(awardsHandler.getAwardUrl()).toBe '/gitlab-org/gitlab-test/issues/8/toggle_award_emoji'
-
-
-  describe '::addAward and ::checkMutuality', ->
-
-    it 'should handle :+1: and :-1: mutuality', ->
-
-      awardUrl         = awardsHandler.getAwardUrl()
-      $votesBlock      = $('.js-awards-block').eq 0
-      $thumbsUpEmoji   = $votesBlock.find('[data-emoji=thumbsup]').parent()
-      $thumbsDownEmoji = $votesBlock.find('[data-emoji=thumbsdown]').parent()
-
-      awardsHandler.addAward $votesBlock, awardUrl, 'thumbsup', no
-
-      expect($thumbsUpEmoji.hasClass('active')).toBe yes
-      expect($thumbsDownEmoji.hasClass('active')).toBe no
-
-      $thumbsUpEmoji.tooltip()
-      $thumbsDownEmoji.tooltip()
-
-      awardsHandler.addAward $votesBlock, awardUrl, 'thumbsdown', yes
-
-      expect($thumbsUpEmoji.hasClass('active')).toBe no
-      expect($thumbsDownEmoji.hasClass('active')).toBe yes
-
-
-  describe '::removeEmoji', ->
-
-    it 'should remove emoji', ->
-
-      awardUrl    = awardsHandler.getAwardUrl()
-      $votesBlock = $('.js-awards-block').eq 0
-
-      awardsHandler.addAward $votesBlock, awardUrl, 'fire',  no
-      expect($votesBlock.find('[data-emoji=fire]').length).toBe  1
-
-      awardsHandler.removeEmoji $votesBlock.find('[data-emoji=fire]').closest('button')
-      expect($votesBlock.find('[data-emoji=fire]').length).toBe  0
-
-
-  describe 'search', ->
-
-    it 'should filter the emoji', ->
-
-      $('.js-add-award').eq(0).click()
-
-      expect($('[data-emoji=angel]').is(':visible')).toBe yes
-      expect($('[data-emoji=anger]').is(':visible')).toBe yes
-
-      $('#emoji_search').val('ali').trigger 'keyup'
-
-      expect($('[data-emoji=angel]').is(':visible')).toBe no
-      expect($('[data-emoji=anger]').is(':visible')).toBe no
-      expect($('[data-emoji=alien]').is(':visible')).toBe yes
-
-
-  describe 'emoji menu', ->
-
-    selector = '[data-emoji=sunglasses]'
-
-    openEmojiMenuAndAddEmoji = ->
-
-      $('.js-add-award').eq(0).click()
-
-      $menu  = $ '.emoji-menu'
-      $block = $ '.js-awards-block'
-      $emoji = $menu.find ".emoji-menu-list-item #{selector}"
-
-      expect($emoji.length).toBe 1
-      expect($block.find(selector).length).toBe 0
-
-      $emoji.click()
-
-      expect($menu.hasClass('.is-visible')).toBe no
-      expect($block.find(selector).length).toBe 1
-
-
-    it 'should add selected emoji to awards block', ->
-
-      openEmojiMenuAndAddEmoji()
-
-
-    it 'should remove already selected emoji', ->
-
-      openEmojiMenuAndAddEmoji()
-      $('.js-add-award').eq(0).click()
-
-      $block = $ '.js-awards-block'
-      $emoji = $('.emoji-menu').find ".emoji-menu-list-item #{selector}"
-
-      $emoji.click()
-      expect($block.find(selector).length).toBe 0
diff --git a/spec/javascripts/behaviors/autosize_spec.js b/spec/javascripts/behaviors/autosize_spec.js
new file mode 100644
index 00000000000..78795f7654a
--- /dev/null
+++ b/spec/javascripts/behaviors/autosize_spec.js
@@ -0,0 +1,21 @@
+
+/*= require behaviors/autosize */
+
+(function() {
+  describe('Autosize behavior', function() {
+    var load;
+    beforeEach(function() {
+      return fixture.set('<textarea class="js-autosize" style="resize: vertical"></textarea>');
+    });
+    it('does not overwrite the resize property', function() {
+      load();
+      return expect($('textarea')).toHaveCss({
+        resize: 'vertical'
+      });
+    });
+    return load = function() {
+      return $(document).trigger('page:load');
+    };
+  });
+
+}).call(this);
diff --git a/spec/javascripts/behaviors/autosize_spec.js.coffee b/spec/javascripts/behaviors/autosize_spec.js.coffee
deleted file mode 100644
index 7fc1d19c35f..00000000000
--- a/spec/javascripts/behaviors/autosize_spec.js.coffee
+++ /dev/null
@@ -1,11 +0,0 @@
-#= require behaviors/autosize
-
-describe 'Autosize behavior', ->
-  beforeEach ->
-    fixture.set('<textarea class="js-autosize" style="resize: vertical"></textarea>')
-
-  it 'does not overwrite the resize property', ->
-    load()
-    expect($('textarea')).toHaveCss(resize: 'vertical')
-
-  load = -> $(document).trigger('page:load')
diff --git a/spec/javascripts/behaviors/quick_submit_spec.js b/spec/javascripts/behaviors/quick_submit_spec.js
new file mode 100644
index 00000000000..4c52ecd903d
--- /dev/null
+++ b/spec/javascripts/behaviors/quick_submit_spec.js
@@ -0,0 +1,93 @@
+
+/*= require behaviors/quick_submit */
+
+(function() {
+  describe('Quick Submit behavior', function() {
+    var keydownEvent;
+    fixture.preload('behaviors/quick_submit.html');
+    beforeEach(function() {
+      fixture.load('behaviors/quick_submit.html');
+      $('form').submit(function(e) {
+        return e.preventDefault();
+      });
+      return this.spies = {
+        submit: spyOnEvent('form', 'submit')
+      };
+    });
+    it('does not respond to other keyCodes', function() {
+      $('input.quick-submit-input').trigger(keydownEvent({
+        keyCode: 32
+      }));
+      return expect(this.spies.submit).not.toHaveBeenTriggered();
+    });
+    it('does not respond to Enter alone', function() {
+      $('input.quick-submit-input').trigger(keydownEvent({
+        ctrlKey: false,
+        metaKey: false
+      }));
+      return expect(this.spies.submit).not.toHaveBeenTriggered();
+    });
+    it('does not respond to repeated events', function() {
+      $('input.quick-submit-input').trigger(keydownEvent({
+        repeat: true
+      }));
+      return expect(this.spies.submit).not.toHaveBeenTriggered();
+    });
+    it('disables submit buttons', function() {
+      $('textarea').trigger(keydownEvent());
+      expect($('input[type=submit]')).toBeDisabled();
+      return expect($('button[type=submit]')).toBeDisabled();
+    });
+    if (navigator.userAgent.match(/Macintosh/)) {
+      it('responds to Meta+Enter', function() {
+        $('input.quick-submit-input').trigger(keydownEvent());
+        return expect(this.spies.submit).toHaveBeenTriggered();
+      });
+      it('excludes other modifier keys', function() {
+        $('input.quick-submit-input').trigger(keydownEvent({
+          altKey: true
+        }));
+        $('input.quick-submit-input').trigger(keydownEvent({
+          ctrlKey: true
+        }));
+        $('input.quick-submit-input').trigger(keydownEvent({
+          shiftKey: true
+        }));
+        return expect(this.spies.submit).not.toHaveBeenTriggered();
+      });
+    } else {
+      it('responds to Ctrl+Enter', function() {
+        $('input.quick-submit-input').trigger(keydownEvent());
+        return expect(this.spies.submit).toHaveBeenTriggered();
+      });
+      it('excludes other modifier keys', function() {
+        $('input.quick-submit-input').trigger(keydownEvent({
+          altKey: true
+        }));
+        $('input.quick-submit-input').trigger(keydownEvent({
+          metaKey: true
+        }));
+        $('input.quick-submit-input').trigger(keydownEvent({
+          shiftKey: true
+        }));
+        return expect(this.spies.submit).not.toHaveBeenTriggered();
+      });
+    }
+    return keydownEvent = function(options) {
+      var defaults;
+      if (navigator.userAgent.match(/Macintosh/)) {
+        defaults = {
+          keyCode: 13,
+          metaKey: true
+        };
+      } else {
+        defaults = {
+          keyCode: 13,
+          ctrlKey: true
+        };
+      }
+      return $.Event('keydown', $.extend({}, defaults, options));
+    };
+  });
+
+}).call(this);
diff --git a/spec/javascripts/behaviors/quick_submit_spec.js.coffee b/spec/javascripts/behaviors/quick_submit_spec.js.coffee
deleted file mode 100644
index d3b003a328a..00000000000
--- a/spec/javascripts/behaviors/quick_submit_spec.js.coffee
+++ /dev/null
@@ -1,70 +0,0 @@
-#= require behaviors/quick_submit
-
-describe 'Quick Submit behavior', ->
-  fixture.preload('behaviors/quick_submit.html')
-
-  beforeEach ->
-    fixture.load('behaviors/quick_submit.html')
-
-    # Prevent a form submit from moving us off the testing page
-    $('form').submit (e) -> e.preventDefault()
-
-    @spies = {
-      submit: spyOnEvent('form', 'submit')
-    }
-
-  it 'does not respond to other keyCodes', ->
-    $('input.quick-submit-input').trigger(keydownEvent(keyCode: 32))
-
-    expect(@spies.submit).not.toHaveBeenTriggered()
-
-  it 'does not respond to Enter alone', ->
-    $('input.quick-submit-input').trigger(keydownEvent(ctrlKey: false, metaKey: false))
-
-    expect(@spies.submit).not.toHaveBeenTriggered()
-
-  it 'does not respond to repeated events', ->
-    $('input.quick-submit-input').trigger(keydownEvent(repeat: true))
-
-    expect(@spies.submit).not.toHaveBeenTriggered()
-
-  it 'disables submit buttons', ->
-    $('textarea').trigger(keydownEvent())
-
-    expect($('input[type=submit]')).toBeDisabled()
-    expect($('button[type=submit]')).toBeDisabled()
-
-  # We cannot stub `navigator.userAgent` for CI's `rake teaspoon` task, so we'll
-  # only run the tests that apply to the current platform
-  if navigator.userAgent.match(/Macintosh/)
-    it 'responds to Meta+Enter', ->
-      $('input.quick-submit-input').trigger(keydownEvent())
-
-      expect(@spies.submit).toHaveBeenTriggered()
-
-    it 'excludes other modifier keys', ->
-      $('input.quick-submit-input').trigger(keydownEvent(altKey: true))
-      $('input.quick-submit-input').trigger(keydownEvent(ctrlKey: true))
-      $('input.quick-submit-input').trigger(keydownEvent(shiftKey: true))
-
-      expect(@spies.submit).not.toHaveBeenTriggered()
-  else
-    it 'responds to Ctrl+Enter', ->
-      $('input.quick-submit-input').trigger(keydownEvent())
-
-      expect(@spies.submit).toHaveBeenTriggered()
-
-    it 'excludes other modifier keys', ->
-      $('input.quick-submit-input').trigger(keydownEvent(altKey: true))
-      $('input.quick-submit-input').trigger(keydownEvent(metaKey: true))
-      $('input.quick-submit-input').trigger(keydownEvent(shiftKey: true))
-
-      expect(@spies.submit).not.toHaveBeenTriggered()
-
-  keydownEvent = (options) ->
-    if navigator.userAgent.match(/Macintosh/)
-      defaults = { keyCode: 13, metaKey: true }
-    else
-      defaults = { keyCode: 13, ctrlKey: true }
-
-    $.Event('keydown', $.extend({}, defaults, options))
diff --git a/spec/javascripts/behaviors/requires_input_spec.js b/spec/javascripts/behaviors/requires_input_spec.js
new file mode 100644
index 00000000000..724c3baf989
--- /dev/null
+++ b/spec/javascripts/behaviors/requires_input_spec.js
@@ -0,0 +1,44 @@
+
+/*= require behaviors/requires_input */
+
+(function() {
+  describe('requiresInput', function() {
+    fixture.preload('behaviors/requires_input.html');
+    beforeEach(function() {
+      return fixture.load('behaviors/requires_input.html');
+    });
+    it('disables submit when any field is required', function() {
+      $('.js-requires-input').requiresInput();
+      return expect($('.submit')).toBeDisabled();
+    });
+    it('enables submit when no field is required', function() {
+      $('*[required=required]').removeAttr('required');
+      $('.js-requires-input').requiresInput();
+      return expect($('.submit')).not.toBeDisabled();
+    });
+    it('enables submit when all required fields are pre-filled', function() {
+      $('*[required=required]').remove();
+      $('.js-requires-input').requiresInput();
+      return expect($('.submit')).not.toBeDisabled();
+    });
+    it('enables submit when all required fields receive input', function() {
+      $('.js-requires-input').requiresInput();
+      $('#required1').val('input1').change();
+      expect($('.submit')).toBeDisabled();
+      $('#optional1').val('input1').change();
+      expect($('.submit')).toBeDisabled();
+      $('#required2').val('input2').change();
+      $('#required3').val('input3').change();
+      $('#required4').val('input4').change();
+      $('#required5').val('1').change();
+      return expect($('.submit')).not.toBeDisabled();
+    });
+    return it('is called on page:load event', function() {
+      var spy;
+      spy = spyOn($.fn, 'requiresInput');
+      $(document).trigger('page:load');
+      return expect(spy).toHaveBeenCalled();
+    });
+  });
+
+}).call(this);
diff --git a/spec/javascripts/behaviors/requires_input_spec.js.coffee b/spec/javascripts/behaviors/requires_input_spec.js.coffee
deleted file mode 100644
index 61a17632173..00000000000
--- a/spec/javascripts/behaviors/requires_input_spec.js.coffee
+++ /dev/null
@@ -1,49 +0,0 @@
-#= require behaviors/requires_input
-
-describe 'requiresInput', ->
-  fixture.preload('behaviors/requires_input.html')
-
-  beforeEach ->
-    fixture.load('behaviors/requires_input.html')
-
-  it 'disables submit when any field is required', ->
-    $('.js-requires-input').requiresInput()
-
-    expect($('.submit')).toBeDisabled()
-
-  it 'enables submit when no field is required', ->
-    $('*[required=required]').removeAttr('required')
-
-    $('.js-requires-input').requiresInput()
-
-    expect($('.submit')).not.toBeDisabled()
-
-  it 'enables submit when all required fields are pre-filled', ->
-    $('*[required=required]').remove()
-
-    $('.js-requires-input').requiresInput()
-
-    expect($('.submit')).not.toBeDisabled()
-
-  it 'enables submit when all required fields receive input', ->
-    $('.js-requires-input').requiresInput()
-
-    $('#required1').val('input1').change()
-    expect($('.submit')).toBeDisabled()
-
-    $('#optional1').val('input1').change()
-    expect($('.submit')).toBeDisabled()
-
-    $('#required2').val('input2').change()
-    $('#required3').val('input3').change()
-    $('#required4').val('input4').change()
-    $('#required5').val('1').change()
-
-    expect($('.submit')).not.toBeDisabled()
-
-  it 'is called on page:load event', ->
-    spy = spyOn($.fn, 'requiresInput')
-
-    $(document).trigger('page:load')
-
-    expect(spy).toHaveBeenCalled()
diff --git a/spec/javascripts/extensions/array_spec.js b/spec/javascripts/extensions/array_spec.js
new file mode 100644
index 00000000000..eced2f6575d
--- /dev/null
+++ b/spec/javascripts/extensions/array_spec.js
@@ -0,0 +1,22 @@
+
+/*= require extensions/array */
+
+(function() {
+  describe('Array extensions', function() {
+    describe('first', function() {
+      return it('returns the first item', function() {
+        var arr;
+        arr = [0, 1, 2, 3, 4, 5];
+        return expect(arr.first()).toBe(0);
+      });
+    });
+    return describe('last', function() {
+      return it('returns the last item', function() {
+        var arr;
+        arr = [0, 1, 2, 3, 4, 5];
+        return expect(arr.last()).toBe(5);
+      });
+    });
+  });
+
+}).call(this);
diff --git a/spec/javascripts/extensions/array_spec.js.coffee b/spec/javascripts/extensions/array_spec.js.coffee
deleted file mode 100644
index 4ceac619422..00000000000
--- a/spec/javascripts/extensions/array_spec.js.coffee
+++ /dev/null
@@ -1,12 +0,0 @@
-#= require extensions/array
-
-describe 'Array extensions', ->
-  describe 'first', ->
-    it 'returns the first item', ->
-      arr = [0, 1, 2, 3, 4, 5]
-      expect(arr.first()).toBe(0)
-
-  describe 'last', ->
-    it 'returns the last item', ->
-      arr = [0, 1, 2, 3, 4, 5]
-      expect(arr.last()).toBe(5)
diff --git a/spec/javascripts/extensions/jquery_spec.js b/spec/javascripts/extensions/jquery_spec.js
new file mode 100644
index 00000000000..b644344b95a
--- /dev/null
+++ b/spec/javascripts/extensions/jquery_spec.js
@@ -0,0 +1,42 @@
+
+/*= require extensions/jquery */
+
+(function() {
+  describe('jQuery extensions', function() {
+    describe('disable', function() {
+      beforeEach(function() {
+        return fixture.set('<input type="text" />');
+      });
+      it('adds the disabled attribute', function() {
+        var $input;
+        $input = $('input').first();
+        $input.disable();
+        return expect($input).toHaveAttr('disabled', 'disabled');
+      });
+      return it('adds the disabled class', function() {
+        var $input;
+        $input = $('input').first();
+        $input.disable();
+        return expect($input).toHaveClass('disabled');
+      });
+    });
+    return describe('enable', function() {
+      beforeEach(function() {
+        return fixture.set('<input type="text" disabled="disabled" class="disabled" />');
+      });
+      it('removes the disabled attribute', function() {
+        var $input;
+        $input = $('input').first();
+        $input.enable();
+        return expect($input).not.toHaveAttr('disabled');
+      });
+      return it('removes the disabled class', function() {
+        var $input;
+        $input = $('input').first();
+        $input.enable();
+        return expect($input).not.toHaveClass('disabled');
+      });
+    });
+  });
+
+}).call(this);
diff --git a/spec/javascripts/extensions/jquery_spec.js.coffee b/spec/javascripts/extensions/jquery_spec.js.coffee
deleted file mode 100644
index b10e16b7d01..00000000000
--- a/spec/javascripts/extensions/jquery_spec.js.coffee
+++ /dev/null
@@ -1,34 +0,0 @@
-#= require extensions/jquery
-
-describe 'jQuery extensions', ->
-  describe 'disable', ->
-    beforeEach ->
-      fixture.set '<input type="text" />'
-
-    it 'adds the disabled attribute', ->
-      $input = $('input').first()
-
-      $input.disable()
-      expect($input).toHaveAttr('disabled', 'disabled')
-
-    it 'adds the disabled class', ->
-      $input = $('input').first()
-
-      $input.disable()
-      expect($input).toHaveClass('disabled')
-
-  describe 'enable', ->
-    beforeEach ->
-      fixture.set '<input type="text" disabled="disabled" class="disabled" />'
-
-    it 'removes the disabled attribute', ->
-      $input = $('input').first()
-
-      $input.enable()
-      expect($input).not.toHaveAttr('disabled')
-
-    it 'removes the disabled class', ->
-      $input = $('input').first()
-
-      $input.enable()
-      expect($input).not.toHaveClass('disabled')
diff --git a/spec/javascripts/fixtures/emoji_menu.coffee b/spec/javascripts/fixtures/emoji_menu.coffee
deleted file mode 100644
index ce1a41390d2..00000000000
--- a/spec/javascripts/fixtures/emoji_menu.coffee
+++ /dev/null
@@ -1,957 +0,0 @@
-window.emojiMenu = """
-  <div class='emoji-menu'>
-    <input type="text" name="emoji_search" id="emoji_search" value="" class="emoji-search search-input form-control" />
-    <div class='emoji-menu-content'>
-      <h5 class='emoji-menu-title'>
-      Emoticons
-      </h5>
-      <ul class='clearfix emoji-menu-list'>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F47D" title="alien" data-aliases="" data-emoji="alien" data-unicode-name="1F47D"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F47C" title="angel" data-aliases="" data-emoji="angel" data-unicode-name="1F47C"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F4A2" title="anger" data-aliases="" data-emoji="anger" data-unicode-name="1F4A2"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F620" title="angry" data-aliases="" data-emoji="angry" data-unicode-name="1F620"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F627" title="anguished" data-aliases="" data-emoji="anguished" data-unicode-name="1F627"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F632" title="astonished" data-aliases="" data-emoji="astonished" data-unicode-name="1F632"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F45F" title="athletic_shoe" data-aliases="" data-emoji="athletic_shoe" data-unicode-name="1F45F"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F476" title="baby" data-aliases="" data-emoji="baby" data-unicode-name="1F476"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F459" title="bikini" data-aliases="" data-emoji="bikini" data-unicode-name="1F459"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F499" title="blue_heart" data-aliases="" data-emoji="blue_heart" data-unicode-name="1F499"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F60A" title="blush" data-aliases="" data-emoji="blush" data-unicode-name="1F60A"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F4A5" title="boom" data-aliases="" data-emoji="boom" data-unicode-name="1F4A5"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F462" title="boot" data-aliases="" data-emoji="boot" data-unicode-name="1F462"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F647" title="bow" data-aliases="" data-emoji="bow" data-unicode-name="1F647"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F466" title="boy" data-aliases="" data-emoji="boy" data-unicode-name="1F466"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F470" title="bride_with_veil" data-aliases="" data-emoji="bride_with_veil" data-unicode-name="1F470"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F4BC" title="briefcase" data-aliases="" data-emoji="briefcase" data-unicode-name="1F4BC"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F494" title="broken_heart" data-aliases="" data-emoji="broken_heart" data-unicode-name="1F494"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F464" title="bust_in_silhouette" data-aliases="" data-emoji="bust_in_silhouette" data-unicode-name="1F464"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F465" title="busts_in_silhouette" data-aliases="" data-emoji="busts_in_silhouette" data-unicode-name="1F465"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F44F" title="clap" data-aliases="" data-emoji="clap" data-unicode-name="1F44F"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F302" title="closed_umbrella" data-aliases="" data-emoji="closed_umbrella" data-unicode-name="1F302"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F630" title="cold_sweat" data-aliases="" data-emoji="cold_sweat" data-unicode-name="1F630"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F616" title="confounded" data-aliases="" data-emoji="confounded" data-unicode-name="1F616"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F615" title="confused" data-aliases="" data-emoji="confused" data-unicode-name="1F615"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F477" title="construction_worker" data-aliases="" data-emoji="construction_worker" data-unicode-name="1F477"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F46E" title="cop" data-aliases="" data-emoji="cop" data-unicode-name="1F46E"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F46B" title="couple" data-aliases="" data-emoji="couple" data-unicode-name="1F46B"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F491" title="couple_with_heart" data-aliases="" data-emoji="couple_with_heart" data-unicode-name="1F491"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F48F" title="couplekiss" data-aliases="" data-emoji="couplekiss" data-unicode-name="1F48F"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F451" title="crown" data-aliases="" data-emoji="crown" data-unicode-name="1F451"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F622" title="cry" data-aliases="" data-emoji="cry" data-unicode-name="1F622"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F63F" title="crying_cat_face" data-aliases="" data-emoji="crying_cat_face" data-unicode-name="1F63F"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F498" title="cupid" data-aliases="" data-emoji="cupid" data-unicode-name="1F498"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F483" title="dancer" data-aliases="" data-emoji="dancer" data-unicode-name="1F483"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F46F" title="dancers" data-aliases="" data-emoji="dancers" data-unicode-name="1F46F"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F4A8" title="dash" data-aliases="" data-emoji="dash" data-unicode-name="1F4A8"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F61E" title="disappointed" data-aliases="" data-emoji="disappointed" data-unicode-name="1F61E"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F625" title="disappointed_relieved" data-aliases="" data-emoji="disappointed_relieved" data-unicode-name="1F625"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F4AB" title="dizzy" data-aliases="" data-emoji="dizzy" data-unicode-name="1F4AB"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F635" title="dizzy_face" data-aliases="" data-emoji="dizzy_face" data-unicode-name="1F635"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F457" title="dress" data-aliases="" data-emoji="dress" data-unicode-name="1F457"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F4A7" title="droplet" data-aliases="" data-emoji="droplet" data-unicode-name="1F4A7"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F442" title="ear" data-aliases="" data-emoji="ear" data-unicode-name="1F442"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F611" title="expressionless" data-aliases="" data-emoji="expressionless" data-unicode-name="1F611"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F453" title="eyeglasses" data-aliases="" data-emoji="eyeglasses" data-unicode-name="1F453"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F440" title="eyes" data-aliases="" data-emoji="eyes" data-unicode-name="1F440"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F46A" title="family" data-aliases="" data-emoji="family" data-unicode-name="1F46A"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F628" title="fearful" data-aliases="" data-emoji="fearful" data-unicode-name="1F628"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F525" title="fire" data-aliases=":flame:" data-emoji="fire" data-unicode-name="1F525"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-270A" title="fist" data-aliases="" data-emoji="fist" data-unicode-name="270A"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F633" title="flushed" data-aliases="" data-emoji="flushed" data-unicode-name="1F633"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F463" title="footprints" data-aliases="" data-emoji="footprints" data-unicode-name="1F463"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F626" title="frowning" data-aliases=":anguished:" data-emoji="frowning" data-unicode-name="1F626"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F48E" title="gem" data-aliases="" data-emoji="gem" data-unicode-name="1F48E"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F467" title="girl" data-aliases="" data-emoji="girl" data-unicode-name="1F467"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F49A" title="green_heart" data-aliases="" data-emoji="green_heart" data-unicode-name="1F49A"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F62C" title="grimacing" data-aliases="" data-emoji="grimacing" data-unicode-name="1F62C"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F601" title="grin" data-aliases="" data-emoji="grin" data-unicode-name="1F601"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F600" title="grinning" data-aliases="" data-emoji="grinning" data-unicode-name="1F600"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F482" title="guardsman" data-aliases="" data-emoji="guardsman" data-unicode-name="1F482"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F487" title="haircut" data-aliases="" data-emoji="haircut" data-unicode-name="1F487"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F45C" title="handbag" data-aliases="" data-emoji="handbag" data-unicode-name="1F45C"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F649" title="hear_no_evil" data-aliases="" data-emoji="hear_no_evil" data-unicode-name="1F649"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-2764" title="heart" data-aliases="" data-emoji="heart" data-unicode-name="2764"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F60D" title="heart_eyes" data-aliases="" data-emoji="heart_eyes" data-unicode-name="1F60D"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F63B" title="heart_eyes_cat" data-aliases="" data-emoji="heart_eyes_cat" data-unicode-name="1F63B"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F493" title="heartbeat" data-aliases="" data-emoji="heartbeat" data-unicode-name="1F493"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F497" title="heartpulse" data-aliases="" data-emoji="heartpulse" data-unicode-name="1F497"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F460" title="high_heel" data-aliases="" data-emoji="high_heel" data-unicode-name="1F460"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F62F" title="hushed" data-aliases="" data-emoji="hushed" data-unicode-name="1F62F"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F47F" title="imp" data-aliases="" data-emoji="imp" data-unicode-name="1F47F"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F481" title="information_desk_person" data-aliases="" data-emoji="information_desk_person" data-unicode-name="1F481"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F607" title="innocent" data-aliases="" data-emoji="innocent" data-unicode-name="1F607"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F47A" title="japanese_goblin" data-aliases="" data-emoji="japanese_goblin" data-unicode-name="1F47A"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F479" title="japanese_ogre" data-aliases="" data-emoji="japanese_ogre" data-unicode-name="1F479"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F456" title="jeans" data-aliases="" data-emoji="jeans" data-unicode-name="1F456"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F602" title="joy" data-aliases="" data-emoji="joy" data-unicode-name="1F602"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F639" title="joy_cat" data-aliases="" data-emoji="joy_cat" data-unicode-name="1F639"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F458" title="kimono" data-aliases="" data-emoji="kimono" data-unicode-name="1F458"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F48B" title="kiss" data-aliases="" data-emoji="kiss" data-unicode-name="1F48B"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F617" title="kissing" data-aliases="" data-emoji="kissing" data-unicode-name="1F617"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F63D" title="kissing_cat" data-aliases="" data-emoji="kissing_cat" data-unicode-name="1F63D"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F61A" title="kissing_closed_eyes" data-aliases="" data-emoji="kissing_closed_eyes" data-unicode-name="1F61A"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F618" title="kissing_heart" data-aliases="" data-emoji="kissing_heart" data-unicode-name="1F618"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F619" title="kissing_smiling_eyes" data-aliases="" data-emoji="kissing_smiling_eyes" data-unicode-name="1F619"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F606" title="laughing" data-aliases=":satisfied:" data-emoji="laughing" data-unicode-name="1F606"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F444" title="lips" data-aliases="" data-emoji="lips" data-unicode-name="1F444"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F484" title="lipstick" data-aliases="" data-emoji="lipstick" data-unicode-name="1F484"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F48C" title="love_letter" data-aliases="" data-emoji="love_letter" data-unicode-name="1F48C"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F468" title="man" data-aliases="" data-emoji="man" data-unicode-name="1F468"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F472" title="man_with_gua_pi_mao" data-aliases="" data-emoji="man_with_gua_pi_mao" data-unicode-name="1F472"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F473" title="man_with_turban" data-aliases="" data-emoji="man_with_turban" data-unicode-name="1F473"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F45E" title="mans_shoe" data-aliases="" data-emoji="mans_shoe" data-unicode-name="1F45E"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F637" title="mask" data-aliases="" data-emoji="mask" data-unicode-name="1F637"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F486" title="massage" data-aliases="" data-emoji="massage" data-unicode-name="1F486"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F4AA" title="muscle" data-aliases="" data-emoji="muscle" data-unicode-name="1F4AA"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F485" title="nail_care" data-aliases="" data-emoji="nail_care" data-unicode-name="1F485"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F454" title="necktie" data-aliases="" data-emoji="necktie" data-unicode-name="1F454"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F610" title="neutral_face" data-aliases="" data-emoji="neutral_face" data-unicode-name="1F610"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F645" title="no_good" data-aliases="" data-emoji="no_good" data-unicode-name="1F645"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F636" title="no_mouth" data-aliases="" data-emoji="no_mouth" data-unicode-name="1F636"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F443" title="nose" data-aliases="" data-emoji="nose" data-unicode-name="1F443"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F44C" title="ok_hand" data-aliases="" data-emoji="ok_hand" data-unicode-name="1F44C"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F646" title="ok_woman" data-aliases="" data-emoji="ok_woman" data-unicode-name="1F646"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F474" title="older_man" data-aliases="" data-emoji="older_man" data-unicode-name="1F474"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F475" title="older_woman" data-aliases=":grandma:" data-emoji="older_woman" data-unicode-name="1F475"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F450" title="open_hands" data-aliases="" data-emoji="open_hands" data-unicode-name="1F450"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F62E" title="open_mouth" data-aliases="" data-emoji="open_mouth" data-unicode-name="1F62E"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F614" title="pensive" data-aliases="" data-emoji="pensive" data-unicode-name="1F614"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F623" title="persevere" data-aliases="" data-emoji="persevere" data-unicode-name="1F623"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F64D" title="person_frowning" data-aliases="" data-emoji="person_frowning" data-unicode-name="1F64D"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F471" title="person_with_blond_hair" data-aliases="" data-emoji="person_with_blond_hair" data-unicode-name="1F471"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F64E" title="person_with_pouting_face" data-aliases="" data-emoji="person_with_pouting_face" data-unicode-name="1F64E"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F447" title="point_down" data-aliases="" data-emoji="point_down" data-unicode-name="1F447"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F448" title="point_left" data-aliases="" data-emoji="point_left" data-unicode-name="1F448"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F449" title="point_right" data-aliases="" data-emoji="point_right" data-unicode-name="1F449"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-261D" title="point_up" data-aliases="" data-emoji="point_up" data-unicode-name="261D"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F446" title="point_up_2" data-aliases="" data-emoji="point_up_2" data-unicode-name="1F446"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F4A9" title="poop" data-aliases=":shit: :hankey: :poo:" data-emoji="poop" data-unicode-name="1F4A9"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F45D" title="pouch" data-aliases="" data-emoji="pouch" data-unicode-name="1F45D"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F63E" title="pouting_cat" data-aliases="" data-emoji="pouting_cat" data-unicode-name="1F63E"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F64F" title="pray" data-aliases="" data-emoji="pray" data-unicode-name="1F64F"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F478" title="princess" data-aliases="" data-emoji="princess" data-unicode-name="1F478"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F44A" title="punch" data-aliases="" data-emoji="punch" data-unicode-name="1F44A"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F49C" title="purple_heart" data-aliases="" data-emoji="purple_heart" data-unicode-name="1F49C"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F45B" title="purse" data-aliases="" data-emoji="purse" data-unicode-name="1F45B"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F621" title="rage" data-aliases="" data-emoji="rage" data-unicode-name="1F621"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-270B" title="raised_hand" data-aliases="" data-emoji="raised_hand" data-unicode-name="270B"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F64C" title="raised_hands" data-aliases="" data-emoji="raised_hands" data-unicode-name="1F64C"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F64B" title="raising_hand" data-aliases="" data-emoji="raising_hand" data-unicode-name="1F64B"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-263A" title="relaxed" data-aliases="" data-emoji="relaxed" data-unicode-name="263A"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F60C" title="relieved" data-aliases="" data-emoji="relieved" data-unicode-name="1F60C"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F49E" title="revolving_hearts" data-aliases="" data-emoji="revolving_hearts" data-unicode-name="1F49E"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F380" title="ribbon" data-aliases="" data-emoji="ribbon" data-unicode-name="1F380"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F48D" title="ring" data-aliases="" data-emoji="ring" data-unicode-name="1F48D"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F3C3" title="runner" data-aliases="" data-emoji="runner" data-unicode-name="1F3C3"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F3BD" title="running_shirt_with_sash" data-aliases="" data-emoji="running_shirt_with_sash" data-unicode-name="1F3BD"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F461" title="sandal" data-aliases="" data-emoji="sandal" data-unicode-name="1F461"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F631" title="scream" data-aliases="" data-emoji="scream" data-unicode-name="1F631"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F640" title="scream_cat" data-aliases="" data-emoji="scream_cat" data-unicode-name="1F640"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F648" title="see_no_evil" data-aliases="" data-emoji="see_no_evil" data-unicode-name="1F648"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F455" title="shirt" data-aliases="" data-emoji="shirt" data-unicode-name="1F455"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F480" title="skull" data-aliases=":skeleton:" data-emoji="skull" data-unicode-name="1F480"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F634" title="sleeping" data-aliases="" data-emoji="sleeping" data-unicode-name="1F634"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F62A" title="sleepy" data-aliases="" data-emoji="sleepy" data-unicode-name="1F62A"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F604" title="smile" data-aliases="" data-emoji="smile" data-unicode-name="1F604"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F638" title="smile_cat" data-aliases="" data-emoji="smile_cat" data-unicode-name="1F638"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F603" title="smiley" data-aliases="" data-emoji="smiley" data-unicode-name="1F603"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F63A" title="smiley_cat" data-aliases="" data-emoji="smiley_cat" data-unicode-name="1F63A"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F608" title="smiling_imp" data-aliases="" data-emoji="smiling_imp" data-unicode-name="1F608"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F60F" title="smirk" data-aliases="" data-emoji="smirk" data-unicode-name="1F60F"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F63C" title="smirk_cat" data-aliases="" data-emoji="smirk_cat" data-unicode-name="1F63C"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F62D" title="sob" data-aliases="" data-emoji="sob" data-unicode-name="1F62D"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-2728" title="sparkles" data-aliases="" data-emoji="sparkles" data-unicode-name="2728"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F496" title="sparkling_heart" data-aliases="" data-emoji="sparkling_heart" data-unicode-name="1F496"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F64A" title="speak_no_evil" data-aliases="" data-emoji="speak_no_evil" data-unicode-name="1F64A"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F4AC" title="speech_balloon" data-aliases="" data-emoji="speech_balloon" data-unicode-name="1F4AC"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F31F" title="star2" data-aliases="" data-emoji="star2" data-unicode-name="1F31F"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F61B" title="stuck_out_tongue" data-aliases="" data-emoji="stuck_out_tongue" data-unicode-name="1F61B"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F61D" title="stuck_out_tongue_closed_eyes" data-aliases="" data-emoji="stuck_out_tongue_closed_eyes" data-unicode-name="1F61D"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F61C" title="stuck_out_tongue_winking_eye" data-aliases="" data-emoji="stuck_out_tongue_winking_eye" data-unicode-name="1F61C"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F60E" title="sunglasses" data-aliases="" data-emoji="sunglasses" data-unicode-name="1F60E"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F613" title="sweat" data-aliases="" data-emoji="sweat" data-unicode-name="1F613"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F4A6" title="sweat_drops" data-aliases="" data-emoji="sweat_drops" data-unicode-name="1F4A6"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F605" title="sweat_smile" data-aliases="" data-emoji="sweat_smile" data-unicode-name="1F605"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F4AD" title="thought_balloon" data-aliases="" data-emoji="thought_balloon" data-unicode-name="1F4AD"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F44E" title="thumbsdown" data-aliases=":-1:" data-emoji="thumbsdown" data-unicode-name="1F44E"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F44D" title="thumbsup" data-aliases=":+1:" data-emoji="thumbsup" data-unicode-name="1F44D"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F62B" title="tired_face" data-aliases="" data-emoji="tired_face" data-unicode-name="1F62B"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F445" title="tongue" data-aliases="" data-emoji="tongue" data-unicode-name="1F445"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F3A9" title="tophat" data-aliases="" data-emoji="tophat" data-unicode-name="1F3A9"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F624" title="triumph" data-aliases="" data-emoji="triumph" data-unicode-name="1F624"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F495" title="two_hearts" data-aliases="" data-emoji="two_hearts" data-unicode-name="1F495"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F46C" title="two_men_holding_hands" data-aliases="" data-emoji="two_men_holding_hands" data-unicode-name="1F46C"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F46D" title="two_women_holding_hands" data-aliases="" data-emoji="two_women_holding_hands" data-unicode-name="1F46D"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F612" title="unamused" data-aliases="" data-emoji="unamused" data-unicode-name="1F612"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-270C" title="v" data-aliases="" data-emoji="v" data-unicode-name="270C"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F6B6" title="walking" data-aliases="" data-emoji="walking" data-unicode-name="1F6B6"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F44B" title="wave" data-aliases="" data-emoji="wave" data-unicode-name="1F44B"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F629" title="weary" data-aliases="" data-emoji="weary" data-unicode-name="1F629"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F609" title="wink" data-aliases="" data-emoji="wink" data-unicode-name="1F609"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F469" title="woman" data-aliases="" data-emoji="woman" data-unicode-name="1F469"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F45A" title="womans_clothes" data-aliases="" data-emoji="womans_clothes" data-unicode-name="1F45A"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F452" title="womans_hat" data-aliases="" data-emoji="womans_hat" data-unicode-name="1F452"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F61F" title="worried" data-aliases="" data-emoji="worried" data-unicode-name="1F61F"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F49B" title="yellow_heart" data-aliases="" data-emoji="yellow_heart" data-unicode-name="1F49B"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F60B" title="yum" data-aliases="" data-emoji="yum" data-unicode-name="1F60B"></div>
-          </button>
-        </li>
-        <li class='pull-left text-center emoji-menu-list-item'>
-          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
-          <div class="icon emoji-icon emoji-1F4A4" title="zzz" data-aliases="" data-emoji="zzz" data-unicode-name="1F4A4"></div>
-          </button>
-        </li>
-      </ul>
-    </div>
-  </div>
-"""
diff --git a/spec/javascripts/fixtures/emoji_menu.js b/spec/javascripts/fixtures/emoji_menu.js
new file mode 100644
index 00000000000..99e3f7247bd
--- /dev/null
+++ b/spec/javascripts/fixtures/emoji_menu.js
@@ -0,0 +1,4 @@
+(function() {
+  window.emojiMenu = "<div class='emoji-menu'>\n  <input type=\"text\" name=\"emoji_search\" id=\"emoji_search\" value=\"\" class=\"emoji-search search-input form-control\" />\n  <div class='emoji-menu-content'>\n    <h5 class='emoji-menu-title'>\n    Emoticons\n    </h5>\n    <ul class='clearfix emoji-menu-list'>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F47D\" title=\"alien\" data-aliases=\"\" data-emoji=\"alien\" data-unicode-name=\"1F47D\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F47C\" title=\"angel\" data-aliases=\"\" data-emoji=\"angel\" data-unicode-name=\"1F47C\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F4A2\" title=\"anger\" data-aliases=\"\" data-emoji=\"anger\" data-unicode-name=\"1F4A2\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F620\" title=\"angry\" data-aliases=\"\" data-emoji=\"angry\" data-unicode-name=\"1F620\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F627\" title=\"anguished\" data-aliases=\"\" data-emoji=\"anguished\" data-unicode-name=\"1F627\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F632\" title=\"astonished\" data-aliases=\"\" data-emoji=\"astonished\" data-unicode-name=\"1F632\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F45F\" title=\"athletic_shoe\" data-aliases=\"\" data-emoji=\"athletic_shoe\" data-unicode-name=\"1F45F\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F476\" title=\"baby\" data-aliases=\"\" data-emoji=\"baby\" data-unicode-name=\"1F476\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F459\" title=\"bikini\" data-aliases=\"\" data-emoji=\"bikini\" data-unicode-name=\"1F459\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F499\" title=\"blue_heart\" data-aliases=\"\" data-emoji=\"blue_heart\" data-unicode-name=\"1F499\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F60A\" title=\"blush\" data-aliases=\"\" data-emoji=\"blush\" data-unicode-name=\"1F60A\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F4A5\" title=\"boom\" data-aliases=\"\" data-emoji=\"boom\" data-unicode-name=\"1F4A5\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F462\" title=\"boot\" data-aliases=\"\" data-emoji=\"boot\" data-unicode-name=\"1F462\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F647\" title=\"bow\" data-aliases=\"\" data-emoji=\"bow\" data-unicode-name=\"1F647\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F466\" title=\"boy\" data-aliases=\"\" data-emoji=\"boy\" data-unicode-name=\"1F466\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F470\" title=\"bride_with_veil\" data-aliases=\"\" data-emoji=\"bride_with_veil\" data-unicode-name=\"1F470\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F4BC\" title=\"briefcase\" data-aliases=\"\" data-emoji=\"briefcase\" data-unicode-name=\"1F4BC\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F494\" title=\"broken_heart\" data-aliases=\"\" data-emoji=\"broken_heart\" data-unicode-name=\"1F494\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F464\" title=\"bust_in_silhouette\" data-aliases=\"\" data-emoji=\"bust_in_silhouette\" data-unicode-name=\"1F464\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F465\" title=\"busts_in_silhouette\" data-aliases=\"\" data-emoji=\"busts_in_silhouette\" data-unicode-name=\"1F465\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F44F\" title=\"clap\" data-aliases=\"\" data-emoji=\"clap\" data-unicode-name=\"1F44F\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F302\" title=\"closed_umbrella\" data-aliases=\"\" data-emoji=\"closed_umbrella\" data-unicode-name=\"1F302\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F630\" title=\"cold_sweat\" data-aliases=\"\" data-emoji=\"cold_sweat\" data-unicode-name=\"1F630\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F616\" title=\"confounded\" data-aliases=\"\" data-emoji=\"confounded\" data-unicode-name=\"1F616\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F615\" title=\"confused\" data-aliases=\"\" data-emoji=\"confused\" data-unicode-name=\"1F615\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F477\" title=\"construction_worker\" data-aliases=\"\" data-emoji=\"construction_worker\" data-unicode-name=\"1F477\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F46E\" title=\"cop\" data-aliases=\"\" data-emoji=\"cop\" data-unicode-name=\"1F46E\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F46B\" title=\"couple\" data-aliases=\"\" data-emoji=\"couple\" data-unicode-name=\"1F46B\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F491\" title=\"couple_with_heart\" data-aliases=\"\" data-emoji=\"couple_with_heart\" data-unicode-name=\"1F491\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F48F\" title=\"couplekiss\" data-aliases=\"\" data-emoji=\"couplekiss\" data-unicode-name=\"1F48F\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F451\" title=\"crown\" data-aliases=\"\" data-emoji=\"crown\" data-unicode-name=\"1F451\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F622\" title=\"cry\" data-aliases=\"\" data-emoji=\"cry\" data-unicode-name=\"1F622\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F63F\" title=\"crying_cat_face\" data-aliases=\"\" data-emoji=\"crying_cat_face\" data-unicode-name=\"1F63F\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F498\" title=\"cupid\" data-aliases=\"\" data-emoji=\"cupid\" data-unicode-name=\"1F498\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F483\" title=\"dancer\" data-aliases=\"\" data-emoji=\"dancer\" data-unicode-name=\"1F483\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F46F\" title=\"dancers\" data-aliases=\"\" data-emoji=\"dancers\" data-unicode-name=\"1F46F\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F4A8\" title=\"dash\" data-aliases=\"\" data-emoji=\"dash\" data-unicode-name=\"1F4A8\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F61E\" title=\"disappointed\" data-aliases=\"\" data-emoji=\"disappointed\" data-unicode-name=\"1F61E\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F625\" title=\"disappointed_relieved\" data-aliases=\"\" data-emoji=\"disappointed_relieved\" data-unicode-name=\"1F625\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F4AB\" title=\"dizzy\" data-aliases=\"\" data-emoji=\"dizzy\" data-unicode-name=\"1F4AB\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F635\" title=\"dizzy_face\" data-aliases=\"\" data-emoji=\"dizzy_face\" data-unicode-name=\"1F635\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F457\" title=\"dress\" data-aliases=\"\" data-emoji=\"dress\" data-unicode-name=\"1F457\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F4A7\" title=\"droplet\" data-aliases=\"\" data-emoji=\"droplet\" data-unicode-name=\"1F4A7\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F442\" title=\"ear\" data-aliases=\"\" data-emoji=\"ear\" data-unicode-name=\"1F442\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F611\" title=\"expressionless\" data-aliases=\"\" data-emoji=\"expressionless\" data-unicode-name=\"1F611\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F453\" title=\"eyeglasses\" data-aliases=\"\" data-emoji=\"eyeglasses\" data-unicode-name=\"1F453\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F440\" title=\"eyes\" data-aliases=\"\" data-emoji=\"eyes\" data-unicode-name=\"1F440\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F46A\" title=\"family\" data-aliases=\"\" data-emoji=\"family\" data-unicode-name=\"1F46A\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F628\" title=\"fearful\" data-aliases=\"\" data-emoji=\"fearful\" data-unicode-name=\"1F628\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F525\" title=\"fire\" data-aliases=\":flame:\" data-emoji=\"fire\" data-unicode-name=\"1F525\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-270A\" title=\"fist\" data-aliases=\"\" data-emoji=\"fist\" data-unicode-name=\"270A\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F633\" title=\"flushed\" data-aliases=\"\" data-emoji=\"flushed\" data-unicode-name=\"1F633\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F463\" title=\"footprints\" data-aliases=\"\" data-emoji=\"footprints\" data-unicode-name=\"1F463\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F626\" title=\"frowning\" data-aliases=\":anguished:\" data-emoji=\"frowning\" data-unicode-name=\"1F626\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F48E\" title=\"gem\" data-aliases=\"\" data-emoji=\"gem\" data-unicode-name=\"1F48E\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F467\" title=\"girl\" data-aliases=\"\" data-emoji=\"girl\" data-unicode-name=\"1F467\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F49A\" title=\"green_heart\" data-aliases=\"\" data-emoji=\"green_heart\" data-unicode-name=\"1F49A\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F62C\" title=\"grimacing\" data-aliases=\"\" data-emoji=\"grimacing\" data-unicode-name=\"1F62C\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F601\" title=\"grin\" data-aliases=\"\" data-emoji=\"grin\" data-unicode-name=\"1F601\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F600\" title=\"grinning\" data-aliases=\"\" data-emoji=\"grinning\" data-unicode-name=\"1F600\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F482\" title=\"guardsman\" data-aliases=\"\" data-emoji=\"guardsman\" data-unicode-name=\"1F482\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F487\" title=\"haircut\" data-aliases=\"\" data-emoji=\"haircut\" data-unicode-name=\"1F487\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F45C\" title=\"handbag\" data-aliases=\"\" data-emoji=\"handbag\" data-unicode-name=\"1F45C\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F649\" title=\"hear_no_evil\" data-aliases=\"\" data-emoji=\"hear_no_evil\" data-unicode-name=\"1F649\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-2764\" title=\"heart\" data-aliases=\"\" data-emoji=\"heart\" data-unicode-name=\"2764\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F60D\" title=\"heart_eyes\" data-aliases=\"\" data-emoji=\"heart_eyes\" data-unicode-name=\"1F60D\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F63B\" title=\"heart_eyes_cat\" data-aliases=\"\" data-emoji=\"heart_eyes_cat\" data-unicode-name=\"1F63B\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F493\" title=\"heartbeat\" data-aliases=\"\" data-emoji=\"heartbeat\" data-unicode-name=\"1F493\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F497\" title=\"heartpulse\" data-aliases=\"\" data-emoji=\"heartpulse\" data-unicode-name=\"1F497\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F460\" title=\"high_heel\" data-aliases=\"\" data-emoji=\"high_heel\" data-unicode-name=\"1F460\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F62F\" title=\"hushed\" data-aliases=\"\" data-emoji=\"hushed\" data-unicode-name=\"1F62F\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F47F\" title=\"imp\" data-aliases=\"\" data-emoji=\"imp\" data-unicode-name=\"1F47F\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F481\" title=\"information_desk_person\" data-aliases=\"\" data-emoji=\"information_desk_person\" data-unicode-name=\"1F481\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F607\" title=\"innocent\" data-aliases=\"\" data-emoji=\"innocent\" data-unicode-name=\"1F607\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F47A\" title=\"japanese_goblin\" data-aliases=\"\" data-emoji=\"japanese_goblin\" data-unicode-name=\"1F47A\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F479\" title=\"japanese_ogre\" data-aliases=\"\" data-emoji=\"japanese_ogre\" data-unicode-name=\"1F479\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F456\" title=\"jeans\" data-aliases=\"\" data-emoji=\"jeans\" data-unicode-name=\"1F456\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F602\" title=\"joy\" data-aliases=\"\" data-emoji=\"joy\" data-unicode-name=\"1F602\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F639\" title=\"joy_cat\" data-aliases=\"\" data-emoji=\"joy_cat\" data-unicode-name=\"1F639\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F458\" title=\"kimono\" data-aliases=\"\" data-emoji=\"kimono\" data-unicode-name=\"1F458\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F48B\" title=\"kiss\" data-aliases=\"\" data-emoji=\"kiss\" data-unicode-name=\"1F48B\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F617\" title=\"kissing\" data-aliases=\"\" data-emoji=\"kissing\" data-unicode-name=\"1F617\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F63D\" title=\"kissing_cat\" data-aliases=\"\" data-emoji=\"kissing_cat\" data-unicode-name=\"1F63D\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F61A\" title=\"kissing_closed_eyes\" data-aliases=\"\" data-emoji=\"kissing_closed_eyes\" data-unicode-name=\"1F61A\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F618\" title=\"kissing_heart\" data-aliases=\"\" data-emoji=\"kissing_heart\" data-unicode-name=\"1F618\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F619\" title=\"kissing_smiling_eyes\" data-aliases=\"\" data-emoji=\"kissing_smiling_eyes\" data-unicode-name=\"1F619\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F606\" title=\"laughing\" data-aliases=\":satisfied:\" data-emoji=\"laughing\" data-unicode-name=\"1F606\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F444\" title=\"lips\" data-aliases=\"\" data-emoji=\"lips\" data-unicode-name=\"1F444\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F484\" title=\"lipstick\" data-aliases=\"\" data-emoji=\"lipstick\" data-unicode-name=\"1F484\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F48C\" title=\"love_letter\" data-aliases=\"\" data-emoji=\"love_letter\" data-unicode-name=\"1F48C\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F468\" title=\"man\" data-aliases=\"\" data-emoji=\"man\" data-unicode-name=\"1F468\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F472\" title=\"man_with_gua_pi_mao\" data-aliases=\"\" data-emoji=\"man_with_gua_pi_mao\" data-unicode-name=\"1F472\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F473\" title=\"man_with_turban\" data-aliases=\"\" data-emoji=\"man_with_turban\" data-unicode-name=\"1F473\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F45E\" title=\"mans_shoe\" data-aliases=\"\" data-emoji=\"mans_shoe\" data-unicode-name=\"1F45E\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F637\" title=\"mask\" data-aliases=\"\" data-emoji=\"mask\" data-unicode-name=\"1F637\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F486\" title=\"massage\" data-aliases=\"\" data-emoji=\"massage\" data-unicode-name=\"1F486\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F4AA\" title=\"muscle\" data-aliases=\"\" data-emoji=\"muscle\" data-unicode-name=\"1F4AA\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F485\" title=\"nail_care\" data-aliases=\"\" data-emoji=\"nail_care\" data-unicode-name=\"1F485\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F454\" title=\"necktie\" data-aliases=\"\" data-emoji=\"necktie\" data-unicode-name=\"1F454\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F610\" title=\"neutral_face\" data-aliases=\"\" data-emoji=\"neutral_face\" data-unicode-name=\"1F610\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F645\" title=\"no_good\" data-aliases=\"\" data-emoji=\"no_good\" data-unicode-name=\"1F645\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F636\" title=\"no_mouth\" data-aliases=\"\" data-emoji=\"no_mouth\" data-unicode-name=\"1F636\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F443\" title=\"nose\" data-aliases=\"\" data-emoji=\"nose\" data-unicode-name=\"1F443\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F44C\" title=\"ok_hand\" data-aliases=\"\" data-emoji=\"ok_hand\" data-unicode-name=\"1F44C\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F646\" title=\"ok_woman\" data-aliases=\"\" data-emoji=\"ok_woman\" data-unicode-name=\"1F646\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F474\" title=\"older_man\" data-aliases=\"\" data-emoji=\"older_man\" data-unicode-name=\"1F474\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F475\" title=\"older_woman\" data-aliases=\":grandma:\" data-emoji=\"older_woman\" data-unicode-name=\"1F475\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F450\" title=\"open_hands\" data-aliases=\"\" data-emoji=\"open_hands\" data-unicode-name=\"1F450\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F62E\" title=\"open_mouth\" data-aliases=\"\" data-emoji=\"open_mouth\" data-unicode-name=\"1F62E\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F614\" title=\"pensive\" data-aliases=\"\" data-emoji=\"pensive\" data-unicode-name=\"1F614\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F623\" title=\"persevere\" data-aliases=\"\" data-emoji=\"persevere\" data-unicode-name=\"1F623\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F64D\" title=\"person_frowning\" data-aliases=\"\" data-emoji=\"person_frowning\" data-unicode-name=\"1F64D\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F471\" title=\"person_with_blond_hair\" data-aliases=\"\" data-emoji=\"person_with_blond_hair\" data-unicode-name=\"1F471\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F64E\" title=\"person_with_pouting_face\" data-aliases=\"\" data-emoji=\"person_with_pouting_face\" data-unicode-name=\"1F64E\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F447\" title=\"point_down\" data-aliases=\"\" data-emoji=\"point_down\" data-unicode-name=\"1F447\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F448\" title=\"point_left\" data-aliases=\"\" data-emoji=\"point_left\" data-unicode-name=\"1F448\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F449\" title=\"point_right\" data-aliases=\"\" data-emoji=\"point_right\" data-unicode-name=\"1F449\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-261D\" title=\"point_up\" data-aliases=\"\" data-emoji=\"point_up\" data-unicode-name=\"261D\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F446\" title=\"point_up_2\" data-aliases=\"\" data-emoji=\"point_up_2\" data-unicode-name=\"1F446\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F4A9\" title=\"poop\" data-aliases=\":shit: :hankey: :poo:\" data-emoji=\"poop\" data-unicode-name=\"1F4A9\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F45D\" title=\"pouch\" data-aliases=\"\" data-emoji=\"pouch\" data-unicode-name=\"1F45D\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F63E\" title=\"pouting_cat\" data-aliases=\"\" data-emoji=\"pouting_cat\" data-unicode-name=\"1F63E\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F64F\" title=\"pray\" data-aliases=\"\" data-emoji=\"pray\" data-unicode-name=\"1F64F\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F478\" title=\"princess\" data-aliases=\"\" data-emoji=\"princess\" data-unicode-name=\"1F478\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F44A\" title=\"punch\" data-aliases=\"\" data-emoji=\"punch\" data-unicode-name=\"1F44A\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F49C\" title=\"purple_heart\" data-aliases=\"\" data-emoji=\"purple_heart\" data-unicode-name=\"1F49C\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F45B\" title=\"purse\" data-aliases=\"\" data-emoji=\"purse\" data-unicode-name=\"1F45B\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F621\" title=\"rage\" data-aliases=\"\" data-emoji=\"rage\" data-unicode-name=\"1F621\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-270B\" title=\"raised_hand\" data-aliases=\"\" data-emoji=\"raised_hand\" data-unicode-name=\"270B\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F64C\" title=\"raised_hands\" data-aliases=\"\" data-emoji=\"raised_hands\" data-unicode-name=\"1F64C\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F64B\" title=\"raising_hand\" data-aliases=\"\" data-emoji=\"raising_hand\" data-unicode-name=\"1F64B\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-263A\" title=\"relaxed\" data-aliases=\"\" data-emoji=\"relaxed\" data-unicode-name=\"263A\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F60C\" title=\"relieved\" data-aliases=\"\" data-emoji=\"relieved\" data-unicode-name=\"1F60C\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F49E\" title=\"revolving_hearts\" data-aliases=\"\" data-emoji=\"revolving_hearts\" data-unicode-name=\"1F49E\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F380\" title=\"ribbon\" data-aliases=\"\" data-emoji=\"ribbon\" data-unicode-name=\"1F380\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F48D\" title=\"ring\" data-aliases=\"\" data-emoji=\"ring\" data-unicode-name=\"1F48D\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F3C3\" title=\"runner\" data-aliases=\"\" data-emoji=\"runner\" data-unicode-name=\"1F3C3\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F3BD\" title=\"running_shirt_with_sash\" data-aliases=\"\" data-emoji=\"running_shirt_with_sash\" data-unicode-name=\"1F3BD\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F461\" title=\"sandal\" data-aliases=\"\" data-emoji=\"sandal\" data-unicode-name=\"1F461\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F631\" title=\"scream\" data-aliases=\"\" data-emoji=\"scream\" data-unicode-name=\"1F631\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F640\" title=\"scream_cat\" data-aliases=\"\" data-emoji=\"scream_cat\" data-unicode-name=\"1F640\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F648\" title=\"see_no_evil\" data-aliases=\"\" data-emoji=\"see_no_evil\" data-unicode-name=\"1F648\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F455\" title=\"shirt\" data-aliases=\"\" data-emoji=\"shirt\" data-unicode-name=\"1F455\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F480\" title=\"skull\" data-aliases=\":skeleton:\" data-emoji=\"skull\" data-unicode-name=\"1F480\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F634\" title=\"sleeping\" data-aliases=\"\" data-emoji=\"sleeping\" data-unicode-name=\"1F634\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F62A\" title=\"sleepy\" data-aliases=\"\" data-emoji=\"sleepy\" data-unicode-name=\"1F62A\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F604\" title=\"smile\" data-aliases=\"\" data-emoji=\"smile\" data-unicode-name=\"1F604\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F638\" title=\"smile_cat\" data-aliases=\"\" data-emoji=\"smile_cat\" data-unicode-name=\"1F638\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F603\" title=\"smiley\" data-aliases=\"\" data-emoji=\"smiley\" data-unicode-name=\"1F603\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F63A\" title=\"smiley_cat\" data-aliases=\"\" data-emoji=\"smiley_cat\" data-unicode-name=\"1F63A\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F608\" title=\"smiling_imp\" data-aliases=\"\" data-emoji=\"smiling_imp\" data-unicode-name=\"1F608\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F60F\" title=\"smirk\" data-aliases=\"\" data-emoji=\"smirk\" data-unicode-name=\"1F60F\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F63C\" title=\"smirk_cat\" data-aliases=\"\" data-emoji=\"smirk_cat\" data-unicode-name=\"1F63C\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F62D\" title=\"sob\" data-aliases=\"\" data-emoji=\"sob\" data-unicode-name=\"1F62D\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-2728\" title=\"sparkles\" data-aliases=\"\" data-emoji=\"sparkles\" data-unicode-name=\"2728\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F496\" title=\"sparkling_heart\" data-aliases=\"\" data-emoji=\"sparkling_heart\" data-unicode-name=\"1F496\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F64A\" title=\"speak_no_evil\" data-aliases=\"\" data-emoji=\"speak_no_evil\" data-unicode-name=\"1F64A\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F4AC\" title=\"speech_balloon\" data-aliases=\"\" data-emoji=\"speech_balloon\" data-unicode-name=\"1F4AC\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F31F\" title=\"star2\" data-aliases=\"\" data-emoji=\"star2\" data-unicode-name=\"1F31F\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F61B\" title=\"stuck_out_tongue\" data-aliases=\"\" data-emoji=\"stuck_out_tongue\" data-unicode-name=\"1F61B\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F61D\" title=\"stuck_out_tongue_closed_eyes\" data-aliases=\"\" data-emoji=\"stuck_out_tongue_closed_eyes\" data-unicode-name=\"1F61D\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F61C\" title=\"stuck_out_tongue_winking_eye\" data-aliases=\"\" data-emoji=\"stuck_out_tongue_winking_eye\" data-unicode-name=\"1F61C\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F60E\" title=\"sunglasses\" data-aliases=\"\" data-emoji=\"sunglasses\" data-unicode-name=\"1F60E\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F613\" title=\"sweat\" data-aliases=\"\" data-emoji=\"sweat\" data-unicode-name=\"1F613\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F4A6\" title=\"sweat_drops\" data-aliases=\"\" data-emoji=\"sweat_drops\" data-unicode-name=\"1F4A6\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F605\" title=\"sweat_smile\" data-aliases=\"\" data-emoji=\"sweat_smile\" data-unicode-name=\"1F605\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F4AD\" title=\"thought_balloon\" data-aliases=\"\" data-emoji=\"thought_balloon\" data-unicode-name=\"1F4AD\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F44E\" title=\"thumbsdown\" data-aliases=\":-1:\" data-emoji=\"thumbsdown\" data-unicode-name=\"1F44E\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F44D\" title=\"thumbsup\" data-aliases=\":+1:\" data-emoji=\"thumbsup\" data-unicode-name=\"1F44D\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F62B\" title=\"tired_face\" data-aliases=\"\" data-emoji=\"tired_face\" data-unicode-name=\"1F62B\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F445\" title=\"tongue\" data-aliases=\"\" data-emoji=\"tongue\" data-unicode-name=\"1F445\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F3A9\" title=\"tophat\" data-aliases=\"\" data-emoji=\"tophat\" data-unicode-name=\"1F3A9\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F624\" title=\"triumph\" data-aliases=\"\" data-emoji=\"triumph\" data-unicode-name=\"1F624\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F495\" title=\"two_hearts\" data-aliases=\"\" data-emoji=\"two_hearts\" data-unicode-name=\"1F495\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F46C\" title=\"two_men_holding_hands\" data-aliases=\"\" data-emoji=\"two_men_holding_hands\" data-unicode-name=\"1F46C\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F46D\" title=\"two_women_holding_hands\" data-aliases=\"\" data-emoji=\"two_women_holding_hands\" data-unicode-name=\"1F46D\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F612\" title=\"unamused\" data-aliases=\"\" data-emoji=\"unamused\" data-unicode-name=\"1F612\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-270C\" title=\"v\" data-aliases=\"\" data-emoji=\"v\" data-unicode-name=\"270C\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F6B6\" title=\"walking\" data-aliases=\"\" data-emoji=\"walking\" data-unicode-name=\"1F6B6\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F44B\" title=\"wave\" data-aliases=\"\" data-emoji=\"wave\" data-unicode-name=\"1F44B\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F629\" title=\"weary\" data-aliases=\"\" data-emoji=\"weary\" data-unicode-name=\"1F629\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F609\" title=\"wink\" data-aliases=\"\" data-emoji=\"wink\" data-unicode-name=\"1F609\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F469\" title=\"woman\" data-aliases=\"\" data-emoji=\"woman\" data-unicode-name=\"1F469\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F45A\" title=\"womans_clothes\" data-aliases=\"\" data-emoji=\"womans_clothes\" data-unicode-name=\"1F45A\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F452\" title=\"womans_hat\" data-aliases=\"\" data-emoji=\"womans_hat\" data-unicode-name=\"1F452\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F61F\" title=\"worried\" data-aliases=\"\" data-emoji=\"worried\" data-unicode-name=\"1F61F\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F49B\" title=\"yellow_heart\" data-aliases=\"\" data-emoji=\"yellow_heart\" data-unicode-name=\"1F49B\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F60B\" title=\"yum\" data-aliases=\"\" data-emoji=\"yum\" data-unicode-name=\"1F60B\"></div>\n        </button>\n      </li>\n      <li class='pull-left text-center emoji-menu-list-item'>\n        <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>\n        <div class=\"icon emoji-icon emoji-1F4A4\" title=\"zzz\" data-aliases=\"\" data-emoji=\"zzz\" data-unicode-name=\"1F4A4\"></div>\n        </button>\n      </li>\n    </ul>\n  </div>\n</div>";
+
+}).call(this);
diff --git a/spec/javascripts/issue_spec.js b/spec/javascripts/issue_spec.js
new file mode 100644
index 00000000000..dc6231ebb38
--- /dev/null
+++ b/spec/javascripts/issue_spec.js
@@ -0,0 +1,121 @@
+
+/*= require lib/utils/text_utility */
+
+
+/*= require issue */
+
+(function() {
+  describe('Issue', function() {
+    return describe('task lists', function() {
+      fixture.preload('issues_show.html');
+      beforeEach(function() {
+        fixture.load('issues_show.html');
+        return this.issue = new Issue();
+      });
+      it('modifies the Markdown field', function() {
+        spyOn(jQuery, 'ajax').and.stub();
+        $('input[type=checkbox]').attr('checked', true).trigger('change');
+        return expect($('.js-task-list-field').val()).toBe('- [x] Task List Item');
+      });
+      return it('submits an ajax request on tasklist:changed', function() {
+        spyOn(jQuery, 'ajax').and.callFake(function(req) {
+          expect(req.type).toBe('PATCH');
+          expect(req.url).toBe('/foo');
+          return expect(req.data.issue.description).not.toBe(null);
+        });
+        return $('.js-task-list-field').trigger('tasklist:changed');
+      });
+    });
+  });
+
+  describe('reopen/close issue', function() {
+    fixture.preload('issues_show.html');
+    beforeEach(function() {
+      fixture.load('issues_show.html');
+      return this.issue = new Issue();
+    });
+    it('closes an issue', function() {
+      var $btnClose, $btnReopen;
+      spyOn(jQuery, 'ajax').and.callFake(function(req) {
+        expect(req.type).toBe('PUT');
+        expect(req.url).toBe('http://gitlab.com/issues/6/close');
+        return req.success({
+          id: 34
+        });
+      });
+      $btnClose = $('a.btn-close');
+      $btnReopen = $('a.btn-reopen');
+      expect($btnReopen).toBeHidden();
+      expect($btnClose.text()).toBe('Close');
+      expect(typeof $btnClose.prop('disabled')).toBe('undefined');
+      $btnClose.trigger('click');
+      expect($btnReopen).toBeVisible();
+      expect($btnClose).toBeHidden();
+      expect($('div.status-box-closed')).toBeVisible();
+      return expect($('div.status-box-open')).toBeHidden();
+    });
+    it('fails to close an issue with success:false', function() {
+      var $btnClose, $btnReopen;
+      spyOn(jQuery, 'ajax').and.callFake(function(req) {
+        expect(req.type).toBe('PUT');
+        expect(req.url).toBe('http://goesnowhere.nothing/whereami');
+        return req.success({
+          saved: false
+        });
+      });
+      $btnClose = $('a.btn-close');
+      $btnReopen = $('a.btn-reopen');
+      $btnClose.attr('href', 'http://goesnowhere.nothing/whereami');
+      expect($btnReopen).toBeHidden();
+      expect($btnClose.text()).toBe('Close');
+      expect(typeof $btnClose.prop('disabled')).toBe('undefined');
+      $btnClose.trigger('click');
+      expect($btnReopen).toBeHidden();
+      expect($btnClose).toBeVisible();
+      expect($('div.status-box-closed')).toBeHidden();
+      expect($('div.status-box-open')).toBeVisible();
+      expect($('div.flash-alert')).toBeVisible();
+      return expect($('div.flash-alert').text()).toBe('Unable to update this issue at this time.');
+    });
+    it('fails to closes an issue with HTTP error', function() {
+      var $btnClose, $btnReopen;
+      spyOn(jQuery, 'ajax').and.callFake(function(req) {
+        expect(req.type).toBe('PUT');
+        expect(req.url).toBe('http://goesnowhere.nothing/whereami');
+        return req.error();
+      });
+      $btnClose = $('a.btn-close');
+      $btnReopen = $('a.btn-reopen');
+      $btnClose.attr('href', 'http://goesnowhere.nothing/whereami');
+      expect($btnReopen).toBeHidden();
+      expect($btnClose.text()).toBe('Close');
+      expect(typeof $btnClose.prop('disabled')).toBe('undefined');
+      $btnClose.trigger('click');
+      expect($btnReopen).toBeHidden();
+      expect($btnClose).toBeVisible();
+      expect($('div.status-box-closed')).toBeHidden();
+      expect($('div.status-box-open')).toBeVisible();
+      expect($('div.flash-alert')).toBeVisible();
+      return expect($('div.flash-alert').text()).toBe('Unable to update this issue at this time.');
+    });
+    return it('reopens an issue', function() {
+      var $btnClose, $btnReopen;
+      spyOn(jQuery, 'ajax').and.callFake(function(req) {
+        expect(req.type).toBe('PUT');
+        expect(req.url).toBe('http://gitlab.com/issues/6/reopen');
+        return req.success({
+          id: 34
+        });
+      });
+      $btnClose = $('a.btn-close');
+      $btnReopen = $('a.btn-reopen');
+      expect($btnReopen.text()).toBe('Reopen');
+      $btnReopen.trigger('click');
+      expect($btnReopen).toBeHidden();
+      expect($btnClose).toBeVisible();
+      expect($('div.status-box-open')).toBeVisible();
+      return expect($('div.status-box-closed')).toBeHidden();
+    });
+  });
+
+}).call(this);
diff --git a/spec/javascripts/issue_spec.js.coffee b/spec/javascripts/issue_spec.js.coffee
deleted file mode 100644
index d84d80f266b..00000000000
--- a/spec/javascripts/issue_spec.js.coffee
+++ /dev/null
@@ -1,109 +0,0 @@
-#= require lib/utils/text_utility
-#= require issue
-
-describe 'Issue', ->
-  describe 'task lists', ->
-    fixture.preload('issues_show.html')
-
-    beforeEach ->
-      fixture.load('issues_show.html')
-      @issue = new Issue()
-
-    it 'modifies the Markdown field', ->
-      spyOn(jQuery, 'ajax').and.stub()
-      $('input[type=checkbox]').attr('checked', true).trigger('change')
-      expect($('.js-task-list-field').val()).toBe('- [x] Task List Item')
-
-    it 'submits an ajax request on tasklist:changed', ->
-      spyOn(jQuery, 'ajax').and.callFake (req) ->
-        expect(req.type).toBe('PATCH')
-        expect(req.url).toBe('/foo')
-        expect(req.data.issue.description).not.toBe(null)
-
-      $('.js-task-list-field').trigger('tasklist:changed')
-describe 'reopen/close issue', ->
-  fixture.preload('issues_show.html')
-  beforeEach ->
-    fixture.load('issues_show.html')
-    @issue = new Issue()
-  it 'closes an issue', ->
-    spyOn(jQuery, 'ajax').and.callFake (req) ->
-      expect(req.type).toBe('PUT')
-      expect(req.url).toBe('http://gitlab.com/issues/6/close')
-      req.success id: 34
-
-    $btnClose = $('a.btn-close')
-    $btnReopen = $('a.btn-reopen')
-    expect($btnReopen).toBeHidden()
-    expect($btnClose.text()).toBe('Close')
-    expect(typeof $btnClose.prop('disabled')).toBe('undefined')
-
-    $btnClose.trigger('click')
-
-    expect($btnReopen).toBeVisible()
-    expect($btnClose).toBeHidden()
-    expect($('div.status-box-closed')).toBeVisible()
-    expect($('div.status-box-open')).toBeHidden()
-
-  it 'fails to close an issue with success:false', ->
-
-    spyOn(jQuery, 'ajax').and.callFake (req) ->
-      expect(req.type).toBe('PUT')
-      expect(req.url).toBe('http://goesnowhere.nothing/whereami')
-      req.success saved: false
-
-    $btnClose = $('a.btn-close')
-    $btnReopen = $('a.btn-reopen')
-    $btnClose.attr('href','http://goesnowhere.nothing/whereami')
-    expect($btnReopen).toBeHidden()
-    expect($btnClose.text()).toBe('Close')
-    expect(typeof $btnClose.prop('disabled')).toBe('undefined')
-
-    $btnClose.trigger('click')
-
-    expect($btnReopen).toBeHidden()
-    expect($btnClose).toBeVisible()
-    expect($('div.status-box-closed')).toBeHidden()
-    expect($('div.status-box-open')).toBeVisible()
-    expect($('div.flash-alert')).toBeVisible()
-    expect($('div.flash-alert').text()).toBe('Unable to update this issue at this time.')
-
-  it 'fails to closes an issue with HTTP error', ->
-
-    spyOn(jQuery, 'ajax').and.callFake (req) ->
-      expect(req.type).toBe('PUT')
-      expect(req.url).toBe('http://goesnowhere.nothing/whereami')
-      req.error()
-
-    $btnClose = $('a.btn-close')
-    $btnReopen = $('a.btn-reopen')
-    $btnClose.attr('href','http://goesnowhere.nothing/whereami')
-    expect($btnReopen).toBeHidden()
-    expect($btnClose.text()).toBe('Close')
-    expect(typeof $btnClose.prop('disabled')).toBe('undefined')
-
-    $btnClose.trigger('click')
-
-    expect($btnReopen).toBeHidden()
-    expect($btnClose).toBeVisible()
-    expect($('div.status-box-closed')).toBeHidden()
-    expect($('div.status-box-open')).toBeVisible()
-    expect($('div.flash-alert')).toBeVisible()
-    expect($('div.flash-alert').text()).toBe('Unable to update this issue at this time.')
-
-  it 'reopens an issue', ->
-    spyOn(jQuery, 'ajax').and.callFake (req) ->
-      expect(req.type).toBe('PUT')
-      expect(req.url).toBe('http://gitlab.com/issues/6/reopen')
-      req.success id: 34
-
-    $btnClose = $('a.btn-close')
-    $btnReopen = $('a.btn-reopen')
-    expect($btnReopen.text()).toBe('Reopen')
-
-    $btnReopen.trigger('click')
-
-    expect($btnReopen).toBeHidden()
-    expect($btnClose).toBeVisible()
-    expect($('div.status-box-open')).toBeVisible()
-    expect($('div.status-box-closed')).toBeHidden()
diff --git a/spec/javascripts/line_highlighter_spec.js b/spec/javascripts/line_highlighter_spec.js
new file mode 100644
index 00000000000..e2789571607
--- /dev/null
+++ b/spec/javascripts/line_highlighter_spec.js
@@ -0,0 +1,229 @@
+
+/*= require line_highlighter */
+
+(function() {
+  describe('LineHighlighter', function() {
+    var clickLine;
+    fixture.preload('line_highlighter.html');
+    clickLine = function(number, eventData) {
+      var e;
+      if (eventData == null) {
+        eventData = {};
+      }
+      if ($.isEmptyObject(eventData)) {
+        return $("#L" + number).mousedown().click();
+      } else {
+        e = $.Event('mousedown', eventData);
+        return $("#L" + number).trigger(e).click();
+      }
+    };
+    beforeEach(function() {
+      fixture.load('line_highlighter.html');
+      this["class"] = new LineHighlighter();
+      this.css = this["class"].highlightClass;
+      return this.spies = {
+        __setLocationHash__: spyOn(this["class"], '__setLocationHash__').and.callFake(function() {})
+      };
+    });
+    describe('behavior', function() {
+      it('highlights one line given in the URL hash', function() {
+        new LineHighlighter('#L13');
+        return expect($('#LC13')).toHaveClass(this.css);
+      });
+      it('highlights a range of lines given in the URL hash', function() {
+        var i, line, results;
+        new LineHighlighter('#L5-25');
+        expect($("." + this.css).length).toBe(21);
+        results = [];
+        for (line = i = 5; i <= 25; line = ++i) {
+          results.push(expect($("#LC" + line)).toHaveClass(this.css));
+        }
+        return results;
+      });
+      it('scrolls to the first highlighted line on initial load', function() {
+        var spy;
+        spy = spyOn($, 'scrollTo');
+        new LineHighlighter('#L5-25');
+        return expect(spy).toHaveBeenCalledWith('#L5', jasmine.anything());
+      });
+      it('discards click events', function() {
+        var spy;
+        spy = spyOnEvent('a[data-line-number]', 'click');
+        clickLine(13);
+        return expect(spy).toHaveBeenPrevented();
+      });
+      return it('handles garbage input from the hash', function() {
+        var func;
+        func = function() {
+          return new LineHighlighter('#blob-content-holder');
+        };
+        return expect(func).not.toThrow();
+      });
+    });
+    describe('#clickHandler', function() {
+      it('discards the mousedown event', function() {
+        var spy;
+        spy = spyOnEvent('a[data-line-number]', 'mousedown');
+        clickLine(13);
+        return expect(spy).toHaveBeenPrevented();
+      });
+      it('handles clicking on a child icon element', function() {
+        var spy;
+        spy = spyOn(this["class"], 'setHash').and.callThrough();
+        $('#L13 i').mousedown().click();
+        expect(spy).toHaveBeenCalledWith(13);
+        return expect($('#LC13')).toHaveClass(this.css);
+      });
+      describe('without shiftKey', function() {
+        it('highlights one line when clicked', function() {
+          clickLine(13);
+          return expect($('#LC13')).toHaveClass(this.css);
+        });
+        it('unhighlights previously highlighted lines', function() {
+          clickLine(13);
+          clickLine(20);
+          expect($('#LC13')).not.toHaveClass(this.css);
+          return expect($('#LC20')).toHaveClass(this.css);
+        });
+        return it('sets the hash', function() {
+          var spy;
+          spy = spyOn(this["class"], 'setHash').and.callThrough();
+          clickLine(13);
+          return expect(spy).toHaveBeenCalledWith(13);
+        });
+      });
+      return describe('with shiftKey', function() {
+        it('sets the hash', function() {
+          var spy;
+          spy = spyOn(this["class"], 'setHash').and.callThrough();
+          clickLine(13);
+          clickLine(20, {
+            shiftKey: true
+          });
+          expect(spy).toHaveBeenCalledWith(13);
+          return expect(spy).toHaveBeenCalledWith(13, 20);
+        });
+        describe('without existing highlight', function() {
+          it('highlights the clicked line', function() {
+            clickLine(13, {
+              shiftKey: true
+            });
+            expect($('#LC13')).toHaveClass(this.css);
+            return expect($("." + this.css).length).toBe(1);
+          });
+          return it('sets the hash', function() {
+            var spy;
+            spy = spyOn(this["class"], 'setHash');
+            clickLine(13, {
+              shiftKey: true
+            });
+            return expect(spy).toHaveBeenCalledWith(13);
+          });
+        });
+        describe('with existing single-line highlight', function() {
+          it('uses existing line as last line when target is lesser', function() {
+            var i, line, results;
+            clickLine(20);
+            clickLine(15, {
+              shiftKey: true
+            });
+            expect($("." + this.css).length).toBe(6);
+            results = [];
+            for (line = i = 15; i <= 20; line = ++i) {
+              results.push(expect($("#LC" + line)).toHaveClass(this.css));
+            }
+            return results;
+          });
+          return it('uses existing line as first line when target is greater', function() {
+            var i, line, results;
+            clickLine(5);
+            clickLine(10, {
+              shiftKey: true
+            });
+            expect($("." + this.css).length).toBe(6);
+            results = [];
+            for (line = i = 5; i <= 10; line = ++i) {
+              results.push(expect($("#LC" + line)).toHaveClass(this.css));
+            }
+            return results;
+          });
+        });
+        return describe('with existing multi-line highlight', function() {
+          beforeEach(function() {
+            clickLine(10, {
+              shiftKey: true
+            });
+            return clickLine(13, {
+              shiftKey: true
+            });
+          });
+          it('uses target as first line when it is less than existing first line', function() {
+            var i, line, results;
+            clickLine(5, {
+              shiftKey: true
+            });
+            expect($("." + this.css).length).toBe(6);
+            results = [];
+            for (line = i = 5; i <= 10; line = ++i) {
+              results.push(expect($("#LC" + line)).toHaveClass(this.css));
+            }
+            return results;
+          });
+          return it('uses target as last line when it is greater than existing first line', function() {
+            var i, line, results;
+            clickLine(15, {
+              shiftKey: true
+            });
+            expect($("." + this.css).length).toBe(6);
+            results = [];
+            for (line = i = 10; i <= 15; line = ++i) {
+              results.push(expect($("#LC" + line)).toHaveClass(this.css));
+            }
+            return results;
+          });
+        });
+      });
+    });
+    describe('#hashToRange', function() {
+      beforeEach(function() {
+        return this.subject = this["class"].hashToRange;
+      });
+      it('extracts a single line number from the hash', function() {
+        return expect(this.subject('#L5')).toEqual([5, null]);
+      });
+      it('extracts a range of line numbers from the hash', function() {
+        return expect(this.subject('#L5-15')).toEqual([5, 15]);
+      });
+      return it('returns [null, null] when the hash is not a line number', function() {
+        return expect(this.subject('#foo')).toEqual([null, null]);
+      });
+    });
+    describe('#highlightLine', function() {
+      beforeEach(function() {
+        return this.subject = this["class"].highlightLine;
+      });
+      it('highlights the specified line', function() {
+        this.subject(13);
+        return expect($('#LC13')).toHaveClass(this.css);
+      });
+      return it('accepts a String-based number', function() {
+        this.subject('13');
+        return expect($('#LC13')).toHaveClass(this.css);
+      });
+    });
+    return describe('#setHash', function() {
+      beforeEach(function() {
+        return this.subject = this["class"].setHash;
+      });
+      it('sets the location hash for a single line', function() {
+        this.subject(5);
+        return expect(this.spies.__setLocationHash__).toHaveBeenCalledWith('#L5');
+      });
+      return it('sets the location hash for a range', function() {
+        this.subject(5, 15);
+        return expect(this.spies.__setLocationHash__).toHaveBeenCalledWith('#L5-15');
+      });
+    });
+  });
+
+}).call(this);
diff --git a/spec/javascripts/line_highlighter_spec.js.coffee b/spec/javascripts/line_highlighter_spec.js.coffee
deleted file mode 100644
index a073f21e7bc..00000000000
--- a/spec/javascripts/line_highlighter_spec.js.coffee
+++ /dev/null
@@ -1,158 +0,0 @@
-#= require line_highlighter
-
-describe 'LineHighlighter', ->
-  fixture.preload('line_highlighter.html')
-
-  clickLine = (number, eventData = {}) ->
-    if $.isEmptyObject(eventData)
-      $("#L#{number}").mousedown().click()
-    else
-      e = $.Event 'mousedown', eventData
-      $("#L#{number}").trigger(e).click()
-
-  beforeEach ->
-    fixture.load('line_highlighter.html')
-    @class = new LineHighlighter()
-    @css   = @class.highlightClass
-    @spies = {
-      __setLocationHash__: spyOn(@class, '__setLocationHash__').and.callFake ->
-    }
-
-  describe 'behavior', ->
-    it 'highlights one line given in the URL hash', ->
-      new LineHighlighter('#L13')
-      expect($('#LC13')).toHaveClass(@css)
-
-    it 'highlights a range of lines given in the URL hash', ->
-      new LineHighlighter('#L5-25')
-      expect($(".#{@css}").length).toBe(21)
-      expect($("#LC#{line}")).toHaveClass(@css) for line in [5..25]
-
-    it 'scrolls to the first highlighted line on initial load', ->
-      spy = spyOn($, 'scrollTo')
-      new LineHighlighter('#L5-25')
-      expect(spy).toHaveBeenCalledWith('#L5', jasmine.anything())
-
-    it 'discards click events', ->
-      spy = spyOnEvent('a[data-line-number]', 'click')
-      clickLine(13)
-      expect(spy).toHaveBeenPrevented()
-
-    it 'handles garbage input from the hash', ->
-      func = -> new LineHighlighter('#blob-content-holder')
-      expect(func).not.toThrow()
-
-  describe '#clickHandler', ->
-    it 'discards the mousedown event', ->
-      spy = spyOnEvent('a[data-line-number]', 'mousedown')
-      clickLine(13)
-      expect(spy).toHaveBeenPrevented()
-
-    it 'handles clicking on a child icon element', ->
-      spy = spyOn(@class, 'setHash').and.callThrough()
-
-      $('#L13 i').mousedown().click()
-
-      expect(spy).toHaveBeenCalledWith(13)
-      expect($('#LC13')).toHaveClass(@css)
-
-    describe 'without shiftKey', ->
-      it 'highlights one line when clicked', ->
-        clickLine(13)
-        expect($('#LC13')).toHaveClass(@css)
-
-      it 'unhighlights previously highlighted lines', ->
-        clickLine(13)
-        clickLine(20)
-
-        expect($('#LC13')).not.toHaveClass(@css)
-        expect($('#LC20')).toHaveClass(@css)
-
-      it 'sets the hash', ->
-        spy = spyOn(@class, 'setHash').and.callThrough()
-        clickLine(13)
-        expect(spy).toHaveBeenCalledWith(13)
-
-    describe 'with shiftKey', ->
-      it 'sets the hash', ->
-        spy = spyOn(@class, 'setHash').and.callThrough()
-        clickLine(13)
-        clickLine(20, shiftKey: true)
-        expect(spy).toHaveBeenCalledWith(13)
-        expect(spy).toHaveBeenCalledWith(13, 20)
-
-      describe 'without existing highlight', ->
-        it 'highlights the clicked line', ->
-          clickLine(13, shiftKey: true)
-          expect($('#LC13')).toHaveClass(@css)
-          expect($(".#{@css}").length).toBe(1)
-
-        it 'sets the hash', ->
-          spy = spyOn(@class, 'setHash')
-          clickLine(13, shiftKey: true)
-          expect(spy).toHaveBeenCalledWith(13)
-
-      describe 'with existing single-line highlight', ->
-        it 'uses existing line as last line when target is lesser', ->
-          clickLine(20)
-          clickLine(15, shiftKey: true)
-          expect($(".#{@css}").length).toBe(6)
-          expect($("#LC#{line}")).toHaveClass(@css) for line in [15..20]
-
-        it 'uses existing line as first line when target is greater', ->
-          clickLine(5)
-          clickLine(10, shiftKey: true)
-          expect($(".#{@css}").length).toBe(6)
-          expect($("#LC#{line}")).toHaveClass(@css) for line in [5..10]
-
-      describe 'with existing multi-line highlight', ->
-        beforeEach ->
-          clickLine(10, shiftKey: true)
-          clickLine(13, shiftKey: true)
-
-        it 'uses target as first line when it is less than existing first line', ->
-          clickLine(5, shiftKey: true)
-          expect($(".#{@css}").length).toBe(6)
-          expect($("#LC#{line}")).toHaveClass(@css) for line in [5..10]
-
-        it 'uses target as last line when it is greater than existing first line', ->
-          clickLine(15, shiftKey: true)
-          expect($(".#{@css}").length).toBe(6)
-          expect($("#LC#{line}")).toHaveClass(@css) for line in [10..15]
-
-  describe '#hashToRange', ->
-    beforeEach ->
-      @subject = @class.hashToRange
-
-    it 'extracts a single line number from the hash', ->
-      expect(@subject('#L5')).toEqual([5, null])
-
-    it 'extracts a range of line numbers from the hash', ->
-      expect(@subject('#L5-15')).toEqual([5, 15])
-
-    it 'returns [null, null] when the hash is not a line number', ->
-      expect(@subject('#foo')).toEqual([null, null])
-
-  describe '#highlightLine', ->
-    beforeEach ->
-      @subject = @class.highlightLine
-
-    it 'highlights the specified line', ->
-      @subject(13)
-      expect($('#LC13')).toHaveClass(@css)
-
-    it 'accepts a String-based number', ->
-      @subject('13')
-      expect($('#LC13')).toHaveClass(@css)
-
-  describe '#setHash', ->
-    beforeEach ->
-      @subject = @class.setHash
-
-    it 'sets the location hash for a single line', ->
-      @subject(5)
-      expect(@spies.__setLocationHash__).toHaveBeenCalledWith('#L5')
-
-    it 'sets the location hash for a range', ->
-      @subject(5, 15)
-      expect(@spies.__setLocationHash__).toHaveBeenCalledWith('#L5-15')
diff --git a/spec/javascripts/merge_request_spec.js b/spec/javascripts/merge_request_spec.js
new file mode 100644
index 00000000000..61830d267a9
--- /dev/null
+++ b/spec/javascripts/merge_request_spec.js
@@ -0,0 +1,28 @@
+
+/*= require merge_request */
+
+(function() {
+  describe('MergeRequest', function() {
+    return describe('task lists', function() {
+      fixture.preload('merge_requests_show.html');
+      beforeEach(function() {
+        fixture.load('merge_requests_show.html');
+        return this.merge = new MergeRequest();
+      });
+      it('modifies the Markdown field', function() {
+        spyOn(jQuery, 'ajax').and.stub();
+        $('input[type=checkbox]').attr('checked', true).trigger('change');
+        return expect($('.js-task-list-field').val()).toBe('- [x] Task List Item');
+      });
+      return it('submits an ajax request on tasklist:changed', function() {
+        spyOn(jQuery, 'ajax').and.callFake(function(req) {
+          expect(req.type).toBe('PATCH');
+          expect(req.url).toBe('/foo');
+          return expect(req.data.merge_request.description).not.toBe(null);
+        });
+        return $('.js-task-list-field').trigger('tasklist:changed');
+      });
+    });
+  });
+
+}).call(this);
diff --git a/spec/javascripts/merge_request_spec.js.coffee b/spec/javascripts/merge_request_spec.js.coffee
deleted file mode 100644
index 3cb67d51c85..00000000000
--- a/spec/javascripts/merge_request_spec.js.coffee
+++ /dev/null
@@ -1,23 +0,0 @@
-#= require merge_request
-
-describe 'MergeRequest', ->
-  describe 'task lists', ->
-    fixture.preload('merge_requests_show.html')
-
-    beforeEach ->
-      fixture.load('merge_requests_show.html')
-      @merge = new MergeRequest()
-
-    it 'modifies the Markdown field', ->
-      spyOn(jQuery, 'ajax').and.stub()
-
-      $('input[type=checkbox]').attr('checked', true).trigger('change')
-      expect($('.js-task-list-field').val()).toBe('- [x] Task List Item')
-
-    it 'submits an ajax request on tasklist:changed', ->
-      spyOn(jQuery, 'ajax').and.callFake (req) ->
-        expect(req.type).toBe('PATCH')
-        expect(req.url).toBe('/foo')
-        expect(req.data.merge_request.description).not.toBe(null)
-
-      $('.js-task-list-field').trigger('tasklist:changed')
diff --git a/spec/javascripts/merge_request_tabs_spec.js b/spec/javascripts/merge_request_tabs_spec.js
new file mode 100644
index 00000000000..395032a7416
--- /dev/null
+++ b/spec/javascripts/merge_request_tabs_spec.js
@@ -0,0 +1,106 @@
+
+/*= require merge_request_tabs */
+
+(function() {
+  describe('MergeRequestTabs', function() {
+    var stubLocation;
+    stubLocation = function(stubs) {
+      var defaults;
+      defaults = {
+        pathname: '',
+        search: '',
+        hash: ''
+      };
+      return $.extend(defaults, stubs);
+    };
+    fixture.preload('merge_request_tabs.html');
+    beforeEach(function() {
+      this["class"] = new MergeRequestTabs();
+      return this.spies = {
+        ajax: spyOn($, 'ajax').and.callFake(function() {}),
+        history: spyOn(history, 'replaceState').and.callFake(function() {})
+      };
+    });
+    describe('#activateTab', function() {
+      beforeEach(function() {
+        fixture.load('merge_request_tabs.html');
+        return this.subject = this["class"].activateTab;
+      });
+      it('shows the first tab when action is show', function() {
+        this.subject('show');
+        return expect($('#notes')).toHaveClass('active');
+      });
+      it('shows the notes tab when action is notes', function() {
+        this.subject('notes');
+        return expect($('#notes')).toHaveClass('active');
+      });
+      it('shows the commits tab when action is commits', function() {
+        this.subject('commits');
+        return expect($('#commits')).toHaveClass('active');
+      });
+      return it('shows the diffs tab when action is diffs', function() {
+        this.subject('diffs');
+        return expect($('#diffs')).toHaveClass('active');
+      });
+    });
+    return describe('#setCurrentAction', function() {
+      beforeEach(function() {
+        return this.subject = this["class"].setCurrentAction;
+      });
+      it('changes from commits', function() {
+        this["class"]._location = stubLocation({
+          pathname: '/foo/bar/merge_requests/1/commits'
+        });
+        expect(this.subject('notes')).toBe('/foo/bar/merge_requests/1');
+        return expect(this.subject('diffs')).toBe('/foo/bar/merge_requests/1/diffs');
+      });
+      it('changes from diffs', function() {
+        this["class"]._location = stubLocation({
+          pathname: '/foo/bar/merge_requests/1/diffs'
+        });
+        expect(this.subject('notes')).toBe('/foo/bar/merge_requests/1');
+        return expect(this.subject('commits')).toBe('/foo/bar/merge_requests/1/commits');
+      });
+      it('changes from diffs.html', function() {
+        this["class"]._location = stubLocation({
+          pathname: '/foo/bar/merge_requests/1/diffs.html'
+        });
+        expect(this.subject('notes')).toBe('/foo/bar/merge_requests/1');
+        return expect(this.subject('commits')).toBe('/foo/bar/merge_requests/1/commits');
+      });
+      it('changes from notes', function() {
+        this["class"]._location = stubLocation({
+          pathname: '/foo/bar/merge_requests/1'
+        });
+        expect(this.subject('diffs')).toBe('/foo/bar/merge_requests/1/diffs');
+        return expect(this.subject('commits')).toBe('/foo/bar/merge_requests/1/commits');
+      });
+      it('includes search parameters and hash string', function() {
+        this["class"]._location = stubLocation({
+          pathname: '/foo/bar/merge_requests/1/diffs',
+          search: '?view=parallel',
+          hash: '#L15-35'
+        });
+        return expect(this.subject('show')).toBe('/foo/bar/merge_requests/1?view=parallel#L15-35');
+      });
+      it('replaces the current history state', function() {
+        var new_state;
+        this["class"]._location = stubLocation({
+          pathname: '/foo/bar/merge_requests/1'
+        });
+        new_state = this.subject('commits');
+        return expect(this.spies.history).toHaveBeenCalledWith({
+          turbolinks: true,
+          url: new_state
+        }, document.title, new_state);
+      });
+      return it('treats "show" like "notes"', function() {
+        this["class"]._location = stubLocation({
+          pathname: '/foo/bar/merge_requests/1/commits'
+        });
+        return expect(this.subject('show')).toBe('/foo/bar/merge_requests/1');
+      });
+    });
+  });
+
+}).call(this);
diff --git a/spec/javascripts/merge_request_tabs_spec.js.coffee b/spec/javascripts/merge_request_tabs_spec.js.coffee
deleted file mode 100644
index a0cfba455ea..00000000000
--- a/spec/javascripts/merge_request_tabs_spec.js.coffee
+++ /dev/null
@@ -1,88 +0,0 @@
-#= require merge_request_tabs
-
-describe 'MergeRequestTabs', ->
-  stubLocation = (stubs) ->
-    defaults = {pathname: '', search: '', hash: ''}
-    $.extend(defaults, stubs)
-
-  fixture.preload('merge_request_tabs.html')
-
-  beforeEach ->
-    @class = new MergeRequestTabs()
-    @spies = {
-      ajax:    spyOn($, 'ajax').and.callFake ->
-      history: spyOn(history, 'replaceState').and.callFake ->
-    }
-
-  describe '#activateTab', ->
-    beforeEach ->
-      fixture.load('merge_request_tabs.html')
-      @subject = @class.activateTab
-
-    it 'shows the first tab when action is show', ->
-      @subject('show')
-      expect($('#notes')).toHaveClass('active')
-
-    it 'shows the notes tab when action is notes', ->
-      @subject('notes')
-      expect($('#notes')).toHaveClass('active')
-
-    it 'shows the commits tab when action is commits', ->
-      @subject('commits')
-      expect($('#commits')).toHaveClass('active')
-
-    it 'shows the diffs tab when action is diffs', ->
-      @subject('diffs')
-      expect($('#diffs')).toHaveClass('active')
-
-  describe '#setCurrentAction', ->
-    beforeEach ->
-      @subject = @class.setCurrentAction
-
-    it 'changes from commits', ->
-      @class._location = stubLocation(pathname: '/foo/bar/merge_requests/1/commits')
-
-      expect(@subject('notes')).toBe('/foo/bar/merge_requests/1')
-      expect(@subject('diffs')).toBe('/foo/bar/merge_requests/1/diffs')
-
-    it 'changes from diffs', ->
-      @class._location = stubLocation(pathname: '/foo/bar/merge_requests/1/diffs')
-
-      expect(@subject('notes')).toBe('/foo/bar/merge_requests/1')
-      expect(@subject('commits')).toBe('/foo/bar/merge_requests/1/commits')
-
-    it 'changes from diffs.html', ->
-      @class._location = stubLocation(pathname: '/foo/bar/merge_requests/1/diffs.html')
-
-      expect(@subject('notes')).toBe('/foo/bar/merge_requests/1')
-      expect(@subject('commits')).toBe('/foo/bar/merge_requests/1/commits')
-
-    it 'changes from notes', ->
-      @class._location = stubLocation(pathname: '/foo/bar/merge_requests/1')
-
-      expect(@subject('diffs')).toBe('/foo/bar/merge_requests/1/diffs')
-      expect(@subject('commits')).toBe('/foo/bar/merge_requests/1/commits')
-
-    it 'includes search parameters and hash string', ->
-      @class._location = stubLocation({
-        pathname: '/foo/bar/merge_requests/1/diffs'
-        search:   '?view=parallel'
-        hash:     '#L15-35'
-      })
-
-      expect(@subject('show')).toBe('/foo/bar/merge_requests/1?view=parallel#L15-35')
-
-    it 'replaces the current history state', ->
-      @class._location = stubLocation(pathname: '/foo/bar/merge_requests/1')
-      new_state = @subject('commits')
-
-      expect(@spies.history).toHaveBeenCalledWith(
-        {turbolinks: true, url: new_state},
-        document.title,
-        new_state
-      )
-
-    it 'treats "show" like "notes"', ->
-      @class._location = stubLocation(pathname: '/foo/bar/merge_requests/1/commits')
-
-      expect(@subject('show')).toBe('/foo/bar/merge_requests/1')
diff --git a/spec/javascripts/merge_request_widget_spec.js b/spec/javascripts/merge_request_widget_spec.js
new file mode 100644
index 00000000000..17b32914ec3
--- /dev/null
+++ b/spec/javascripts/merge_request_widget_spec.js
@@ -0,0 +1,74 @@
+
+/*= require merge_request_widget */
+
+(function() {
+  describe('MergeRequestWidget', function() {
+    beforeEach(function() {
+      window.notifyPermissions = function() {};
+      window.notify = function() {};
+      this.opts = {
+        ci_status_url: "http://sampledomain.local/ci/getstatus",
+        ci_status: "",
+        ci_message: {
+          normal: "Build {{status}} for \"{{title}}\"",
+          preparing: "{{status}} build for \"{{title}}\""
+        },
+        ci_title: {
+          preparing: "{{status}} build",
+          normal: "Build {{status}}"
+        },
+        gitlab_icon: "gitlab_logo.png",
+        builds_path: "http://sampledomain.local/sampleBuildsPath"
+      };
+      this["class"] = new MergeRequestWidget(this.opts);
+      return this.ciStatusData = {
+        "title": "Sample MR title",
+        "sha": "12a34bc5",
+        "status": "success",
+        "coverage": 98
+      };
+    });
+    return describe('getCIStatus', function() {
+      beforeEach(function() {
+        return spyOn(jQuery, 'getJSON').and.callFake((function(_this) {
+          return function(req, cb) {
+            return cb(_this.ciStatusData);
+          };
+        })(this));
+      });
+      it('should call showCIStatus even if a notification should not be displayed', function() {
+        var spy;
+        spy = spyOn(this["class"], 'showCIStatus').and.stub();
+        this["class"].getCIStatus(false);
+        return expect(spy).toHaveBeenCalledWith(this.ciStatusData.status);
+      });
+      it('should call showCIStatus when a notification should be displayed', function() {
+        var spy;
+        spy = spyOn(this["class"], 'showCIStatus').and.stub();
+        this["class"].getCIStatus(true);
+        return expect(spy).toHaveBeenCalledWith(this.ciStatusData.status);
+      });
+      it('should call showCICoverage when the coverage rate is set', function() {
+        var spy;
+        spy = spyOn(this["class"], 'showCICoverage').and.stub();
+        this["class"].getCIStatus(false);
+        return expect(spy).toHaveBeenCalledWith(this.ciStatusData.coverage);
+      });
+      it('should not call showCICoverage when the coverage rate is not set', function() {
+        var spy;
+        this.ciStatusData.coverage = null;
+        spy = spyOn(this["class"], 'showCICoverage').and.stub();
+        this["class"].getCIStatus(false);
+        return expect(spy).not.toHaveBeenCalled();
+      });
+      return it('should not display a notification on the first check after the widget has been created', function() {
+        var spy;
+        spy = spyOn(window, 'notify');
+        this["class"] = new MergeRequestWidget(this.opts);
+        this["class"].getCIStatus(true);
+        return expect(spy).not.toHaveBeenCalled();
+      });
+    });
+  });
+
+}).call(this);
diff --git a/spec/javascripts/merge_request_widget_spec.js.coffee b/spec/javascripts/merge_request_widget_spec.js.coffee
deleted file mode 100644
index 92b7eeb1116..00000000000
--- a/spec/javascripts/merge_request_widget_spec.js.coffee
+++ /dev/null
@@ -1,55 +0,0 @@
-#= require merge_request_widget
-
-describe 'MergeRequestWidget', ->
-
-  beforeEach ->
-    window.notifyPermissions = () ->
-    window.notify = () ->
-    @opts = {
-      ci_status_url:"http://sampledomain.local/ci/getstatus",
-      ci_status:"",
-      ci_message: {
-        normal: "Build {{status}} for \"{{title}}\"",
-        preparing: "{{status}} build for \"{{title}}\""
-      },
-      ci_title: {
-        preparing: "{{status}} build",
-        normal: "Build {{status}}"
-      },
-      gitlab_icon:"gitlab_logo.png",
-      builds_path:"http://sampledomain.local/sampleBuildsPath"
-    }
-    @class = new MergeRequestWidget(@opts)
-    @ciStatusData = {"title":"Sample MR title","sha":"12a34bc5","status":"success","coverage":98}
-
-  describe 'getCIStatus', ->
-    beforeEach ->
-      spyOn(jQuery, 'getJSON').and.callFake (req, cb) =>
-        cb(@ciStatusData)
-
-    it 'should call showCIStatus even if a notification should not be displayed', ->
-      spy = spyOn(@class, 'showCIStatus').and.stub()
-      @class.getCIStatus(false)
-      expect(spy).toHaveBeenCalledWith(@ciStatusData.status)
-
-    it 'should call showCIStatus when a notification should be displayed', ->
-      spy = spyOn(@class, 'showCIStatus').and.stub()
-      @class.getCIStatus(true)
-      expect(spy).toHaveBeenCalledWith(@ciStatusData.status)
-
-    it 'should call showCICoverage when the coverage rate is set', ->
-      spy = spyOn(@class, 'showCICoverage').and.stub()
-      @class.getCIStatus(false)
-      expect(spy).toHaveBeenCalledWith(@ciStatusData.coverage)
-
-    it 'should not call showCICoverage when the coverage rate is not set', ->
-      @ciStatusData.coverage = null
-      spy = spyOn(@class, 'showCICoverage').and.stub()
-      @class.getCIStatus(false)
-      expect(spy).not.toHaveBeenCalled()
-
-    it 'should not display a notification on the first check after the widget has been created', ->
-      spy = spyOn(window, 'notify')
-      @class = new MergeRequestWidget(@opts)
-      @class.getCIStatus(true)
-      expect(spy).not.toHaveBeenCalled()
diff --git a/spec/javascripts/new_branch_spec.js b/spec/javascripts/new_branch_spec.js
new file mode 100644
index 00000000000..25d3f5b6c04
--- /dev/null
+++ b/spec/javascripts/new_branch_spec.js
@@ -0,0 +1,170 @@
+
+/*= require jquery-ui/autocomplete */
+
+
+/*= require new_branch_form */
+
+(function() {
+  describe('Branch', function() {
+    return describe('create a new branch', function() {
+      var expectToHaveError, fillNameWith;
+      fixture.preload('new_branch.html');
+      fillNameWith = function(value) {
+        return $('.js-branch-name').val(value).trigger('blur');
+      };
+      expectToHaveError = function(error) {
+        return expect($('.js-branch-name-error span').text()).toEqual(error);
+      };
+      beforeEach(function() {
+        fixture.load('new_branch.html');
+        $('form').on('submit', function(e) {
+          return e.preventDefault();
+        });
+        return this.form = new NewBranchForm($('.js-create-branch-form'), []);
+      });
+      it("can't start with a dot", function() {
+        fillNameWith('.foo');
+        return expectToHaveError("can't start with '.'");
+      });
+      it("can't start with a slash", function() {
+        fillNameWith('/foo');
+        return expectToHaveError("can't start with '/'");
+      });
+      it("can't have two consecutive dots", function() {
+        fillNameWith('foo..bar');
+        return expectToHaveError("can't contain '..'");
+      });
+      it("can't have spaces anywhere", function() {
+        fillNameWith(' foo');
+        expectToHaveError("can't contain spaces");
+        fillNameWith('foo bar');
+        expectToHaveError("can't contain spaces");
+        fillNameWith('foo ');
+        return expectToHaveError("can't contain spaces");
+      });
+      it("can't have ~ anywhere", function() {
+        fillNameWith('~foo');
+        expectToHaveError("can't contain '~'");
+        fillNameWith('foo~bar');
+        expectToHaveError("can't contain '~'");
+        fillNameWith('foo~');
+        return expectToHaveError("can't contain '~'");
+      });
+      it("can't have tilde anwhere", function() {
+        fillNameWith('~foo');
+        expectToHaveError("can't contain '~'");
+        fillNameWith('foo~bar');
+        expectToHaveError("can't contain '~'");
+        fillNameWith('foo~');
+        return expectToHaveError("can't contain '~'");
+      });
+      it("can't have caret anywhere", function() {
+        fillNameWith('^foo');
+        expectToHaveError("can't contain '^'");
+        fillNameWith('foo^bar');
+        expectToHaveError("can't contain '^'");
+        fillNameWith('foo^');
+        return expectToHaveError("can't contain '^'");
+      });
+      it("can't have : anywhere", function() {
+        fillNameWith(':foo');
+        expectToHaveError("can't contain ':'");
+        fillNameWith('foo:bar');
+        expectToHaveError("can't contain ':'");
+        fillNameWith(':foo');
+        return expectToHaveError("can't contain ':'");
+      });
+      it("can't have question mark anywhere", function() {
+        fillNameWith('?foo');
+        expectToHaveError("can't contain '?'");
+        fillNameWith('foo?bar');
+        expectToHaveError("can't contain '?'");
+        fillNameWith('foo?');
+        return expectToHaveError("can't contain '?'");
+      });
+      it("can't have asterisk anywhere", function() {
+        fillNameWith('*foo');
+        expectToHaveError("can't contain '*'");
+        fillNameWith('foo*bar');
+        expectToHaveError("can't contain '*'");
+        fillNameWith('foo*');
+        return expectToHaveError("can't contain '*'");
+      });
+      it("can't have open bracket anywhere", function() {
+        fillNameWith('[foo');
+        expectToHaveError("can't contain '['");
+        fillNameWith('foo[bar');
+        expectToHaveError("can't contain '['");
+        fillNameWith('foo[');
+        return expectToHaveError("can't contain '['");
+      });
+      it("can't have a backslash anywhere", function() {
+        fillNameWith('\\foo');
+        expectToHaveError("can't contain '\\'");
+        fillNameWith('foo\\bar');
+        expectToHaveError("can't contain '\\'");
+        fillNameWith('foo\\');
+        return expectToHaveError("can't contain '\\'");
+      });
+      it("can't contain a sequence @{ anywhere", function() {
+        fillNameWith('@{foo');
+        expectToHaveError("can't contain '@{'");
+        fillNameWith('foo@{bar');
+        expectToHaveError("can't contain '@{'");
+        fillNameWith('foo@{');
+        return expectToHaveError("can't contain '@{'");
+      });
+      it("can't have consecutive slashes", function() {
+        fillNameWith('foo//bar');
+        return expectToHaveError("can't contain consecutive slashes");
+      });
+      it("can't end with a slash", function() {
+        fillNameWith('foo/');
+        return expectToHaveError("can't end in '/'");
+      });
+      it("can't end with a dot", function() {
+        fillNameWith('foo.');
+        return expectToHaveError("can't end in '.'");
+      });
+      it("can't end with .lock", function() {
+        fillNameWith('foo.lock');
+        return expectToHaveError("can't end in '.lock'");
+      });
+      it("can't be the single character @", function() {
+        fillNameWith('@');
+        return expectToHaveError("can't be '@'");
+      });
+      it("concatenates all error messages", function() {
+        fillNameWith('/foo bar?~.');
+        return expectToHaveError("can't start with '/', can't contain spaces, '?', '~', can't end in '.'");
+      });
+      it("doesn't duplicate error messages", function() {
+        fillNameWith('?foo?bar?zoo?');
+        return expectToHaveError("can't contain '?'");
+      });
+      it("removes the error message when is a valid name", function() {
+        fillNameWith('foo?bar');
+        expect($('.js-branch-name-error span').length).toEqual(1);
+        fillNameWith('foobar');
+        return expect($('.js-branch-name-error span').length).toEqual(0);
+      });
+      it("can have dashes anywhere", function() {
+        fillNameWith('-foo-bar-zoo-');
+        return expect($('.js-branch-name-error span').length).toEqual(0);
+      });
+      it("can have underscores anywhere", function() {
+        fillNameWith('_foo_bar_zoo_');
+        return expect($('.js-branch-name-error span').length).toEqual(0);
+      });
+      it("can have numbers anywhere", function() {
+        fillNameWith('1foo2bar3zoo4');
+        return expect($('.js-branch-name-error span').length).toEqual(0);
+      });
+      return it("can be only letters", function() {
+        fillNameWith('foo');
+        return expect($('.js-branch-name-error span').length).toEqual(0);
+      });
+    });
+  });
+
+}).call(this);
diff --git a/spec/javascripts/new_branch_spec.js.coffee b/spec/javascripts/new_branch_spec.js.coffee
deleted file mode 100644
index ce773793817..00000000000
--- a/spec/javascripts/new_branch_spec.js.coffee
+++ /dev/null
@@ -1,160 +0,0 @@
-#= require jquery-ui/autocomplete
-#= require new_branch_form
-
-describe 'Branch', ->
-  describe 'create a new branch', ->
-    fixture.preload('new_branch.html')
-
-    fillNameWith = (value) ->
-      $('.js-branch-name').val(value).trigger('blur')
-
-    expectToHaveError = (error) ->
-      expect($('.js-branch-name-error span').text()).toEqual(error)
-
-    beforeEach ->
-      fixture.load('new_branch.html')
-      $('form').on 'submit', (e) -> e.preventDefault()
-
-      @form = new NewBranchForm($('.js-create-branch-form'), [])
-
-    it "can't start with a dot", ->
-      fillNameWith '.foo'
-      expectToHaveError "can't start with '.'"
-
-    it "can't start with a slash", ->
-      fillNameWith '/foo'
-      expectToHaveError "can't start with '/'"
-
-    it "can't have two consecutive dots", ->
-      fillNameWith 'foo..bar'
-      expectToHaveError "can't contain '..'"
-
-    it "can't have spaces anywhere", ->
-      fillNameWith ' foo'
-      expectToHaveError "can't contain spaces"
-      fillNameWith 'foo bar'
-      expectToHaveError "can't contain spaces"
-      fillNameWith 'foo '
-      expectToHaveError "can't contain spaces"
-
-    it "can't have ~ anywhere", ->
-      fillNameWith '~foo'
-      expectToHaveError "can't contain '~'"
-      fillNameWith 'foo~bar'
-      expectToHaveError "can't contain '~'"
-      fillNameWith 'foo~'
-      expectToHaveError "can't contain '~'"
-
-    it "can't have tilde anwhere", ->
-      fillNameWith '~foo'
-      expectToHaveError "can't contain '~'"
-      fillNameWith 'foo~bar'
-      expectToHaveError "can't contain '~'"
-      fillNameWith 'foo~'
-      expectToHaveError "can't contain '~'"
-
-    it "can't have caret anywhere", ->
-      fillNameWith '^foo'
-      expectToHaveError "can't contain '^'"
-      fillNameWith 'foo^bar'
-      expectToHaveError "can't contain '^'"
-      fillNameWith 'foo^'
-      expectToHaveError "can't contain '^'"
-
-    it "can't have : anywhere", ->
-      fillNameWith ':foo'
-      expectToHaveError "can't contain ':'"
-      fillNameWith 'foo:bar'
-      expectToHaveError "can't contain ':'"
-      fillNameWith ':foo'
-      expectToHaveError "can't contain ':'"
-
-    it "can't have question mark anywhere", ->
-      fillNameWith '?foo'
-      expectToHaveError "can't contain '?'"
-      fillNameWith 'foo?bar'
-      expectToHaveError "can't contain '?'"
-      fillNameWith 'foo?'
-      expectToHaveError "can't contain '?'"
-
-    it "can't have asterisk anywhere", ->
-      fillNameWith '*foo'
-      expectToHaveError "can't contain '*'"
-      fillNameWith 'foo*bar'
-      expectToHaveError "can't contain '*'"
-      fillNameWith 'foo*'
-      expectToHaveError "can't contain '*'"
-
-    it "can't have open bracket anywhere", ->
-      fillNameWith '[foo'
-      expectToHaveError "can't contain '['"
-      fillNameWith 'foo[bar'
-      expectToHaveError "can't contain '['"
-      fillNameWith 'foo['
-      expectToHaveError "can't contain '['"
-
-    it "can't have a backslash anywhere", ->
-      fillNameWith '\\foo'
-      expectToHaveError "can't contain '\\'"
-      fillNameWith 'foo\\bar'
-      expectToHaveError "can't contain '\\'"
-      fillNameWith 'foo\\'
-      expectToHaveError "can't contain '\\'"
-
-    it "can't contain a sequence @{ anywhere", ->
-      fillNameWith '@{foo'
-      expectToHaveError "can't contain '@{'"
-      fillNameWith 'foo@{bar'
-      expectToHaveError "can't contain '@{'"
-      fillNameWith 'foo@{'
-      expectToHaveError "can't contain '@{'"
-
-    it "can't have consecutive slashes", ->
-      fillNameWith 'foo//bar'
-      expectToHaveError "can't contain consecutive slashes"
-
-    it "can't end with a slash", ->
-      fillNameWith 'foo/'
-      expectToHaveError "can't end in '/'"
-
-    it "can't end with a dot", ->
-      fillNameWith 'foo.'
-      expectToHaveError "can't end in '.'"
-
-    it "can't end with .lock", ->
-      fillNameWith 'foo.lock'
-      expectToHaveError "can't end in '.lock'"
-
-    it "can't be the single character @", ->
-      fillNameWith '@'
-      expectToHaveError "can't be '@'"
-
-    it "concatenates all error messages", ->
-      fillNameWith '/foo bar?~.'
-      expectToHaveError "can't start with '/', can't contain spaces, '?', '~', can't end in '.'"
-
-    it "doesn't duplicate error messages", ->
-      fillNameWith '?foo?bar?zoo?'
-      expectToHaveError "can't contain '?'"
-
-    it "removes the error message when is a valid name", ->
-      fillNameWith 'foo?bar'
-      expect($('.js-branch-name-error span').length).toEqual(1)
-      fillNameWith 'foobar'
-      expect($('.js-branch-name-error span').length).toEqual(0)
-
-    it "can have dashes anywhere", ->
-      fillNameWith '-foo-bar-zoo-'
-      expect($('.js-branch-name-error span').length).toEqual(0)
-
-    it "can have underscores anywhere", ->
-      fillNameWith '_foo_bar_zoo_'
-      expect($('.js-branch-name-error span').length).toEqual(0)
-
-    it "can have numbers anywhere", ->
-      fillNameWith '1foo2bar3zoo4'
-      expect($('.js-branch-name-error span').length).toEqual(0)
-
-    it "can be only letters", ->
-      fillNameWith 'foo'
-      expect($('.js-branch-name-error span').length).toEqual(0)
diff --git a/spec/javascripts/notes_spec.js b/spec/javascripts/notes_spec.js
new file mode 100644
index 00000000000..14dc6bfdfde
--- /dev/null
+++ b/spec/javascripts/notes_spec.js
@@ -0,0 +1,41 @@
+
+/*= require notes */
+
+
+/*= require gl_form */
+
+(function() {
+  window.gon || (window.gon = {});
+
+  window.disableButtonIfEmptyField = function() {
+    return null;
+  };
+
+  describe('Notes', function() {
+    return describe('task lists', function() {
+      fixture.preload('issue_note.html');
+      beforeEach(function() {
+        fixture.load('issue_note.html');
+        $('form').on('submit', function(e) {
+          return e.preventDefault();
+        });
+        return this.notes = new Notes();
+      });
+      it('modifies the Markdown field', function() {
+        $('input[type=checkbox]').attr('checked', true).trigger('change');
+        return expect($('.js-task-list-field').val()).toBe('- [x] Task List Item');
+      });
+      return it('submits the form on tasklist:changed', function() {
+        var submitted;
+        submitted = false;
+        $('form').on('submit', function(e) {
+          submitted = true;
+          return e.preventDefault();
+        });
+        $('.js-task-list-field').trigger('tasklist:changed');
+        return expect(submitted).toBe(true);
+      });
+    });
+  });
+
+}).call(this);
diff --git a/spec/javascripts/notes_spec.js.coffee b/spec/javascripts/notes_spec.js.coffee
deleted file mode 100644
index 3a3c8d63e82..00000000000
--- a/spec/javascripts/notes_spec.js.coffee
+++ /dev/null
@@ -1,26 +0,0 @@
-#= require notes
-#= require gl_form
-
-window.gon or= {}
-window.disableButtonIfEmptyField = -> null
-
-describe 'Notes', ->
-  describe 'task lists', ->
-    fixture.preload('issue_note.html')
-
-    beforeEach ->
-      fixture.load('issue_note.html')
-      $('form').on 'submit', (e) -> e.preventDefault()
-
-      @notes = new Notes()
-
-    it 'modifies the Markdown field', ->
-      $('input[type=checkbox]').attr('checked', true).trigger('change')
-      expect($('.js-task-list-field').val()).toBe('- [x] Task List Item')
-
-    it 'submits the form on tasklist:changed', ->
-      submitted = false
-      $('form').on 'submit', (e) -> submitted = true; e.preventDefault()
-
-      $('.js-task-list-field').trigger('tasklist:changed')
-      expect(submitted).toBe(true)
diff --git a/spec/javascripts/project_title_spec.js b/spec/javascripts/project_title_spec.js
new file mode 100644
index 00000000000..ffe49828492
--- /dev/null
+++ b/spec/javascripts/project_title_spec.js
@@ -0,0 +1,60 @@
+
+/*= require bootstrap */
+
+
+/*= require select2 */
+
+
+/*= require lib/utils/type_utility */
+
+
+/*= require gl_dropdown */
+
+
+/*= require api */
+
+
+/*= require project_select */
+
+
+/*= require project */
+
+(function() {
+  window.gon || (window.gon = {});
+
+  window.gon.api_version = 'v3';
+
+  describe('Project Title', function() {
+    fixture.preload('project_title.html');
+    fixture.preload('projects.json');
+    beforeEach(function() {
+      fixture.load('project_title.html');
+      return this.project = new Project();
+    });
+    return describe('project list', function() {
+      beforeEach((function(_this) {
+        return function() {
+          _this.projects_data = fixture.load('projects.json')[0];
+          return spyOn(jQuery, 'ajax').and.callFake(function(req) {
+            var d;
+            expect(req.url).toBe('/api/v3/projects.json?simple=true');
+            d = $.Deferred();
+            d.resolve(_this.projects_data);
+            return d.promise();
+          });
+        };
+      })(this));
+      it('to show on toggle click', (function(_this) {
+        return function() {
+          $('.js-projects-dropdown-toggle').click();
+          return expect($('.header-content').hasClass('open')).toBe(true);
+        };
+      })(this));
+      return it('hide dropdown', function() {
+        $(".dropdown-menu-close-icon").click();
+        return expect($('.header-content').hasClass('open')).toBe(false);
+      });
+    });
+  });
+
+}).call(this);
diff --git a/spec/javascripts/project_title_spec.js.coffee b/spec/javascripts/project_title_spec.js.coffee
deleted file mode 100644
index 0244119fa0e..00000000000
--- a/spec/javascripts/project_title_spec.js.coffee
+++ /dev/null
@@ -1,37 +0,0 @@
-#= require bootstrap
-#= require select2
-#= require lib/utils/type_utility
-#= require gl_dropdown
-#= require api
-#= require project_select
-#= require project
-
-window.gon or= {}
-window.gon.api_version = 'v3'
-
-describe 'Project Title', ->
-  fixture.preload('project_title.html')
-  fixture.preload('projects.json')
-
-  beforeEach ->
-    fixture.load('project_title.html')
-    @project = new Project()
-
-  describe 'project list', ->
-    beforeEach =>
-      @projects_data = fixture.load('projects.json')[0]
-
-      spyOn(jQuery, 'ajax').and.callFake (req) =>
-        expect(req.url).toBe('/api/v3/projects.json?simple=true')
-        d = $.Deferred()
-        d.resolve @projects_data
-        d.promise()
-
-    it 'to show on toggle click', =>
-      $('.js-projects-dropdown-toggle').click()
-      expect($('.header-content').hasClass('open')).toBe(true)
-
-    it 'hide dropdown', ->
-      $(".dropdown-menu-close-icon").click()
-
-      expect($('.header-content').hasClass('open')).toBe(false)
diff --git a/spec/javascripts/right_sidebar_spec.js b/spec/javascripts/right_sidebar_spec.js
new file mode 100644
index 00000000000..38b3b2653ec
--- /dev/null
+++ b/spec/javascripts/right_sidebar_spec.js
@@ -0,0 +1,70 @@
+
+/*= require right_sidebar */
+
+
+/*= require jquery */
+
+
+/*= require jquery.cookie */
+
+(function() {
+  var $aside, $icon, $labelsIcon, $page, $toggle, assertSidebarState;
+
+  this.sidebar = null;
+
+  $aside = null;
+
+  $toggle = null;
+
+  $icon = null;
+
+  $page = null;
+
+  $labelsIcon = null;
+
+  assertSidebarState = function(state) {
+    var shouldBeCollapsed, shouldBeExpanded;
+    shouldBeExpanded = state === 'expanded';
+    shouldBeCollapsed = state === 'collapsed';
+    expect($aside.hasClass('right-sidebar-expanded')).toBe(shouldBeExpanded);
+    expect($page.hasClass('right-sidebar-expanded')).toBe(shouldBeExpanded);
+    expect($icon.hasClass('fa-angle-double-right')).toBe(shouldBeExpanded);
+    expect($aside.hasClass('right-sidebar-collapsed')).toBe(shouldBeCollapsed);
+    expect($page.hasClass('right-sidebar-collapsed')).toBe(shouldBeCollapsed);
+    return expect($icon.hasClass('fa-angle-double-left')).toBe(shouldBeCollapsed);
+  };
+
+  describe('RightSidebar', function() {
+    fixture.preload('right_sidebar.html');
+    beforeEach(function() {
+      fixture.load('right_sidebar.html');
+      this.sidebar = new Sidebar;
+      $aside = $('.right-sidebar');
+      $page = $('.page-with-sidebar');
+      $icon = $aside.find('i');
+      $toggle = $aside.find('.js-sidebar-toggle');
+      return $labelsIcon = $aside.find('.sidebar-collapsed-icon');
+    });
+    it('should expand the sidebar when arrow is clicked', function() {
+      $toggle.click();
+      return assertSidebarState('expanded');
+    });
+    it('should collapse the sidebar when arrow is clicked', function() {
+      $toggle.click();
+      assertSidebarState('expanded');
+      $toggle.click();
+      return assertSidebarState('collapsed');
+    });
+    it('should float over the page and when sidebar icons clicked', function() {
+      $labelsIcon.click();
+      return assertSidebarState('expanded');
+    });
+    return it('should collapse when the icon arrow clicked while it is floating on page', function() {
+      $labelsIcon.click();
+      assertSidebarState('expanded');
+      $toggle.click();
+      return assertSidebarState('collapsed');
+    });
+  });
+
+}).call(this);
diff --git a/spec/javascripts/right_sidebar_spec.js.coffee b/spec/javascripts/right_sidebar_spec.js.coffee
deleted file mode 100644
index 2075cacdb67..00000000000
--- a/spec/javascripts/right_sidebar_spec.js.coffee
+++ /dev/null
@@ -1,69 +0,0 @@
-#= require right_sidebar
-#= require jquery
-#= require jquery.cookie
-
-@sidebar    = null
-$aside      = null
-$toggle     = null
-$icon       = null
-$page       = null
-$labelsIcon = null
-
-
-assertSidebarState = (state) ->
-
-  shouldBeExpanded  = state is 'expanded'
-  shouldBeCollapsed = state is 'collapsed'
-
-  expect($aside.hasClass('right-sidebar-expanded')).toBe shouldBeExpanded
-  expect($page.hasClass('right-sidebar-expanded')).toBe shouldBeExpanded
-  expect($icon.hasClass('fa-angle-double-right')).toBe shouldBeExpanded
-
-  expect($aside.hasClass('right-sidebar-collapsed')).toBe shouldBeCollapsed
-  expect($page.hasClass('right-sidebar-collapsed')).toBe shouldBeCollapsed
-  expect($icon.hasClass('fa-angle-double-left')).toBe shouldBeCollapsed
-
-
-describe 'RightSidebar', ->
-
-  fixture.preload 'right_sidebar.html'
-
-  beforeEach ->
-    fixture.load 'right_sidebar.html'
-
-    @sidebar    = new Sidebar
-    $aside      = $ '.right-sidebar'
-    $page       = $ '.page-with-sidebar'
-    $icon       = $aside.find 'i'
-    $toggle     = $aside.find '.js-sidebar-toggle'
-    $labelsIcon = $aside.find '.sidebar-collapsed-icon'
-
-
-  it 'should expand the sidebar when arrow is clicked', ->
-
-    $toggle.click()
-    assertSidebarState 'expanded'
-
-
-  it 'should collapse the sidebar when arrow is clicked', ->
-
-    $toggle.click()
-    assertSidebarState 'expanded'
-
-    $toggle.click()
-    assertSidebarState 'collapsed'
-
-
-  it 'should float over the page and when sidebar icons clicked', ->
-
-    $labelsIcon.click()
-    assertSidebarState 'expanded'
-
-
-  it 'should collapse when the icon arrow clicked while it is floating on page', ->
-
-    $labelsIcon.click()
-    assertSidebarState 'expanded'
-
-    $toggle.click()
-    assertSidebarState 'collapsed'
diff --git a/spec/javascripts/search_autocomplete_spec.js b/spec/javascripts/search_autocomplete_spec.js
new file mode 100644
index 00000000000..68d64483d67
--- /dev/null
+++ b/spec/javascripts/search_autocomplete_spec.js
@@ -0,0 +1,159 @@
+
+/*= require gl_dropdown */
+
+
+/*= require search_autocomplete */
+
+
+/*= require jquery */
+
+
+/*= require lib/utils/common_utils */
+
+
+/*= require lib/utils/type_utility */
+
+
+/*= require fuzzaldrin-plus */
+
+(function() {
+  var addBodyAttributes, assertLinks, dashboardIssuesPath, dashboardMRsPath, groupIssuesPath, groupMRsPath, groupName, mockDashboardOptions, mockGroupOptions, mockProjectOptions, projectIssuesPath, projectMRsPath, projectName, userId, widget;
+
+  widget = null;
+
+  userId = 1;
+
+  window.gon || (window.gon = {});
+
+  window.gon.current_user_id = userId;
+
+  dashboardIssuesPath = '/dashboard/issues';
+
+  dashboardMRsPath = '/dashboard/merge_requests';
+
+  projectIssuesPath = '/gitlab-org/gitlab-ce/issues';
+
+  projectMRsPath = '/gitlab-org/gitlab-ce/merge_requests';
+
+  groupIssuesPath = '/groups/gitlab-org/issues';
+
+  groupMRsPath = '/groups/gitlab-org/merge_requests';
+
+  projectName = 'GitLab Community Edition';
+
+  groupName = 'Gitlab Org';
+
+  addBodyAttributes = function(section) {
+    var $body;
+    if (section == null) {
+      section = 'dashboard';
+    }
+    $body = $('body');
+    $body.removeAttr('data-page');
+    $body.removeAttr('data-project');
+    $body.removeAttr('data-group');
+    switch (section) {
+      case 'dashboard':
+        return $body.data('page', 'root:index');
+      case 'group':
+        $body.data('page', 'groups:show');
+        return $body.data('group', 'gitlab-org');
+      case 'project':
+        $body.data('page', 'projects:show');
+        return $body.data('project', 'gitlab-ce');
+    }
+  };
+
+  mockDashboardOptions = function() {
+    window.gl || (window.gl = {});
+    return window.gl.dashboardOptions = {
+      issuesPath: dashboardIssuesPath,
+      mrPath: dashboardMRsPath
+    };
+  };
+
+  mockProjectOptions = function() {
+    window.gl || (window.gl = {});
+    return window.gl.projectOptions = {
+      'gitlab-ce': {
+        issuesPath: projectIssuesPath,
+        mrPath: projectMRsPath,
+        projectName: projectName
+      }
+    };
+  };
+
+  mockGroupOptions = function() {
+    window.gl || (window.gl = {});
+    return window.gl.groupOptions = {
+      'gitlab-org': {
+        issuesPath: groupIssuesPath,
+        mrPath: groupMRsPath,
+        projectName: groupName
+      }
+    };
+  };
+
+  assertLinks = function(list, issuesPath, mrsPath) {
+    var a1, a2, a3, a4, issuesAssignedToMeLink, issuesIHaveCreatedLink, mrsAssignedToMeLink, mrsIHaveCreatedLink;
+    issuesAssignedToMeLink = issuesPath + "/?assignee_id=" + userId;
+    issuesIHaveCreatedLink = issuesPath + "/?author_id=" + userId;
+    mrsAssignedToMeLink = mrsPath + "/?assignee_id=" + userId;
+    mrsIHaveCreatedLink = mrsPath + "/?author_id=" + userId;
+    a1 = "a[href='" + issuesAssignedToMeLink + "']";
+    a2 = "a[href='" + issuesIHaveCreatedLink + "']";
+    a3 = "a[href='" + mrsAssignedToMeLink + "']";
+    a4 = "a[href='" + mrsIHaveCreatedLink + "']";
+    expect(list.find(a1).length).toBe(1);
+    expect(list.find(a1).text()).toBe(' Issues assigned to me ');
+    expect(list.find(a2).length).toBe(1);
+    expect(list.find(a2).text()).toBe(" Issues I've created ");
+    expect(list.find(a3).length).toBe(1);
+    expect(list.find(a3).text()).toBe(' Merge requests assigned to me ');
+    expect(list.find(a4).length).toBe(1);
+    return expect(list.find(a4).text()).toBe(" Merge requests I've created ");
+  };
+
+  describe('Search autocomplete dropdown', function() {
+    fixture.preload('search_autocomplete.html');
+    beforeEach(function() {
+      fixture.load('search_autocomplete.html');
+      return widget = new SearchAutocomplete;
+    });
+    it('should show Dashboard specific dropdown menu', function() {
+      var list;
+      addBodyAttributes();
+      mockDashboardOptions();
+      widget.searchInput.focus();
+      list = widget.wrap.find('.dropdown-menu').find('ul');
+      return assertLinks(list, dashboardIssuesPath, dashboardMRsPath);
+    });
+    it('should show Group specific dropdown menu', function() {
+      var list;
+      addBodyAttributes('group');
+      mockGroupOptions();
+      widget.searchInput.focus();
+      list = widget.wrap.find('.dropdown-menu').find('ul');
+      return assertLinks(list, groupIssuesPath, groupMRsPath);
+    });
+    it('should show Project specific dropdown menu', function() {
+      var list;
+      addBodyAttributes('project');
+      mockProjectOptions();
+      widget.searchInput.focus();
+      list = widget.wrap.find('.dropdown-menu').find('ul');
+      return assertLinks(list, projectIssuesPath, projectMRsPath);
+    });
+    return it('should not show category related menu if there is text in the input', function() {
+      var link, list;
+      addBodyAttributes('project');
+      mockProjectOptions();
+      widget.searchInput.val('help');
+      widget.searchInput.focus();
+      list = widget.wrap.find('.dropdown-menu').find('ul');
+      link = "a[href='" + projectIssuesPath + "/?assignee_id=" + userId + "']";
+      return expect(list.find(link).length).toBe(0);
+    });
+  });
+
+}).call(this);
diff --git a/spec/javascripts/search_autocomplete_spec.js.coffee b/spec/javascripts/search_autocomplete_spec.js.coffee
deleted file mode 100644
index 1c1faca3333..00000000000
--- a/spec/javascripts/search_autocomplete_spec.js.coffee
+++ /dev/null
@@ -1,149 +0,0 @@
-#= require gl_dropdown
-#= require search_autocomplete
-#= require jquery
-#= require lib/utils/common_utils
-#= require lib/utils/type_utility
-#= require fuzzaldrin-plus
-
-
-widget       = null
-userId       = 1
-window.gon or= {}
-window.gon.current_user_id = userId
-
-dashboardIssuesPath = '/dashboard/issues'
-dashboardMRsPath    = '/dashboard/merge_requests'
-projectIssuesPath   = '/gitlab-org/gitlab-ce/issues'
-projectMRsPath      = '/gitlab-org/gitlab-ce/merge_requests'
-groupIssuesPath     = '/groups/gitlab-org/issues'
-groupMRsPath        = '/groups/gitlab-org/merge_requests'
-projectName         = 'GitLab Community Edition'
-groupName           = 'Gitlab Org'
-
-
-# Add required attributes to body before starting the test.
-# section would be dashboard|group|project
-addBodyAttributes = (section = 'dashboard') ->
-
-  $body = $ 'body'
-
-  $body.removeAttr 'data-page'
-  $body.removeAttr 'data-project'
-  $body.removeAttr 'data-group'
-
-  switch section
-    when 'dashboard'
-      $body.data 'page', 'root:index'
-    when 'group'
-      $body.data 'page', 'groups:show'
-      $body.data 'group', 'gitlab-org'
-    when 'project'
-      $body.data 'page', 'projects:show'
-      $body.data 'project', 'gitlab-ce'
-
-
-# Mock `gl` object in window for dashboard specific page. App code will need it.
-mockDashboardOptions = ->
-
-  window.gl or= {}
-  window.gl.dashboardOptions =
-    issuesPath: dashboardIssuesPath
-    mrPath    : dashboardMRsPath
-
-
-# Mock `gl` object in window for project specific page. App code will need it.
-mockProjectOptions = ->
-
-  window.gl or= {}
-  window.gl.projectOptions =
-    'gitlab-ce'   :
-      issuesPath  : projectIssuesPath
-      mrPath      : projectMRsPath
-      projectName : projectName
-
-
-mockGroupOptions = ->
-
-  window.gl or= {}
-  window.gl.groupOptions =
-    'gitlab-org'  :
-      issuesPath  : groupIssuesPath
-      mrPath      : groupMRsPath
-      projectName : groupName
-
-
-assertLinks = (list, issuesPath, mrsPath) ->
-
-  issuesAssignedToMeLink = "#{issuesPath}/?assignee_id=#{userId}"
-  issuesIHaveCreatedLink = "#{issuesPath}/?author_id=#{userId}"
-  mrsAssignedToMeLink    = "#{mrsPath}/?assignee_id=#{userId}"
-  mrsIHaveCreatedLink    = "#{mrsPath}/?author_id=#{userId}"
-
-  a1 = "a[href='#{issuesAssignedToMeLink}']"
-  a2 = "a[href='#{issuesIHaveCreatedLink}']"
-  a3 = "a[href='#{mrsAssignedToMeLink}']"
-  a4 = "a[href='#{mrsIHaveCreatedLink}']"
-
-  expect(list.find(a1).length).toBe 1
-  expect(list.find(a1).text()).toBe ' Issues assigned to me '
-
-  expect(list.find(a2).length).toBe 1
-  expect(list.find(a2).text()).toBe " Issues I've created "
-
-  expect(list.find(a3).length).toBe 1
-  expect(list.find(a3).text()).toBe ' Merge requests assigned to me '
-
-  expect(list.find(a4).length).toBe 1
-  expect(list.find(a4).text()).toBe " Merge requests I've created "
-
-
-describe 'Search autocomplete dropdown', ->
-
-  fixture.preload 'search_autocomplete.html'
-
-  beforeEach ->
-
-    fixture.load 'search_autocomplete.html'
-    widget = new SearchAutocomplete
-
-
-  it 'should show Dashboard specific dropdown menu', ->
-
-    addBodyAttributes()
-    mockDashboardOptions()
-    widget.searchInput.focus()
-
-    list = widget.wrap.find('.dropdown-menu').find 'ul'
-    assertLinks list, dashboardIssuesPath, dashboardMRsPath
-
-
-  it 'should show Group specific dropdown menu', ->
-
-    addBodyAttributes 'group'
-    mockGroupOptions()
-    widget.searchInput.focus()
-
-    list = widget.wrap.find('.dropdown-menu').find 'ul'
-    assertLinks list, groupIssuesPath, groupMRsPath
-
-
-  it 'should show Project specific dropdown menu', ->
-
-    addBodyAttributes 'project'
-    mockProjectOptions()
-    widget.searchInput.focus()
-
-    list = widget.wrap.find('.dropdown-menu').find 'ul'
-    assertLinks list, projectIssuesPath, projectMRsPath
-
-
-  it 'should not show category related menu if there is text in the input', ->
-
-    addBodyAttributes 'project'
-    mockProjectOptions()
-    widget.searchInput.val 'help'
-    widget.searchInput.focus()
-
-    list = widget.wrap.find('.dropdown-menu').find 'ul'
-    link = "a[href='#{projectIssuesPath}/?assignee_id=#{userId}']"
-    expect(list.find(link).length).toBe 0
diff --git a/spec/javascripts/shortcuts_issuable_spec.js b/spec/javascripts/shortcuts_issuable_spec.js
new file mode 100644
index 00000000000..7b6b55fe545
--- /dev/null
+++ b/spec/javascripts/shortcuts_issuable_spec.js
@@ -0,0 +1,74 @@
+
+/*= require shortcuts_issuable */
+
+(function() {
+  describe('ShortcutsIssuable', function() {
+    fixture.preload('issuable.html');
+    beforeEach(function() {
+      fixture.load('issuable.html');
+      return this.shortcut = new ShortcutsIssuable();
+    });
+    return describe('#replyWithSelectedText', function() {
+      var stubSelection;
+      stubSelection = function(text) {
+        return window.getSelection = function() {
+          return text;
+        };
+      };
+      beforeEach(function() {
+        return this.selector = 'form.js-main-target-form textarea#note_note';
+      });
+      describe('with empty selection', function() {
+        return it('does nothing', function() {
+          stubSelection('');
+          this.shortcut.replyWithSelectedText();
+          return expect($(this.selector).val()).toBe('');
+        });
+      });
+      describe('with any selection', function() {
+        beforeEach(function() {
+          return stubSelection('Selected text.');
+        });
+        it('leaves existing input intact', function() {
+          $(this.selector).val('This text was already here.');
+          expect($(this.selector).val()).toBe('This text was already here.');
+          this.shortcut.replyWithSelectedText();
+          return expect($(this.selector).val()).toBe("This text was already here.\n> Selected text.\n\n");
+        });
+        it('triggers `input`', function() {
+          var triggered;
+          triggered = false;
+          $(this.selector).on('input', function() {
+            return triggered = true;
+          });
+          this.shortcut.replyWithSelectedText();
+          return expect(triggered).toBe(true);
+        });
+        return it('triggers `focus`', function() {
+          var focused;
+          focused = false;
+          $(this.selector).on('focus', function() {
+            return focused = true;
+          });
+          this.shortcut.replyWithSelectedText();
+          return expect(focused).toBe(true);
+        });
+      });
+      describe('with a one-line selection', function() {
+        return it('quotes the selection', function() {
+          stubSelection('This text has been selected.');
+          this.shortcut.replyWithSelectedText();
+          return expect($(this.selector).val()).toBe("> This text has been selected.\n\n");
+        });
+      });
+      return describe('with a multi-line selection', function() {
+        return it('quotes the selected lines as a group', function() {
+          stubSelection("Selected line one.\n\nSelected line two.\nSelected line three.\n");
+          this.shortcut.replyWithSelectedText();
+          return expect($(this.selector).val()).toBe("> Selected line one.\n> Selected line two.\n> Selected line three.\n\n");
+        });
+      });
+    });
+  });
+
+}).call(this);
diff --git a/spec/javascripts/shortcuts_issuable_spec.js.coffee b/spec/javascripts/shortcuts_issuable_spec.js.coffee
deleted file mode 100644
index a01ad7140dd..00000000000
--- a/spec/javascripts/shortcuts_issuable_spec.js.coffee
+++ /dev/null
@@ -1,82 +0,0 @@
-#= require shortcuts_issuable
-
-describe 'ShortcutsIssuable', ->
-  fixture.preload('issuable.html')
-
-  beforeEach ->
-    fixture.load('issuable.html')
-    @shortcut = new ShortcutsIssuable()
-
-  describe '#replyWithSelectedText', ->
-    # Stub window.getSelection to return the provided String.
-    stubSelection = (text) ->
-      window.getSelection = -> text
-
-    beforeEach ->
-      @selector = 'form.js-main-target-form textarea#note_note'
-
-    describe 'with empty selection', ->
-      it 'does nothing', ->
-        stubSelection('')
-        @shortcut.replyWithSelectedText()
-        expect($(@selector).val()).toBe('')
-
-    describe 'with any selection', ->
-      beforeEach ->
-        stubSelection('Selected text.')
-
-      it 'leaves existing input intact', ->
-        $(@selector).val('This text was already here.')
-        expect($(@selector).val()).toBe('This text was already here.')
-
-        @shortcut.replyWithSelectedText()
-        expect($(@selector).val()).
-          toBe("This text was already here.\n> Selected text.\n\n")
-
-      it 'triggers `input`', ->
-        triggered = false
-        $(@selector).on 'input', -> triggered = true
-        @shortcut.replyWithSelectedText()
-
-        expect(triggered).toBe(true)
-
-      it 'triggers `focus`', ->
-        focused = false
-        $(@selector).on 'focus', -> focused = true
-        @shortcut.replyWithSelectedText()
-
-        expect(focused).toBe(true)
-
-    describe 'with a one-line selection', ->
-      it 'quotes the selection', ->
-        stubSelection('This text has been selected.')
-
-        @shortcut.replyWithSelectedText()
-
-        expect($(@selector).val()).
-          toBe("> This text has been selected.\n\n")
-
-    describe 'with a multi-line selection', ->
-      it 'quotes the selected lines as a group', ->
-        stubSelection(
-          """
-          Selected line one.
-
-          Selected line two.
-          Selected line three.
-
-          """
-        )
-
-        @shortcut.replyWithSelectedText()
-
-        expect($(@selector).val()).
-          toBe(
-            """
-            > Selected line one.
-            > Selected line two.
-            > Selected line three.
-
-
-            """
-          )
diff --git a/spec/javascripts/spec_helper.coffee b/spec/javascripts/spec_helper.coffee
deleted file mode 100644
index 90b02a6aec5..00000000000
--- a/spec/javascripts/spec_helper.coffee
+++ /dev/null
@@ -1,47 +0,0 @@
-# PhantomJS (Teaspoons default driver) doesn't have support for
-# Function.prototype.bind, which has caused confusion.  Use this polyfill to
-# avoid the confusion.
-
-#= require support/bind-poly
-
-# You can require your own javascript files here. By default this will include
-# everything in application, however you may get better load performance if you
-# require the specific files that are being used in the spec that tests them.
-
-#= require jquery
-#= require jquery.turbolinks
-#= require bootstrap
-#= require underscore
-
-# Teaspoon includes some support files, but you can use anything from your own
-# support path too.
-
-# require support/jasmine-jquery-1.7.0
-# require support/jasmine-jquery-2.0.0
-#= require support/jasmine-jquery-2.1.0
-# require support/sinon
-# require support/your-support-file
-
-# Deferring execution
-
-# If you're using CommonJS, RequireJS or some other asynchronous library you can
-# defer execution. Call Teaspoon.execute() after everything has been loaded.
-# Simple example of a timeout:
-
-# Teaspoon.defer = true
-# setTimeout(Teaspoon.execute, 1000)
-
-# Matching files
-
-# By default Teaspoon will look for files that match
-# _spec.{js,js.coffee,.coffee}. Add a filename_spec.js file in your spec path
-# and it'll be included in the default suite automatically. If you want to
-# customize suites, check out the configuration in teaspoon_env.rb
-
-# Manifest
-
-# If you'd rather require your spec files manually (to control order for
-# instance) you can disable the suite matcher in the configuration and use this
-# file as a manifest.
-
-# For more information: http://github.com/modeset/teaspoon
diff --git a/spec/javascripts/spec_helper.js b/spec/javascripts/spec_helper.js
new file mode 100644
index 00000000000..7d91ed0f855
--- /dev/null
+++ b/spec/javascripts/spec_helper.js
@@ -0,0 +1,22 @@
+
+/*= require support/bind-poly */
+
+
+/*= require jquery */
+
+
+/*= require jquery.turbolinks */
+
+
+/*= require bootstrap */
+
+
+/*= require underscore */
+
+
+/*= require support/jasmine-jquery-2.1.0 */
+
+(function() {
+
+
+}).call(this);
diff --git a/spec/javascripts/syntax_highlight_spec.js b/spec/javascripts/syntax_highlight_spec.js
new file mode 100644
index 00000000000..4e5dd1e59bf
--- /dev/null
+++ b/spec/javascripts/syntax_highlight_spec.js
@@ -0,0 +1,44 @@
+
+/*= require syntax_highlight */
+
+(function() {
+  describe('Syntax Highlighter', function() {
+    var stubUserColorScheme;
+    stubUserColorScheme = function(value) {
+      if (window.gon == null) {
+        window.gon = {};
+      }
+      return window.gon.user_color_scheme = value;
+    };
+    describe('on a js-syntax-highlight element', function() {
+      beforeEach(function() {
+        return fixture.set('<div class="js-syntax-highlight"></div>');
+      });
+      return it('applies syntax highlighting', function() {
+        stubUserColorScheme('monokai');
+        $('.js-syntax-highlight').syntaxHighlight();
+        return expect($('.js-syntax-highlight')).toHaveClass('monokai');
+      });
+    });
+    return describe('on a parent element', function() {
+      beforeEach(function() {
+        return fixture.set("<div class=\"parent\">\n  <div class=\"js-syntax-highlight\"></div>\n  <div class=\"foo\"></div>\n  <div class=\"js-syntax-highlight\"></div>\n</div>");
+      });
+      it('applies highlighting to all applicable children', function() {
+        stubUserColorScheme('monokai');
+        $('.parent').syntaxHighlight();
+        expect($('.parent, .foo')).not.toHaveClass('monokai');
+        return expect($('.monokai').length).toBe(2);
+      });
+      return it('prevents an infinite loop when no matches exist', function() {
+        var highlight;
+        fixture.set('<div></div>');
+        highlight = function() {
+          return $('div').syntaxHighlight();
+        };
+        return expect(highlight).not.toThrow();
+      });
+    });
+  });
+
+}).call(this);
diff --git a/spec/javascripts/syntax_highlight_spec.js.coffee b/spec/javascripts/syntax_highlight_spec.js.coffee
deleted file mode 100644
index 6a73b6bf32c..00000000000
--- a/spec/javascripts/syntax_highlight_spec.js.coffee
+++ /dev/null
@@ -1,42 +0,0 @@
-#= require syntax_highlight
-
-describe 'Syntax Highlighter', ->
-  stubUserColorScheme = (value) ->
-    window.gon ?= {}
-    window.gon.user_color_scheme = value
-
-  describe 'on a js-syntax-highlight element', ->
-    beforeEach ->
-      fixture.set('<div class="js-syntax-highlight"></div>')
-
-    it 'applies syntax highlighting', ->
-      stubUserColorScheme('monokai')
-
-      $('.js-syntax-highlight').syntaxHighlight()
-
-      expect($('.js-syntax-highlight')).toHaveClass('monokai')
-
-  describe 'on a parent element', ->
-    beforeEach ->
-      fixture.set """
-        <div class="parent">
-          <div class="js-syntax-highlight"></div>
-          <div class="foo"></div>
-          <div class="js-syntax-highlight"></div>
-        </div>
-      """
-
-    it 'applies highlighting to all applicable children', ->
-      stubUserColorScheme('monokai')
-
-      $('.parent').syntaxHighlight()
-
-      expect($('.parent, .foo')).not.toHaveClass('monokai')
-      expect($('.monokai').length).toBe(2)
-
-    it 'prevents an infinite loop when no matches exist', ->
-      fixture.set('<div></div>')
-
-      highlight = -> $('div').syntaxHighlight()
-
-      expect(highlight).not.toThrow()
diff --git a/spec/javascripts/u2f/authenticate_spec.coffee b/spec/javascripts/u2f/authenticate_spec.coffee
deleted file mode 100644
index e8a2892d678..00000000000
--- a/spec/javascripts/u2f/authenticate_spec.coffee
+++ /dev/null
@@ -1,52 +0,0 @@
-#= require u2f/authenticate
-#= require u2f/util
-#= require u2f/error
-#= require u2f
-#= require ./mock_u2f_device
-
-describe 'U2FAuthenticate', ->
-  U2FUtil.enableTestMode()
-  fixture.load('u2f/authenticate')
-
-  beforeEach ->
-    @u2fDevice = new MockU2FDevice
-    @container = $("#js-authenticate-u2f")
-    @component = new U2FAuthenticate(@container, {}, "token")
-    @component.start()
-
-  it 'allows authenticating via a U2F device', ->
-    setupButton = @container.find("#js-login-u2f-device")
-    setupMessage = @container.find("p")
-    expect(setupMessage.text()).toContain('Insert your security key')
-    expect(setupButton.text()).toBe('Login Via U2F Device')
-    setupButton.trigger('click')
-
-    inProgressMessage = @container.find("p")
-    expect(inProgressMessage.text()).toContain("Trying to communicate with your device")
-
-    @u2fDevice.respondToAuthenticateRequest({deviceData: "this is data from the device"})
-    authenticatedMessage = @container.find("p")
-    deviceResponse = @container.find('#js-device-response')
-    expect(authenticatedMessage.text()).toContain("Click this button to authenticate with the GitLab server")
-    expect(deviceResponse.val()).toBe('{"deviceData":"this is data from the device"}')
-
-  describe "errors", ->
-    it "displays an error message", ->
-      setupButton = @container.find("#js-login-u2f-device")
-      setupButton.trigger('click')
-      @u2fDevice.respondToAuthenticateRequest({errorCode: "error!"})
-      errorMessage = @container.find("p")
-      expect(errorMessage.text()).toContain("There was a problem communicating with your device")
-
-    it "allows retrying authentication after an error", ->
-      setupButton = @container.find("#js-login-u2f-device")
-      setupButton.trigger('click')
-      @u2fDevice.respondToAuthenticateRequest({errorCode: "error!"})
-      retryButton = @container.find("#js-u2f-try-again")
-      retryButton.trigger('click')
-
-      setupButton = @container.find("#js-login-u2f-device")
-      setupButton.trigger('click')
-      @u2fDevice.respondToAuthenticateRequest({deviceData: "this is data from the device"})
-      authenticatedMessage = @container.find("p")
-      expect(authenticatedMessage.text()).toContain("Click this button to authenticate with the GitLab server")
diff --git a/spec/javascripts/u2f/authenticate_spec.js b/spec/javascripts/u2f/authenticate_spec.js
new file mode 100644
index 00000000000..e008ce956ad
--- /dev/null
+++ b/spec/javascripts/u2f/authenticate_spec.js
@@ -0,0 +1,75 @@
+
+/*= require u2f/authenticate */
+
+
+/*= require u2f/util */
+
+
+/*= require u2f/error */
+
+
+/*= require u2f */
+
+
+/*= require ./mock_u2f_device */
+
+(function() {
+  describe('U2FAuthenticate', function() {
+    fixture.load('u2f/authenticate');
+    beforeEach(function() {
+      this.u2fDevice = new MockU2FDevice;
+      this.container = $("#js-authenticate-u2f");
+      this.component = new U2FAuthenticate(this.container, {
+        sign_requests: []
+      }, "token");
+      return this.component.start();
+    });
+    it('allows authenticating via a U2F device', function() {
+      var authenticatedMessage, deviceResponse, inProgressMessage, setupButton, setupMessage;
+      setupButton = this.container.find("#js-login-u2f-device");
+      setupMessage = this.container.find("p");
+      expect(setupMessage.text()).toContain('Insert your security key');
+      expect(setupButton.text()).toBe('Login Via U2F Device');
+      setupButton.trigger('click');
+      inProgressMessage = this.container.find("p");
+      expect(inProgressMessage.text()).toContain("Trying to communicate with your device");
+      this.u2fDevice.respondToAuthenticateRequest({
+        deviceData: "this is data from the device"
+      });
+      authenticatedMessage = this.container.find("p");
+      deviceResponse = this.container.find('#js-device-response');
+      expect(authenticatedMessage.text()).toContain("Click this button to authenticate with the GitLab server");
+      return expect(deviceResponse.val()).toBe('{"deviceData":"this is data from the device"}');
+    });
+    return describe("errors", function() {
+      it("displays an error message", function() {
+        var errorMessage, setupButton;
+        setupButton = this.container.find("#js-login-u2f-device");
+        setupButton.trigger('click');
+        this.u2fDevice.respondToAuthenticateRequest({
+          errorCode: "error!"
+        });
+        errorMessage = this.container.find("p");
+        return expect(errorMessage.text()).toContain("There was a problem communicating with your device");
+      });
+      return it("allows retrying authentication after an error", function() {
+        var authenticatedMessage, retryButton, setupButton;
+        setupButton = this.container.find("#js-login-u2f-device");
+        setupButton.trigger('click');
+        this.u2fDevice.respondToAuthenticateRequest({
+          errorCode: "error!"
+        });
+        retryButton = this.container.find("#js-u2f-try-again");
+        retryButton.trigger('click');
+        setupButton = this.container.find("#js-login-u2f-device");
+        setupButton.trigger('click');
+        this.u2fDevice.respondToAuthenticateRequest({
+          deviceData: "this is data from the device"
+        });
+        authenticatedMessage = this.container.find("p");
+        return expect(authenticatedMessage.text()).toContain("Click this button to authenticate with the GitLab server");
+      });
+    });
+  });
+
+}).call(this);
diff --git a/spec/javascripts/u2f/mock_u2f_device.js b/spec/javascripts/u2f/mock_u2f_device.js
new file mode 100644
index 00000000000..ca91a716ba3
--- /dev/null
+++ b/spec/javascripts/u2f/mock_u2f_device.js
@@ -0,0 +1,33 @@
+(function() {
+  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  this.MockU2FDevice = (function() {
+    function MockU2FDevice() {
+      this.respondToAuthenticateRequest = bind(this.respondToAuthenticateRequest, this);
+      this.respondToRegisterRequest = bind(this.respondToRegisterRequest, this);
+      window.u2f || (window.u2f = {});
+      window.u2f.register = (function(_this) {
+        return function(appId, registerRequests, signRequests, callback) {
+          return _this.registerCallback = callback;
+        };
+      })(this);
+      window.u2f.sign = (function(_this) {
+        return function(appId, challenges, signRequests, callback) {
+          return _this.authenticateCallback = callback;
+        };
+      })(this);
+    }
+
+    MockU2FDevice.prototype.respondToRegisterRequest = function(params) {
+      return this.registerCallback(params);
+    };
+
+    MockU2FDevice.prototype.respondToAuthenticateRequest = function(params) {
+      return this.authenticateCallback(params);
+    };
+
+    return MockU2FDevice;
+
+  })();
+
+}).call(this);
diff --git a/spec/javascripts/u2f/mock_u2f_device.js.coffee b/spec/javascripts/u2f/mock_u2f_device.js.coffee
deleted file mode 100644
index 97ed0e83a0e..00000000000
--- a/spec/javascripts/u2f/mock_u2f_device.js.coffee
+++ /dev/null
@@ -1,15 +0,0 @@
-class @MockU2FDevice
-  constructor: () ->
-    window.u2f ||= {}
-
-    window.u2f.register = (appId, registerRequests, signRequests, callback) =>
-      @registerCallback = callback
-
-    window.u2f.sign = (appId, challenges, signRequests, callback) =>
-      @authenticateCallback = callback
-
-  respondToRegisterRequest: (params) =>
-    @registerCallback(params)
-
-  respondToAuthenticateRequest: (params) =>
-    @authenticateCallback(params)
diff --git a/spec/javascripts/u2f/register_spec.js b/spec/javascripts/u2f/register_spec.js
new file mode 100644
index 00000000000..21c5266c60e
--- /dev/null
+++ b/spec/javascripts/u2f/register_spec.js
@@ -0,0 +1,81 @@
+
+/*= require u2f/register */
+
+
+/*= require u2f/util */
+
+
+/*= require u2f/error */
+
+
+/*= require u2f */
+
+
+/*= require ./mock_u2f_device */
+
+(function() {
+  describe('U2FRegister', function() {
+    fixture.load('u2f/register');
+    beforeEach(function() {
+      this.u2fDevice = new MockU2FDevice;
+      this.container = $("#js-register-u2f");
+      this.component = new U2FRegister(this.container, $("#js-register-u2f-templates"), {}, "token");
+      return this.component.start();
+    });
+    it('allows registering a U2F device', function() {
+      var deviceResponse, inProgressMessage, registeredMessage, setupButton;
+      setupButton = this.container.find("#js-setup-u2f-device");
+      expect(setupButton.text()).toBe('Setup New U2F Device');
+      setupButton.trigger('click');
+      inProgressMessage = this.container.children("p");
+      expect(inProgressMessage.text()).toContain("Trying to communicate with your device");
+      this.u2fDevice.respondToRegisterRequest({
+        deviceData: "this is data from the device"
+      });
+      registeredMessage = this.container.find('p');
+      deviceResponse = this.container.find('#js-device-response');
+      expect(registeredMessage.text()).toContain("Your device was successfully set up!");
+      return expect(deviceResponse.val()).toBe('{"deviceData":"this is data from the device"}');
+    });
+    return describe("errors", function() {
+      it("doesn't allow the same device to be registered twice (for the same user", function() {
+        var errorMessage, setupButton;
+        setupButton = this.container.find("#js-setup-u2f-device");
+        setupButton.trigger('click');
+        this.u2fDevice.respondToRegisterRequest({
+          errorCode: 4
+        });
+        errorMessage = this.container.find("p");
+        return expect(errorMessage.text()).toContain("already been registered with us");
+      });
+      it("displays an error message for other errors", function() {
+        var errorMessage, setupButton;
+        setupButton = this.container.find("#js-setup-u2f-device");
+        setupButton.trigger('click');
+        this.u2fDevice.respondToRegisterRequest({
+          errorCode: "error!"
+        });
+        errorMessage = this.container.find("p");
+        return expect(errorMessage.text()).toContain("There was a problem communicating with your device");
+      });
+      return it("allows retrying registration after an error", function() {
+        var registeredMessage, retryButton, setupButton;
+        setupButton = this.container.find("#js-setup-u2f-device");
+        setupButton.trigger('click');
+        this.u2fDevice.respondToRegisterRequest({
+          errorCode: "error!"
+        });
+        retryButton = this.container.find("#U2FTryAgain");
+        retryButton.trigger('click');
+        setupButton = this.container.find("#js-setup-u2f-device");
+        setupButton.trigger('click');
+        this.u2fDevice.respondToRegisterRequest({
+          deviceData: "this is data from the device"
+        });
+        registeredMessage = this.container.find("p");
+        return expect(registeredMessage.text()).toContain("Your device was successfully set up!");
+      });
+    });
+  });
+
+}).call(this);
diff --git a/spec/javascripts/u2f/register_spec.js.coffee b/spec/javascripts/u2f/register_spec.js.coffee
deleted file mode 100644
index 0858abeca1a..00000000000
--- a/spec/javascripts/u2f/register_spec.js.coffee
+++ /dev/null
@@ -1,57 +0,0 @@
-#= require u2f/register
-#= require u2f/util
-#= require u2f/error
-#= require u2f
-#= require ./mock_u2f_device
-
-describe 'U2FRegister', ->
-  U2FUtil.enableTestMode()
-  fixture.load('u2f/register')
-
-  beforeEach ->
-    @u2fDevice = new MockU2FDevice
-    @container = $("#js-register-u2f")
-    @component = new U2FRegister(@container, $("#js-register-u2f-templates"), {}, "token")
-    @component.start()
-
-  it 'allows registering a U2F device', ->
-    setupButton = @container.find("#js-setup-u2f-device")
-    expect(setupButton.text()).toBe('Setup New U2F Device')
-    setupButton.trigger('click')
-
-    inProgressMessage = @container.children("p")
-    expect(inProgressMessage.text()).toContain("Trying to communicate with your device")
-
-    @u2fDevice.respondToRegisterRequest({deviceData: "this is data from the device"})
-    registeredMessage = @container.find('p')
-    deviceResponse = @container.find('#js-device-response')
-    expect(registeredMessage.text()).toContain("Your device was successfully set up!")
-    expect(deviceResponse.val()).toBe('{"deviceData":"this is data from the device"}')
-
-  describe "errors", ->
-    it "doesn't allow the same device to be registered twice (for the same user", ->
-      setupButton = @container.find("#js-setup-u2f-device")
-      setupButton.trigger('click')
-      @u2fDevice.respondToRegisterRequest({errorCode: 4})
-      errorMessage = @container.find("p")
-      expect(errorMessage.text()).toContain("already been registered with us")
-
-    it "displays an error message for other errors", ->
-      setupButton = @container.find("#js-setup-u2f-device")
-      setupButton.trigger('click')
-      @u2fDevice.respondToRegisterRequest({errorCode: "error!"})
-      errorMessage = @container.find("p")
-      expect(errorMessage.text()).toContain("There was a problem communicating with your device")
-
-    it "allows retrying registration after an error", ->
-      setupButton = @container.find("#js-setup-u2f-device")
-      setupButton.trigger('click')
-      @u2fDevice.respondToRegisterRequest({errorCode: "error!"})
-      retryButton = @container.find("#U2FTryAgain")
-      retryButton.trigger('click')
-
-      setupButton = @container.find("#js-setup-u2f-device")
-      setupButton.trigger('click')
-      @u2fDevice.respondToRegisterRequest({deviceData: "this is data from the device"})
-      registeredMessage = @container.find("p")
-      expect(registeredMessage.text()).toContain("Your device was successfully set up!")
diff --git a/spec/javascripts/zen_mode_spec.js b/spec/javascripts/zen_mode_spec.js
new file mode 100644
index 00000000000..3d680ec8ea3
--- /dev/null
+++ b/spec/javascripts/zen_mode_spec.js
@@ -0,0 +1,73 @@
+
+/*= require zen_mode */
+
+(function() {
+  var enterZen, escapeKeydown, exitZen;
+
+  describe('ZenMode', function() {
+    fixture.preload('zen_mode.html');
+    beforeEach(function() {
+      fixture.load('zen_mode.html');
+      spyOn(Dropzone, 'forElement').and.callFake(function() {
+        return {
+          enable: function() {
+            return true;
+          }
+        };
+      });
+      this.zen = new ZenMode();
+      return this.zen.scroll_position = 456;
+    });
+    describe('on enter', function() {
+      it('pauses Mousetrap', function() {
+        spyOn(Mousetrap, 'pause');
+        enterZen();
+        return expect(Mousetrap.pause).toHaveBeenCalled();
+      });
+      return it('removes textarea styling', function() {
+        $('textarea').attr('style', 'height: 400px');
+        enterZen();
+        return expect('textarea').not.toHaveAttr('style');
+      });
+    });
+    describe('in use', function() {
+      beforeEach(function() {
+        return enterZen();
+      });
+      return it('exits on Escape', function() {
+        escapeKeydown();
+        return expect($('.zen-backdrop')).not.toHaveClass('fullscreen');
+      });
+    });
+    return describe('on exit', function() {
+      beforeEach(function() {
+        return enterZen();
+      });
+      it('unpauses Mousetrap', function() {
+        spyOn(Mousetrap, 'unpause');
+        exitZen();
+        return expect(Mousetrap.unpause).toHaveBeenCalled();
+      });
+      return it('restores the scroll position', function() {
+        spyOn(this.zen, 'scrollTo');
+        exitZen();
+        return expect(this.zen.scrollTo).toHaveBeenCalled();
+      });
+    });
+  });
+
+  enterZen = function() {
+    return $('a.js-zen-enter').click();
+  };
+
+  exitZen = function() {
+    return $('a.js-zen-leave').click();
+  };
+
+  escapeKeydown = function() {
+    return $('textarea').trigger($.Event('keydown', {
+      keyCode: 27
+    }));
+  };
+
+}).call(this);
diff --git a/spec/javascripts/zen_mode_spec.js.coffee b/spec/javascripts/zen_mode_spec.js.coffee
deleted file mode 100644
index b790fce01ed..00000000000
--- a/spec/javascripts/zen_mode_spec.js.coffee
+++ /dev/null
@@ -1,51 +0,0 @@
-#= require zen_mode
-
-describe 'ZenMode', ->
-  fixture.preload('zen_mode.html')
-
-  beforeEach ->
-    fixture.load('zen_mode.html')
-
-    # Stub Dropzone.forElement(...).enable()
-    spyOn(Dropzone, 'forElement').and.callFake ->
-      enable: -> true
-
-    @zen = new ZenMode()
-
-    # Set this manually because we can't actually scroll the window
-    @zen.scroll_position = 456
-
-  describe 'on enter', ->
-    it 'pauses Mousetrap', ->
-      spyOn(Mousetrap, 'pause')
-      enterZen()
-      expect(Mousetrap.pause).toHaveBeenCalled()
-
-    it 'removes textarea styling', ->
-      $('textarea').attr('style', 'height: 400px')
-      enterZen()
-      expect('textarea').not.toHaveAttr('style')
-
-  describe 'in use', ->
-    beforeEach -> enterZen()
-
-    it 'exits on Escape', ->
-      escapeKeydown()
-      expect($('.zen-backdrop')).not.toHaveClass('fullscreen')
-
-  describe 'on exit', ->
-    beforeEach -> enterZen()
-
-    it 'unpauses Mousetrap', ->
-      spyOn(Mousetrap, 'unpause')
-      exitZen()
-      expect(Mousetrap.unpause).toHaveBeenCalled()
-
-    it 'restores the scroll position', ->
-      spyOn(@zen, 'scrollTo')
-      exitZen()
-      expect(@zen.scrollTo).toHaveBeenCalled()
-
-enterZen      = -> $('a.js-zen-enter').click() # Ohmmmmmmm
-exitZen       = -> $('a.js-zen-leave').click()
-escapeKeydown = -> $('textarea').trigger($.Event('keydown', {keyCode: 27}))
diff --git a/spec/lib/banzai/filter/autolink_filter_spec.rb b/spec/lib/banzai/filter/autolink_filter_spec.rb
index 84c2ddf444e..dca7f997570 100644
--- a/spec/lib/banzai/filter/autolink_filter_spec.rb
+++ b/spec/lib/banzai/filter/autolink_filter_spec.rb
@@ -15,6 +15,16 @@ describe Banzai::Filter::AutolinkFilter, lib: true do
     expect(filter(act).to_html).to eq exp
   end
 
+  context 'when the input contains no links' do
+    it 'does not parse_html back the rinku returned value' do
+      act = HTML::Pipeline.parse('<p>This text contains no links to autolink</p>')
+
+      expect_any_instance_of(described_class).not_to receive(:parse_html)
+
+      filter(act).to_html
+    end
+  end
+
   context 'Rinku schemes' do
     it 'autolinks http' do
       doc = filter("See #{link}")
@@ -58,6 +68,16 @@ describe Banzai::Filter::AutolinkFilter, lib: true do
         expect(filter(act).to_html).to eq exp
       end
     end
+
+    context 'when the input contains link' do
+      it 'does parse_html back the rinku returned value' do
+        act = HTML::Pipeline.parse("<p>See #{link}</p>")
+
+        expect_any_instance_of(described_class).to receive(:parse_html).at_least(:once).and_call_original
+
+        filter(act).to_html
+      end
+    end
   end
 
   context 'other schemes' do
diff --git a/spec/lib/banzai/filter/relative_link_filter_spec.rb b/spec/lib/banzai/filter/relative_link_filter_spec.rb
index b9e4a4eaf0e..2401875a057 100644
--- a/spec/lib/banzai/filter/relative_link_filter_spec.rb
+++ b/spec/lib/banzai/filter/relative_link_filter_spec.rb
@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require 'spec_helper'
 
 describe Banzai::Filter::RelativeLinkFilter, lib: true do
diff --git a/spec/lib/banzai/filter/syntax_highlight_filter_spec.rb b/spec/lib/banzai/filter/syntax_highlight_filter_spec.rb
index 407617f3307..b1370bca833 100644
--- a/spec/lib/banzai/filter/syntax_highlight_filter_spec.rb
+++ b/spec/lib/banzai/filter/syntax_highlight_filter_spec.rb
@@ -3,15 +3,35 @@ require 'spec_helper'
 describe Banzai::Filter::SyntaxHighlightFilter, lib: true do
   include FilterSpecHelper
 
-  it 'highlights valid code blocks' do
-    result = filter('<pre><code>def fun end</code>')
-    expect(result.to_html).to eq("<pre class=\"code highlight js-syntax-highlight plaintext\"><code>def fun end</code></pre>\n")
+  context "when no language is specified" do
+    it "highlights as plaintext" do
+      result = filter('<pre><code>def fun end</code></pre>')
+      expect(result.to_html).to eq('<pre class="code highlight js-syntax-highlight plaintext"><code>def fun end</code></pre>')
+    end
   end
 
-  it 'passes through invalid code blocks' do
-    allow_any_instance_of(described_class).to receive(:block_code).and_raise(StandardError)
+  context "when a valid language is specified" do
+    it "highlights as that language" do
+      result = filter('<pre><code class="ruby">def fun end</code></pre>')
+      expect(result.to_html).to eq('<pre class="code highlight js-syntax-highlight ruby"><code><span class="k">def</span> <span class="nf">fun</span> <span class="k">end</span></code></pre>')
+    end
+  end
+
+  context "when an invalid language is specified" do
+    it "highlights as plaintext" do
+      result = filter('<pre><code class="gnuplot">This is a test</code></pre>')
+      expect(result.to_html).to eq('<pre class="code highlight js-syntax-highlight plaintext"><code>This is a test</code></pre>')
+    end
+  end
+
+  context "when Rouge formatting fails" do
+    before do
+      allow_any_instance_of(Rouge::Formatter).to receive(:format).and_raise(StandardError)
+    end
 
-    result = filter('<pre><code>This is a test</code></pre>')
-    expect(result.to_html).to eq('<pre>This is a test</pre>')
+    it "highlights as plaintext" do
+      result = filter('<pre><code class="ruby">This is a test</code></pre>')
+      expect(result.to_html).to eq('<pre class="code highlight"><code>This is a test</code></pre>')
+    end
   end
 end
diff --git a/spec/lib/banzai/filter/table_of_contents_filter_spec.rb b/spec/lib/banzai/filter/table_of_contents_filter_spec.rb
index 6a5d003e87f..356dd01a03a 100644
--- a/spec/lib/banzai/filter/table_of_contents_filter_spec.rb
+++ b/spec/lib/banzai/filter/table_of_contents_filter_spec.rb
@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require 'spec_helper'
 
 describe Banzai::Filter::TableOfContentsFilter, lib: true do
diff --git a/spec/lib/banzai/filter/upload_link_filter_spec.rb b/spec/lib/banzai/filter/upload_link_filter_spec.rb
index 273d2ed709a..8b76c1d73c9 100644
--- a/spec/lib/banzai/filter/upload_link_filter_spec.rb
+++ b/spec/lib/banzai/filter/upload_link_filter_spec.rb
@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require 'spec_helper'
 
 describe Banzai::Filter::UploadLinkFilter, lib: true do
diff --git a/spec/lib/banzai/filter/video_link_filter_spec.rb b/spec/lib/banzai/filter/video_link_filter_spec.rb
new file mode 100644
index 00000000000..cc4349f80ba
--- /dev/null
+++ b/spec/lib/banzai/filter/video_link_filter_spec.rb
@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe Banzai::Filter::VideoLinkFilter, lib: true do
+  def filter(doc, contexts = {})
+    contexts.reverse_merge!({
+      project: project
+    })
+
+    described_class.call(doc, contexts)
+  end
+
+  def link_to_image(path)
+    %(<img src="#{path}" />)
+  end
+
+  let(:project) { create(:project) }
+
+  context 'when the element src has a video extension' do
+    UploaderHelper::VIDEO_EXT.each do |ext|
+      it "replaces the image tag 'path/video.#{ext}' with a video tag" do
+        container = filter(link_to_image("/path/video.#{ext}")).children.first
+
+        expect(container.name).to eq 'div'
+        expect(container['class']).to eq 'video-container'
+
+        video, paragraph = container.children
+
+        expect(video.name).to eq 'video'
+        expect(video['src']).to eq "/path/video.#{ext}"
+
+        expect(paragraph.name).to eq 'p'
+
+        link = paragraph.children.first
+
+        expect(link.name).to eq 'a'
+        expect(link['href']).to eq "/path/video.#{ext}"
+        expect(link['target']).to eq '_blank'
+      end
+    end
+  end
+
+  context 'when the element src is an image' do
+    it 'leaves the document unchanged' do
+      element = filter(link_to_image('/path/my_image.jpg')).children.first
+
+      expect(element.name).to eq 'img'
+      expect(element['src']).to eq '/path/my_image.jpg'
+    end
+  end
+
+end
diff --git a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
index bcbf409c8b0..d20fd4ab7dd 100644
--- a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+++ b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
@@ -19,15 +19,14 @@ module Ci
         expect(config_processor.builds_for_stage_and_ref(type, "master").first).to eq({
           stage: "test",
           stage_idx: 1,
-          except: nil,
           name: :rspec,
-          only: nil,
           commands: "pwd\nrspec",
           tag_list: [],
           options: {},
           allow_failure: false,
           when: "on_success",
           environment: nil,
+          yaml_variables: []
         })
       end
 
@@ -432,11 +431,9 @@ module Ci
 
         expect(config_processor.builds_for_stage_and_ref("test", "master").size).to eq(1)
         expect(config_processor.builds_for_stage_and_ref("test", "master").first).to eq({
-          except: nil,
           stage: "test",
           stage_idx: 1,
           name: :rspec,
-          only: nil,
           commands: "pwd\nrspec",
           tag_list: [],
           options: {
@@ -446,6 +443,7 @@ module Ci
           allow_failure: false,
           when: "on_success",
           environment: nil,
+          yaml_variables: []
         })
       end
 
@@ -461,11 +459,9 @@ module Ci
 
         expect(config_processor.builds_for_stage_and_ref("test", "master").size).to eq(1)
         expect(config_processor.builds_for_stage_and_ref("test", "master").first).to eq({
-          except: nil,
           stage: "test",
           stage_idx: 1,
           name: :rspec,
-          only: nil,
           commands: "pwd\nrspec",
           tag_list: [],
           options: {
@@ -475,101 +471,126 @@ module Ci
           allow_failure: false,
           when: "on_success",
           environment: nil,
+          yaml_variables: []
         })
       end
     end
 
     describe 'Variables' do
-      context 'when global variables are defined' do
-        it 'returns global variables' do
-          variables = {
-            VAR1: 'value1',
-            VAR2: 'value2',
-          }
+      let(:config_processor) { GitlabCiYamlProcessor.new(YAML.dump(config), path) }
 
-          config = YAML.dump({
+      subject { config_processor.builds.first[:yaml_variables] }
+
+      context 'when global variables are defined' do
+        let(:variables) do
+          { VAR1: 'value1', VAR2: 'value2' }
+        end
+        let(:config) do
+          {
             variables: variables,
             before_script: ['pwd'],
             rspec: { script: 'rspec' }
-          })
+          }
+        end
 
-          config_processor = GitlabCiYamlProcessor.new(config, path)
+        it 'returns global variables' do
+          expect(subject).to contain_exactly(
+            { key: :VAR1, value: 'value1', public: true },
+            { key: :VAR2, value: 'value2', public: true }
+          )
+        end
+      end
+
+      context 'when job and global variables are defined' do
+        let(:global_variables) do
+          { VAR1: 'global1', VAR3: 'global3' }
+        end
+        let(:job_variables) do
+          { VAR1: 'value1', VAR2: 'value2' }
+        end
+        let(:config) do
+          {
+            before_script: ['pwd'],
+            variables: global_variables,
+            rspec: { script: 'rspec', variables: job_variables }
+          }
+        end
 
-          expect(config_processor.global_variables).to eq(variables)
+        it 'returns all unique variables' do
+          expect(subject).to contain_exactly(
+            { key: :VAR3, value: 'global3', public: true },
+            { key: :VAR1, value: 'value1', public: true },
+            { key: :VAR2, value: 'value2', public: true }
+          )
         end
       end
 
       context 'when job variables are defined' do
-        context 'when syntax is correct' do
-          it 'returns job variables' do
-            variables = {
-              KEY1: 'value1',
-              SOME_KEY_2: 'value2'
-            }
+        let(:config) do
+          {
+            before_script: ['pwd'],
+            rspec: { script: 'rspec', variables: variables }
+          }
+        end
+
+        context 'when also global variables are defined' do
 
-            config = YAML.dump(
-              { before_script: ['pwd'],
-                rspec: {
-                  variables: variables,
-                  script: 'rspec' }
-              })
+        end
 
-            config_processor = GitlabCiYamlProcessor.new(config, path)
+        context 'when syntax is correct' do
+          let(:variables) do
+            { VAR1: 'value1', VAR2: 'value2' }
+          end
 
-            expect(config_processor.job_variables(:rspec)).to eq variables
+          it 'returns job variables' do
+            expect(subject).to contain_exactly(
+              { key: :VAR1, value: 'value1', public: true },
+              { key: :VAR2, value: 'value2', public: true }
+            )
           end
         end
 
         context 'when syntax is incorrect' do
           context 'when variables defined but invalid' do
-            it 'raises error' do
-              variables = [:KEY1, 'value1', :KEY2, 'value2']
-
-              config =  YAML.dump(
-                { before_script: ['pwd'],
-                  rspec: {
-                    variables: variables,
-                    script: 'rspec' }
-                })
+            let(:variables) do
+              [ :VAR1, 'value1', :VAR2, 'value2' ]
+            end
 
-              expect { GitlabCiYamlProcessor.new(config, path) }
+            it 'raises error' do
+              expect { subject }
                 .to raise_error(GitlabCiYamlProcessor::ValidationError,
-                                 /job: variables should be a map/)
+                                /job: variables should be a map/)
             end
           end
 
           context 'when variables key defined but value not specified' do
-            it 'returns empty array' do
-              config =  YAML.dump(
-                { before_script: ['pwd'],
-                  rspec: {
-                    variables: nil,
-                    script: 'rspec' }
-                })
-
-              config_processor = GitlabCiYamlProcessor.new(config, path)
+            let(:variables) do
+              nil
+            end
 
+            it 'returns empty array' do
               ##
               # When variables config is empty, we assume this is a valid
               # configuration, see issue #18775
               #
-              expect(config_processor.job_variables(:rspec))
-                .to be_an_instance_of(Array).and be_empty
+              expect(subject).to be_an_instance_of(Array)
+              expect(subject).to be_empty
             end
           end
         end
       end
 
       context 'when job variables are not defined' do
-        it 'returns empty array' do
-          config = YAML.dump({
+        let(:config) do
+          {
             before_script: ['pwd'],
             rspec: { script: 'rspec' }
-          })
-
-          config_processor = GitlabCiYamlProcessor.new(config, path)
+          }
+        end
 
-          expect(config_processor.job_variables(:rspec)).to eq []
+        it 'returns empty array' do
+          expect(subject).to be_an_instance_of(Array)
+          expect(subject).to be_empty
         end
       end
     end
@@ -681,11 +702,9 @@ module Ci
 
         expect(config_processor.builds_for_stage_and_ref("test", "master").size).to eq(1)
         expect(config_processor.builds_for_stage_and_ref("test", "master").first).to eq({
-          except: nil,
           stage: "test",
           stage_idx: 1,
           name: :rspec,
-          only: nil,
           commands: "pwd\nrspec",
           tag_list: [],
           options: {
@@ -701,6 +720,7 @@ module Ci
           when: "on_success",
           allow_failure: false,
           environment: nil,
+          yaml_variables: []
         })
       end
 
@@ -819,17 +839,16 @@ module Ci
         it "doesn't create jobs that start with dot" do
           expect(subject.size).to eq(1)
           expect(subject.first).to eq({
-            except: nil,
             stage: "test",
             stage_idx: 1,
             name: :normal_job,
-            only: nil,
             commands: "test",
             tag_list: [],
             options: {},
             when: "on_success",
             allow_failure: false,
             environment: nil,
+            yaml_variables: []
           })
         end
       end
@@ -865,30 +884,28 @@ module Ci
         it "is correctly supported for jobs" do
           expect(subject.size).to eq(2)
           expect(subject.first).to eq({
-            except: nil,
             stage: "build",
             stage_idx: 0,
             name: :job1,
-            only: nil,
             commands: "execute-script-for-job",
             tag_list: [],
             options: {},
             when: "on_success",
             allow_failure: false,
             environment: nil,
+            yaml_variables: []
           })
           expect(subject.second).to eq({
-            except: nil,
             stage: "build",
             stage_idx: 0,
             name: :job2,
-            only: nil,
             commands: "execute-script-for-job",
             tag_list: [],
             options: {},
             when: "on_success",
             allow_failure: false,
             environment: nil,
+            yaml_variables: []
           })
         end
       end
@@ -1124,7 +1141,7 @@ EOT
         config = YAML.dump({ rspec: { script: "test", when: 1 } })
         expect do
           GitlabCiYamlProcessor.new(config, path)
-        end.to raise_error(GitlabCiYamlProcessor::ValidationError, "rspec job: when parameter should be on_success, on_failure or always")
+        end.to raise_error(GitlabCiYamlProcessor::ValidationError, "rspec job: when parameter should be on_success, on_failure, always or manual")
       end
 
       it "returns errors if job artifacts:name is not an a string" do
diff --git a/spec/lib/container_registry/blob_spec.rb b/spec/lib/container_registry/blob_spec.rb
index 4d8cb787dde..bbacdc67ebd 100644
--- a/spec/lib/container_registry/blob_spec.rb
+++ b/spec/lib/container_registry/blob_spec.rb
@@ -9,8 +9,9 @@ describe ContainerRegistry::Blob do
       'size' => 1000
     }
   end
+  let(:token) { 'authorization-token' }
   
-  let(:registry) { ContainerRegistry::Registry.new('http://example.com') }
+  let(:registry) { ContainerRegistry::Registry.new('http://example.com', token: token) }
   let(:repository) { registry.repository('group/test') }
   let(:blob) { repository.blob(config) }
 
@@ -58,4 +59,53 @@ describe ContainerRegistry::Blob do
 
     it { is_expected.to be_truthy }
   end
+
+  context '#data' do
+    let(:data) { '{"key":"value"}' }
+
+    subject { blob.data }
+
+    context 'when locally stored' do
+      before do
+        stub_request(:get, 'http://example.com/v2/group/test/blobs/sha256:0123456789012345').
+          to_return(
+            status: 200,
+            headers: { 'Content-Type' => 'application/json' },
+            body: data)
+      end
+
+      it { is_expected.to eq(data) }
+    end
+
+    context 'when externally stored' do
+      before do
+        stub_request(:get, 'http://example.com/v2/group/test/blobs/sha256:0123456789012345').
+          with(headers: { 'Authorization' => "bearer #{token}" }).
+          to_return(
+            status: 307,
+            headers: { 'Location' => location })
+      end
+
+      context 'for a valid address' do
+        let(:location) { 'http://external.com/blob/file' }
+
+        before do
+          stub_request(:get, location).
+            with(headers: { 'Authorization' => nil }).
+            to_return(
+              status: 200,
+              headers: { 'Content-Type' => 'application/json' },
+              body: data)
+        end
+
+        it { is_expected.to eq(data) }
+      end
+
+      context 'for invalid file' do
+        let(:location) { 'file:///etc/passwd' }
+
+        it { expect{ subject }.to raise_error(ArgumentError, 'invalid address') }
+      end
+    end
+  end
 end
diff --git a/spec/lib/container_registry/tag_spec.rb b/spec/lib/container_registry/tag_spec.rb
index c7324c2bf77..c5e31ae82b6 100644
--- a/spec/lib/container_registry/tag_spec.rb
+++ b/spec/lib/container_registry/tag_spec.rb
@@ -77,24 +77,47 @@ describe ContainerRegistry::Tag do
       end
 
       context 'config processing' do
-        before do
-          stub_request(:get, 'http://example.com/v2/group/test/blobs/sha256:d7a513a663c1a6dcdba9ed832ca53c02ac2af0c333322cd6ca92936d1d9917ac').
-            with(headers: { 'Accept' => 'application/octet-stream' }).
-            to_return(
-              status: 200,
-              body: File.read(Rails.root + 'spec/fixtures/container_registry/config_blob.json'))
-        end
+        shared_examples 'a processable' do
+          context '#config' do
+            subject { tag.config }
 
-        context '#config' do
-          subject { tag.config }
+            it { is_expected.not_to be_nil }
+          end
+
+          context '#created_at' do
+            subject { tag.created_at }
 
-          it { is_expected.not_to be_nil }
+            it { is_expected.not_to be_nil }
+          end
         end
 
-        context '#created_at' do
-          subject { tag.created_at }
+        context 'when locally stored' do
+          before do
+            stub_request(:get, 'http://example.com/v2/group/test/blobs/sha256:d7a513a663c1a6dcdba9ed832ca53c02ac2af0c333322cd6ca92936d1d9917ac').
+              with(headers: { 'Accept' => 'application/octet-stream' }).
+              to_return(
+                status: 200,
+                body: File.read(Rails.root + 'spec/fixtures/container_registry/config_blob.json'))
+          end
+
+          it_behaves_like 'a processable'
+        end
 
-          it { is_expected.not_to be_nil }
+        context 'when externally stored' do
+          before do
+            stub_request(:get, 'http://example.com/v2/group/test/blobs/sha256:d7a513a663c1a6dcdba9ed832ca53c02ac2af0c333322cd6ca92936d1d9917ac').
+              with(headers: { 'Accept' => 'application/octet-stream' }).
+              to_return(
+                status: 307,
+                headers: { 'Location' => 'http://external.com/blob/file' })
+
+            stub_request(:get, 'http://external.com/blob/file').
+              to_return(
+                status: 200,
+                body: File.read(Rails.root + 'spec/fixtures/container_registry/config_blob.json'))
+          end
+
+          it_behaves_like 'a processable'
         end
       end
     end
diff --git a/spec/lib/gitlab/badge/build_spec.rb b/spec/lib/gitlab/badge/build_spec.rb
index 2034445a197..f3b522a02f5 100644
--- a/spec/lib/gitlab/badge/build_spec.rb
+++ b/spec/lib/gitlab/badge/build_spec.rb
@@ -113,7 +113,7 @@ describe Gitlab::Badge::Build do
                                     sha: sha,
                                     ref: branch)
 
-    create(:ci_build, pipeline: pipeline)
+    create(:ci_build, pipeline: pipeline, stage: 'notify')
   end
 
   def status_node(data, status)
diff --git a/spec/lib/gitlab/bitbucket_import/client_spec.rb b/spec/lib/gitlab/bitbucket_import/client_spec.rb
index 760d66a1488..7543c29bcc4 100644
--- a/spec/lib/gitlab/bitbucket_import/client_spec.rb
+++ b/spec/lib/gitlab/bitbucket_import/client_spec.rb
@@ -54,12 +54,12 @@ describe Gitlab::BitbucketImport::Client, lib: true do
   context 'project import' do
     it 'calls .from_project with no errors' do
       project = create(:empty_project)
+      project.import_url = "ssh://git@bitbucket.org/test/test.git"
       project.create_or_update_import_data(credentials:
                                              { user: "git",
                                                password: nil,
                                                bb_session: { bitbucket_access_token: "test",
                                                              bitbucket_access_token_secret: "test" } })
-      project.import_url = "ssh://git@bitbucket.org/test/test.git"
 
       expect { described_class.from_project(project) }.not_to raise_error
     end
diff --git a/spec/lib/gitlab/diff/file_spec.rb b/spec/lib/gitlab/diff/file_spec.rb
index 0460dcf4658..e883a6eb9c2 100644
--- a/spec/lib/gitlab/diff/file_spec.rb
+++ b/spec/lib/gitlab/diff/file_spec.rb
@@ -32,4 +32,18 @@ describe Gitlab::Diff::File, lib: true do
       expect(diff_file.too_large?).to eq(false)
     end
   end
+
+  describe '#collapsed?' do
+    it 'returns true for a file that is quite big' do
+      expect(diff).to receive(:collapsed?).and_return(true)
+
+      expect(diff_file.collapsed?).to eq(true)
+    end
+
+    it 'returns false for a file that is small enough' do
+      expect(diff).to receive(:collapsed?).and_return(false)
+
+      expect(diff_file.collapsed?).to eq(false)
+    end
+  end
 end
diff --git a/spec/lib/gitlab/diff/highlight_spec.rb b/spec/lib/gitlab/diff/highlight_spec.rb
index fb5d50a5c68..88e4115c453 100644
--- a/spec/lib/gitlab/diff/highlight_spec.rb
+++ b/spec/lib/gitlab/diff/highlight_spec.rb
@@ -28,13 +28,13 @@ describe Gitlab::Diff::Highlight, lib: true do
       end
 
       it 'highlights and marks removed lines' do
-        code = %Q{-<span id="LC9" class="line">      <span class="k">raise</span> <span class="s2">&quot;System commands must be given as an array of strings&quot;</span></span>\n}
+        code = %Q{-<span id="LC9" class="line">      <span class="k">raise</span> <span class="s2">"System commands must be given as an array of strings"</span></span>\n}
 
         expect(subject[4].text).to eq(code)
       end
 
       it 'highlights and marks added lines' do
-        code = %Q{+<span id="LC9" class="line">      <span class="k">raise</span> <span class="no"><span class='idiff left'>RuntimeError</span></span><span class="p"><span class='idiff'>,</span></span><span class='idiff right'> </span><span class="s2">&quot;System commands must be given as an array of strings&quot;</span></span>\n}
+        code = %Q{+<span id="LC9" class="line">      <span class="k">raise</span> <span class="no"><span class='idiff left'>RuntimeError</span></span><span class="p"><span class='idiff'>,</span></span><span class='idiff right'> </span><span class="s2">"System commands must be given as an array of strings"</span></span>\n}
 
         expect(subject[5].text).to eq(code)
       end
diff --git a/spec/lib/gitlab/diff/parallel_diff_spec.rb b/spec/lib/gitlab/diff/parallel_diff_spec.rb
index 5f76b70c6f5..2aa5ae44f54 100644
--- a/spec/lib/gitlab/diff/parallel_diff_spec.rb
+++ b/spec/lib/gitlab/diff/parallel_diff_spec.rb
@@ -11,11 +11,51 @@ describe Gitlab::Diff::ParallelDiff, lib: true do
   let(:diff_file) { Gitlab::Diff::File.new(diff, diff_refs: commit.diff_refs, repository: repository) }
   subject { described_class.new(diff_file) }
 
-  let(:parallel_diff_result_array) { YAML.load_file("#{Rails.root}/spec/fixtures/parallel_diff_result.yml") }
-
   describe '#parallelize' do
     it 'should return an array of arrays containing the parsed diff' do
-      expect(subject.parallelize).to match_array(parallel_diff_result_array)
+      diff_lines = diff_file.highlighted_diff_lines
+      expected = [
+        # Unchanged lines
+        { left: diff_lines[0], right: diff_lines[0] },
+        { left: diff_lines[1], right: diff_lines[1] },
+        { left: diff_lines[2], right: diff_lines[2] },
+        { left: diff_lines[3], right: diff_lines[3] },
+        { left: diff_lines[4], right: diff_lines[5] },
+        { left: diff_lines[6], right: diff_lines[6] },
+        { left: diff_lines[7], right: diff_lines[7] },
+        { left: diff_lines[8], right: diff_lines[8] },
+
+        # Changed lines
+        { left: diff_lines[9], right: diff_lines[11] },
+        { left: diff_lines[10], right: diff_lines[12] },
+
+        # Added lines
+        { left: nil, right: diff_lines[13] },
+        { left: nil, right: diff_lines[14] },
+        { left: nil, right: diff_lines[15] },
+        { left: nil, right: diff_lines[16] },
+        { left: nil, right: diff_lines[17] },
+        { left: nil, right: diff_lines[18] },
+
+        # Unchanged lines
+        { left: diff_lines[19], right: diff_lines[19] },
+        { left: diff_lines[20], right: diff_lines[20] },
+        { left: diff_lines[21], right: diff_lines[21] },
+        { left: diff_lines[22], right: diff_lines[22] },
+        { left: diff_lines[23], right: diff_lines[23] },
+        { left: diff_lines[24], right: diff_lines[24] },
+        { left: diff_lines[25], right: diff_lines[25] },
+
+        # Added line
+        { left: nil, right: diff_lines[26] },
+
+        # Unchanged lines
+        { left: diff_lines[27], right: diff_lines[27] },
+        { left: diff_lines[28], right: diff_lines[28] },
+        { left: diff_lines[29], right: diff_lines[29] }
+      ]
+
+      expect(subject.parallelize).to eq(expected)
     end
   end
 end
diff --git a/spec/lib/gitlab/diff/position_spec.rb b/spec/lib/gitlab/diff/position_spec.rb
index cf28628cb96..10537bea008 100644
--- a/spec/lib/gitlab/diff/position_spec.rb
+++ b/spec/lib/gitlab/diff/position_spec.rb
@@ -338,4 +338,28 @@ describe Gitlab::Diff::Position, lib: true do
       end
     end
   end
+
+  describe "#to_json" do
+    let(:hash) do
+      {
+        old_path: "files/ruby/popen.rb",
+        new_path: "files/ruby/popen.rb",
+        old_line: nil,
+        new_line: 14,
+        base_sha: nil,
+        head_sha: nil,
+        start_sha: nil
+      }
+    end
+
+    let(:diff_position) { described_class.new(hash) }
+
+    it "returns the position as JSON" do
+      expect(JSON.parse(diff_position.to_json)).to eq(hash.stringify_keys)
+    end
+
+    it "works when nested under another hash" do
+      expect(JSON.parse(JSON.generate(pos: diff_position))).to eq('pos' => hash.stringify_keys)
+    end
+  end
 end
diff --git a/spec/lib/gitlab/diff/position_tracer_spec.rb b/spec/lib/gitlab/diff/position_tracer_spec.rb
index 08312e60f4a..c268f84c759 100644
--- a/spec/lib/gitlab/diff/position_tracer_spec.rb
+++ b/spec/lib/gitlab/diff/position_tracer_spec.rb
@@ -1639,7 +1639,8 @@ describe Gitlab::Diff::PositionTracer, lib: true do
           committer: committer
         }
 
-        repository.merge(current_user, second_create_file_commit.sha, branch_name, options)
+        merge_request = create(:merge_request, source_branch: second_create_file_commit.sha, target_branch: branch_name, source_project: project)
+        repository.merge(current_user, merge_request, options)
         project.commit(branch_name)
       end
 
diff --git a/spec/lib/gitlab/downtime_check/message_spec.rb b/spec/lib/gitlab/downtime_check/message_spec.rb
new file mode 100644
index 00000000000..93094cda776
--- /dev/null
+++ b/spec/lib/gitlab/downtime_check/message_spec.rb
@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Gitlab::DowntimeCheck::Message do
+  describe '#to_s' do
+    it 'returns an ANSI formatted String for an offline migration' do
+      message = described_class.new('foo.rb', true, 'hello')
+
+      expect(message.to_s).to eq("[\e[32moffline\e[0m]: foo.rb: hello")
+    end
+
+    it 'returns an ANSI formatted String for an online migration' do
+      message = described_class.new('foo.rb')
+
+      expect(message.to_s).to eq("[\e[31monline\e[0m]: foo.rb")
+    end
+  end
+end
diff --git a/spec/lib/gitlab/downtime_check_spec.rb b/spec/lib/gitlab/downtime_check_spec.rb
new file mode 100644
index 00000000000..42d895e548e
--- /dev/null
+++ b/spec/lib/gitlab/downtime_check_spec.rb
@@ -0,0 +1,113 @@
+require 'spec_helper'
+
+describe Gitlab::DowntimeCheck do
+  subject { described_class.new }
+  let(:path) { 'foo.rb' }
+
+  describe '#check' do
+    before do
+      expect(subject).to receive(:require).with(path)
+    end
+
+    context 'when a migration does not specify if downtime is required' do
+      it 'raises RuntimeError' do
+        expect(subject).to receive(:class_for_migration_file).
+          with(path).
+          and_return(Class.new)
+
+        expect { subject.check([path]) }.
+          to raise_error(RuntimeError, /it requires downtime/)
+      end
+    end
+
+    context 'when a migration requires downtime' do
+      context 'when no reason is specified' do
+        it 'raises RuntimeError' do
+          stub_const('TestMigration::DOWNTIME', true)
+
+          expect(subject).to receive(:class_for_migration_file).
+            with(path).
+            and_return(TestMigration)
+
+          expect { subject.check([path]) }.
+            to raise_error(RuntimeError, /no reason was given/)
+        end
+      end
+
+      context 'when a reason is specified' do
+        it 'returns an Array of messages' do
+          stub_const('TestMigration::DOWNTIME', true)
+          stub_const('TestMigration::DOWNTIME_REASON', 'foo')
+
+          expect(subject).to receive(:class_for_migration_file).
+            with(path).
+            and_return(TestMigration)
+
+          messages = subject.check([path])
+
+          expect(messages).to be_an_instance_of(Array)
+          expect(messages[0]).to be_an_instance_of(Gitlab::DowntimeCheck::Message)
+
+          message = messages[0]
+
+          expect(message.path).to eq(path)
+          expect(message.offline).to eq(true)
+          expect(message.reason).to eq('foo')
+        end
+      end
+    end
+  end
+
+  describe '#check_and_print' do
+    it 'checks the migrations and prints the results to STDOUT' do
+      stub_const('TestMigration::DOWNTIME', true)
+      stub_const('TestMigration::DOWNTIME_REASON', 'foo')
+
+      expect(subject).to receive(:require).with(path)
+
+      expect(subject).to receive(:class_for_migration_file).
+        with(path).
+        and_return(TestMigration)
+
+      expect(subject).to receive(:puts).with(an_instance_of(String))
+
+      subject.check_and_print([path])
+    end
+  end
+
+  describe '#class_for_migration_file' do
+    it 'returns the class for a migration file path' do
+      expect(subject.class_for_migration_file('123_string.rb')).to eq(String)
+    end
+  end
+
+  describe '#online?' do
+    it 'returns true when a migration can be performed online' do
+      stub_const('TestMigration::DOWNTIME', false)
+
+      expect(subject.online?(TestMigration)).to eq(true)
+    end
+
+    it 'returns false when a migration can not be performed online' do
+      stub_const('TestMigration::DOWNTIME', true)
+
+      expect(subject.online?(TestMigration)).to eq(false)
+    end
+  end
+
+  describe '#downtime_reason' do
+    context 'when a reason is defined' do
+      it 'returns the downtime reason' do
+        stub_const('TestMigration::DOWNTIME_REASON', 'hello')
+
+        expect(subject.downtime_reason(TestMigration)).to eq('hello')
+      end
+    end
+
+    context 'when a reason is not defined' do
+      it 'returns nil' do
+        expect(subject.downtime_reason(Class.new)).to be_nil
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/email/attachment_uploader_spec.rb b/spec/lib/gitlab/email/attachment_uploader_spec.rb
index 476a21bf996..08b2577ecc4 100644
--- a/spec/lib/gitlab/email/attachment_uploader_spec.rb
+++ b/spec/lib/gitlab/email/attachment_uploader_spec.rb
@@ -11,7 +11,6 @@ describe Gitlab::Email::AttachmentUploader, lib: true do
       link = links.first
 
       expect(link).not_to be_nil
-      expect(link[:is_image]).to be_truthy
       expect(link[:alt]).to eq("bricks")
       expect(link[:url]).to include("bricks.png")
     end
diff --git a/spec/lib/gitlab/email/email_shared_blocks.rb b/spec/lib/gitlab/email/email_shared_blocks.rb
index c1dc1003831..19298e261e3 100644
--- a/spec/lib/gitlab/email/email_shared_blocks.rb
+++ b/spec/lib/gitlab/email/email_shared_blocks.rb
@@ -10,7 +10,6 @@ shared_context :email_shared_context do
       [
         {
           url: "uploads/image.png",
-          is_image: true,
           alt: "image",
           markdown: markdown
         }
diff --git a/spec/lib/gitlab/git_access_spec.rb b/spec/lib/gitlab/git_access_spec.rb
index c79ba11f782..ae064a878b0 100644
--- a/spec/lib/gitlab/git_access_spec.rb
+++ b/spec/lib/gitlab/git_access_spec.rb
@@ -6,67 +6,6 @@ describe Gitlab::GitAccess, lib: true do
   let(:user) { create(:user) }
   let(:actor) { user }
 
-  describe 'can_push_to_branch?' do
-    describe 'push to none protected branch' do
-      it "returns true if user is a master" do
-        project.team << [user, :master]
-        expect(access.can_push_to_branch?("random_branch")).to be_truthy
-      end
-
-      it "returns true if user is a developer" do
-        project.team << [user, :developer]
-        expect(access.can_push_to_branch?("random_branch")).to be_truthy
-      end
-
-      it "returns false if user is a reporter" do
-        project.team << [user, :reporter]
-        expect(access.can_push_to_branch?("random_branch")).to be_falsey
-      end
-    end
-
-    describe 'push to protected branch' do
-      before do
-        @branch = create :protected_branch, project: project
-      end
-      
-      it "returns true if user is a master" do
-        project.team << [user, :master]
-        expect(access.can_push_to_branch?(@branch.name)).to be_truthy
-      end
-
-      it "returns false if user is a developer" do
-        project.team << [user, :developer]
-        expect(access.can_push_to_branch?(@branch.name)).to be_falsey
-      end
-
-      it "returns false if user is a reporter" do
-        project.team << [user, :reporter]
-        expect(access.can_push_to_branch?(@branch.name)).to be_falsey
-      end
-    end
-
-    describe 'push to protected branch if allowed for developers' do
-      before do
-        @branch = create :protected_branch, project: project, developers_can_push: true
-      end
-      
-      it "returns true if user is a master" do
-        project.team << [user, :master]
-        expect(access.can_push_to_branch?(@branch.name)).to be_truthy
-      end
-
-      it "returns true if user is a developer" do
-        project.team << [user, :developer]
-        expect(access.can_push_to_branch?(@branch.name)).to be_truthy
-      end
-
-      it "returns false if user is a reporter" do
-        project.team << [user, :reporter]
-        expect(access.can_push_to_branch?(@branch.name)).to be_falsey
-      end
-    end
-  end
-
   describe '#check with single protocols allowed' do
     def disable_protocol(protocol)
       settings = ::ApplicationSetting.create_from_defaults
@@ -105,12 +44,12 @@ describe Gitlab::GitAccess, lib: true do
   end
 
   describe 'download_access_check' do
+    subject { access.check('git-upload-pack') }
+
     describe 'master permissions' do
       before { project.team << [user, :master] }
 
       context 'pull code' do
-        subject { access.download_access_check }
-
         it { expect(subject.allowed?).to be_truthy }
       end
     end
@@ -119,8 +58,6 @@ describe Gitlab::GitAccess, lib: true do
       before { project.team << [user, :guest] }
 
       context 'pull code' do
-        subject { access.download_access_check }
-
         it { expect(subject.allowed?).to be_falsey }
       end
     end
@@ -132,16 +69,12 @@ describe Gitlab::GitAccess, lib: true do
       end
 
       context 'pull code' do
-        subject { access.download_access_check }
-
         it { expect(subject.allowed?).to be_falsey }
       end
     end
 
     describe 'without acccess to project' do
       context 'pull code' do
-        subject { access.download_access_check }
-
         it { expect(subject.allowed?).to be_falsey }
       end
     end
@@ -151,110 +84,208 @@ describe Gitlab::GitAccess, lib: true do
       let(:actor) { key }
 
       context 'pull code' do
-        before { key.projects << project }
-        subject { access.download_access_check }
+        context 'when project is authorized' do
+          before { key.projects << project }
 
-        it { expect(subject.allowed?).to be_truthy }
+          it { expect(subject).to be_allowed }
+        end
+
+        context 'when unauthorized' do
+          context 'from public project' do
+            let(:project) { create(:project, :public) }
+
+            it { expect(subject).to be_allowed }
+          end
+
+          context 'from internal project' do
+            let(:project) { create(:project, :internal) }
+
+            it { expect(subject).not_to be_allowed }
+          end
+
+          context 'from private project' do
+            let(:project) { create(:project, :internal) }
+
+            it { expect(subject).not_to be_allowed }
+          end
+        end
       end
     end
   end
 
   describe 'push_access_check' do
-    def protect_feature_branch
-      create(:protected_branch, name: 'feature', project: project)
-    end
+    before { merge_into_protected_branch }
+    let(:unprotected_branch) { FFaker::Internet.user_name }
 
-    def changes
-      {
-        push_new_branch: "#{Gitlab::Git::BLANK_SHA} 570e7b2ab refs/heads/wow",
+    let(:changes) do
+      { push_new_branch: "#{Gitlab::Git::BLANK_SHA} 570e7b2ab refs/heads/wow",
         push_master: '6f6d7e7ed 570e7b2ab refs/heads/master',
         push_protected_branch: '6f6d7e7ed 570e7b2ab refs/heads/feature',
         push_remove_protected_branch: "570e7b2ab #{Gitlab::Git::BLANK_SHA} "\
                                       'refs/heads/feature',
         push_tag: '6f6d7e7ed 570e7b2ab refs/tags/v1.0.0',
         push_new_tag: "#{Gitlab::Git::BLANK_SHA} 570e7b2ab refs/tags/v7.8.9",
-        push_all: ['6f6d7e7ed 570e7b2ab refs/heads/master', '6f6d7e7ed 570e7b2ab refs/heads/feature']
-      }
+        push_all: ['6f6d7e7ed 570e7b2ab refs/heads/master', '6f6d7e7ed 570e7b2ab refs/heads/feature'],
+        merge_into_protected_branch: "0b4bc9a #{merge_into_protected_branch} refs/heads/feature" }
     end
 
-    def self.permissions_matrix
-      {
-        master: {
-          push_new_branch: true,
-          push_master: true,
-          push_protected_branch: true,
-          push_remove_protected_branch: false,
-          push_tag: true,
-          push_new_tag: true,
-          push_all: true,
-        },
-
-        developer: {
-          push_new_branch: true,
-          push_master: true,
-          push_protected_branch: false,
-          push_remove_protected_branch: false,
-          push_tag: false,
-          push_new_tag: true,
-          push_all: false,
-        },
-
-        reporter: {
-          push_new_branch: false,
-          push_master: false,
-          push_protected_branch: false,
-          push_remove_protected_branch: false,
-          push_tag: false,
-          push_new_tag: false,
-          push_all: false,
-        },
-
-        guest: {
-          push_new_branch: false,
-          push_master: false,
-          push_protected_branch: false,
-          push_remove_protected_branch: false,
-          push_tag: false,
-          push_new_tag: false,
-          push_all: false,
-        }
-      }
+    def stub_git_hooks
+      # Running the `pre-receive` hook is expensive, and not necessary for this test.
+      allow_any_instance_of(GitHooksService).to receive(:execute).and_yield
     end
 
-    def self.updated_permissions_matrix
-      updated_permissions_matrix = permissions_matrix.dup
-      updated_permissions_matrix[:developer][:push_protected_branch] = true
-      updated_permissions_matrix[:developer][:push_all] = true
-      updated_permissions_matrix
+    def merge_into_protected_branch
+      @protected_branch_merge_commit ||= begin
+        stub_git_hooks
+        project.repository.add_branch(user, unprotected_branch, 'feature')
+        target_branch = project.repository.lookup('feature')
+        source_branch = project.repository.commit_file(user, FFaker::InternetSE.login_user_name, FFaker::HipsterIpsum.paragraph, FFaker::HipsterIpsum.sentence, unprotected_branch, false)
+        rugged = project.repository.rugged
+        author = { email: "email@example.com", time: Time.now, name: "Example Git User" }
+
+        merge_index = rugged.merge_commits(target_branch, source_branch)
+        Rugged::Commit.create(rugged, author: author, committer: author, message: "commit message", parents: [target_branch, source_branch], tree: merge_index.write_tree(rugged))
+      end
     end
 
-    permissions_matrix.keys.each do |role|
-      describe "#{role} access" do
-        before { protect_feature_branch }
-        before { project.team << [user, role] }
+    def self.run_permission_checks(permissions_matrix)
+      permissions_matrix.keys.each do |role|
+        describe "#{role} access" do
+          before { project.team << [user, role] }
 
-        permissions_matrix[role].each do |action, allowed|
-          context action do
-            subject { access.push_access_check(changes[action]) }
+          permissions_matrix[role].each do |action, allowed|
+            context action do
+              subject { access.push_access_check(changes[action]) }
 
-            it { expect(subject.allowed?).to allowed ? be_truthy : be_falsey }
+              it { expect(subject.allowed?).to allowed ? be_truthy : be_falsey }
+            end
           end
         end
       end
     end
 
-    context "with enabled developers push to protected branches " do
-      updated_permissions_matrix.keys.each do |role|
-        describe "#{role} access" do
-          before { create(:protected_branch, name: 'feature', developers_can_push: true, project: project) }
-          before { project.team << [user, role] }
+    permissions_matrix = {
+      master: {
+        push_new_branch: true,
+        push_master: true,
+        push_protected_branch: true,
+        push_remove_protected_branch: false,
+        push_tag: true,
+        push_new_tag: true,
+        push_all: true,
+        merge_into_protected_branch: true
+      },
+
+      developer: {
+        push_new_branch: true,
+        push_master: true,
+        push_protected_branch: false,
+        push_remove_protected_branch: false,
+        push_tag: false,
+        push_new_tag: true,
+        push_all: false,
+        merge_into_protected_branch: false
+      },
+
+      reporter: {
+        push_new_branch: false,
+        push_master: false,
+        push_protected_branch: false,
+        push_remove_protected_branch: false,
+        push_tag: false,
+        push_new_tag: false,
+        push_all: false,
+        merge_into_protected_branch: false
+      },
+
+      guest: {
+        push_new_branch: false,
+        push_master: false,
+        push_protected_branch: false,
+        push_remove_protected_branch: false,
+        push_tag: false,
+        push_new_tag: false,
+        push_all: false,
+        merge_into_protected_branch: false
+      }
+    }
 
-          updated_permissions_matrix[role].each do |action, allowed|
-            context action do
-              subject { access.push_access_check(changes[action]) }
+    [['feature', 'exact'], ['feat*', 'wildcard']].each do |protected_branch_name, protected_branch_type|
+      context do
+        before { create(:protected_branch, name: protected_branch_name, project: project) }
 
-              it { expect(subject.allowed?).to allowed ? be_truthy : be_falsey }
+        run_permission_checks(permissions_matrix)
+      end
+
+      context "when 'developers can push' is turned on for the #{protected_branch_type} protected branch" do
+        before { create(:protected_branch, name: protected_branch_name, developers_can_push: true, project: project) }
+
+        run_permission_checks(permissions_matrix.deep_merge(developer: { push_protected_branch: true, push_all: true, merge_into_protected_branch: true }))
+      end
+
+      context "when 'developers can merge' is turned on for the #{protected_branch_type} protected branch" do
+        before { create(:protected_branch, name: protected_branch_name, developers_can_merge: true, project: project) }
+
+        context "when a merge request exists for the given source/target branch" do
+          context "when the merge request is in progress" do
+            before do
+              create(:merge_request, source_project: project, source_branch: unprotected_branch, target_branch: 'feature', state: 'locked', in_progress_merge_commit_sha: merge_into_protected_branch)
             end
+
+            run_permission_checks(permissions_matrix.deep_merge(developer: { merge_into_protected_branch: true }))
+          end
+
+          context "when the merge request is not in progress" do
+            before do
+              create(:merge_request, source_project: project, source_branch: unprotected_branch, target_branch: 'feature', in_progress_merge_commit_sha: nil)
+            end
+
+            run_permission_checks(permissions_matrix.deep_merge(developer: { merge_into_protected_branch: false }))
+          end
+        end
+
+        context "when a merge request does not exist for the given source/target branch" do
+          run_permission_checks(permissions_matrix.deep_merge(developer: { merge_into_protected_branch: false }))
+        end
+      end
+
+      context "when 'developers can merge' and 'developers can push' are turned on for the #{protected_branch_type} protected branch" do
+        before { create(:protected_branch, name: protected_branch_name, developers_can_merge: true, developers_can_push: true, project: project) }
+
+        run_permission_checks(permissions_matrix.deep_merge(developer: { push_protected_branch: true, push_all: true, merge_into_protected_branch: true }))
+      end
+    end
+
+    describe 'deploy key permissions' do
+      let(:key) { create(:deploy_key) }
+      let(:actor) { key }
+
+      context 'push code' do
+        subject { access.check('git-receive-pack') }
+
+        context 'when project is authorized' do
+          before { key.projects << project }
+
+          it { expect(subject).not_to be_allowed }
+        end
+
+        context 'when unauthorized' do
+          context 'to public project' do
+            let(:project) { create(:project, :public) }
+
+            it { expect(subject).not_to be_allowed }
+          end
+
+          context 'to internal project' do
+            let(:project) { create(:project, :internal) }
+
+            it { expect(subject).not_to be_allowed }
+          end
+
+          context 'to private project' do
+            let(:project) { create(:project, :internal) }
+
+            it { expect(subject).not_to be_allowed }
           end
         end
       end
diff --git a/spec/lib/gitlab/import_export/avatar_restorer_spec.rb b/spec/lib/gitlab/import_export/avatar_restorer_spec.rb
new file mode 100644
index 00000000000..5ae178414cc
--- /dev/null
+++ b/spec/lib/gitlab/import_export/avatar_restorer_spec.rb
@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Gitlab::ImportExport::AvatarRestorer, lib: true do
+  let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: 'test') }
+  let(:project) { create(:empty_project) }
+
+  before do
+    allow_any_instance_of(described_class).to receive(:avatar_export_file)
+                                                .and_return(Rails.root + "spec/fixtures/dk.png")
+  end
+
+  after do
+    project.remove_avatar!
+  end
+
+  it 'restores a project avatar' do
+    expect(described_class.new(project: project, shared: shared).restore).to be true
+  end
+
+  it 'saves the avatar into the project' do
+    described_class.new(project: project, shared: shared).restore
+
+    expect(project.reload.avatar.file.exists?).to be true
+  end
+end
diff --git a/spec/lib/gitlab/import_export/avatar_saver_spec.rb b/spec/lib/gitlab/import_export/avatar_saver_spec.rb
new file mode 100644
index 00000000000..d6ee94442cb
--- /dev/null
+++ b/spec/lib/gitlab/import_export/avatar_saver_spec.rb
@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Gitlab::ImportExport::AvatarSaver, lib: true do
+  let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: 'test') }
+  let(:export_path) { "#{Dir::tmpdir}/project_tree_saver_spec" }
+  let(:project_with_avatar) { create(:empty_project, avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")) }
+  let(:project) { create(:empty_project) }
+
+  before do
+    FileUtils.mkdir_p("#{shared.export_path}/avatar/")
+    allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path)
+  end
+
+  after do
+    FileUtils.rm_rf("#{shared.export_path}/avatar")
+  end
+
+  it 'saves a project avatar' do
+    described_class.new(project: project_with_avatar, shared: shared).save
+
+    expect(File).to exist("#{shared.export_path}/avatar/dk.png")
+  end
+
+  it 'is fine not to have an avatar' do
+    expect(described_class.new(project: project, shared: shared).save).to be true
+  end
+end
diff --git a/spec/lib/gitlab/import_export/import_export_spec.rb b/spec/lib/gitlab/import_export/import_export_spec.rb
new file mode 100644
index 00000000000..d6409a29550
--- /dev/null
+++ b/spec/lib/gitlab/import_export/import_export_spec.rb
@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Gitlab::ImportExport, services: true do
+  describe 'export filename' do
+    let(:project) { create(:project, :public, path: 'project-path') }
+
+    it 'contains the project path' do
+      expect(described_class.export_filename(project: project)).to include(project.path)
+    end
+
+    it 'contains the namespace path' do
+      expect(described_class.export_filename(project: project)).to include(project.namespace.path)
+    end
+
+    it 'does not go over a certain length' do
+      project.path = 'a' * 100
+
+      expect(described_class.export_filename(project: project).length).to be < 70
+    end
+  end
+end
diff --git a/spec/lib/gitlab/import_export/project.json b/spec/lib/gitlab/import_export/project.json
index 7286b0c39c0..b1a5d72c624 100644
--- a/spec/lib/gitlab/import_export/project.json
+++ b/spec/lib/gitlab/import_export/project.json
@@ -26,6 +26,7 @@
       "deleted_at": null,
       "due_date": null,
       "moved_to_id": null,
+      "test_ee_field": "test",
       "notes": [
         {
           "id": 351,
@@ -2764,7 +2765,7 @@
             "committer_email": "dmitriy.zaporozhets@gmail.com"
           }
         ],
-        "st_diffs": [
+        "utf8_st_diffs": [
           {
             "diff": "Binary files a/.DS_Store and /dev/null differ\n",
             "new_path": ".DS_Store",
@@ -3137,7 +3138,7 @@
             "committer_email": "dmitriy.zaporozhets@gmail.com"
           }
         ],
-        "st_diffs": [
+        "utf8_st_diffs": [
           {
             "diff": "--- /dev/null\n+++ b/files/ruby/feature.rb\n@@ -0,0 +1,5 @@\n+class Feature\n+  def foo\n+    puts 'bar'\n+  end\n+end\n",
             "new_path": "files/ruby/feature.rb",
@@ -3422,7 +3423,7 @@
             "committer_email": "james@jameslopez.es"
           }
         ],
-        "st_diffs": [
+        "utf8_st_diffs": [
           {
             "diff": "--- /dev/null\n+++ b/test\n",
             "new_path": "test",
@@ -3959,7 +3960,7 @@
             "committer_email": "dmitriy.zaporozhets@gmail.com"
           }
         ],
-        "st_diffs": [
+        "utf8_st_diffs": [
           {
             "diff": "Binary files a/.DS_Store and /dev/null differ\n",
             "new_path": ".DS_Store",
@@ -4596,7 +4597,7 @@
             "committer_email": "marmis85@gmail.com"
           }
         ],
-        "st_diffs": [
+        "utf8_st_diffs": [
           {
             "diff": "--- a/CHANGELOG\n+++ b/CHANGELOG\n@@ -1,4 +1,6 @@\n-v 6.7.0\n+v6.8.0\n+\n+v6.7.0\n   - Add support for Gemnasium as a Project Service (Olivier Gonzalez)\n   - Add edit file button to MergeRequest diff\n   - Public groups (Jason Hollingsworth)\n",
             "new_path": "CHANGELOG",
@@ -5107,7 +5108,7 @@
             "committer_email": "stanhu@packetzoom.com"
           }
         ],
-        "st_diffs": [
+        "utf8_st_diffs": [
           {
             "diff": "--- a/CHANGELOG\n+++ b/CHANGELOG\n@@ -1,4 +1,6 @@\n-v 6.7.0\n+v6.8.0\n+\n+v6.7.0\n   - Add support for Gemnasium as a Project Service (Olivier Gonzalez)\n   - Add edit file button to MergeRequest diff\n   - Public groups (Jason Hollingsworth)\n",
             "new_path": "CHANGELOG",
@@ -5433,7 +5434,7 @@
         "id": 11,
         "state": "empty",
         "st_commits": null,
-        "st_diffs": [
+        "utf8_st_diffs": [
 
         ],
         "merge_request_id": 11,
@@ -5960,7 +5961,7 @@
             "committer_email": "dmitriy.zaporozhets@gmail.com"
           }
         ],
-        "st_diffs": [
+        "utf8_st_diffs": [
           {
             "diff": "Binary files a/.DS_Store and /dev/null differ\n",
             "new_path": ".DS_Store",
@@ -6399,7 +6400,7 @@
             "committer_email": "james@jameslopez.es"
           }
         ],
-        "st_diffs": [
+        "utf8_st_diffs": [
           {
             "diff": "--- /dev/null\n+++ b/test\n",
             "new_path": "test",
diff --git a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
index 877be300262..6ae20c943b1 100644
--- a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do
   describe 'restore project tree' do
+
     let(:user) { create(:user) }
     let(:namespace) { create(:namespace, owner: user) }
     let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: "", project_path: 'path') }
@@ -53,6 +54,12 @@ describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do
           expect(event.note.noteable.project).not_to be_nil
         end
       end
+
+      it 'has the correct data for merge request st_diffs' do
+        # makes sure we are renaming the custom method +utf8_st_diffs+ into +st_diffs+
+
+        expect { restored_project_json }.to change(MergeRequestDiff.where.not(st_diffs: nil), :count).by(9)
+      end
     end
   end
 end
diff --git a/spec/lib/gitlab/import_export/project_tree_saver_spec.rb b/spec/lib/gitlab/import_export/project_tree_saver_spec.rb
index 1424de9e60b..057ef6e76a0 100644
--- a/spec/lib/gitlab/import_export/project_tree_saver_spec.rb
+++ b/spec/lib/gitlab/import_export/project_tree_saver_spec.rb
@@ -102,12 +102,17 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do
       it 'has ci pipeline notes' do
         expect(saved_project_json['pipelines'].first['notes']).not_to be_empty
       end
+
+      it 'does not complain about non UTF-8 characters in MR diffs' do
+        ActiveRecord::Base.connection.execute("UPDATE merge_request_diffs SET st_diffs = '---\n- :diff: !binary |-\n    LS0tIC9kZXYvbnVsbAorKysgYi9pbWFnZXMvbnVjb3IucGRmCkBAIC0wLDAg\n    KzEsMTY3OSBAQAorJVBERi0xLjUNJeLjz9MNCisxIDAgb2JqDTw8L01ldGFk\n    YXR'")
+
+        expect(project_tree_saver.save).to be true
+      end
     end
   end
 
   def setup_project
     issue = create(:issue, assignee: user)
-    merge_request = create(:merge_request)
     label = create(:label)
     snippet = create(:project_snippet)
     release = create(:release)
@@ -115,12 +120,12 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do
     project = create(:project,
                      :public,
                      issues: [issue],
-                     merge_requests: [merge_request],
                      labels: [label],
                      snippets: [snippet],
                      releases: [release]
                     )
 
+    merge_request = create(:merge_request, source_project: project)
     commit_status = create(:commit_status, project: project)
 
     ci_pipeline = create(:ci_pipeline,
diff --git a/spec/lib/gitlab/lfs/lfs_router_spec.rb b/spec/lib/gitlab/lfs/lfs_router_spec.rb
deleted file mode 100644
index 659facd6c19..00000000000
--- a/spec/lib/gitlab/lfs/lfs_router_spec.rb
+++ /dev/null
@@ -1,730 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::Lfs::Router, lib: true do
-  let(:project) { create(:project) }
-  let(:public_project) { create(:project, :public) }
-  let(:forked_project) { fork_project(public_project, user) }
-
-  let(:user) { create(:user) }
-  let(:user_two) { create(:user) }
-  let!(:lfs_object) { create(:lfs_object, :with_file) }
-
-  let(:request) { Rack::Request.new(env) }
-  let(:env) do
-    {
-      'rack.input'     => '',
-      'REQUEST_METHOD' => 'GET',
-    }
-  end
-
-  let(:lfs_router_auth) { new_lfs_router(project, user: user) }
-  let(:lfs_router_ci_auth) { new_lfs_router(project, ci: true) }
-  let(:lfs_router_noauth) { new_lfs_router(project) }
-  let(:lfs_router_public_auth) { new_lfs_router(public_project, user: user) }
-  let(:lfs_router_public_ci_auth) { new_lfs_router(public_project, ci: true) }
-  let(:lfs_router_public_noauth) { new_lfs_router(public_project) }
-  let(:lfs_router_forked_noauth) { new_lfs_router(forked_project) }
-  let(:lfs_router_forked_auth) { new_lfs_router(forked_project, user: user_two) }
-  let(:lfs_router_forked_ci_auth) { new_lfs_router(forked_project, ci: true) }
-
-  let(:sample_oid) { "b68143e6463773b1b6c6fd009a76c32aeec041faff32ba2ed42fd7f708a17f80" }
-  let(:sample_size) { 499013 }
-  let(:respond_with_deprecated) {[ 501, { "Content-Type" => "application/json; charset=utf-8" }, ["{\"message\":\"Server supports batch API only, please update your Git LFS client to version 1.0.1 and up.\",\"documentation_url\":\"#{Gitlab.config.gitlab.url}/help\"}"]]}
-  let(:respond_with_disabled) {[ 501, { "Content-Type" => "application/json; charset=utf-8" }, ["{\"message\":\"Git LFS is not enabled on this GitLab server, contact your admin.\",\"documentation_url\":\"#{Gitlab.config.gitlab.url}/help\"}"]]}
-
-  describe 'when lfs is disabled' do
-    before do
-      allow(Gitlab.config.lfs).to receive(:enabled).and_return(false)
-      env['REQUEST_METHOD'] = 'POST'
-      body = {
-                'objects' => [
-                  { 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
-                    'size' => 1575078
-                  },
-                  { 'oid' => sample_oid,
-                    'size' => sample_size
-                  }
-                ],
-                'operation' => 'upload'
-              }.to_json
-      env['rack.input'] = StringIO.new(body)
-      env["PATH_INFO"] = "#{project.repository.path_with_namespace}.git/info/lfs/objects/batch"
-    end
-
-    it 'responds with 501' do
-      expect(lfs_router_auth.try_call).to match_array(respond_with_disabled)
-    end
-  end
-
-  describe 'when fetching lfs object using deprecated API' do
-    before do
-      enable_lfs
-      env["PATH_INFO"] = "#{project.repository.path_with_namespace}.git/info/lfs/objects/#{sample_oid}"
-    end
-
-    it 'responds with 501' do
-      expect(lfs_router_auth.try_call).to match_array(respond_with_deprecated)
-    end
-  end
-
-  describe 'when fetching lfs object' do
-    before do
-      enable_lfs
-      env['HTTP_ACCEPT'] = "application/vnd.git-lfs+json; charset=utf-8"
-      env["PATH_INFO"] = "#{project.repository.path_with_namespace}.git/gitlab-lfs/objects/#{sample_oid}"
-    end
-
-    describe 'and request comes from gitlab-workhorse' do
-      context 'without user being authorized' do
-        it "responds with status 401" do
-          expect(lfs_router_noauth.try_call.first).to eq(401)
-        end
-      end
-
-      context 'with required headers' do
-        before do
-          project.lfs_objects << lfs_object
-          env['HTTP_X_SENDFILE_TYPE'] = "X-Sendfile"
-        end
-
-        context 'when user does not have project access' do
-          it "responds with status 403" do
-            expect(lfs_router_auth.try_call.first).to eq(403)
-          end
-        end
-
-        context 'when user has project access' do
-          before do
-            project.team << [user, :master]
-          end
-
-          it "responds with status 200" do
-            expect(lfs_router_auth.try_call.first).to eq(200)
-          end
-
-          it "responds with the file location" do
-            expect(lfs_router_auth.try_call[1]['Content-Type']).to eq("application/octet-stream")
-            expect(lfs_router_auth.try_call[1]['X-Sendfile']).to eq(lfs_object.file.path)
-          end
-        end
-
-        context 'when CI is authorized' do
-          it "responds with status 200" do
-            expect(lfs_router_ci_auth.try_call.first).to eq(200)
-          end
-
-          it "responds with the file location" do
-            expect(lfs_router_ci_auth.try_call[1]['Content-Type']).to eq("application/octet-stream")
-            expect(lfs_router_ci_auth.try_call[1]['X-Sendfile']).to eq(lfs_object.file.path)
-          end
-        end
-      end
-
-      context 'without required headers' do
-        it "responds with status 403" do
-          expect(lfs_router_auth.try_call.first).to eq(403)
-        end
-      end
-    end
-  end
-
-  describe 'when handling lfs request using deprecated API' do
-    before do
-      enable_lfs
-      env['REQUEST_METHOD'] = 'POST'
-      env["PATH_INFO"] = "#{project.repository.path_with_namespace}.git/info/lfs/objects"
-    end
-
-    it 'responds with 501' do
-      expect(lfs_router_auth.try_call).to match_array(respond_with_deprecated)
-    end
-  end
-
-  describe 'when handling lfs batch request' do
-    before do
-      enable_lfs
-      env['REQUEST_METHOD'] = 'POST'
-      env['PATH_INFO'] = "#{project.repository.path_with_namespace}.git/info/lfs/objects/batch"
-    end
-
-    describe 'download' do
-      before do
-        body = { 'operation' => 'download',
-                 'objects' => [
-                   { 'oid' => sample_oid,
-                     'size' => sample_size
-                   }]
-        }.to_json
-        env['rack.input'] = StringIO.new(body)
-      end
-
-      shared_examples 'an authorized requests' do
-        context 'when downloading an lfs object that is assigned to our project' do
-          before do
-            project.lfs_objects << lfs_object
-          end
-
-          it 'responds with status 200 and href to download' do
-            response = router.try_call
-            expect(response.first).to eq(200)
-            response_body = ActiveSupport::JSON.decode(response.last.first)
-
-            expect(response_body).to eq('objects' => [
-              { 'oid' => sample_oid,
-                'size' => sample_size,
-                'actions' => {
-                  'download' => {
-                    'href' => "#{project.http_url_to_repo}/gitlab-lfs/objects/#{sample_oid}",
-                    'header' => { 'Authorization' => auth }
-                  }
-                }
-              }])
-          end
-        end
-
-        context 'when downloading an lfs object that is assigned to other project' do
-          before do
-            public_project.lfs_objects << lfs_object
-          end
-
-          it 'responds with status 200 and error message' do
-            response = router.try_call
-            expect(response.first).to eq(200)
-            response_body = ActiveSupport::JSON.decode(response.last.first)
-
-            expect(response_body).to eq('objects' => [
-              { 'oid' => sample_oid,
-                'size' => sample_size,
-                'error' => {
-                  'code' => 404,
-                  'message' => "Object does not exist on the server or you don't have permissions to access it",
-                }
-              }])
-          end
-        end
-
-        context 'when downloading a lfs object that does not exist' do
-          before do
-            body = { 'operation' => 'download',
-                     'objects' => [
-                       { 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
-                         'size' => 1575078
-                       }]
-            }.to_json
-            env['rack.input'] = StringIO.new(body)
-          end
-
-          it "responds with status 200 and error message" do
-            response = router.try_call
-            expect(response.first).to eq(200)
-            response_body = ActiveSupport::JSON.decode(response.last.first)
-
-            expect(response_body).to eq('objects' => [
-              { 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
-                'size' => 1575078,
-                'error' => {
-                  'code' => 404,
-                  'message' => "Object does not exist on the server or you don't have permissions to access it",
-                }
-              }])
-          end
-        end
-
-        context 'when downloading one new and one existing lfs object' do
-          before do
-            body = { 'operation' => 'download',
-                     'objects' => [
-                       { 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
-                         'size' => 1575078
-                       },
-                       { 'oid' => sample_oid,
-                         'size' => sample_size
-                       }
-                     ]
-            }.to_json
-            env['rack.input'] = StringIO.new(body)
-            project.lfs_objects << lfs_object
-          end
-
-          it "responds with status 200 with upload hypermedia link for the new object" do
-            response = router.try_call
-            expect(response.first).to eq(200)
-            response_body = ActiveSupport::JSON.decode(response.last.first)
-
-            expect(response_body).to eq('objects' => [
-              { 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
-                'size' => 1575078,
-                'error' => {
-                  'code' => 404,
-                  'message' => "Object does not exist on the server or you don't have permissions to access it",
-                }
-              },
-              { 'oid' => sample_oid,
-                'size' => sample_size,
-                'actions' => {
-                  'download' => {
-                    'href' => "#{project.http_url_to_repo}/gitlab-lfs/objects/#{sample_oid}",
-                    'header' => { 'Authorization' => auth }
-                  }
-                }
-              }])
-          end
-        end
-      end
-
-      context 'when user is authenticated' do
-        let(:auth) { authorize(user) }
-
-        before do
-          env["HTTP_AUTHORIZATION"] = auth
-          project.team << [user, role]
-        end
-
-        it_behaves_like 'an authorized requests' do
-          let(:role) { :reporter }
-          let(:router) { lfs_router_auth }
-        end
-
-        context 'when user does is not member of the project' do
-          let(:role) { :guest }
-
-          it 'responds with 403' do
-            expect(lfs_router_auth.try_call.first).to eq(403)
-          end
-        end
-
-        context 'when user does not have download access' do
-          let(:role) { :guest }
-
-          it 'responds with 403' do
-            expect(lfs_router_auth.try_call.first).to eq(403)
-          end
-        end
-      end
-
-      context 'when CI is authorized' do
-        let(:auth) { 'gitlab-ci-token:password' }
-
-        before do
-          env["HTTP_AUTHORIZATION"] = auth
-        end
-
-        it_behaves_like 'an authorized requests' do
-          let(:router) { lfs_router_ci_auth }
-        end
-      end
-
-      context 'when user is not authenticated' do
-        describe 'is accessing public project' do
-          before do
-            public_project.lfs_objects << lfs_object
-          end
-
-          it 'responds with status 200 and href to download' do
-            response = lfs_router_public_noauth.try_call
-            expect(response.first).to eq(200)
-            response_body = ActiveSupport::JSON.decode(response.last.first)
-
-            expect(response_body).to eq('objects' => [
-              { 'oid' => sample_oid,
-                'size' => sample_size,
-                'actions' => {
-                  'download' => {
-                    'href' => "#{public_project.http_url_to_repo}/gitlab-lfs/objects/#{sample_oid}",
-                    'header' => {}
-                  }
-                }
-              }])
-          end
-        end
-
-        describe 'is accessing non-public project' do
-          before do
-            project.lfs_objects << lfs_object
-          end
-
-          it 'responds with authorization required' do
-            expect(lfs_router_noauth.try_call.first).to eq(401)
-          end
-        end
-      end
-    end
-
-    describe 'upload' do
-      before do
-        body = { 'operation' => 'upload',
-                 'objects' => [
-                   { 'oid' => sample_oid,
-                     'size' => sample_size
-                   }]
-        }.to_json
-        env['rack.input'] = StringIO.new(body)
-      end
-
-      describe 'when request is authenticated' do
-        describe 'when user has project push access' do
-          before do
-            @auth = authorize(user)
-            env["HTTP_AUTHORIZATION"] = @auth
-            project.team << [user, :developer]
-          end
-
-          context 'when pushing an lfs object that already exists' do
-            before do
-              public_project.lfs_objects << lfs_object
-            end
-
-            it "responds with status 200 and links the object to the project" do
-              response_body = lfs_router_auth.try_call.last
-              response = ActiveSupport::JSON.decode(response_body.first)
-
-              expect(response['objects']).to be_kind_of(Array)
-              expect(response['objects'].first['oid']).to eq(sample_oid)
-              expect(response['objects'].first['size']).to eq(sample_size)
-              expect(lfs_object.projects.pluck(:id)).not_to include(project.id)
-              expect(lfs_object.projects.pluck(:id)).to include(public_project.id)
-              expect(response['objects'].first['actions']['upload']['href']).to eq("#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}.git/gitlab-lfs/objects/#{sample_oid}/#{sample_size}")
-              expect(response['objects'].first['actions']['upload']['header']).to eq('Authorization' => @auth)
-            end
-          end
-
-          context 'when pushing a lfs object that does not exist' do
-            before do
-              body = { 'operation' => 'upload',
-                       'objects' => [
-                         { 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
-                           'size' => 1575078
-                         }]
-              }.to_json
-              env['rack.input'] = StringIO.new(body)
-            end
-
-            it "responds with status 200 and upload hypermedia link" do
-              response = lfs_router_auth.try_call
-              expect(response.first).to eq(200)
-
-              response_body = ActiveSupport::JSON.decode(response.last.first)
-              expect(response_body['objects']).to be_kind_of(Array)
-              expect(response_body['objects'].first['oid']).to eq("91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897")
-              expect(response_body['objects'].first['size']).to eq(1575078)
-              expect(lfs_object.projects.pluck(:id)).not_to include(project.id)
-              expect(response_body['objects'].first['actions']['upload']['href']).to eq("#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}.git/gitlab-lfs/objects/91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897/1575078")
-              expect(response_body['objects'].first['actions']['upload']['header']).to eq('Authorization' => @auth)
-            end
-          end
-
-          context 'when pushing one new and one existing lfs object' do
-            before do
-              body = { 'operation' => 'upload',
-                       'objects' => [
-                         { 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
-                           'size' => 1575078
-                         },
-                         { 'oid' => sample_oid,
-                           'size' => sample_size
-                         }
-                       ]
-              }.to_json
-              env['rack.input'] = StringIO.new(body)
-              project.lfs_objects << lfs_object
-            end
-
-            it "responds with status 200 with upload hypermedia link for the new object" do
-              response = lfs_router_auth.try_call
-              expect(response.first).to eq(200)
-
-              response_body = ActiveSupport::JSON.decode(response.last.first)
-              expect(response_body['objects']).to be_kind_of(Array)
-
-              expect(response_body['objects'].first['oid']).to eq("91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897")
-              expect(response_body['objects'].first['size']).to eq(1575078)
-              expect(response_body['objects'].first['actions']['upload']['href']).to eq("#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}.git/gitlab-lfs/objects/91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897/1575078")
-              expect(response_body['objects'].first['actions']['upload']['header']).to eq("Authorization" => @auth)
-
-              expect(response_body['objects'].last['oid']).to eq(sample_oid)
-              expect(response_body['objects'].last['size']).to eq(sample_size)
-              expect(response_body['objects'].last).not_to have_key('actions')
-            end
-          end
-        end
-
-        context 'when user does not have push access' do
-          it 'responds with 403' do
-            expect(lfs_router_auth.try_call.first).to eq(403)
-          end
-        end
-
-        context 'when CI is authorized' do
-          it 'responds with 401' do
-            expect(lfs_router_ci_auth.try_call.first).to eq(401)
-          end
-        end
-      end
-
-      context 'when user is not authenticated' do
-        context 'when user has push access' do
-          before do
-            project.team << [user, :master]
-          end
-
-          it "responds with status 401" do
-            expect(lfs_router_public_noauth.try_call.first).to eq(401)
-          end
-        end
-
-        context 'when user does not have push access' do
-          it "responds with status 401" do
-            expect(lfs_router_public_noauth.try_call.first).to eq(401)
-          end
-        end
-      end
-
-      context 'when CI is authorized' do
-        let(:auth) { 'gitlab-ci-token:password' }
-
-        before do
-          env["HTTP_AUTHORIZATION"] = auth
-        end
-
-        it "responds with status 403" do
-          expect(lfs_router_public_ci_auth.try_call.first).to eq(401)
-        end
-      end
-    end
-
-    describe 'unsupported' do
-      before do
-        body = { 'operation' => 'other',
-                 'objects' => [
-                   { 'oid' => sample_oid,
-                     'size' => sample_size
-                   }]
-        }.to_json
-        env['rack.input'] = StringIO.new(body)
-      end
-
-      it 'responds with status 404' do
-        expect(lfs_router_public_noauth.try_call.first).to eq(404)
-      end
-    end
-  end
-
-  describe 'when pushing a lfs object' do
-    before do
-      enable_lfs
-      env['REQUEST_METHOD'] = 'PUT'
-    end
-
-    shared_examples 'unauthorized' do
-      context 'and request is sent by gitlab-workhorse to authorize the request' do
-        before do
-          header_for_upload_authorize(router.project)
-        end
-
-        it 'responds with status 401' do
-          expect(router.try_call.first).to eq(401)
-        end
-      end
-
-      context 'and request is sent by gitlab-workhorse to finalize the upload' do
-        before do
-          headers_for_upload_finalize(router.project)
-        end
-
-        it 'responds with status 401' do
-          expect(router.try_call.first).to eq(401)
-        end
-      end
-
-      context 'and request is sent with a malformed headers' do
-        before do
-          env["PATH_INFO"] = "#{router.project.repository.path_with_namespace}.git/gitlab-lfs/objects/#{sample_oid}/#{sample_size}"
-          env["HTTP_X_GITLAB_LFS_TMP"] = "cat /etc/passwd"
-        end
-
-        it 'does not recognize it as a valid lfs command' do
-          expect(router.try_call).to eq(nil)
-        end
-      end
-    end
-
-    shared_examples 'forbidden' do
-      context 'and request is sent by gitlab-workhorse to authorize the request' do
-        before do
-          header_for_upload_authorize(router.project)
-        end
-
-        it 'responds with 403' do
-          expect(router.try_call.first).to eq(403)
-        end
-      end
-
-      context 'and request is sent by gitlab-workhorse to finalize the upload' do
-        before do
-          headers_for_upload_finalize(router.project)
-        end
-
-        it 'responds with 403' do
-          expect(router.try_call.first).to eq(403)
-        end
-      end
-    end
-
-    describe 'to one project' do
-      describe 'when user is authenticated' do
-        describe 'when user has push access to the project' do
-          before do
-            project.team << [user, :developer]
-          end
-
-          context 'and request is sent by gitlab-workhorse to authorize the request' do
-            before do
-              header_for_upload_authorize(project)
-            end
-
-            it 'responds with status 200, location of lfs store and object details' do
-              json_response = ActiveSupport::JSON.decode(lfs_router_auth.try_call.last.first)
-
-              expect(lfs_router_auth.try_call.first).to eq(200)
-              expect(json_response['StoreLFSPath']).to eq("#{Gitlab.config.shared.path}/lfs-objects/tmp/upload")
-              expect(json_response['LfsOid']).to eq(sample_oid)
-              expect(json_response['LfsSize']).to eq(sample_size)
-            end
-          end
-
-          context 'and request is sent by gitlab-workhorse to finalize the upload' do
-            before do
-              headers_for_upload_finalize(project)
-            end
-
-            it 'responds with status 200 and lfs object is linked to the project' do
-              expect(lfs_router_auth.try_call.first).to eq(200)
-              expect(lfs_object.projects.pluck(:id)).to include(project.id)
-            end
-          end
-        end
-
-        describe 'and user does not have push access' do
-          let(:router) { lfs_router_auth }
-
-          it_behaves_like 'forbidden'
-        end
-      end
-
-      context 'when CI is authenticated' do
-        let(:router) { lfs_router_ci_auth }
-
-        it_behaves_like 'unauthorized'
-      end
-
-      context 'for unauthenticated' do
-        let(:router) { new_lfs_router(project) }
-
-        it_behaves_like 'unauthorized'
-      end
-    end
-
-    describe 'to a forked project' do
-      let(:forked_project) { fork_project(public_project, user) }
-
-      describe 'when user is authenticated' do
-        describe 'when user has push access to the project' do
-          before do
-            forked_project.team << [user_two, :developer]
-          end
-
-          context 'and request is sent by gitlab-workhorse to authorize the request' do
-            before do
-              header_for_upload_authorize(forked_project)
-            end
-
-            it 'responds with status 200, location of lfs store and object details' do
-              json_response = ActiveSupport::JSON.decode(lfs_router_forked_auth.try_call.last.first)
-
-              expect(lfs_router_forked_auth.try_call.first).to eq(200)
-              expect(json_response['StoreLFSPath']).to eq("#{Gitlab.config.shared.path}/lfs-objects/tmp/upload")
-              expect(json_response['LfsOid']).to eq(sample_oid)
-              expect(json_response['LfsSize']).to eq(sample_size)
-            end
-          end
-
-          context 'and request is sent by gitlab-workhorse to finalize the upload' do
-            before do
-              headers_for_upload_finalize(forked_project)
-            end
-
-            it 'responds with status 200 and lfs object is linked to the source project' do
-              expect(lfs_router_forked_auth.try_call.first).to eq(200)
-              expect(lfs_object.projects.pluck(:id)).to include(public_project.id)
-            end
-          end
-        end
-
-        describe 'and user does not have push access' do
-          let(:router) { lfs_router_forked_auth }
-
-          it_behaves_like 'forbidden'
-        end
-      end
-
-      context 'when CI is authenticated' do
-        let(:router) { lfs_router_forked_ci_auth }
-
-        it_behaves_like 'unauthorized'
-      end
-
-      context 'for unauthenticated' do
-        let(:router) { lfs_router_forked_noauth }
-
-        it_behaves_like 'unauthorized'
-      end
-
-      describe 'and second project not related to fork or a source project' do
-        let(:second_project) { create(:project) }
-        let(:lfs_router_second_project) { new_lfs_router(second_project, user: user) }
-
-        before do
-          public_project.lfs_objects << lfs_object
-          headers_for_upload_finalize(second_project)
-        end
-
-        context 'when pushing the same lfs object to the second project' do
-          before do
-            second_project.team << [user, :master]
-          end
-
-          it 'responds with 200 and links the lfs object to the project' do
-            expect(lfs_router_second_project.try_call.first).to eq(200)
-            expect(lfs_object.projects.pluck(:id)).to include(second_project.id, public_project.id)
-          end
-        end
-      end
-    end
-  end
-
-  def enable_lfs
-    allow(Gitlab.config.lfs).to receive(:enabled).and_return(true)
-  end
-
-  def authorize(user)
-    ActionController::HttpAuthentication::Basic.encode_credentials(user.username, user.password)
-  end
-
-  def new_lfs_router(project, user: nil, ci: false)
-    Gitlab::Lfs::Router.new(project, user, ci, request)
-  end
-
-  def header_for_upload_authorize(project)
-    env["PATH_INFO"] = "#{project.repository.path_with_namespace}.git/gitlab-lfs/objects/#{sample_oid}/#{sample_size}/authorize"
-  end
-
-  def headers_for_upload_finalize(project)
-    env["PATH_INFO"] = "#{project.repository.path_with_namespace}.git/gitlab-lfs/objects/#{sample_oid}/#{sample_size}"
-    env["HTTP_X_GITLAB_LFS_TMP"] = "#{sample_oid}6e561c9d4"
-  end
-
-  def fork_project(project, user, object = nil)
-    allow(RepositoryForkWorker).to receive(:perform_async).and_return(true)
-    Projects::ForkService.new(project, user, {}).execute
-  end
-end
diff --git a/spec/lib/gitlab/user_access_spec.rb b/spec/lib/gitlab/user_access_spec.rb
new file mode 100644
index 00000000000..aa9ec243498
--- /dev/null
+++ b/spec/lib/gitlab/user_access_spec.rb
@@ -0,0 +1,88 @@
+require 'spec_helper'
+
+describe Gitlab::UserAccess, lib: true do
+  let(:access) { Gitlab::UserAccess.new(user, project: project) }
+  let(:project) { create(:project) }
+  let(:user) { create(:user) }
+
+  describe 'can_push_to_branch?' do
+    describe 'push to none protected branch' do
+      it 'returns true if user is a master' do
+        project.team << [user, :master]
+        expect(access.can_push_to_branch?('random_branch')).to be_truthy
+      end
+
+      it 'returns true if user is a developer' do
+        project.team << [user, :developer]
+        expect(access.can_push_to_branch?('random_branch')).to be_truthy
+      end
+
+      it 'returns false if user is a reporter' do
+        project.team << [user, :reporter]
+        expect(access.can_push_to_branch?('random_branch')).to be_falsey
+      end
+    end
+
+    describe 'push to protected branch' do
+      let(:branch) { create :protected_branch, project: project }
+
+      it 'returns true if user is a master' do
+        project.team << [user, :master]
+        expect(access.can_push_to_branch?(branch.name)).to be_truthy
+      end
+
+      it 'returns false if user is a developer' do
+        project.team << [user, :developer]
+        expect(access.can_push_to_branch?(branch.name)).to be_falsey
+      end
+
+      it 'returns false if user is a reporter' do
+        project.team << [user, :reporter]
+        expect(access.can_push_to_branch?(branch.name)).to be_falsey
+      end
+    end
+
+    describe 'push to protected branch if allowed for developers' do
+      before do
+        @branch = create :protected_branch, project: project, developers_can_push: true
+      end
+
+      it 'returns true if user is a master' do
+        project.team << [user, :master]
+        expect(access.can_push_to_branch?(@branch.name)).to be_truthy
+      end
+
+      it 'returns true if user is a developer' do
+        project.team << [user, :developer]
+        expect(access.can_push_to_branch?(@branch.name)).to be_truthy
+      end
+
+      it 'returns false if user is a reporter' do
+        project.team << [user, :reporter]
+        expect(access.can_push_to_branch?(@branch.name)).to be_falsey
+      end
+    end
+
+    describe 'merge to protected branch if allowed for developers' do
+      before do
+        @branch = create :protected_branch, project: project, developers_can_merge: true
+      end
+
+      it 'returns true if user is a master' do
+        project.team << [user, :master]
+        expect(access.can_merge_to_branch?(@branch.name)).to be_truthy
+      end
+
+      it 'returns true if user is a developer' do
+        project.team << [user, :developer]
+        expect(access.can_merge_to_branch?(@branch.name)).to be_truthy
+      end
+
+      it 'returns false if user is a reporter' do
+        project.team << [user, :reporter]
+        expect(access.can_merge_to_branch?(@branch.name)).to be_falsey
+      end
+    end
+
+  end
+end
diff --git a/spec/lib/repository_cache_spec.rb b/spec/lib/repository_cache_spec.rb
index 63b5292b098..f227926f39c 100644
--- a/spec/lib/repository_cache_spec.rb
+++ b/spec/lib/repository_cache_spec.rb
@@ -1,33 +1,34 @@
-require_relative '../../lib/repository_cache'
+require 'spec_helper'
 
 describe RepositoryCache, lib: true do
+  let(:project) { create(:project) }
   let(:backend) { double('backend').as_null_object }
-  let(:cache) { RepositoryCache.new('example', backend) }
+  let(:cache) { RepositoryCache.new('example', project.id, backend) }
 
   describe '#cache_key' do
     it 'includes the namespace' do
-      expect(cache.cache_key(:foo)).to eq 'foo:example'
+      expect(cache.cache_key(:foo)).to eq "foo:example:#{project.id}"
     end
   end
 
   describe '#expire' do
     it 'expires the given key from the cache' do
       cache.expire(:foo)
-      expect(backend).to have_received(:delete).with('foo:example')
+      expect(backend).to have_received(:delete).with("foo:example:#{project.id}")
     end
   end
 
   describe '#fetch' do
     it 'fetches the given key from the cache' do
       cache.fetch(:bar)
-      expect(backend).to have_received(:fetch).with('bar:example')
+      expect(backend).to have_received(:fetch).with("bar:example:#{project.id}")
     end
 
     it 'accepts a block' do
       p = -> {}
 
       cache.fetch(:baz, &p)
-      expect(backend).to have_received(:fetch).with('baz:example', &p)
+      expect(backend).to have_received(:fetch).with("baz:example:#{project.id}", &p)
     end
   end
 end
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 0a9b10bebea..3685b2b17b5 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -12,7 +12,7 @@ describe Notify do
   context 'for a project' do
     describe 'items that are assignable, the email' do
       let(:current_user) { create(:user, email: "current@email.com") }
-      let(:assignee) { create(:user, email: 'assignee@example.com') }
+      let(:assignee) { create(:user, email: 'assignee@example.com', name: 'John Doe') }
       let(:previous_assignee) { create(:user, name: 'Previous Assignee') }
 
       shared_examples 'an assignee email' do
diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb
index 2ea1320267c..fb040ba82bc 100644
--- a/spec/models/application_setting_spec.rb
+++ b/spec/models/application_setting_spec.rb
@@ -54,23 +54,60 @@ describe ApplicationSetting, models: true do
 
   context 'restricted signup domains' do
     it 'set single domain' do
-      setting.restricted_signup_domains_raw = 'example.com'
-      expect(setting.restricted_signup_domains).to eq(['example.com'])
+      setting.domain_whitelist_raw = 'example.com'
+      expect(setting.domain_whitelist).to eq(['example.com'])
     end
 
     it 'set multiple domains with spaces' do
-      setting.restricted_signup_domains_raw = 'example.com *.example.com'
-      expect(setting.restricted_signup_domains).to eq(['example.com', '*.example.com'])
+      setting.domain_whitelist_raw = 'example.com *.example.com'
+      expect(setting.domain_whitelist).to eq(['example.com', '*.example.com'])
     end
 
     it 'set multiple domains with newlines and a space' do
-      setting.restricted_signup_domains_raw = "example.com\n *.example.com"
-      expect(setting.restricted_signup_domains).to eq(['example.com', '*.example.com'])
+      setting.domain_whitelist_raw = "example.com\n *.example.com"
+      expect(setting.domain_whitelist).to eq(['example.com', '*.example.com'])
     end
 
     it 'set multiple domains with commas' do
-      setting.restricted_signup_domains_raw = "example.com, *.example.com"
-      expect(setting.restricted_signup_domains).to eq(['example.com', '*.example.com'])
+      setting.domain_whitelist_raw = "example.com, *.example.com"
+      expect(setting.domain_whitelist).to eq(['example.com', '*.example.com'])
+    end
+  end
+
+  context 'blacklisted signup domains' do
+    it 'set single domain' do
+      setting.domain_blacklist_raw = 'example.com'
+      expect(setting.domain_blacklist).to contain_exactly('example.com')
+    end
+
+    it 'set multiple domains with spaces' do
+      setting.domain_blacklist_raw = 'example.com *.example.com'
+      expect(setting.domain_blacklist).to contain_exactly('example.com', '*.example.com')
+    end
+
+    it 'set multiple domains with newlines and a space' do
+      setting.domain_blacklist_raw = "example.com\n *.example.com"
+      expect(setting.domain_blacklist).to contain_exactly('example.com', '*.example.com')
+    end
+
+    it 'set multiple domains with commas' do
+      setting.domain_blacklist_raw = "example.com, *.example.com"
+      expect(setting.domain_blacklist).to contain_exactly('example.com', '*.example.com')
+    end
+
+    it 'set multiple domains with semicolon' do
+      setting.domain_blacklist_raw = "example.com; *.example.com"
+      expect(setting.domain_blacklist).to contain_exactly('example.com', '*.example.com')
+    end
+
+    it 'set multiple domains with mixture of everything' do
+      setting.domain_blacklist_raw = "example.com; *.example.com\n test.com\sblock.com   yes.com"
+      expect(setting.domain_blacklist).to contain_exactly('example.com', '*.example.com', 'test.com', 'block.com', 'yes.com')
+    end
+
+    it 'set multiple domain with file' do
+      setting.domain_blacklist_file = File.open(Rails.root.join('spec/fixtures/', 'domain_blacklist.txt'))
+      expect(setting.domain_blacklist).to contain_exactly('example.com', 'test.com', 'foo.bar')
     end
   end
 end
diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index e8171788872..978ad9c52d5 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -5,7 +5,9 @@ describe Ci::Build, models: true do
 
   let(:pipeline) do
     create(:ci_pipeline, project: project,
-                         sha: project.commit.id)
+                         sha: project.commit.id,
+                         ref: project.default_branch,
+                         status: 'success')
   end
 
   let(:build) { create(:ci_build, pipeline: pipeline) }
@@ -191,93 +193,185 @@ describe Ci::Build, models: true do
   end
 
   describe '#variables' do
+    let(:container_registry_enabled) { false }
+    let(:predefined_variables) do
+      [
+        { key: 'CI', value: 'true', public: true },
+        { key: 'GITLAB_CI', value: 'true', public: true },
+        { key: 'CI_BUILD_ID', value: build.id.to_s, public: true },
+        { key: 'CI_BUILD_TOKEN', value: build.token, public: false },
+        { key: 'CI_BUILD_REF', value: build.sha, public: true },
+        { key: 'CI_BUILD_BEFORE_SHA', value: build.before_sha, public: true },
+        { key: 'CI_BUILD_REF_NAME', value: 'master', public: true },
+        { key: 'CI_BUILD_NAME', value: 'test', public: true },
+        { key: 'CI_BUILD_STAGE', value: 'test', public: true },
+        { key: 'CI_SERVER_NAME', value: 'GitLab', public: true },
+        { key: 'CI_SERVER_VERSION', value: Gitlab::VERSION, public: true },
+        { key: 'CI_SERVER_REVISION', value: Gitlab::REVISION, public: true },
+        { key: 'CI_PROJECT_ID', value: project.id.to_s, public: true },
+        { key: 'CI_PROJECT_NAME', value: project.path, public: true },
+        { key: 'CI_PROJECT_PATH', value: project.path_with_namespace, public: true },
+        { key: 'CI_PROJECT_NAMESPACE', value: project.namespace.path, public: true },
+        { key: 'CI_PROJECT_URL', value: project.web_url, public: true },
+        { key: 'CI_PIPELINE_ID', value: pipeline.id.to_s, public: true }
+      ]
+    end
+
+    before do
+      stub_container_registry_config(enabled: container_registry_enabled, host_port: 'registry.example.com')
+    end
+
+    subject { build.variables }
+
     context 'returns variables' do
-      subject { build.variables }
+      before do
+        build.yaml_variables = []
+      end
 
-      let(:predefined_variables) do
-        [
-          { key: :CI_BUILD_NAME, value: 'test', public: true },
-          { key: :CI_BUILD_STAGE, value: 'stage', public: true },
-        ]
+      it { is_expected.to eq(predefined_variables) }
+    end
+
+    context 'when build is for tag' do
+      let(:tag_variable) do
+        { key: 'CI_BUILD_TAG', value: 'master', public: true }
       end
 
-      let(:yaml_variables) do
-        [
-          { key: :DB_NAME, value: 'postgres', public: true }
-        ]
+      before do
+        build.update_attributes(tag: true)
+      end
+
+      it { is_expected.to include(tag_variable) }
+    end
+
+    context 'when secure variable is defined' do
+      let(:secure_variable) do
+        { key: 'SECRET_KEY', value: 'secret_value', public: false }
       end
 
       before do
-        build.update_attributes(stage: 'stage')
+        build.project.variables << Ci::Variable.new(key: 'SECRET_KEY', value: 'secret_value')
       end
 
-      it { is_expected.to eq(predefined_variables + yaml_variables) }
+      it { is_expected.to include(secure_variable) }
+    end
 
-      context 'for tag' do
-        let(:tag_variable) do
-          [
-            { key: :CI_BUILD_TAG, value: 'master', public: true }
-          ]
-        end
+    context 'when build is for triggers' do
+      let(:trigger) { create(:ci_trigger, project: project) }
+      let(:trigger_request) { create(:ci_trigger_request_with_variables, pipeline: pipeline, trigger: trigger) }
+      let(:user_trigger_variable) do
+        { key: :TRIGGER_KEY, value: 'TRIGGER_VALUE', public: false }
+      end
+      let(:predefined_trigger_variable) do
+        { key: 'CI_BUILD_TRIGGERED', value: 'true', public: true }
+      end
 
-        before do
-          build.update_attributes(tag: true)
-        end
+      before do
+        build.trigger_request = trigger_request
+      end
 
-        it { is_expected.to eq(tag_variable + predefined_variables + yaml_variables) }
+      it { is_expected.to include(user_trigger_variable) }
+      it { is_expected.to include(predefined_trigger_variable) }
+    end
+
+    context 'when yaml_variables are undefined' do
+      before do
+        build.yaml_variables = nil
       end
 
-      context 'and secure variables' do
-        let(:secure_variables) do
-          [
-            { key: 'SECRET_KEY', value: 'secret_value', public: false }
-          ]
+      context 'use from gitlab-ci.yml' do
+        before do
+          stub_ci_pipeline_yaml_file(config)
         end
 
-        before do
-          build.project.variables << Ci::Variable.new(key: 'SECRET_KEY', value: 'secret_value')
+        context 'if config is not found' do
+          let(:config) { nil }
+
+          it { is_expected.to eq(predefined_variables) }
         end
 
-        it { is_expected.to eq(predefined_variables + yaml_variables + secure_variables) }
+        context 'if config does not have a questioned job' do
+          let(:config) do
+            YAML.dump({
+              test_other: {
+                script: 'Hello World'
+              }
+            })
+          end
+
+          it { is_expected.to eq(predefined_variables) }
+        end
 
-        context 'and trigger variables' do
-          let(:trigger) { create(:ci_trigger, project: project) }
-          let(:trigger_request) { create(:ci_trigger_request_with_variables, pipeline: pipeline, trigger: trigger) }
-          let(:trigger_variables) do
-            [
-              { key: :TRIGGER_KEY, value: 'TRIGGER_VALUE', public: false }
-            ]
+        context 'if config has variables' do
+          let(:config) do
+            YAML.dump({
+              test: {
+                script: 'Hello World',
+                variables: {
+                  KEY: 'value'
+                }
+              }
+            })
           end
-          let(:predefined_trigger_variable) do
-            [
-              { key: :CI_BUILD_TRIGGERED, value: 'true', public: true }
-            ]
+          let(:variables) do
+            [{ key: :KEY, value: 'value', public: true }]
           end
 
-          before do
-            build.trigger_request = trigger_request
-          end
+          it { is_expected.to eq(predefined_variables + variables) }
+        end
+      end
+    end
+
+    context 'when container registry is enabled' do
+      let(:container_registry_enabled) { true }
+      let(:ci_registry) do
+        { key: 'CI_REGISTRY',  value: 'registry.example.com',  public: true }
+      end
+      let(:ci_registry_image) do
+        { key: 'CI_REGISTRY_IMAGE',  value: project.container_registry_repository_url, public: true }
+      end
 
-          it { is_expected.to eq(predefined_variables + predefined_trigger_variable + yaml_variables + secure_variables + trigger_variables) }
+      context 'and is disabled for project' do
+        before do
+          project.update(container_registry_enabled: false)
         end
 
-        context 'when job variables are defined' do
-          ##
-          # Job-level variables are defined in gitlab_ci.yml fixture
-          #
-          context 'when job variables are unique' do
-            let(:build) { create(:ci_build, name: 'staging') }
-
-            it 'includes job variables' do
-              expect(subject).to include(
-                { key: :KEY1, value: 'value1', public: true },
-                { key: :KEY2, value: 'value2', public: true }
-              )
-            end
-          end
+        it { is_expected.to include(ci_registry) }
+        it { is_expected.not_to include(ci_registry_image) }
+      end
+
+      context 'and is enabled for project' do
+        before do
+          project.update(container_registry_enabled: true)
         end
+
+        it { is_expected.to include(ci_registry) }
+        it { is_expected.to include(ci_registry_image) }
       end
     end
+
+    context 'when runner is assigned to build' do
+      let(:runner) { create(:ci_runner, description: 'description', tag_list: ['docker', 'linux']) }
+
+      before do
+        build.update(runner: runner)
+      end
+
+      it { is_expected.to include({ key: 'CI_RUNNER_ID', value: runner.id.to_s, public: true }) }
+      it { is_expected.to include({ key: 'CI_RUNNER_DESCRIPTION', value: 'description', public: true }) }
+      it { is_expected.to include({ key: 'CI_RUNNER_TAGS', value: 'docker, linux', public: true }) }
+    end
+
+    context 'returns variables in valid order' do
+      before do
+        allow(build).to receive(:predefined_variables) { ['predefined'] }
+        allow(project).to receive(:predefined_variables) { ['project'] }
+        allow(pipeline).to receive(:predefined_variables) { ['pipeline'] }
+        allow(build).to receive(:yaml_variables) { ['yaml'] }
+        allow(project).to receive(:secret_variables) { ['secret'] }
+      end
+
+      it { is_expected.to eq(%w[predefined project pipeline yaml secret]) }
+    end
   end
 
   describe '#has_tags?' do
@@ -628,7 +722,7 @@ describe Ci::Build, models: true do
 
       describe '#erasable?' do
         subject { build.erasable? }
-        it { is_expected.to eq true }
+        it { is_expected.to be_truthy }
       end
 
       describe '#erased?' do
@@ -636,7 +730,7 @@ describe Ci::Build, models: true do
         subject { build.erased? }
 
         context 'build has not been erased' do
-          it { is_expected.to be false }
+          it { is_expected.to be_falsey }
         end
 
         context 'build has been erased' do
@@ -644,12 +738,13 @@ describe Ci::Build, models: true do
             build.erase
           end
 
-          it { is_expected.to be true }
+          it { is_expected.to be_truthy }
         end
       end
 
       context 'metadata and build trace are not available' do
         let!(:build) { create(:ci_build, :success, :artifacts) }
+
         before do
           build.remove_artifacts_metadata!
         end
@@ -671,6 +766,138 @@ describe Ci::Build, models: true do
 
   describe '#retryable?' do
     context 'when build is running' do
+      before do
+        build.run!
+      end
+
+      it { expect(build).not_to be_retryable }
+    end
+
+    context 'when build is finished' do
+      before do
+        build.success!
+      end
+
+      it { expect(build).to be_retryable }
+    end
+  end
+
+  describe '#manual?' do
+    before do
+      build.update(when: value)
+    end
+
+    subject { build.manual? }
+
+    context 'when is set to manual' do
+      let(:value) { 'manual' }
+
+      it { is_expected.to be_truthy }
+    end
+
+    context 'when set to something else' do
+      let(:value) { 'something else' }
+
+      it { is_expected.to be_falsey }
+    end
+  end
+
+  describe '#other_actions' do
+    let(:build) { create(:ci_build, :manual, pipeline: pipeline) }
+    let!(:other_build) { create(:ci_build, :manual, pipeline: pipeline, name: 'other action') }
+
+    subject { build.other_actions }
+
+    it 'returns other actions' do
+      is_expected.to contain_exactly(other_build)
+    end
+
+    context 'when build is retried' do
+      let!(:new_build) { Ci::Build.retry(build) }
+
+      it 'does not return any of them' do
+        is_expected.not_to include(build, new_build)
+      end
+    end
+
+    context 'when other build is retried' do
+      let!(:retried_build) { Ci::Build.retry(other_build) }
+
+      it 'returns a retried build' do
+        is_expected.to contain_exactly(retried_build)
+      end
+    end
+  end
+
+  describe '#play' do
+    let(:build) { create(:ci_build, :manual, pipeline: pipeline) }
+
+    subject { build.play }
+
+    it 'enques a build' do
+      is_expected.to be_pending
+      is_expected.to eq(build)
+    end
+
+    context 'for success build' do
+      before { build.queue }
+
+      it 'creates a new build' do
+        is_expected.to be_pending
+        is_expected.not_to eq(build)
+      end
+    end
+  end
+
+  describe '#when' do
+    subject { build.when }
+
+    context 'if is undefined' do
+      before do
+        build.when = nil
+      end
+
+      context 'use from gitlab-ci.yml' do
+        before do
+          stub_ci_pipeline_yaml_file(config)
+        end
+
+        context 'if config is not found' do
+          let(:config) { nil }
+
+          it { is_expected.to eq('on_success') }
+        end
+
+        context 'if config does not have a questioned job' do
+          let(:config) do
+            YAML.dump({
+                        test_other: {
+                          script: 'Hello World'
+                        }
+                      })
+          end
+
+          it { is_expected.to eq('on_success') }
+        end
+
+        context 'if config has when' do
+          let(:config) do
+            YAML.dump({
+                        test: {
+                          script: 'Hello World',
+                          when: 'always'
+                        }
+                      })
+          end
+
+          it { is_expected.to eq('always') }
+        end
+      end
+    end
+  end
+
+  describe '#retryable?' do
+    context 'when build is running' do
       before { build.run! }
 
       it 'should return false' do
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index 4e5481f9154..0d4c86955ce 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -5,9 +5,12 @@ describe Ci::Pipeline, models: true do
   let(:pipeline) { FactoryGirl.create :ci_pipeline, project: project }
 
   it { is_expected.to belong_to(:project) }
+  it { is_expected.to belong_to(:user) }
+
   it { is_expected.to have_many(:statuses) }
   it { is_expected.to have_many(:trigger_requests) }
   it { is_expected.to have_many(:builds) }
+
   it { is_expected.to validate_presence_of :sha }
   it { is_expected.to validate_presence_of :status }
 
@@ -257,6 +260,70 @@ describe Ci::Pipeline, models: true do
           expect(pipeline.reload.status).to eq('canceled')
         end
       end
+
+      context 'when listing manual actions' do
+        let(:yaml) do
+          {
+            stages: ["build", "test", "staging", "production", "cleanup"],
+            build: {
+              stage: "build",
+              script: "BUILD",
+            },
+            test: {
+              stage: "test",
+              script: "TEST",
+            },
+            staging: {
+              stage: "staging",
+              script: "PUBLISH",
+            },
+            production: {
+              stage: "production",
+              script: "PUBLISH",
+              when: "manual",
+            },
+            cleanup: {
+              stage: "cleanup",
+              script: "TIDY UP",
+              when: "always",
+            },
+            clear_cache: {
+              stage: "cleanup",
+              script: "CLEAR CACHE",
+              when: "manual",
+            }
+          }
+        end
+
+        it 'returns only for skipped builds' do
+          # currently all builds are created
+          expect(create_builds).to be_truthy
+          expect(manual_actions).to be_empty
+
+          # succeed stage build
+          pipeline.builds.running_or_pending.each(&:success)
+          expect(manual_actions).to be_empty
+
+          # succeed stage test
+          pipeline.builds.running_or_pending.each(&:success)
+          expect(manual_actions).to be_empty
+
+          # succeed stage staging and skip stage production
+          pipeline.builds.running_or_pending.each(&:success)
+          expect(manual_actions).to be_many # production and clear cache
+
+          # succeed stage cleanup
+          pipeline.builds.running_or_pending.each(&:success)
+
+          # after processing a pipeline we should have 6 builds, 5 succeeded
+          expect(pipeline.builds.count).to eq(6)
+          expect(pipeline.builds.success.count).to eq(4)
+        end
+
+        def manual_actions
+          pipeline.manual_actions
+        end
+      end
     end
 
     context 'when no builds created' do
@@ -413,4 +480,66 @@ describe Ci::Pipeline, models: true do
       end
     end
   end
+
+  describe '#manual_actions' do
+    subject { pipeline.manual_actions }
+
+    it 'when none defined' do
+      is_expected.to be_empty
+    end
+
+    context 'when action defined' do
+      let!(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'deploy') }
+
+      it 'returns one action' do
+        is_expected.to contain_exactly(manual)
+      end
+
+      context 'there are multiple of the same name' do
+        let!(:manual2) { create(:ci_build, :manual, pipeline: pipeline, name: 'deploy') }
+
+        it 'returns latest one' do
+          is_expected.to contain_exactly(manual2)
+        end
+      end
+    end
+  end
+
+  describe '#has_warnings?' do
+    subject { pipeline.has_warnings? }
+
+    context 'build which is allowed to fail fails' do
+      before do
+        create :ci_build, :success, pipeline: pipeline, name: 'rspec'
+        create :ci_build, :allowed_to_fail, :failed, pipeline: pipeline, name: 'rubocop'
+      end
+      
+      it 'returns true' do
+        is_expected.to be_truthy
+      end
+    end
+
+    context 'build which is allowed to fail succeeds' do
+      before do
+        create :ci_build, :success, pipeline: pipeline, name: 'rspec'
+        create :ci_build, :allowed_to_fail, :success, pipeline: pipeline, name: 'rubocop'
+      end
+      
+      it 'returns false' do
+        is_expected.to be_falsey
+      end
+    end
+
+    context 'build is retried and succeeds' do
+      before do
+        create :ci_build, :success, pipeline: pipeline, name: 'rubocop'
+        create :ci_build, :failed, pipeline: pipeline, name: 'rspec'
+        create :ci_build, :success, pipeline: pipeline, name: 'rspec'
+      end
+
+      it 'returns false' do
+        is_expected.to be_falsey
+      end
+    end
+  end
 end
diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index 05f22c7a9eb..ff6371ad685 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -177,10 +177,10 @@ describe CommitStatus, models: true do
 
   describe '#stages' do
     before do
-      FactoryGirl.create :commit_status, pipeline: pipeline, stage: 'build', stage_idx: 0, status: 'success'
-      FactoryGirl.create :commit_status, pipeline: pipeline, stage: 'build', stage_idx: 0, status: 'failed'
-      FactoryGirl.create :commit_status, pipeline: pipeline, stage: 'deploy', stage_idx: 2, status: 'running'
-      FactoryGirl.create :commit_status, pipeline: pipeline, stage: 'test', stage_idx: 1, status: 'success'
+      create :commit_status, pipeline: pipeline, stage: 'build', name: 'linux', stage_idx: 0, status: 'success'
+      create :commit_status, pipeline: pipeline, stage: 'build', name: 'mac', stage_idx: 0, status: 'failed'
+      create :commit_status, pipeline: pipeline, stage: 'deploy', name: 'staging', stage_idx: 2, status: 'running'
+      create :commit_status, pipeline: pipeline, stage: 'test', name: 'rspec', stage_idx: 1, status: 'success'
     end
 
     context 'stages list' do
@@ -192,7 +192,7 @@ describe CommitStatus, models: true do
     end
 
     context 'stages with statuses' do
-      subject { CommitStatus.where(pipeline: pipeline).stages_status }
+      subject { CommitStatus.where(pipeline: pipeline).latest.stages_status }
 
       it 'return list of stages with statuses' do
         is_expected.to eq({
@@ -201,6 +201,20 @@ describe CommitStatus, models: true do
           'deploy' => 'running'
         })
       end
+
+      context 'when build is retried' do
+        before do
+          create :commit_status, pipeline: pipeline, stage: 'build', name: 'mac', stage_idx: 0, status: 'success'
+        end
+
+        it 'ignores a previous state' do
+          is_expected.to eq({
+            'build' => 'success',
+            'test' => 'success',
+            'deploy' => 'running'
+          })
+        end
+      end
     end
   end
 
diff --git a/spec/models/deployment_spec.rb b/spec/models/deployment_spec.rb
index b273018707f..7df3df4bb9e 100644
--- a/spec/models/deployment_spec.rb
+++ b/spec/models/deployment_spec.rb
@@ -11,6 +11,7 @@ describe Deployment, models: true do
   it { is_expected.to delegate_method(:name).to(:environment).with_prefix }
   it { is_expected.to delegate_method(:commit).to(:project) }
   it { is_expected.to delegate_method(:commit_title).to(:commit).as(:try) }
+  it { is_expected.to delegate_method(:manual_actions).to(:deployable).as(:try) }
 
   it { is_expected.to validate_presence_of(:ref) }
   it { is_expected.to validate_presence_of(:sha) }
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index b87d68283e6..6a897c96690 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -22,6 +22,26 @@ describe Issue, models: true do
     it { is_expected.to have_db_index(:deleted_at) }
   end
 
+  describe 'visible_to_user' do
+    let(:user) { create(:user) }
+    let(:authorized_user) { create(:user) }
+    let(:project) { create(:project, namespace: authorized_user.namespace) }
+    let!(:public_issue) { create(:issue, project: project) }
+    let!(:confidential_issue) { create(:issue, project: project, confidential: true) }
+
+    it 'returns non confidential issues for nil user' do
+      expect(Issue.visible_to_user(nil).count).to be(1)
+    end
+
+    it 'returns non confidential issues for user not authorized for the issues projects' do
+      expect(Issue.visible_to_user(user).count).to be(1)
+    end
+
+    it 'returns all issues for user authorized for the issues projects' do
+      expect(Issue.visible_to_user(authorized_user).count).to be(2)
+    end
+  end
+
   describe '#to_reference' do
     it 'returns a String reference to the object' do
       expect(subject.to_reference).to eq "##{subject.iid}"
diff --git a/spec/models/legacy_diff_note_spec.rb b/spec/models/legacy_diff_note_spec.rb
index d64d89edbd3..d23fc06c3ad 100644
--- a/spec/models/legacy_diff_note_spec.rb
+++ b/spec/models/legacy_diff_note_spec.rb
@@ -16,10 +16,10 @@ describe LegacyDiffNote, models: true do
   end
 
   describe '#active?' do
-    it 'is always true when the note has no associated diff' do
+    it 'is always true when the note has no associated diff line' do
       note = build(:legacy_diff_note_on_merge_request)
 
-      expect(note).to receive(:diff).and_return(nil)
+      expect(note).to receive(:diff_line).and_return(nil)
 
       expect(note).to be_active
     end
@@ -27,7 +27,7 @@ describe LegacyDiffNote, models: true do
     it 'is never true when the note has no noteable associated' do
       note = build(:legacy_diff_note_on_merge_request)
 
-      expect(note).to receive(:diff).and_return(double)
+      expect(note).to receive(:diff_line).and_return(double)
       expect(note).to receive(:noteable).and_return(nil)
 
       expect(note).not_to be_active
@@ -47,7 +47,7 @@ describe LegacyDiffNote, models: true do
         merge = build_stubbed(:merge_request, :simple)
         note = build(:legacy_diff_note_on_merge_request, noteable: merge)
 
-        allow(note).to receive(:diff).and_return(double)
+        allow(note).to receive(:diff_line).and_return(double)
         expect(note).to receive(:find_noteable_diff).and_return(nil)
 
         expect(note).not_to be_active
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 7d0697dab42..1243f5420a7 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -135,22 +135,30 @@ describe Note, models: true do
     let!(:note2) { create(:note_on_issue) }
 
     it "reads the rendered note body from the cache" do
-      expect(Banzai::Renderer).to receive(:render).
-        with(note1.note,
-             pipeline: :note,
-             cache_key: [note1, "note"],
-             project: note1.project,
-             author: note1.author)
-
-      expect(Banzai::Renderer).to receive(:render).
-        with(note2.note,
-             pipeline: :note,
-             cache_key: [note2, "note"],
-             project: note2.project,
-             author: note2.author)
-
-      note1.all_references
-      note2.all_references
+      expect(Banzai::Renderer).to receive(:cache_collection_render).
+        with([{
+          text: note1.note,
+          context: {
+            pipeline: :note,
+            cache_key: [note1, "note"],
+            project: note1.project,
+            author: note1.author
+          }
+        }]).and_call_original
+
+      expect(Banzai::Renderer).to receive(:cache_collection_render).
+        with([{
+          text: note2.note,
+          context: {
+            pipeline: :note,
+            cache_key: [note2, "note"],
+            project: note2.project,
+            author: note2.author
+          }
+        }]).and_call_original
+
+      note1.all_references.users
+      note2.all_references.users
     end
   end
 
diff --git a/spec/models/project_services/builds_email_service_spec.rb b/spec/models/project_services/builds_email_service_spec.rb
index 236df8f047d..ca2cd8aa551 100644
--- a/spec/models/project_services/builds_email_service_spec.rb
+++ b/spec/models/project_services/builds_email_service_spec.rb
@@ -23,6 +23,44 @@ describe BuildsEmailService do
     end
   end
 
+  describe '#test_data' do
+    let(:build)   { create(:ci_build) }
+    let(:project) { build.project }
+    let(:user)    { create(:user) }
+
+    before { project.team << [user, :developer] }
+
+    it 'builds test data' do
+      data = subject.test_data(project)
+
+      expect(data[:object_kind]).to eq("build")
+    end
+  end
+
+  describe '#test' do
+    it 'sends email' do
+      data = Gitlab::BuildDataBuilder.build(create(:ci_build))
+      subject.recipients = 'test@gitlab.com'
+
+      expect(BuildEmailWorker).to receive(:perform_async)
+
+      subject.test(data)
+    end
+
+    context 'notify only failed builds is true' do
+      it 'sends email' do
+        data = Gitlab::BuildDataBuilder.build(create(:ci_build))
+        data[:build_status] = "success"
+        subject.recipients = 'test@gitlab.com'
+
+        expect(subject).not_to receive(:notify_only_broken_builds)
+        expect(BuildEmailWorker).to receive(:perform_async)
+
+        subject.test(data)
+      end
+    end
+  end
+
   describe '#execute' do
     it 'sends email' do
       subject.recipients = 'test@gitlab.com'
diff --git a/spec/models/project_services/slack_service_spec.rb b/spec/models/project_services/slack_service_spec.rb
index 155f3e74e0d..df511b1bc4c 100644
--- a/spec/models/project_services/slack_service_spec.rb
+++ b/spec/models/project_services/slack_service_spec.rb
@@ -124,6 +124,7 @@ describe SlackService, models: true do
        and_return(
          double(:slack_service).as_null_object
        )
+
       slack.execute(push_sample_data)
     end
 
@@ -136,6 +137,76 @@ describe SlackService, models: true do
         )
       slack.execute(push_sample_data)
     end
+
+    context "event channels" do
+      it "uses the right channel for push event" do
+        slack.update_attributes(push_channel: "random")
+
+        expect(Slack::Notifier).to receive(:new).
+         with(webhook_url, channel: "random").
+         and_return(
+           double(:slack_service).as_null_object
+         )
+
+        slack.execute(push_sample_data)
+      end
+
+      it "uses the right channel for merge request event" do
+        slack.update_attributes(merge_request_channel: "random")
+
+        expect(Slack::Notifier).to receive(:new).
+         with(webhook_url, channel: "random").
+         and_return(
+           double(:slack_service).as_null_object
+         )
+
+        slack.execute(@merge_sample_data)
+      end
+
+      it "uses the right channel for issue event" do
+        slack.update_attributes(issue_channel: "random")
+
+        expect(Slack::Notifier).to receive(:new).
+         with(webhook_url, channel: "random").
+         and_return(
+           double(:slack_service).as_null_object
+         )
+
+        slack.execute(@issues_sample_data)
+      end
+
+      it "uses the right channel for wiki event" do
+        slack.update_attributes(wiki_page_channel: "random")
+
+        expect(Slack::Notifier).to receive(:new).
+         with(webhook_url, channel: "random").
+         and_return(
+           double(:slack_service).as_null_object
+         )
+
+        slack.execute(@wiki_page_sample_data)
+      end
+
+      context "note event" do
+        let(:issue_note) do
+          create(:note_on_issue, project: project, note: "issue note")
+        end
+
+        it "uses the right channel" do
+          slack.update_attributes(note_channel: "random")
+
+          note_data = Gitlab::NoteDataBuilder.build(issue_note, user)
+
+          expect(Slack::Notifier).to receive(:new).
+           with(webhook_url, channel: "random").
+           and_return(
+             double(:slack_service).as_null_object
+           )
+
+          slack.execute(note_data)
+        end
+      end
+    end
   end
 
   describe "Note events" do
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index ba61c164ee2..07e3be6f6e6 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -142,10 +142,10 @@ describe Project, models: true do
       expect(project2).to be_valid
     end
 
-    it 'does not allow to introduce an empty URI' do
+    it 'allows an empty URI' do
       project2 = build(:project, import_url: '')
 
-      expect(project2).not_to be_valid
+      expect(project2).to be_valid
     end
 
     it 'does not produce import data on an empty URI' do
@@ -405,7 +405,7 @@ describe Project, models: true do
   describe '#repository' do
     let(:project) { create(:project) }
 
-    it 'should return valid repo' do
+    it 'returns valid repo' do
       expect(project.repository).to be_kind_of(Repository)
     end
   end
@@ -486,6 +486,57 @@ describe Project, models: true do
     end
   end
 
+  describe '#external_wiki' do
+    let(:project) { create(:project) }
+
+    context 'with an active external wiki' do
+      before do
+        create(:service, project: project, type: 'ExternalWikiService', active: true)
+        project.external_wiki
+      end
+
+      it 'sets :has_external_wiki as true' do
+        expect(project.has_external_wiki).to be(true)
+      end
+
+      it 'sets :has_external_wiki as false if an external wiki service is destroyed later' do
+        expect(project.has_external_wiki).to be(true)
+
+        project.services.external_wikis.first.destroy
+
+        expect(project.has_external_wiki).to be(false)
+      end
+    end
+
+    context 'with an inactive external wiki' do
+      before do
+        create(:service, project: project, type: 'ExternalWikiService', active: false)
+      end
+
+      it 'sets :has_external_wiki as false' do
+        expect(project.has_external_wiki).to be(false)
+      end
+    end
+
+    context 'with no external wiki' do
+      before do
+        project.external_wiki
+      end
+
+      it 'sets :has_external_wiki as false' do
+        expect(project.has_external_wiki).to be(false)
+      end
+
+      it 'sets :has_external_wiki as true if an external wiki service is created later' do
+        expect(project.has_external_wiki).to be(false)
+
+        create(:service, project: project, type: 'ExternalWikiService', active: true)
+
+        expect(project.has_external_wiki).to be(true)
+      end
+    end
+  end
+
   describe '#open_branches' do
     let(:project) { create(:project) }
 
@@ -1142,6 +1193,85 @@ describe Project, models: true do
     end
   end
 
+  describe '#latest_successful_builds_for' do
+    def create_pipeline(status = 'success')
+      create(:ci_pipeline, project: project,
+                           sha: project.commit.sha,
+                           ref: project.default_branch,
+                           status: status)
+    end
+
+    def create_build(new_pipeline = pipeline, name = 'test')
+      create(:ci_build, :success, :artifacts,
+             pipeline: new_pipeline,
+             status: new_pipeline.status,
+             name: name)
+    end
+
+    let(:project) { create(:project) }
+    let(:pipeline) { create_pipeline }
+
+    context 'with many builds' do
+      it 'gives the latest builds from latest pipeline' do
+        pipeline1 = create_pipeline
+        pipeline2 = create_pipeline
+        build1_p2 = create_build(pipeline2, 'test')
+        create_build(pipeline1, 'test')
+        create_build(pipeline1, 'test2')
+        build2_p2 = create_build(pipeline2, 'test2')
+
+        latest_builds = project.latest_successful_builds_for
+
+        expect(latest_builds).to contain_exactly(build2_p2, build1_p2)
+      end
+    end
+
+    context 'with succeeded pipeline' do
+      let!(:build) { create_build }
+
+      context 'standalone pipeline' do
+        it 'returns builds for ref for default_branch' do
+          builds = project.latest_successful_builds_for
+
+          expect(builds).to contain_exactly(build)
+        end
+
+        it 'returns empty relation if the build cannot be found' do
+          builds = project.latest_successful_builds_for('TAIL')
+
+          expect(builds).to be_kind_of(ActiveRecord::Relation)
+          expect(builds).to be_empty
+        end
+      end
+
+      context 'with some pending pipeline' do
+        before do
+          create_build(create_pipeline('pending'))
+        end
+
+        it 'gives the latest build from latest pipeline' do
+          latest_build = project.latest_successful_builds_for
+
+          expect(latest_build).to contain_exactly(build)
+        end
+      end
+    end
+
+    context 'with pending pipeline' do
+      before do
+        pipeline.update(status: 'pending')
+        create_build(pipeline)
+      end
+
+      it 'returns empty relation' do
+        builds = project.latest_successful_builds_for
+
+        expect(builds).to be_kind_of(ActiveRecord::Relation)
+        expect(builds).to be_empty
+      end
+    end
+  end
+
   describe '.where_paths_in' do
     context 'without any paths' do
       it 'returns an empty relation' do
@@ -1174,4 +1304,53 @@ describe Project, models: true do
       end
     end
   end
+
+  describe 'authorized_for_user' do
+    let(:group) { create(:group) }
+    let(:developer) { create(:user) }
+    let(:master) { create(:user) }
+    let(:personal_project) { create(:project, namespace: developer.namespace) }
+    let(:group_project) { create(:project, namespace: group) }
+    let(:members_project) { create(:project) }
+    let(:shared_project) { create(:project) }
+
+    before do
+      group.add_master(master)
+      group.add_developer(developer)
+
+      members_project.team << [developer, :developer]
+      members_project.team << [master, :master]
+
+      create(:project_group_link, project: shared_project, group: group)
+    end
+
+    it 'returns false for no user' do
+      expect(personal_project.authorized_for_user?(nil)).to be(false)
+    end
+
+    it 'returns true for personal projects of the user' do
+      expect(personal_project.authorized_for_user?(developer)).to be(true)
+    end
+
+    it 'returns true for projects of groups the user is a member of' do
+      expect(group_project.authorized_for_user?(developer)).to be(true)
+    end
+
+    it 'returns true for projects for which the user is a member of' do
+      expect(members_project.authorized_for_user?(developer)).to be(true)
+    end
+
+    it 'returns true for projects shared on a group the user is a member of' do
+      expect(shared_project.authorized_for_user?(developer)).to be(true)
+    end
+
+    it 'checks for the correct minimum level access' do
+      expect(group_project.authorized_for_user?(developer, Gitlab::Access::MASTER)).to be(false)
+      expect(group_project.authorized_for_user?(master, Gitlab::Access::MASTER)).to be(true)
+      expect(members_project.authorized_for_user?(developer, Gitlab::Access::MASTER)).to be(false)
+      expect(members_project.authorized_for_user?(master, Gitlab::Access::MASTER)).to be(true)
+      expect(shared_project.authorized_for_user?(developer, Gitlab::Access::MASTER)).to be(false)
+      expect(shared_project.authorized_for_user?(master, Gitlab::Access::MASTER)).to be(true)
+    end
+  end
 end
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index b39b958450c..881ab5ff8dc 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -4,16 +4,17 @@ describe Repository, models: true do
   include RepoHelpers
   TestBlob = Struct.new(:name)
 
-  let(:repository) { create(:project).repository }
+  let(:project) { create(:project) }
+  let(:repository) { project.repository }
   let(:user) { create(:user) }
   let(:commit_options) do
     author = repository.user_to_committer(user)
     { message: 'Test message', committer: author, author: author }
   end
   let(:merge_commit) do
-    source_sha = repository.find_branch('feature').target
-    merge_commit_sha = repository.merge(user, source_sha, 'master', commit_options)
-    repository.commit(merge_commit_sha)
+    merge_request = create(:merge_request, source_branch: 'feature', target_branch: 'master', source_project: project)
+    merge_commit_id = repository.merge(user, merge_request, commit_options)
+    repository.commit(merge_commit_id)
   end
 
   describe '#branch_names_contains' do
@@ -129,6 +130,36 @@ describe Repository, models: true do
     end
   end
 
+  describe :commit_file do
+    it 'commits change to a file successfully' do
+      expect do
+        repository.commit_file(user, 'CHANGELOG', 'Changelog!',
+                              'Updates file content',
+                              'master', true)
+      end.to change { repository.commits('master').count }.by(1)
+
+      blob = repository.blob_at('master', 'CHANGELOG')
+
+      expect(blob.data).to eq('Changelog!')
+    end
+  end
+
+  describe :update_file do
+    it 'updates filename successfully' do
+      expect do
+        repository.update_file(user, 'NEWLICENSE', 'Copyright!',
+                                     branch: 'master',
+                                     previous_path: 'LICENSE',
+                                     message: 'Changes filename')
+      end.to change { repository.commits('master').count }.by(1)
+
+      files = repository.ls_files('master')
+
+      expect(files).not_to include('LICENSE')
+      expect(files).to include('NEWLICENSE')
+    end
+  end
+
   describe "search_files" do
     let(:results) { repository.search_files('feature', 'master') }
     subject { results }
@@ -718,6 +749,30 @@ describe Repository, models: true do
         repository.before_delete
       end
 
+      it 'flushes the tags cache' do
+        expect(repository).to receive(:expire_tags_cache)
+
+        repository.before_delete
+      end
+
+      it 'flushes the tag count cache' do
+        expect(repository).to receive(:expire_tag_count_cache)
+
+        repository.before_delete
+      end
+
+      it 'flushes the branches cache' do
+        expect(repository).to receive(:expire_branches_cache)
+
+        repository.before_delete
+      end
+
+      it 'flushes the branch count cache' do
+        expect(repository).to receive(:expire_branch_count_cache)
+
+        repository.before_delete
+      end
+
       it 'flushes the root ref cache' do
         expect(repository).to receive(:expire_root_ref_cache)
 
@@ -748,6 +803,30 @@ describe Repository, models: true do
         repository.before_delete
       end
 
+      it 'flushes the tags cache' do
+        expect(repository).to receive(:expire_tags_cache)
+
+        repository.before_delete
+      end
+
+      it 'flushes the tag count cache' do
+        expect(repository).to receive(:expire_tag_count_cache)
+
+        repository.before_delete
+      end
+
+      it 'flushes the branches cache' do
+        expect(repository).to receive(:expire_branches_cache)
+
+        repository.before_delete
+      end
+
+      it 'flushes the branch count cache' do
+        expect(repository).to receive(:expire_branch_count_cache)
+
+        repository.before_delete
+      end
+
       it 'flushes the root ref cache' do
         expect(repository).to receive(:expire_root_ref_cache)
 
@@ -1093,35 +1172,31 @@ describe Repository, models: true do
     end
   end
 
-  describe '.clean_old_archives' do
-    let(:path) { Gitlab.config.gitlab.repository_downloads_path }
-
-    context 'when the downloads directory does not exist' do
-      it 'does not remove any archives' do
-        expect(File).to receive(:directory?).with(path).and_return(false)
+  describe "#keep_around" do
+    it "does not fail if we attempt to reference bad commit" do
+      expect(repository.kept_around?('abc1234')).to be_falsey
+    end
 
-        expect(Gitlab::Popen).not_to receive(:popen)
+    it "stores a reference to the specified commit sha so it isn't garbage collected" do
+      repository.keep_around(sample_commit.id)
 
-        described_class.clean_old_archives
-      end
+      expect(repository.kept_around?(sample_commit.id)).to be_truthy
     end
 
-    context 'when the downloads directory exists' do
-      it 'removes old archives' do
-        expect(File).to receive(:directory?).with(path).and_return(true)
-
-        expect(Gitlab::Popen).to receive(:popen)
+    it "attempting to call keep_around on truncated ref does not fail" do
+      repository.keep_around(sample_commit.id)
+      ref = repository.send(:keep_around_ref_name, sample_commit.id)
+      path = File.join(repository.path, ref)
+      # Corrupt the reference
+      File.truncate(path, 0)
 
-        described_class.clean_old_archives
-      end
-    end
-  end
+      expect(repository.kept_around?(sample_commit.id)).to be_falsey
 
-  describe "#keep_around" do
-    it "stores a reference to the specified commit sha so it isn't garbage collected" do
       repository.keep_around(sample_commit.id)
 
-      expect(repository.kept_around?(sample_commit.id)).to be_truthy
+      expect(repository.kept_around?(sample_commit.id)).to be_falsey
+
+      File.delete(path)
     end
   end
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index ff39f187759..2a5a7fb2fc6 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -31,6 +31,8 @@ describe User, models: true do
     it { is_expected.to have_many(:spam_logs).dependent(:destroy) }
     it { is_expected.to have_many(:todos).dependent(:destroy) }
     it { is_expected.to have_many(:award_emoji).dependent(:destroy) }
+    it { is_expected.to have_many(:builds).dependent(:nullify) }
+    it { is_expected.to have_many(:pipelines).dependent(:nullify) }
 
     describe '#group_members' do
       it 'does not include group memberships for which user is a requester' do
@@ -87,9 +89,9 @@ describe User, models: true do
     end
 
     describe 'email' do
-      context 'when no signup domains listed' do
+      context 'when no signup domains whitelisted' do
         before do
-          allow_any_instance_of(ApplicationSetting).to receive(:restricted_signup_domains).and_return([])
+          allow_any_instance_of(ApplicationSetting).to receive(:domain_whitelist).and_return([])
         end
 
         it 'accepts any email' do
@@ -98,9 +100,9 @@ describe User, models: true do
         end
       end
 
-      context 'when a signup domain is listed and subdomains are allowed' do
+      context 'when a signup domain is whitelisted and subdomains are allowed' do
         before do
-          allow_any_instance_of(ApplicationSetting).to receive(:restricted_signup_domains).and_return(['example.com', '*.example.com'])
+          allow_any_instance_of(ApplicationSetting).to receive(:domain_whitelist).and_return(['example.com', '*.example.com'])
         end
 
         it 'accepts info@example.com' do
@@ -119,9 +121,9 @@ describe User, models: true do
         end
       end
 
-      context 'when a signup domain is listed and subdomains are not allowed' do
+      context 'when a signup domain is whitelisted and subdomains are not allowed' do
         before do
-          allow_any_instance_of(ApplicationSetting).to receive(:restricted_signup_domains).and_return(['example.com'])
+          allow_any_instance_of(ApplicationSetting).to receive(:domain_whitelist).and_return(['example.com'])
         end
 
         it 'accepts info@example.com' do
@@ -140,6 +142,53 @@ describe User, models: true do
         end
       end
 
+      context 'domain blacklist' do
+        before do
+          allow_any_instance_of(ApplicationSetting).to receive(:domain_blacklist_enabled?).and_return(true)
+          allow_any_instance_of(ApplicationSetting).to receive(:domain_blacklist).and_return(['example.com'])
+        end
+
+        context 'when a signup domain is blacklisted' do
+          it 'accepts info@test.com' do
+            user = build(:user, email: 'info@test.com')
+            expect(user).to be_valid
+          end
+
+          it 'rejects info@example.com' do
+            user = build(:user, email: 'info@example.com')
+            expect(user).not_to be_valid
+          end
+        end
+
+        context 'when a signup domain is blacklisted but a wildcard subdomain is allowed' do
+          before do
+            allow_any_instance_of(ApplicationSetting).to receive(:domain_blacklist).and_return(['test.example.com'])
+            allow_any_instance_of(ApplicationSetting).to receive(:domain_whitelist).and_return(['*.example.com'])
+          end
+
+          it 'should give priority to whitelist and allow info@test.example.com' do
+            user = build(:user, email: 'info@test.example.com')
+            expect(user).to be_valid
+          end
+        end
+
+        context 'with both lists containing a domain' do
+          before do
+            allow_any_instance_of(ApplicationSetting).to receive(:domain_whitelist).and_return(['test.com'])
+          end
+
+          it 'accepts info@test.com' do
+            user = build(:user, email: 'info@test.com')
+            expect(user).to be_valid
+          end
+
+          it 'rejects info@example.com' do
+            user = build(:user, email: 'info@example.com')
+            expect(user).not_to be_valid
+          end
+        end
+      end
+
       context 'owns_notification_email' do
         it 'accepts temp_oauth_email emails' do
           user = build(:user, email: "temp-email-for-oauth@example.com")
@@ -885,16 +934,25 @@ describe User, models: true do
   end
 
   describe '#authorized_projects' do
-    let!(:user) { create(:user) }
-    let!(:private_project) { create(:project, :private) }
+    context 'with a minimum access level' do
+      it 'includes projects for which the user is an owner' do
+        user = create(:user)
+        project = create(:empty_project, :private, namespace: user.namespace)
 
-    before do
-      private_project.team << [user, Gitlab::Access::MASTER]
-    end
+        expect(user.authorized_projects(Gitlab::Access::REPORTER))
+          .to contain_exactly(project)
+      end
+
+      it 'includes projects for which the user is a master' do
+        user = create(:user)
+        project = create(:empty_project, :private)
 
-    subject { user.authorized_projects }
+        project.team << [user, Gitlab::Access::MASTER]
 
-    it { is_expected.to eq([private_project]) }
+        expect(user.authorized_projects(Gitlab::Access::REPORTER))
+          .to contain_exactly(project)
+      end
+    end
   end
 
   describe '#ci_authorized_runners' do
diff --git a/spec/requests/api/api_helpers_spec.rb b/spec/requests/api/api_helpers_spec.rb
index 83025953889..831889afb6c 100644
--- a/spec/requests/api/api_helpers_spec.rb
+++ b/spec/requests/api/api_helpers_spec.rb
@@ -49,7 +49,7 @@ describe API::Helpers, api: true do
 
       it "should return nil for a user without access" do
         env[API::Helpers::PRIVATE_TOKEN_HEADER] = user.private_token
-        allow(Gitlab::UserAccess).to receive(:allowed?).and_return(false)
+        allow_any_instance_of(Gitlab::UserAccess).to receive(:allowed?).and_return(false)
         expect(current_user).to be_nil
       end
 
@@ -73,7 +73,7 @@ describe API::Helpers, api: true do
 
       it "should return nil for a user without access" do
         env[API::Helpers::PRIVATE_TOKEN_HEADER] = personal_access_token.token
-        allow(Gitlab::UserAccess).to receive(:allowed?).and_return(false)
+        allow_any_instance_of(Gitlab::UserAccess).to receive(:allowed?).and_return(false)
         expect(current_user).to be_nil
       end
 
@@ -211,4 +211,27 @@ describe API::Helpers, api: true do
       expect(sudo_identifier).to eq(' 123')
     end
   end
+
+  describe '.to_boolean' do
+    it 'converts a valid string to a boolean' do
+      expect(to_boolean('true')).to be_truthy
+      expect(to_boolean('YeS')).to be_truthy
+      expect(to_boolean('t')).to be_truthy
+      expect(to_boolean('1')).to be_truthy
+      expect(to_boolean('ON')).to be_truthy
+      expect(to_boolean('FaLse')).to be_falsy
+      expect(to_boolean('F')).to be_falsy
+      expect(to_boolean('NO')).to be_falsy
+      expect(to_boolean('n')).to be_falsy
+      expect(to_boolean('0')).to be_falsy
+      expect(to_boolean('oFF')).to be_falsy
+    end
+
+    it 'converts an invalid string to nil' do
+      expect(to_boolean('fals')).to be_nil
+      expect(to_boolean('yeah')).to be_nil
+      expect(to_boolean('')).to be_nil
+      expect(to_boolean(nil)).to be_nil
+    end
+  end
 end
diff --git a/spec/requests/api/award_emoji_spec.rb b/spec/requests/api/award_emoji_spec.rb
index 72a6d45f47d..2b74dd4bbb0 100644
--- a/spec/requests/api/award_emoji_spec.rb
+++ b/spec/requests/api/award_emoji_spec.rb
@@ -135,6 +135,22 @@ describe API::API, api: true  do
 
         expect(response).to have_http_status(401)
       end
+
+      it "normalizes +1 as thumbsup award" do
+        post api("/projects/#{project.id}/issues/#{issue.id}/award_emoji", user), name: '+1'
+
+        expect(issue.award_emoji.last.name).to eq("thumbsup")
+      end
+
+      context 'when the emoji already has been awarded' do
+        it 'returns a 404 status code' do
+          post api("/projects/#{project.id}/issues/#{issue.id}/award_emoji", user), name: 'thumbsup'
+          post api("/projects/#{project.id}/issues/#{issue.id}/award_emoji", user), name: 'thumbsup'
+
+          expect(response).to have_http_status(404)
+          expect(json_response["message"]).to match("has already been taken")
+        end
+      end
     end
   end
 
@@ -147,6 +163,22 @@ describe API::API, api: true  do
       expect(response).to have_http_status(201)
       expect(json_response['user']['username']).to eq(user.username)
     end
+
+    it "normalizes +1 as thumbsup award" do
+      post api("/projects/#{project.id}/issues/#{issue.id}/notes/#{note.id}/award_emoji", user), name: '+1'
+
+      expect(note.award_emoji.last.name).to eq("thumbsup")
+    end
+
+    context 'when the emoji already has been awarded' do
+      it 'returns a 404 status code' do
+        post api("/projects/#{project.id}/issues/#{issue.id}/notes/#{note.id}/award_emoji", user), name: 'rocket'
+        post api("/projects/#{project.id}/issues/#{issue.id}/notes/#{note.id}/award_emoji", user), name: 'rocket'
+
+        expect(response).to have_http_status(404)
+        expect(json_response["message"]).to match("has already been taken")
+      end
+    end
   end
 
   describe 'DELETE /projects/:id/awardable/:awardable_id/award_emoji/:award_id' do
diff --git a/spec/requests/api/branches_spec.rb b/spec/requests/api/branches_spec.rb
index b11ca26ee68..719da27f919 100644
--- a/spec/requests/api/branches_spec.rb
+++ b/spec/requests/api/branches_spec.rb
@@ -32,6 +32,8 @@ describe API::API, api: true  do
       expect(json_response['name']).to eq(branch_name)
       expect(json_response['commit']['id']).to eq(branch_sha)
       expect(json_response['protected']).to eq(false)
+      expect(json_response['developers_can_push']).to eq(false)
+      expect(json_response['developers_can_merge']).to eq(false)
     end
 
     it "should return a 403 error if guest" do
@@ -45,14 +47,95 @@ describe API::API, api: true  do
     end
   end
 
-  describe "PUT /projects/:id/repository/branches/:branch/protect" do
-    it "should protect a single branch" do
+  describe 'PUT /projects/:id/repository/branches/:branch/protect' do
+    it 'protects a single branch' do
       put api("/projects/#{project.id}/repository/branches/#{branch_name}/protect", user)
+
       expect(response).to have_http_status(200)
+      expect(json_response['name']).to eq(branch_name)
+      expect(json_response['commit']['id']).to eq(branch_sha)
+      expect(json_response['protected']).to eq(true)
+      expect(json_response['developers_can_push']).to eq(false)
+      expect(json_response['developers_can_merge']).to eq(false)
+    end
+
+    it 'protects a single branch and developers can push' do
+      put api("/projects/#{project.id}/repository/branches/#{branch_name}/protect", user),
+        developers_can_push: true
+
+      expect(response).to have_http_status(200)
+      expect(json_response['name']).to eq(branch_name)
+      expect(json_response['commit']['id']).to eq(branch_sha)
+      expect(json_response['protected']).to eq(true)
+      expect(json_response['developers_can_push']).to eq(true)
+      expect(json_response['developers_can_merge']).to eq(false)
+    end
 
+    it 'protects a single branch and developers can merge' do
+      put api("/projects/#{project.id}/repository/branches/#{branch_name}/protect", user),
+        developers_can_merge: true
+
+      expect(response).to have_http_status(200)
       expect(json_response['name']).to eq(branch_name)
       expect(json_response['commit']['id']).to eq(branch_sha)
       expect(json_response['protected']).to eq(true)
+      expect(json_response['developers_can_push']).to eq(false)
+      expect(json_response['developers_can_merge']).to eq(true)
+    end
+
+    it 'protects a single branch and developers can push and merge' do
+      put api("/projects/#{project.id}/repository/branches/#{branch_name}/protect", user),
+        developers_can_push: true, developers_can_merge: true
+
+      expect(response).to have_http_status(200)
+      expect(json_response['name']).to eq(branch_name)
+      expect(json_response['commit']['id']).to eq(branch_sha)
+      expect(json_response['protected']).to eq(true)
+      expect(json_response['developers_can_push']).to eq(true)
+      expect(json_response['developers_can_merge']).to eq(true)
+    end
+
+    it 'protects a single branch and developers cannot push and merge' do
+      put api("/projects/#{project.id}/repository/branches/#{branch_name}/protect", user),
+        developers_can_push: 'tru', developers_can_merge: 'tr'
+
+      expect(response).to have_http_status(200)
+      expect(json_response['name']).to eq(branch_name)
+      expect(json_response['commit']['id']).to eq(branch_sha)
+      expect(json_response['protected']).to eq(true)
+      expect(json_response['developers_can_push']).to eq(false)
+      expect(json_response['developers_can_merge']).to eq(false)
+    end
+
+    context 'on a protected branch' do
+      let(:protected_branch) { 'foo' }
+
+      before do
+        project.repository.add_branch(user, protected_branch, 'master')
+        create(:protected_branch, project: project, name: protected_branch, developers_can_push: true, developers_can_merge: true)
+      end
+
+      it 'updates that a developer can push' do
+        put api("/projects/#{project.id}/repository/branches/#{protected_branch}/protect", user),
+          developers_can_push: false, developers_can_merge: false
+
+        expect(response).to have_http_status(200)
+        expect(json_response['name']).to eq(protected_branch)
+        expect(json_response['protected']).to eq(true)
+        expect(json_response['developers_can_push']).to eq(false)
+        expect(json_response['developers_can_merge']).to eq(false)
+      end
+
+      it 'does not update that a developer can push' do
+        put api("/projects/#{project.id}/repository/branches/#{protected_branch}/protect", user),
+          developers_can_push: 'foobar', developers_can_merge: 'foo'
+
+        expect(response).to have_http_status(200)
+        expect(json_response['name']).to eq(protected_branch)
+        expect(json_response['protected']).to eq(true)
+        expect(json_response['developers_can_push']).to eq(true)
+        expect(json_response['developers_can_merge']).to eq(true)
+      end
     end
 
     it "should return a 404 error if branch not found" do
diff --git a/spec/requests/api/builds_spec.rb b/spec/requests/api/builds_spec.rb
index f5b39c3d698..86a7b242fbe 100644
--- a/spec/requests/api/builds_spec.rb
+++ b/spec/requests/api/builds_spec.rb
@@ -1,15 +1,15 @@
 require 'spec_helper'
 
-describe API::API, api: true  do
+describe API::API, api: true do
   include ApiHelpers
 
   let(:user) { create(:user) }
   let(:api_user) { user }
-  let(:user2) { create(:user) }
   let!(:project) { create(:project, creator_id: user.id) }
   let!(:developer) { create(:project_member, :developer, user: user, project: project) }
-  let!(:reporter) { create(:project_member, :reporter, user: user2, project: project) }
-  let!(:pipeline) { create(:ci_pipeline, project: project, sha: project.commit.id) }
+  let(:reporter) { create(:project_member, :reporter, project: project) }
+  let(:guest) { create(:project_member, :guest, project: project) }
+  let!(:pipeline) { create(:ci_pipeline, project: project, sha: project.commit.id, ref: project.default_branch) }
   let!(:build) { create(:ci_build, pipeline: pipeline) }
 
   describe 'GET /projects/:id/builds ' do
@@ -172,10 +172,104 @@ describe API::API, api: true  do
     end
   end
 
+  describe 'GET /projects/:id/artifacts/:ref_name/download?job=name' do
+    let(:api_user) { reporter.user }
+    let(:build) { create(:ci_build, :success, :artifacts, pipeline: pipeline) }
+
+    def path_for_ref(ref = pipeline.ref, job = build.name)
+      api("/projects/#{project.id}/builds/artifacts/#{ref}/download?job=#{job}", api_user)
+    end
+
+    context 'when not logged in' do
+      let(:api_user) { nil }
+
+      before do
+        get path_for_ref
+      end
+
+      it 'gives 401' do
+        expect(response).to have_http_status(401)
+      end
+    end
+
+    context 'when logging as guest' do
+      let(:api_user) { guest.user }
+
+      before do
+        get path_for_ref
+      end
+
+      it 'gives 403' do
+        expect(response).to have_http_status(403)
+      end
+    end
+
+    context 'non-existing build' do
+      shared_examples 'not found' do
+        it { expect(response).to have_http_status(:not_found) }
+      end
+
+      context 'has no such ref' do
+        before do
+          get path_for_ref('TAIL', build.name)
+        end
+
+        it_behaves_like 'not found'
+      end
+
+      context 'has no such build' do
+        before do
+          get path_for_ref(pipeline.ref, 'NOBUILD')
+        end
+
+        it_behaves_like 'not found'
+      end
+    end
+
+    context 'find proper build' do
+      shared_examples 'a valid file' do
+        let(:download_headers) do
+          { 'Content-Transfer-Encoding' => 'binary',
+            'Content-Disposition' =>
+              "attachment; filename=#{build.artifacts_file.filename}" }
+        end
+
+        it { expect(response).to have_http_status(200) }
+        it { expect(response.headers).to include(download_headers) }
+      end
+
+      context 'with regular branch' do
+        before do
+          pipeline.update(ref: 'master',
+                          sha: project.commit('master').sha)
+
+          get path_for_ref('master')
+        end
+
+        it_behaves_like 'a valid file'
+      end
+
+      context 'with branch name containing slash' do
+        before do
+          pipeline.update(ref: 'improve/awesome',
+                          sha: project.commit('improve/awesome').sha)
+        end
+
+        before do
+          get path_for_ref('improve/awesome')
+        end
+
+        it_behaves_like 'a valid file'
+      end
+    end
+  end
+
   describe 'GET /projects/:id/builds/:build_id/trace' do
     let(:build) { create(:ci_build, :trace, pipeline: pipeline) }
 
-    before { get api("/projects/#{project.id}/builds/#{build.id}/trace", api_user) }
+    before do
+      get api("/projects/#{project.id}/builds/#{build.id}/trace", api_user)
+    end
 
     context 'authorized user' do
       it 'should return specific build trace' do
@@ -205,7 +299,7 @@ describe API::API, api: true  do
       end
 
       context 'user without :update_build permission' do
-        let(:api_user) { user2 }
+        let(:api_user) { reporter.user }
 
         it 'should not cancel build' do
           expect(response).to have_http_status(403)
@@ -237,7 +331,7 @@ describe API::API, api: true  do
       end
 
       context 'user without :update_build permission' do
-        let(:api_user) { user2 }
+        let(:api_user) { reporter.user }
 
         it 'should not retry build' do
           expect(response).to have_http_status(403)
diff --git a/spec/requests/api/deploy_keys.rb b/spec/requests/api/deploy_keys.rb
new file mode 100644
index 00000000000..ac42288bc34
--- /dev/null
+++ b/spec/requests/api/deploy_keys.rb
@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe API::API, api: true  do
+  include ApiHelpers
+
+  let(:user)  { create(:user) }
+  let(:project) { create(:project, creator_id: user.id) }
+  let!(:deploy_keys_project) { create(:deploy_keys_project, project: project) }
+  let(:admin) { create(:admin) }
+
+  describe 'GET /deploy_keys' do
+    before { admin }
+
+    context 'when unauthenticated' do
+      it 'should return authentication error' do
+        get api('/deploy_keys')
+        expect(response.status).to eq(401)
+      end
+    end
+
+    context 'when authenticated as non-admin user' do
+      it 'should return a 403 error' do
+        get api('/deploy_keys', user)
+        expect(response.status).to eq(403)
+      end
+    end
+
+    context 'when authenticated as admin' do
+      it 'should return all deploy keys' do
+        get api('/deploy_keys', admin)
+        expect(response.status).to eq(200)
+
+        expect(json_response).to be_an Array
+        expect(json_response.first['id']).to eq(deploy_keys_project.deploy_key.id)
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb
index e567d36afa8..f6f85d6e95e 100644
--- a/spec/requests/api/internal_spec.rb
+++ b/spec/requests/api/internal_spec.rb
@@ -56,13 +56,21 @@ describe API::API, api: true  do
 
       context "git push with project.wiki" do
         it 'responds with success' do
-          project_wiki = create(:project, name: 'my.wiki', path: 'my.wiki')
-          project_wiki.team << [user, :developer]
+          push(key, project.wiki)
 
-          push(key, project_wiki)
+          expect(response).to have_http_status(200)
+          expect(json_response["status"]).to be_truthy
+          expect(json_response["repository_path"]).to eq(project.wiki.repository.path_to_repo)
+        end
+      end
+
+      context "git pull with project.wiki" do
+        it 'responds with success' do
+          pull(key, project.wiki)
 
           expect(response).to have_http_status(200)
           expect(json_response["status"]).to be_truthy
+          expect(json_response["repository_path"]).to eq(project.wiki.repository.path_to_repo)
         end
       end
 
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index 6adccb4ebae..12f2cfa6942 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -503,6 +503,20 @@ describe API::API, api: true  do
       ])
     end
 
+    context 'with due date' do
+      it 'creates a new project issue' do
+        due_date = 2.weeks.from_now.strftime('%Y-%m-%d')
+
+        post api("/projects/#{project.id}/issues", user),
+          title: 'new issue', due_date: due_date
+
+        expect(response).to have_http_status(201)
+        expect(json_response['title']).to eq('new issue')
+        expect(json_response['description']).to be_nil
+        expect(json_response['due_date']).to eq(due_date)
+      end
+    end
+
     context 'when an admin or owner makes the request' do
       it 'accepts the creation date to be set' do
         creation_time = 2.weeks.ago
@@ -683,6 +697,17 @@ describe API::API, api: true  do
     end
   end
 
+  describe 'PUT /projects/:id/issues/:issue_id to update due date' do
+    it 'creates a new project issue' do
+      due_date = 2.weeks.from_now.strftime('%Y-%m-%d')
+
+      put api("/projects/#{project.id}/issues/#{issue.id}", user), due_date: due_date
+
+      expect(response).to have_http_status(200)
+      expect(json_response['due_date']).to eq(due_date)
+    end
+  end
+
   describe "DELETE /projects/:id/issues/:issue_id" do
     it "rejects a non member from deleting an issue" do
       delete api("/projects/#{project.id}/issues/#{issue.id}", non_member)
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 152cd802839..8c6a7e6529d 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -396,7 +396,6 @@ describe API::API, api: true  do
       expect(json_response['alt']).to eq("dk")
       expect(json_response['url']).to start_with("/uploads/")
       expect(json_response['url']).to end_with("/dk.png")
-      expect(json_response['is_image']).to eq(true)
     end
   end
 
@@ -647,33 +646,33 @@ describe API::API, api: true  do
     let(:deploy_keys_project) { create(:deploy_keys_project, project: project) }
     let(:deploy_key) { deploy_keys_project.deploy_key }
 
-    describe 'GET /projects/:id/keys' do
+    describe 'GET /projects/:id/deploy_keys' do
       before { deploy_key }
 
       it 'should return array of ssh keys' do
-        get api("/projects/#{project.id}/keys", user)
+        get api("/projects/#{project.id}/deploy_keys", user)
         expect(response).to have_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['title']).to eq(deploy_key.title)
       end
     end
 
-    describe 'GET /projects/:id/keys/:key_id' do
+    describe 'GET /projects/:id/deploy_keys/:key_id' do
       it 'should return a single key' do
-        get api("/projects/#{project.id}/keys/#{deploy_key.id}", user)
+        get api("/projects/#{project.id}/deploy_keys/#{deploy_key.id}", user)
         expect(response).to have_http_status(200)
         expect(json_response['title']).to eq(deploy_key.title)
       end
 
       it 'should return 404 Not Found with invalid ID' do
-        get api("/projects/#{project.id}/keys/404", user)
+        get api("/projects/#{project.id}/deploy_keys/404", user)
         expect(response).to have_http_status(404)
       end
     end
 
-    describe 'POST /projects/:id/keys' do
+    describe 'POST /projects/:id/deploy_keys' do
       it 'should not create an invalid ssh key' do
-        post api("/projects/#{project.id}/keys", user), { title: 'invalid key' }
+        post api("/projects/#{project.id}/deploy_keys", user), { title: 'invalid key' }
         expect(response).to have_http_status(400)
         expect(json_response['message']['key']).to eq([
           'can\'t be blank',
@@ -683,7 +682,7 @@ describe API::API, api: true  do
       end
 
       it 'should not create a key without title' do
-        post api("/projects/#{project.id}/keys", user), key: 'some key'
+        post api("/projects/#{project.id}/deploy_keys", user), key: 'some key'
         expect(response).to have_http_status(400)
         expect(json_response['message']['title']).to eq([
           'can\'t be blank',
@@ -694,22 +693,22 @@ describe API::API, api: true  do
       it 'should create new ssh key' do
         key_attrs = attributes_for :key
         expect do
-          post api("/projects/#{project.id}/keys", user), key_attrs
+          post api("/projects/#{project.id}/deploy_keys", user), key_attrs
         end.to change{ project.deploy_keys.count }.by(1)
       end
     end
 
-    describe 'DELETE /projects/:id/keys/:key_id' do
+    describe 'DELETE /projects/:id/deploy_keys/:key_id' do
       before { deploy_key }
 
       it 'should delete existing key' do
         expect do
-          delete api("/projects/#{project.id}/keys/#{deploy_key.id}", user)
+          delete api("/projects/#{project.id}/deploy_keys/#{deploy_key.id}", user)
         end.to change{ project.deploy_keys.count }.by(-1)
       end
 
       it 'should return 404 Not Found with invalid ID' do
-        delete api("/projects/#{project.id}/keys/404", user)
+        delete api("/projects/#{project.id}/deploy_keys/404", user)
         expect(response).to have_http_status(404)
       end
     end
diff --git a/spec/requests/api/todos_spec.rb b/spec/requests/api/todos_spec.rb
index 92a4fa216cd..3ccd0af652f 100644
--- a/spec/requests/api/todos_spec.rb
+++ b/spec/requests/api/todos_spec.rb
@@ -134,8 +134,7 @@ describe API::Todos, api: true do
         delete api('/todos', john_doe)
 
         expect(response.status).to eq(200)
-        expect(json_response).to be_an Array
-        expect(json_response.length).to eq(3)
+        expect(response.body).to eq('3')
         expect(pending_1.reload).to be_done
         expect(pending_2.reload).to be_done
         expect(pending_3.reload).to be_done
diff --git a/spec/requests/ci/api/builds_spec.rb b/spec/requests/ci/api/builds_spec.rb
index e7cbc3dd3a7..1c7c60ec644 100644
--- a/spec/requests/ci/api/builds_spec.rb
+++ b/spec/requests/ci/api/builds_spec.rb
@@ -73,12 +73,12 @@ describe Ci::API::API do
         post ci_api("/builds/register"), token: runner.token, info: { platform: :darwin }
 
         expect(response).to have_http_status(201)
-        expect(json_response["variables"]).to eq([
+        expect(json_response["variables"]).to include(
           { "key" => "CI_BUILD_NAME", "value" => "spinach", "public" => true },
           { "key" => "CI_BUILD_STAGE", "value" => "test", "public" => true },
           { "key" => "DB_NAME", "value" => "postgres", "public" => true },
           { "key" => "SECRET_KEY", "value" => "secret_value", "public" => false }
-        ])
+        )
       end
 
       it "returns variables for triggers" do
@@ -92,14 +92,14 @@ describe Ci::API::API do
         post ci_api("/builds/register"), token: runner.token, info: { platform: :darwin }
 
         expect(response).to have_http_status(201)
-        expect(json_response["variables"]).to eq([
+        expect(json_response["variables"]).to include(
           { "key" => "CI_BUILD_NAME", "value" => "spinach", "public" => true },
           { "key" => "CI_BUILD_STAGE", "value" => "test", "public" => true },
           { "key" => "CI_BUILD_TRIGGERED", "value" => "true", "public" => true },
           { "key" => "DB_NAME", "value" => "postgres", "public" => true },
           { "key" => "SECRET_KEY", "value" => "secret_value", "public" => false },
-          { "key" => "TRIGGER_KEY", "value" => "TRIGGER_VALUE", "public" => false },
-        ])
+          { "key" => "TRIGGER_KEY", "value" => "TRIGGER_VALUE", "public" => false }
+        )
       end
 
       it "returns dependent builds" do
diff --git a/spec/requests/lfs_http_spec.rb b/spec/requests/lfs_http_spec.rb
new file mode 100644
index 00000000000..93d2bc160cc
--- /dev/null
+++ b/spec/requests/lfs_http_spec.rb
@@ -0,0 +1,768 @@
+require 'spec_helper'
+
+describe Gitlab::Lfs::Router do
+  let(:user) { create(:user) }
+  let!(:lfs_object) { create(:lfs_object, :with_file) }
+
+  let(:headers) do
+    {
+      'Authorization' => authorization,
+      'X-Sendfile-Type' => sendfile
+    }.compact
+  end
+  let(:authorization) { }
+  let(:sendfile) { }
+
+  let(:sample_oid) { lfs_object.oid }
+  let(:sample_size) { lfs_object.size }
+
+  describe 'when lfs is disabled' do
+    let(:project) { create(:empty_project) }
+    let(:body) do
+      {
+        'objects' => [
+          { 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
+            'size' => 1575078
+          },
+          { 'oid' => sample_oid,
+            'size' => sample_size
+          }
+        ],
+        'operation' => 'upload'
+      }
+    end
+
+    before do
+      allow(Gitlab.config.lfs).to receive(:enabled).and_return(false)
+      post_json "#{project.http_url_to_repo}/info/lfs/objects/batch", body, headers
+    end
+
+    it 'responds with 501' do
+      expect(response).to have_http_status(501)
+      expect(json_response).to include('message' => 'Git LFS is not enabled on this GitLab server, contact your admin.')
+    end
+  end
+
+  describe 'deprecated API' do
+    let(:project) { create(:empty_project) }
+
+    before do
+      enable_lfs
+    end
+
+    shared_examples 'a deprecated' do
+      it 'responds with 501' do
+        expect(response).to have_http_status(501)
+      end
+
+      it 'returns deprecated message' do
+        expect(json_response).to include('message' => 'Server supports batch API only, please update your Git LFS client to version 1.0.1 and up.')
+      end
+    end
+
+    context 'when fetching lfs object using deprecated API' do
+      let(:authorization) { authorize_user }
+
+      before do
+        get "#{project.http_url_to_repo}/info/lfs/objects/#{sample_oid}", nil, headers
+      end
+
+      it_behaves_like 'a deprecated'
+    end
+
+    context 'when handling lfs request using deprecated API' do
+      before do
+        post_json "#{project.http_url_to_repo}/info/lfs/objects", nil, headers
+      end
+
+      it_behaves_like 'a deprecated'
+    end
+  end
+
+  describe 'when fetching lfs object' do
+    let(:project) { create(:empty_project) }
+    let(:update_permissions) { }
+
+    before do
+      enable_lfs
+      update_permissions
+      get "#{project.http_url_to_repo}/gitlab-lfs/objects/#{sample_oid}", nil, headers
+    end
+
+    context 'and request comes from gitlab-workhorse' do
+      context 'without user being authorized' do
+        it 'responds with status 401' do
+          expect(response).to have_http_status(401)
+        end
+      end
+
+      context 'with required headers' do
+        shared_examples 'responds with a file' do
+          let(:sendfile) { 'X-Sendfile' }
+
+          it 'responds with status 200' do
+            expect(response).to have_http_status(200)
+          end
+
+          it 'responds with the file location' do
+            expect(response.headers['Content-Type']).to eq('application/octet-stream')
+            expect(response.headers['X-Sendfile']).to eq(lfs_object.file.path)
+          end
+        end
+
+        context 'with user is authorized' do
+          let(:authorization) { authorize_user }
+
+          context 'and does not have project access' do
+            let(:update_permissions) do
+              project.lfs_objects << lfs_object
+            end
+
+            it 'responds with status 403' do
+              expect(response).to have_http_status(403)
+            end
+          end
+
+          context 'and does have project access' do
+            let(:update_permissions) do
+              project.team << [user, :master]
+              project.lfs_objects << lfs_object
+            end
+
+            it_behaves_like 'responds with a file'
+          end
+        end
+
+        context 'when CI is authorized' do
+          let(:authorization) { authorize_ci_project }
+
+          let(:update_permissions) do
+            project.lfs_objects << lfs_object
+          end
+
+          it_behaves_like 'responds with a file'
+        end
+      end
+
+      context 'without required headers' do
+        let(:authorization) { authorize_user }
+
+        it 'responds with status 403' do
+          expect(response).to have_http_status(403)
+        end
+      end
+    end
+  end
+
+  describe 'when handling lfs batch request' do
+    let(:update_lfs_permissions) { }
+    let(:update_user_permissions) { }
+
+    before do
+      enable_lfs
+      update_lfs_permissions
+      update_user_permissions
+      post_json "#{project.http_url_to_repo}/info/lfs/objects/batch", body, headers
+    end
+
+    describe 'download' do
+      let(:project) { create(:empty_project) }
+      let(:body) do
+        { 'operation' => 'download',
+          'objects' => [
+            { 'oid' => sample_oid,
+              'size' => sample_size
+            }]
+        }
+      end
+
+      shared_examples 'an authorized requests' do
+        context 'when downloading an lfs object that is assigned to our project' do
+          let(:update_lfs_permissions) do
+            project.lfs_objects << lfs_object
+          end
+
+          it 'responds with status 200' do
+            expect(response).to have_http_status(200)
+          end
+
+          it 'with href to download' do
+            expect(json_response).to eq('objects' => [
+              { 'oid' => sample_oid,
+                'size' => sample_size,
+                'actions' => {
+                  'download' => {
+                    'href' => "#{project.http_url_to_repo}/gitlab-lfs/objects/#{sample_oid}",
+                    'header' => { 'Authorization' => authorization }
+                  }
+                }
+              }])
+          end
+        end
+
+        context 'when downloading an lfs object that is assigned to other project' do
+          let(:other_project) { create(:empty_project) }
+          let(:update_lfs_permissions) do
+            other_project.lfs_objects << lfs_object
+          end
+
+          it 'responds with status 200' do
+            expect(response).to have_http_status(200)
+          end
+
+          it 'with href to download' do
+            expect(json_response).to eq('objects' => [
+              { 'oid' => sample_oid,
+                'size' => sample_size,
+                'error' => {
+                  'code' => 404,
+                  'message' => "Object does not exist on the server or you don't have permissions to access it",
+                }
+              }])
+          end
+        end
+
+        context 'when downloading a lfs object that does not exist' do
+          let(:body) do
+            { 'operation' => 'download',
+              'objects' => [
+                { 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
+                  'size' => 1575078
+                }]
+            }
+          end
+
+          it 'responds with status 200' do
+            expect(response).to have_http_status(200)
+          end
+
+          it 'with an 404 for specific object' do
+            expect(json_response).to eq('objects' => [
+              { 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
+                'size' => 1575078,
+                'error' => {
+                  'code' => 404,
+                  'message' => "Object does not exist on the server or you don't have permissions to access it",
+                }
+              }])
+          end
+        end
+
+        context 'when downloading one new and one existing lfs object' do
+          let(:body) do
+            { 'operation' => 'download',
+              'objects' => [
+                { 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
+                  'size' => 1575078
+                },
+                { 'oid' => sample_oid,
+                  'size' => sample_size
+                }
+              ]
+            }
+          end
+
+          let(:update_lfs_permissions) do
+            project.lfs_objects << lfs_object
+          end
+
+          it 'responds with status 200' do
+            expect(response).to have_http_status(200)
+          end
+
+          it 'responds with upload hypermedia link for the new object' do
+            expect(json_response).to eq('objects' => [
+              { 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
+                'size' => 1575078,
+                'error' => {
+                  'code' => 404,
+                  'message' => "Object does not exist on the server or you don't have permissions to access it",
+                }
+              },
+              { 'oid' => sample_oid,
+                'size' => sample_size,
+                'actions' => {
+                  'download' => {
+                    'href' => "#{project.http_url_to_repo}/gitlab-lfs/objects/#{sample_oid}",
+                    'header' => { 'Authorization' => authorization }
+                  }
+                }
+              }])
+          end
+        end
+      end
+
+      context 'when user is authenticated' do
+        let(:authorization) { authorize_user }
+
+        let(:update_user_permissions) do
+          project.team << [user, role]
+        end
+
+        it_behaves_like 'an authorized requests' do
+          let(:role) { :reporter }
+        end
+
+        context 'when user does is not member of the project' do
+          let(:role) { :guest }
+
+          it 'responds with 403' do
+            expect(response).to have_http_status(403)
+          end
+        end
+
+        context 'when user does not have download access' do
+          let(:role) { :guest }
+
+          it 'responds with 403' do
+            expect(response).to have_http_status(403)
+          end
+        end
+      end
+
+      context 'when CI is authorized' do
+        let(:authorization) { authorize_ci_project }
+
+        it_behaves_like 'an authorized requests'
+      end
+
+      context 'when user is not authenticated' do
+        describe 'is accessing public project' do
+          let(:project) { create(:project, :public) }
+
+          let(:update_lfs_permissions) do
+            project.lfs_objects << lfs_object
+          end
+
+          it 'responds with status 200 and href to download' do
+            expect(response).to have_http_status(200)
+          end
+
+          it 'responds with status 200 and href to download' do
+            expect(json_response).to eq('objects' => [
+              { 'oid' => sample_oid,
+                'size' => sample_size,
+                'actions' => {
+                  'download' => {
+                    'href' => "#{project.http_url_to_repo}/gitlab-lfs/objects/#{sample_oid}",
+                    'header' => {}
+                  }
+                }
+              }])
+          end
+        end
+
+        describe 'is accessing non-public project' do
+          let(:update_lfs_permissions) do
+            project.lfs_objects << lfs_object
+          end
+
+          it 'responds with authorization required' do
+            expect(response).to have_http_status(401)
+          end
+        end
+      end
+    end
+
+    describe 'upload' do
+      let(:project) { create(:project, :public) }
+      let(:body) do
+        { 'operation' => 'upload',
+          'objects' => [
+            { 'oid' => sample_oid,
+              'size' => sample_size
+            }]
+        }
+      end
+
+      describe 'when request is authenticated' do
+        describe 'when user has project push access' do
+          let(:authorization) { authorize_user }
+
+          let(:update_user_permissions) do
+            project.team << [user, :developer]
+          end
+
+          context 'when pushing an lfs object that already exists' do
+            let(:other_project) { create(:empty_project) }
+            let(:update_lfs_permissions) do
+              other_project.lfs_objects << lfs_object
+            end
+
+            it 'responds with status 200' do
+              expect(response).to have_http_status(200)
+            end
+
+            it 'responds with links the object to the project' do
+              expect(json_response['objects']).to be_kind_of(Array)
+              expect(json_response['objects'].first['oid']).to eq(sample_oid)
+              expect(json_response['objects'].first['size']).to eq(sample_size)
+              expect(lfs_object.projects.pluck(:id)).not_to include(project.id)
+              expect(lfs_object.projects.pluck(:id)).to include(other_project.id)
+              expect(json_response['objects'].first['actions']['upload']['href']).to eq("#{project.http_url_to_repo}/gitlab-lfs/objects/#{sample_oid}/#{sample_size}")
+              expect(json_response['objects'].first['actions']['upload']['header']).to eq('Authorization' => authorization)
+            end
+          end
+
+          context 'when pushing a lfs object that does not exist' do
+            let(:body) do
+              { 'operation' => 'upload',
+                'objects' => [
+                  { 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
+                    'size' => 1575078
+                  }]
+              }
+            end
+
+            it 'responds with status 200' do
+              expect(response).to have_http_status(200)
+            end
+
+            it 'responds with upload hypermedia link' do
+              expect(json_response['objects']).to be_kind_of(Array)
+              expect(json_response['objects'].first['oid']).to eq("91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897")
+              expect(json_response['objects'].first['size']).to eq(1575078)
+              expect(json_response['objects'].first['actions']['upload']['href']).to eq("#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}.git/gitlab-lfs/objects/91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897/1575078")
+              expect(json_response['objects'].first['actions']['upload']['header']).to eq('Authorization' => authorization)
+            end
+          end
+
+          context 'when pushing one new and one existing lfs object' do
+            let(:body) do
+              { 'operation' => 'upload',
+                'objects' => [
+                  { 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
+                    'size' => 1575078
+                  },
+                  { 'oid' => sample_oid,
+                    'size' => sample_size
+                  }
+                ]
+              }
+            end
+
+            let(:update_lfs_permissions) do
+              project.lfs_objects << lfs_object
+            end
+
+            it 'responds with status 200' do
+              expect(response).to have_http_status(200)
+            end
+
+            it 'responds with upload hypermedia link for the new object' do
+              expect(json_response['objects']).to be_kind_of(Array)
+
+              expect(json_response['objects'].first['oid']).to eq("91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897")
+              expect(json_response['objects'].first['size']).to eq(1575078)
+              expect(json_response['objects'].first['actions']['upload']['href']).to eq("#{project.http_url_to_repo}/gitlab-lfs/objects/91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897/1575078")
+              expect(json_response['objects'].first['actions']['upload']['header']).to eq("Authorization" => authorization)
+
+              expect(json_response['objects'].last['oid']).to eq(sample_oid)
+              expect(json_response['objects'].last['size']).to eq(sample_size)
+              expect(json_response['objects'].last).not_to have_key('actions')
+            end
+          end
+        end
+
+        context 'when user does not have push access' do
+          let(:authorization) { authorize_user }
+
+          it 'responds with 403' do
+            expect(response).to have_http_status(403)
+          end
+        end
+
+        context 'when CI is authorized' do
+          let(:authorization) { authorize_ci_project }
+
+          it 'responds with 401' do
+            expect(response).to have_http_status(401)
+          end
+        end
+      end
+
+      context 'when user is not authenticated' do
+        context 'when user has push access' do
+          let(:update_user_permissions) do
+            project.team << [user, :master]
+          end
+
+          it 'responds with status 401' do
+            expect(response).to have_http_status(401)
+          end
+        end
+
+        context 'when user does not have push access' do
+          it 'responds with status 401' do
+            expect(response).to have_http_status(401)
+          end
+        end
+      end
+
+      context 'when CI is authorized' do
+        let(:authorization) { authorize_ci_project }
+
+        it 'responds with status 403' do
+          expect(response).to have_http_status(401)
+        end
+      end
+    end
+
+    describe 'unsupported' do
+      let(:project) { create(:empty_project) }
+      let(:body) do
+        { 'operation' => 'other',
+          'objects' => [
+            { 'oid' => sample_oid,
+              'size' => sample_size
+            }]
+        }
+      end
+
+      it 'responds with status 404' do
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+
+  describe 'when pushing a lfs object' do
+    before do
+      enable_lfs
+    end
+
+    shared_examples 'unauthorized' do
+      context 'and request is sent by gitlab-workhorse to authorize the request' do
+        before do
+          put_authorize
+        end
+
+        it 'responds with status 401' do
+          expect(response).to have_http_status(401)
+        end
+      end
+
+      context 'and request is sent by gitlab-workhorse to finalize the upload' do
+        before do
+          put_finalize
+        end
+
+        it 'responds with status 401' do
+          expect(response).to have_http_status(401)
+        end
+      end
+
+      context 'and request is sent with a malformed headers' do
+        before do
+          put_finalize('cat /etc/passwd')
+        end
+
+        it 'does not recognize it as a valid lfs command' do
+          expect(response).to have_http_status(403)
+        end
+      end
+    end
+
+    shared_examples 'forbidden' do
+      context 'and request is sent by gitlab-workhorse to authorize the request' do
+        before do
+          put_authorize
+        end
+
+        it 'responds with 403' do
+          expect(response).to have_http_status(403)
+        end
+      end
+
+      context 'and request is sent by gitlab-workhorse to finalize the upload' do
+        before do
+          put_finalize
+        end
+
+        it 'responds with 403' do
+          expect(response).to have_http_status(403)
+        end
+      end
+    end
+
+    describe 'to one project' do
+      let(:project) { create(:empty_project) }
+
+      describe 'when user is authenticated' do
+        let(:authorization) { authorize_user }
+
+        describe 'when user has push access to the project' do
+          before do
+            project.team << [user, :developer]
+          end
+
+          context 'and request is sent by gitlab-workhorse to authorize the request' do
+            before do
+              put_authorize
+            end
+
+            it 'responds with status 200' do
+              expect(response).to have_http_status(200)
+            end
+
+            it 'responds with status 200, location of lfs store and object details' do
+              expect(json_response['StoreLFSPath']).to eq("#{Gitlab.config.shared.path}/lfs-objects/tmp/upload")
+              expect(json_response['LfsOid']).to eq(sample_oid)
+              expect(json_response['LfsSize']).to eq(sample_size)
+            end
+          end
+
+          context 'and request is sent by gitlab-workhorse to finalize the upload' do
+            before do
+              put_finalize
+            end
+
+            it 'responds with status 200' do
+              expect(response).to have_http_status(200)
+            end
+
+            it 'lfs object is linked to the project' do
+              expect(lfs_object.projects.pluck(:id)).to include(project.id)
+            end
+          end
+        end
+
+        describe 'and user does not have push access' do
+          it_behaves_like 'forbidden'
+        end
+      end
+
+      context 'when CI is authenticated' do
+        let(:authorization) { authorize_ci_project }
+
+        it_behaves_like 'unauthorized'
+      end
+
+      context 'for unauthenticated' do
+        it_behaves_like 'unauthorized'
+      end
+    end
+
+    describe 'to a forked project' do
+      let(:upstream_project) { create(:project, :public) }
+      let(:project_owner) { create(:user) }
+      let(:project) { fork_project(upstream_project, project_owner) }
+
+      describe 'when user is authenticated' do
+        let(:authorization) { authorize_user }
+
+        describe 'when user has push access to the project' do
+          before do
+            project.team << [user, :developer]
+          end
+
+          context 'and request is sent by gitlab-workhorse to authorize the request' do
+            before do
+              put_authorize
+            end
+
+            it 'responds with status 200' do
+              expect(response).to have_http_status(200)
+            end
+
+            it 'with location of lfs store and object details' do
+              expect(json_response['StoreLFSPath']).to eq("#{Gitlab.config.shared.path}/lfs-objects/tmp/upload")
+              expect(json_response['LfsOid']).to eq(sample_oid)
+              expect(json_response['LfsSize']).to eq(sample_size)
+            end
+          end
+
+          context 'and request is sent by gitlab-workhorse to finalize the upload' do
+            before do
+              put_finalize
+            end
+
+            it 'responds with status 200' do
+              expect(response).to have_http_status(200)
+            end
+
+            it 'lfs object is linked to the source project' do
+              expect(lfs_object.projects.pluck(:id)).to include(upstream_project.id)
+            end
+          end
+        end
+
+        describe 'and user does not have push access' do
+          it_behaves_like 'forbidden'
+        end
+      end
+
+      context 'when CI is authenticated' do
+        let(:authorization) { authorize_ci_project }
+
+        it_behaves_like 'unauthorized'
+      end
+
+      context 'for unauthenticated' do
+        it_behaves_like 'unauthorized'
+      end
+
+      describe 'and second project not related to fork or a source project' do
+        let(:second_project) { create(:empty_project) }
+        let(:authorization) { authorize_user }
+
+        before do
+          second_project.team << [user, :master]
+          upstream_project.lfs_objects << lfs_object
+        end
+
+        context 'when pushing the same lfs object to the second project' do
+          before do
+            put "#{second_project.http_url_to_repo}/gitlab-lfs/objects/#{sample_oid}/#{sample_size}", nil,
+                headers.merge('X-Gitlab-Lfs-Tmp' => lfs_tmp_file).compact
+          end
+
+          it 'responds with status 200' do
+            expect(response).to have_http_status(200)
+          end
+
+          it 'links the lfs object to the project' do
+            expect(lfs_object.projects.pluck(:id)).to include(second_project.id, upstream_project.id)
+          end
+        end
+      end
+    end
+
+    def put_authorize
+      put "#{project.http_url_to_repo}/gitlab-lfs/objects/#{sample_oid}/#{sample_size}/authorize", nil, headers
+    end
+
+    def put_finalize(lfs_tmp = lfs_tmp_file)
+      put "#{project.http_url_to_repo}/gitlab-lfs/objects/#{sample_oid}/#{sample_size}", nil,
+          headers.merge('X-Gitlab-Lfs-Tmp' => lfs_tmp).compact
+    end
+
+    def lfs_tmp_file
+      "#{sample_oid}012345678"
+    end
+  end
+
+  def enable_lfs
+    allow(Gitlab.config.lfs).to receive(:enabled).and_return(true)
+  end
+
+  def authorize_ci_project
+    ActionController::HttpAuthentication::Basic.encode_credentials('gitlab-ci-token', project.runners_token)
+  end
+
+  def authorize_user
+    ActionController::HttpAuthentication::Basic.encode_credentials(user.username, user.password)
+  end
+
+  def fork_project(project, user, object = nil)
+    allow(RepositoryForkWorker).to receive(:perform_async).and_return(true)
+    Projects::ForkService.new(project, user, {}).execute
+  end
+
+  def post_json(url, body = nil, headers = nil)
+    post(url, body.try(:to_json), (headers || {}).merge('Content-Type' => 'application/json'))
+  end
+
+  def json_response
+    @json_response ||= JSON.parse(response.body)
+  end
+end
diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb
index 2c755919456..0a52c1ab933 100644
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
@@ -116,12 +116,9 @@ describe HelpController, "routing" do
     expect(get(path)).to route_to('help#show',
                                   path: 'workflow/protected_branches/protected_branches1',
                                   format: 'png')
-    path = '/help/shortcuts'
-    expect(get(path)).to route_to('help#show',
-                                  path: 'shortcuts')
+    
     path = '/help/ui'
-    expect(get(path)).to route_to('help#show',
-                                  path: 'ui')
+    expect(get(path)).to route_to('help#ui')
   end
 end
 
diff --git a/spec/services/auth/container_registry_authentication_service_spec.rb b/spec/services/auth/container_registry_authentication_service_spec.rb
index 67777ad48bc..7cc71f706ce 100644
--- a/spec/services/auth/container_registry_authentication_service_spec.rb
+++ b/spec/services/auth/container_registry_authentication_service_spec.rb
@@ -87,51 +87,105 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
   end
 
   context 'user authorization' do
-    let(:project) { create(:project) }
     let(:current_user) { create(:user) }
 
-    context 'allow to use scope-less authentication' do
-      it_behaves_like 'a valid token'
-    end
+    context 'for private project' do
+      let(:project) { create(:empty_project) }
 
-    context 'allow developer to push images' do
-      before { project.team << [current_user, :developer] }
+      context 'allow to use scope-less authentication' do
+        it_behaves_like 'a valid token'
+      end
 
-      let(:current_params) do
-        { scope: "repository:#{project.path_with_namespace}:push" }
+      context 'allow developer to push images' do
+        before { project.team << [current_user, :developer] }
+
+        let(:current_params) do
+          { scope: "repository:#{project.path_with_namespace}:push" }
+        end
+
+        it_behaves_like 'a pushable'
       end
 
-      it_behaves_like 'a pushable'
-    end
+      context 'allow reporter to pull images' do
+        before { project.team << [current_user, :reporter] }
+
+        let(:current_params) do
+          { scope: "repository:#{project.path_with_namespace}:pull" }
+        end
 
-    context 'allow reporter to pull images' do
-      before { project.team << [current_user, :reporter] }
+        it_behaves_like 'a pullable'
+      end
 
-      let(:current_params) do
-        { scope: "repository:#{project.path_with_namespace}:pull" }
+      context 'return a least of privileges' do
+        before { project.team << [current_user, :reporter] }
+
+        let(:current_params) do
+          { scope: "repository:#{project.path_with_namespace}:push,pull" }
+        end
+
+        it_behaves_like 'a pullable'
       end
 
-      it_behaves_like 'a pullable'
+      context 'disallow guest to pull or push images' do
+        before { project.team << [current_user, :guest] }
+
+        let(:current_params) do
+          { scope: "repository:#{project.path_with_namespace}:pull,push" }
+        end
+
+        it_behaves_like 'an inaccessible'
+      end
     end
 
-    context 'return a least of privileges' do
-      before { project.team << [current_user, :reporter] }
+    context 'for public project' do
+      let(:project) { create(:empty_project, :public) }
 
-      let(:current_params) do
-        { scope: "repository:#{project.path_with_namespace}:push,pull" }
+      context 'allow anyone to pull images' do
+        let(:current_params) do
+          { scope: "repository:#{project.path_with_namespace}:pull" }
+        end
+
+        it_behaves_like 'a pullable'
       end
 
-      it_behaves_like 'a pullable'
+      context 'disallow anyone to push images' do
+        let(:current_params) do
+          { scope: "repository:#{project.path_with_namespace}:push" }
+        end
+
+        it_behaves_like 'an inaccessible'
+      end
     end
 
-    context 'disallow guest to pull or push images' do
-      before { project.team << [current_user, :guest] }
+    context 'for internal project' do
+      let(:project) { create(:empty_project, :internal) }
 
-      let(:current_params) do
-        { scope: "repository:#{project.path_with_namespace}:pull,push" }
+      context 'for internal user' do
+        context 'allow anyone to pull images' do
+          let(:current_params) do
+            { scope: "repository:#{project.path_with_namespace}:pull" }
+          end
+
+          it_behaves_like 'a pullable'
+        end
+
+        context 'disallow anyone to push images' do
+          let(:current_params) do
+            { scope: "repository:#{project.path_with_namespace}:push" }
+          end
+
+          it_behaves_like 'an inaccessible'
+        end
       end
 
-      it_behaves_like 'an inaccessible'
+      context 'for external user' do
+        let(:current_user) { create(:user, external: true) }
+        let(:current_params) do
+          { scope: "repository:#{project.path_with_namespace}:pull,push" }
+        end
+
+        it_behaves_like 'an inaccessible'
+      end
     end
   end
 
diff --git a/spec/services/create_commit_builds_service_spec.rb b/spec/services/create_commit_builds_service_spec.rb
index 4d09bc5fb12..d4c5e584421 100644
--- a/spec/services/create_commit_builds_service_spec.rb
+++ b/spec/services/create_commit_builds_service_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe CreateCommitBuildsService, services: true do
   let(:service) { CreateCommitBuildsService.new }
   let(:project) { FactoryGirl.create(:empty_project) }
-  let(:user) { nil }
+  let(:user) { create(:user) }
 
   before do
     stub_ci_pipeline_to_return_yaml_file
@@ -24,6 +24,7 @@ describe CreateCommitBuildsService, services: true do
       it { expect(pipeline).to be_valid }
       it { expect(pipeline).to be_persisted }
       it { expect(pipeline).to eq(project.pipelines.last) }
+      it { expect(pipeline).to have_attributes(user: user) }
       it { expect(pipeline.builds.first).to be_kind_of(Ci::Build) }
     end
 
diff --git a/spec/services/create_deployment_service_spec.rb b/spec/services/create_deployment_service_spec.rb
index 654e441f3cd..8da2a2b3c1b 100644
--- a/spec/services/create_deployment_service_spec.rb
+++ b/spec/services/create_deployment_service_spec.rb
@@ -89,6 +89,12 @@ describe CreateDeploymentService, services: true do
         expect_any_instance_of(described_class).to receive(:execute)
         subject
       end
+
+      it 'is set as deployable' do
+        subject
+
+        expect(Deployment.last.deployable).to eq(deployable)
+      end
     end
 
     context 'without environment specified' do
@@ -105,6 +111,8 @@ describe CreateDeploymentService, services: true do
 
       context 'when build succeeds' do
         it_behaves_like 'does create environment and deployment' do
+          let(:deployable) { build }
+
           subject { build.success }
         end
       end
@@ -114,6 +122,14 @@ describe CreateDeploymentService, services: true do
           subject { build.drop }
         end
       end
+
+      context 'when build is retried' do
+        it_behaves_like 'does create environment and deployment' do
+          let(:deployable) { Ci::Build.retry(build) }
+
+          subject { deployable.success }
+        end
+      end
     end
   end
 end
diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb
index afabeed4a80..47c0580e0f0 100644
--- a/spec/services/git_push_service_spec.rb
+++ b/spec/services/git_push_service_spec.rb
@@ -224,7 +224,7 @@ describe GitPushService, services: true do
       it "when pushing a branch for the first time" do
         expect(project).to receive(:execute_hooks)
         expect(project.default_branch).to eq("master")
-        expect(project.protected_branches).to receive(:create).with({ name: "master", developers_can_push: false })
+        expect(project.protected_branches).to receive(:create).with({ name: "master", developers_can_push: false, developers_can_merge: false })
         execute_service(project, user, @blankrev, 'newrev', 'refs/heads/master' )
       end
 
@@ -242,7 +242,17 @@ describe GitPushService, services: true do
 
         expect(project).to receive(:execute_hooks)
         expect(project.default_branch).to eq("master")
-        expect(project.protected_branches).to receive(:create).with({ name: "master", developers_can_push: true })
+        expect(project.protected_branches).to receive(:create).with({ name: "master", developers_can_push: true, developers_can_merge: false })
+
+        execute_service(project, user, @blankrev, 'newrev', 'refs/heads/master')
+      end
+
+      it "when pushing a branch for the first time with default branch protection set to 'developers can merge'" do
+        stub_application_setting(default_branch_protection: Gitlab::Access::PROTECTION_DEV_CAN_MERGE)
+
+        expect(project).to receive(:execute_hooks)
+        expect(project.default_branch).to eq("master")
+        expect(project.protected_branches).to receive(:create).with({ name: "master", developers_can_push: false, developers_can_merge: true })
         execute_service(project, user, @blankrev, 'newrev', 'refs/heads/master' )
       end
 
diff --git a/spec/services/issues/bulk_update_service_spec.rb b/spec/services/issues/bulk_update_service_spec.rb
index 4a689e64dc5..321b54ac39d 100644
--- a/spec/services/issues/bulk_update_service_spec.rb
+++ b/spec/services/issues/bulk_update_service_spec.rb
@@ -1,118 +1,106 @@
 require 'spec_helper'
 
 describe Issues::BulkUpdateService, services: true do
-  let(:user) { create(:user) }
-  let(:project) { Projects::CreateService.new(user, namespace: user.namespace, name: 'test').execute }
+  let(:user)    { create(:user) }
+  let(:project) { create(:empty_project, namespace: user.namespace) }
 
-  let!(:result) { Issues::BulkUpdateService.new(project, user, params).execute }
+  def bulk_update(issues, extra_params = {})
+    bulk_update_params = extra_params
+      .reverse_merge(issues_ids: Array(issues).map(&:id).join(','))
 
-  describe :close_issue do
-    let(:issues) { create_list(:issue, 5, project: project) }
-    let(:params) do
-      {
-        state_event: 'close',
-        issues_ids: issues.map(&:id).join(',')
-      }
-    end
+    Issues::BulkUpdateService.new(project, user, bulk_update_params).execute
+  end
+
+  describe 'close issues' do
+    let(:issues) { create_list(:issue, 2, project: project) }
 
     it 'succeeds and returns the correct number of issues updated' do
+      result = bulk_update(issues, state_event: 'close')
+
       expect(result[:success]).to be_truthy
       expect(result[:count]).to eq(issues.count)
     end
 
     it 'closes all the issues passed' do
+      bulk_update(issues, state_event: 'close')
+
       expect(project.issues.opened).to be_empty
       expect(project.issues.closed).not_to be_empty
     end
   end
 
-  describe :reopen_issues do
-    let(:issues) { create_list(:closed_issue, 5, project: project) }
-    let(:params) do
-      {
-        state_event: 'reopen',
-        issues_ids: issues.map(&:id).join(',')
-      }
-    end
+  describe 'reopen issues' do
+    let(:issues) { create_list(:closed_issue, 2, project: project) }
 
     it 'succeeds and returns the correct number of issues updated' do
+      result = bulk_update(issues, state_event: 'reopen')
+
       expect(result[:success]).to be_truthy
       expect(result[:count]).to eq(issues.count)
     end
 
     it 'reopens all the issues passed' do
+      bulk_update(issues, state_event: 'reopen')
+
       expect(project.issues.closed).to be_empty
       expect(project.issues.opened).not_to be_empty
     end
   end
 
   describe 'updating assignee' do
-    let(:issue) do
-      create(:issue, project: project) { |issue| issue.update_attributes(assignee: user) }
-    end
-
-    let(:params) do
-      {
-        assignee_id: assignee_id,
-        issues_ids: issue.id.to_s
-      }
-    end
+    let(:issue) { create(:issue, project: project, assignee: user) }
 
     context 'when the new assignee ID is a valid user' do
-      let(:new_assignee) { create(:user) }
-      let(:assignee_id) { new_assignee.id }
-
       it 'succeeds' do
+        result = bulk_update(issue, assignee_id: create(:user).id)
+
         expect(result[:success]).to be_truthy
         expect(result[:count]).to eq(1)
       end
 
       it 'updates the assignee to the use ID passed' do
-        expect(issue.reload.assignee).to eq(new_assignee)
+        assignee = create(:user)
+
+        expect { bulk_update(issue, assignee_id: assignee.id) }
+          .to change { issue.reload.assignee }.from(user).to(assignee)
       end
     end
 
     context 'when the new assignee ID is -1' do
-      let(:assignee_id) { -1 }
-
       it 'unassigns the issues' do
-        expect(issue.reload.assignee).to be_nil
+        expect { bulk_update(issue, assignee_id: -1) }
+          .to change { issue.reload.assignee }.to(nil)
       end
     end
 
     context 'when the new assignee ID is not present' do
-      let(:assignee_id) { nil }
-
       it 'does not unassign' do
-        expect(issue.reload.assignee).to eq(user)
+        expect { bulk_update(issue, assignee_id: nil) }
+          .not_to change { issue.reload.assignee }
       end
     end
   end
 
   describe 'updating milestones' do
-    let(:issue) { create(:issue, project: project) }
+    let(:issue)     { create(:issue, project: project) }
     let(:milestone) { create(:milestone, project: project) }
 
-    let(:params) do
-      {
-        issues_ids: issue.id.to_s,
-        milestone_id: milestone.id
-      }
-    end
-
     it 'succeeds' do
+      result = bulk_update(issue, milestone_id: milestone.id)
+
       expect(result[:success]).to be_truthy
       expect(result[:count]).to eq(1)
     end
 
     it 'updates the issue milestone' do
-      expect(project.issues.first.milestone).to eq(milestone)
+      expect { bulk_update(issue, milestone_id: milestone.id) }
+        .to change { issue.reload.milestone }.from(nil).to(milestone)
     end
   end
 
   describe 'updating labels' do
     def create_issue_with_labels(labels)
-      create(:issue, project: project) { |issue| issue.update_attributes(labels: labels) }
+      create(:labeled_issue, project: project, labels: labels)
     end
 
     let(:bug) { create(:label, project: project) }
@@ -129,15 +117,18 @@ describe Issues::BulkUpdateService, services: true do
     let(:add_labels) { [] }
     let(:remove_labels) { [] }
 
-    let(:params) do
+    let(:bulk_update_params) do
       {
-        label_ids: labels.map(&:id),
-        add_label_ids: add_labels.map(&:id),
+        label_ids:        labels.map(&:id),
+        add_label_ids:    add_labels.map(&:id),
         remove_label_ids: remove_labels.map(&:id),
-        issues_ids: issues.map(&:id).join(',')
       }
     end
 
+    before do
+      bulk_update(issues, bulk_update_params)
+    end
+
     context 'when label_ids are passed' do
       let(:issues) { [issue_all_labels, issue_no_labels] }
       let(:labels) { [bug, regression] }
@@ -262,4 +253,30 @@ describe Issues::BulkUpdateService, services: true do
       end
     end
   end
+
+  describe 'subscribe to issues' do
+    let(:issues) { create_list(:issue, 2, project: project) }
+
+    it 'subscribes the given user' do
+      bulk_update(issues, subscription_event: 'subscribe')
+
+      expect(issues).to all(be_subscribed(user))
+    end
+  end
+
+  describe 'unsubscribe from issues' do
+    let(:issues) do
+      create_list(:closed_issue, 2, project: project) do |issue|
+        issue.subscriptions.create(user: user, subscribed: true)
+      end
+    end
+
+    it 'unsubscribes the given user' do
+      bulk_update(issues, subscription_event: 'unsubscribe')
+
+      issues.each do |issue|
+        expect(issue).not_to be_subscribed(user)
+      end
+    end
+  end
 end
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb
index 06f56d85aa8..ce643b3f860 100644
--- a/spec/services/merge_requests/refresh_service_spec.rb
+++ b/spec/services/merge_requests/refresh_service_spec.rb
@@ -88,8 +88,7 @@ describe MergeRequests::RefreshService, services: true do
         # Merge master -> feature branch
         author = { email: 'test@gitlab.com', time: Time.now, name: "Me" }
         commit_options = { message: 'Test message', committer: author, author: author }
-        master_commit = @project.repository.commit('master')
-        @project.repository.merge(@user, master_commit.id, 'feature', commit_options)
+        @project.repository.merge(@user, @merge_request, commit_options)
         commit = @project.repository.commit('feature')
         service.new(@project, @user).execute(@oldrev, commit.id, 'refs/heads/feature')
         reload_mrs
diff --git a/spec/services/projects/download_service_spec.rb b/spec/services/projects/download_service_spec.rb
index f252e2c5902..122a7cea2a1 100644
--- a/spec/services/projects/download_service_spec.rb
+++ b/spec/services/projects/download_service_spec.rb
@@ -35,8 +35,6 @@ describe Projects::DownloadService, services: true do
 
         it { expect(@link_to_file).to have_key(:alt) }
         it { expect(@link_to_file).to have_key(:url) }
-        it { expect(@link_to_file).to have_key(:is_image) }
-        it { expect(@link_to_file[:is_image]).to be true }
         it { expect(@link_to_file[:url]).to match('rails_sample.jpg') }
         it { expect(@link_to_file[:alt]).to eq('rails_sample') }
       end
@@ -49,8 +47,6 @@ describe Projects::DownloadService, services: true do
 
         it { expect(@link_to_file).to have_key(:alt) }
         it { expect(@link_to_file).to have_key(:url) }
-        it { expect(@link_to_file).to have_key(:is_image) }
-        it { expect(@link_to_file[:is_image]).to be false }
         it { expect(@link_to_file[:url]).to match('doc_sample.txt') }
         it { expect(@link_to_file[:alt]).to eq('doc_sample.txt') }
       end
diff --git a/spec/services/projects/upload_service_spec.rb b/spec/services/projects/upload_service_spec.rb
index 9268a9fb1a2..c42eeba4b9c 100644
--- a/spec/services/projects/upload_service_spec.rb
+++ b/spec/services/projects/upload_service_spec.rb
@@ -15,9 +15,7 @@ describe Projects::UploadService, services: true do
 
       it { expect(@link_to_file).to have_key(:alt) }
       it { expect(@link_to_file).to have_key(:url) }
-      it { expect(@link_to_file).to have_key(:is_image) }
       it { expect(@link_to_file).to have_value('banana_sample') }
-      it { expect(@link_to_file[:is_image]).to equal(true) }
       it { expect(@link_to_file[:url]).to match('banana_sample.gif') }
     end
 
@@ -31,8 +29,6 @@ describe Projects::UploadService, services: true do
       it { expect(@link_to_file).to have_key(:alt) }
       it { expect(@link_to_file).to have_key(:url) }
       it { expect(@link_to_file).to have_value('dk') }
-      it { expect(@link_to_file).to have_key(:is_image) }
-      it { expect(@link_to_file[:is_image]).to equal(true) }
       it { expect(@link_to_file[:url]).to match('dk.png') }
     end
 
@@ -44,9 +40,7 @@ describe Projects::UploadService, services: true do
 
       it { expect(@link_to_file).to have_key(:alt) }
       it { expect(@link_to_file).to have_key(:url) }
-      it { expect(@link_to_file).to have_key(:is_image) }
       it { expect(@link_to_file).to have_value('rails_sample') }
-      it { expect(@link_to_file[:is_image]).to equal(true) }
       it { expect(@link_to_file[:url]).to match('rails_sample.jpg') }
     end
 
@@ -58,9 +52,7 @@ describe Projects::UploadService, services: true do
 
       it { expect(@link_to_file).to have_key(:alt) }
       it { expect(@link_to_file).to have_key(:url) }
-      it { expect(@link_to_file).to have_key(:is_image) }
       it { expect(@link_to_file).to have_value('doc_sample.txt') }
-      it { expect(@link_to_file[:is_image]).to equal(false) }
       it { expect(@link_to_file[:url]).to match('doc_sample.txt') }
     end
 
diff --git a/spec/services/repository_archive_clean_up_service_spec.rb b/spec/services/repository_archive_clean_up_service_spec.rb
new file mode 100644
index 00000000000..842585f9e54
--- /dev/null
+++ b/spec/services/repository_archive_clean_up_service_spec.rb
@@ -0,0 +1,81 @@
+require 'spec_helper'
+
+describe RepositoryArchiveCleanUpService, services: true do
+  describe '#execute' do
+    subject(:service) { described_class.new }
+
+    context 'when the downloads directory does not exist' do
+      it 'does not remove any archives' do
+        path = '/invalid/path/'
+        stub_repository_downloads_path(path)
+
+        expect(File).to receive(:directory?).with(path).and_return(false)
+        expect(service).not_to receive(:clean_up_old_archives)
+        expect(service).not_to receive(:clean_up_empty_directories)
+
+        service.execute
+      end
+    end
+
+    context 'when the downloads directory exists' do
+      shared_examples 'invalid archive files' do |dirname, extensions, mtime|
+        it 'does not remove files and directoy' do
+          in_directory_with_files(dirname, extensions, mtime) do |dir, files|
+            service.execute
+
+            files.each { |file| expect(File.exist?(file)).to eq true }
+            expect(File.directory?(dir)).to eq true
+          end
+        end
+      end
+
+      it 'removes files older than 2 hours that matches valid archive extensions' do
+        in_directory_with_files('sample.git', %w[tar tar.bz2 tar.gz zip], 2.hours) do |dir, files|
+          service.execute
+
+          files.each { |file| expect(File.exist?(file)).to eq false }
+          expect(File.directory?(dir)).to eq false
+        end
+      end
+
+      context 'with files older than 2 hours that does not matches valid archive extensions' do
+        it_behaves_like 'invalid archive files', 'sample.git', %w[conf rb], 2.hours
+      end
+
+      context 'with files older than 2 hours inside invalid directories' do
+        it_behaves_like 'invalid archive files', 'john_doe/sample.git', %w[conf rb tar tar.gz], 2.hours
+      end
+
+      context 'with files newer than 2 hours that matches valid archive extensions' do
+        it_behaves_like 'invalid archive files', 'sample.git', %w[tar tar.bz2 tar.gz zip], 1.hour
+      end
+
+      context 'with files newer than 2 hours that does not matches valid archive extensions' do
+        it_behaves_like 'invalid archive files', 'sample.git', %w[conf rb], 1.hour
+      end
+
+      context 'with files newer than 2 hours inside invalid directories' do
+        it_behaves_like 'invalid archive files', 'sample.git', %w[conf rb tar tar.gz], 1.hour
+      end
+    end
+
+    def in_directory_with_files(dirname, extensions, mtime)
+      Dir.mktmpdir do |tmpdir|
+        stub_repository_downloads_path(tmpdir)
+        dir = File.join(tmpdir, dirname)
+        files = create_temporary_files(dir, extensions, mtime)
+
+        yield(dir, files)
+      end
+    end
+
+    def stub_repository_downloads_path(path)
+      allow(Gitlab.config.gitlab).to receive(:repository_downloads_path).and_return(path)
+    end
+
+    def create_temporary_files(dir, extensions, mtime)
+      FileUtils.mkdir_p(dir)
+      FileUtils.touch(extensions.map { |ext| File.join(dir, "sample.#{ext}") }, mtime: Time.now - mtime)
+    end
+  end
+end
diff --git a/spec/services/todo_service_spec.rb b/spec/services/todo_service_spec.rb
index b4522536724..34d8ea9090e 100644
--- a/spec/services/todo_service_spec.rb
+++ b/spec/services/todo_service_spec.rb
@@ -35,8 +35,11 @@ describe TodoService, services: true do
         should_not_create_any_todo { service.new_issue(unassigned_issue, author) }
       end
 
-      it 'does not create a todo if assignee is the current user' do
-        should_not_create_any_todo { service.new_issue(unassigned_issue, john_doe) }
+      it 'creates a todo if assignee is the current user' do
+        unassigned_issue.update_attribute(:assignee, john_doe)
+        service.new_issue(unassigned_issue, john_doe)
+
+        should_create_todo(user: john_doe, target: unassigned_issue, author: john_doe, action: Todo::ASSIGNED)
       end
 
       it 'creates a todo for each valid mentioned user' do
@@ -44,7 +47,7 @@ describe TodoService, services: true do
 
         should_create_todo(user: member, target: issue, action: Todo::MENTIONED)
         should_create_todo(user: guest, target: issue, action: Todo::MENTIONED)
-        should_not_create_todo(user: author, target: issue, action: Todo::MENTIONED)
+        should_create_todo(user: author, target: issue, action: Todo::MENTIONED)
         should_not_create_todo(user: john_doe, target: issue, action: Todo::MENTIONED)
         should_not_create_todo(user: non_member, target: issue, action: Todo::MENTIONED)
       end
@@ -57,7 +60,7 @@ describe TodoService, services: true do
         should_create_todo(user: member, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
         should_create_todo(user: admin, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
         should_not_create_todo(user: guest, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
-        should_not_create_todo(user: john_doe, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
+        should_create_todo(user: john_doe, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
       end
 
       context 'when a private group is mentioned' do
@@ -87,7 +90,7 @@ describe TodoService, services: true do
         should_create_todo(user: member, target: issue, action: Todo::MENTIONED)
         should_create_todo(user: guest, target: issue, action: Todo::MENTIONED)
         should_create_todo(user: john_doe, target: issue, action: Todo::MENTIONED)
-        should_not_create_todo(user: author, target: issue, action: Todo::MENTIONED)
+        should_create_todo(user: author, target: issue, action: Todo::MENTIONED)
         should_not_create_todo(user: non_member, target: issue, action: Todo::MENTIONED)
       end
 
@@ -105,7 +108,7 @@ describe TodoService, services: true do
         should_create_todo(user: member, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
         should_create_todo(user: admin, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
         should_not_create_todo(user: guest, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
-        should_not_create_todo(user: john_doe, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
+        should_create_todo(user: john_doe, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
       end
 
       context 'issues with a task list' do
@@ -156,10 +159,11 @@ describe TodoService, services: true do
         should_not_create_any_todo { service.reassigned_issue(issue, author) }
       end
 
-      it 'does not create a todo if new assignee is the current user' do
+      it 'creates a todo if new assignee is the current user' do
         unassigned_issue.update_attribute(:assignee, john_doe)
+        service.reassigned_issue(unassigned_issue, john_doe)
 
-        should_not_create_any_todo { service.reassigned_issue(unassigned_issue, john_doe) }
+        should_create_todo(user: john_doe, target: unassigned_issue, author: john_doe, action: Todo::ASSIGNED)
       end
     end
 
@@ -250,7 +254,7 @@ describe TodoService, services: true do
         should_create_todo(user: member, target: issue, author: john_doe, action: Todo::MENTIONED, note: note)
         should_create_todo(user: guest, target: issue, author: john_doe, action: Todo::MENTIONED, note: note)
         should_create_todo(user: author, target: issue, author: john_doe, action: Todo::MENTIONED, note: note)
-        should_not_create_todo(user: john_doe, target: issue, author: john_doe, action: Todo::MENTIONED, note: note)
+        should_create_todo(user: john_doe, target: issue, author: john_doe, action: Todo::MENTIONED, note: note)
         should_not_create_todo(user: non_member, target: issue, author: john_doe, action: Todo::MENTIONED, note: note)
       end
 
@@ -262,7 +266,7 @@ describe TodoService, services: true do
         should_create_todo(user: member, target: confidential_issue, author: john_doe, action: Todo::MENTIONED, note: note_on_confidential_issue)
         should_create_todo(user: admin, target: confidential_issue, author: john_doe, action: Todo::MENTIONED, note: note_on_confidential_issue)
         should_not_create_todo(user: guest, target: confidential_issue, author: john_doe, action: Todo::MENTIONED, note: note_on_confidential_issue)
-        should_not_create_todo(user: john_doe, target: confidential_issue, author: john_doe, action: Todo::MENTIONED, note: note_on_confidential_issue)
+        should_create_todo(user: john_doe, target: confidential_issue, author: john_doe, action: Todo::MENTIONED, note: note_on_confidential_issue)
       end
 
       it 'creates a todo for each valid mentioned user when leaving a note on commit' do
@@ -270,7 +274,7 @@ describe TodoService, services: true do
 
         should_create_todo(user: member, target_id: nil, target_type: 'Commit', commit_id: note_on_commit.commit_id, author: john_doe, action: Todo::MENTIONED, note: note_on_commit)
         should_create_todo(user: author, target_id: nil, target_type: 'Commit', commit_id: note_on_commit.commit_id, author: john_doe, action: Todo::MENTIONED, note: note_on_commit)
-        should_not_create_todo(user: john_doe, target_id: nil, target_type: 'Commit', commit_id: note_on_commit.commit_id, author: john_doe, action: Todo::MENTIONED, note: note_on_commit)
+        should_create_todo(user: john_doe, target_id: nil, target_type: 'Commit', commit_id: note_on_commit.commit_id, author: john_doe, action: Todo::MENTIONED, note: note_on_commit)
         should_not_create_todo(user: non_member, target_id: nil, target_type: 'Commit', commit_id: note_on_commit.commit_id, author: john_doe, action: Todo::MENTIONED, note: note_on_commit)
       end
 
@@ -312,7 +316,7 @@ describe TodoService, services: true do
 
         should_create_todo(user: member, target: mr_assigned, action: Todo::MENTIONED)
         should_create_todo(user: guest, target: mr_assigned, action: Todo::MENTIONED)
-        should_not_create_todo(user: author, target: mr_assigned, action: Todo::MENTIONED)
+        should_create_todo(user: author, target: mr_assigned, action: Todo::MENTIONED)
         should_not_create_todo(user: john_doe, target: mr_assigned, action: Todo::MENTIONED)
         should_not_create_todo(user: non_member, target: mr_assigned, action: Todo::MENTIONED)
       end
@@ -325,7 +329,7 @@ describe TodoService, services: true do
         should_create_todo(user: member, target: mr_assigned, action: Todo::MENTIONED)
         should_create_todo(user: guest, target: mr_assigned, action: Todo::MENTIONED)
         should_create_todo(user: john_doe, target: mr_assigned, action: Todo::MENTIONED)
-        should_not_create_todo(user: author, target: mr_assigned, action: Todo::MENTIONED)
+        should_create_todo(user: author, target: mr_assigned, action: Todo::MENTIONED)
         should_not_create_todo(user: non_member, target: mr_assigned, action: Todo::MENTIONED)
       end
 
@@ -382,10 +386,11 @@ describe TodoService, services: true do
         should_not_create_any_todo { service.reassigned_merge_request(mr_assigned, author) }
       end
 
-      it 'does not create a todo if new assignee is the current user' do
+      it 'creates a todo if new assignee is the current user' do
         mr_assigned.update_attribute(:assignee, john_doe)
+        service.reassigned_merge_request(mr_assigned, john_doe)
 
-        should_not_create_any_todo { service.reassigned_merge_request(mr_assigned, john_doe) }
+        should_create_todo(user: john_doe, target: mr_assigned, author: john_doe, action: Todo::ASSIGNED)
       end
     end
 
@@ -435,6 +440,24 @@ describe TodoService, services: true do
         should_create_todo(user: author, target: mr_unassigned, action: Todo::MARKED)
       end
     end
+
+    describe '#new_note' do
+      let(:mention) { john_doe.to_reference }
+      let(:diff_note_on_merge_request) { create(:diff_note_on_merge_request, project: project, noteable: mr_unassigned, author: author, note: "Hey #{mention}") }
+      let(:legacy_diff_note_on_merge_request) { create(:legacy_diff_note_on_merge_request, project: project, noteable: mr_unassigned, author: author, note: "Hey #{mention}") }
+
+      it 'creates a todo for mentioned user on new diff note' do
+        service.new_note(diff_note_on_merge_request, author)
+
+        should_create_todo(user: john_doe, target: mr_unassigned, author: author, action: Todo::MENTIONED, note: diff_note_on_merge_request)
+      end
+
+      it 'creates a todo for mentioned user on legacy diff note' do
+        service.new_note(legacy_diff_note_on_merge_request, author)
+
+        should_create_todo(user: john_doe, target: mr_unassigned, author: author, action: Todo::MENTIONED, note: legacy_diff_note_on_merge_request)
+      end
+    end
   end
 
   it 'updates cached counts when a todo is created' do
diff --git a/spec/support/api_helpers.rb b/spec/support/api_helpers.rb
index 1b3cafb497c..68b196d9033 100644
--- a/spec/support/api_helpers.rb
+++ b/spec/support/api_helpers.rb
@@ -24,8 +24,11 @@ module ApiHelpers
       (path.index('?') ? '' : '?') +
 
       # Append private_token if given a User object
-      (user.respond_to?(:private_token) ?
-        "&private_token=#{user.private_token}" : "")
+      if user.respond_to?(:private_token)
+        "&private_token=#{user.private_token}"
+      else
+        ''
+      end
   end
 
   def ci_api(path, user = nil)
@@ -35,8 +38,11 @@ module ApiHelpers
       (path.index('?') ? '' : '?') +
 
       # Append private_token if given a User object
-      (user.respond_to?(:private_token) ?
-        "&private_token=#{user.private_token}" : "")
+      if user.respond_to?(:private_token)
+        "&private_token=#{user.private_token}"
+      else
+        ''
+      end
   end
 
   def json_response
diff --git a/spec/support/fake_u2f_device.rb b/spec/support/fake_u2f_device.rb
index 553fe9f1fbc..f550e9a0160 100644
--- a/spec/support/fake_u2f_device.rb
+++ b/spec/support/fake_u2f_device.rb
@@ -18,8 +18,8 @@ class FakeU2fDevice
 
   def respond_to_u2f_authentication
     app_id = @page.evaluate_script('gon.u2f.app_id')
-    challenges = @page.evaluate_script('gon.u2f.challenges')
-    json_response = u2f_device(app_id).sign_response(challenges[0])
+    challenge = @page.evaluate_script('gon.u2f.challenge')
+    json_response = u2f_device(app_id).sign_response(challenge)
 
     @page.execute_script("
     u2f.sign = function(appId, challenges, signRequests, callback) {
diff --git a/spec/support/matchers/markdown_matchers.rb b/spec/support/matchers/markdown_matchers.rb
index e005058ba5b..8c98b1f988c 100644
--- a/spec/support/matchers/markdown_matchers.rb
+++ b/spec/support/matchers/markdown_matchers.rb
@@ -178,6 +178,17 @@ module MarkdownMatchers
       expect(actual).to have_selector('span.idiff.deletion', count: 2)
     end
   end
+
+  # VideoLinkFilter
+  matcher :parse_video_links do
+    set_default_markdown_messages
+
+    match do |actual|
+      video = actual.at_css('video')
+
+      expect(video['src']).to end_with('/assets/videos/gitlab-demo.mp4')
+    end
+  end
 end
 
 # Monkeypatch the matcher DSL so that we can reduce some noisy duplication for
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index bb6c84262f6..83f2ad96fd8 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -18,7 +18,9 @@ module TestEnv
     'orphaned-branch'       => '45127a9',
     'binary-encoding'       => '7b1cf43',
     'gitattributes'         => '5a62481',
-    'expand-collapse-diffs' => '4842455'
+    'expand-collapse-diffs' => '4842455',
+    'expand-collapse-files' => '025db92',
+    'expand-collapse-lines' => '238e82d'
   }
 
   # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily
diff --git a/spec/uploaders/file_uploader_spec.rb b/spec/uploaders/file_uploader_spec.rb
new file mode 100644
index 00000000000..e8300abed5d
--- /dev/null
+++ b/spec/uploaders/file_uploader_spec.rb
@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe FileUploader do
+  let(:project) { create(:project) }
+
+  before do
+    @previous_enable_processing = FileUploader.enable_processing
+    FileUploader.enable_processing = false
+    @uploader = FileUploader.new(project)
+  end
+
+  after do
+    FileUploader.enable_processing = @previous_enable_processing
+    @uploader.remove!
+  end
+
+  describe '#image_or_video?' do
+    context 'given an image file' do
+      before do
+        @uploader.store!(File.new(Rails.root.join('spec', 'fixtures', 'rails_sample.jpg')))
+      end
+
+      it 'detects an image based on file extension' do
+        expect(@uploader.image_or_video?).to be true
+      end
+    end
+
+    context 'given an video file' do
+      before do
+        video_file = File.new(Rails.root.join('spec', 'fixtures', 'video_sample.mp4'))
+        @uploader.store!(video_file)
+      end
+
+      it 'detects a video based on file extension' do
+        expect(@uploader.image_or_video?).to be true
+      end
+    end
+
+    it 'does not return image_or_video? for other types' do
+      @uploader.store!(File.new(Rails.root.join('spec', 'fixtures', 'doc_sample.txt')))
+
+      expect(@uploader.image_or_video?).to be false
+    end
+  end
+end
diff --git a/spec/views/admin/dashboard/index.html.haml_spec.rb b/spec/views/admin/dashboard/index.html.haml_spec.rb
new file mode 100644
index 00000000000..dae858a52f6
--- /dev/null
+++ b/spec/views/admin/dashboard/index.html.haml_spec.rb
@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe 'admin/dashboard/index.html.haml' do
+  include Devise::TestHelpers
+
+  before do
+    assign(:projects, create_list(:empty_project, 1))
+    assign(:users, create_list(:user, 1))
+    assign(:groups, create_list(:group, 1))
+
+    allow(view).to receive(:admin?).and_return(true)
+  end
+
+  it "shows version of GitLab Workhorse" do
+    render
+
+    expect(rendered).to have_content 'GitLab Workhorse'
+    expect(rendered).to have_content Gitlab::Workhorse.version
+  end
+end
diff --git a/spec/views/projects/builds/show.html.haml_spec.rb b/spec/views/projects/builds/show.html.haml_spec.rb
index cd18d19ef5e..42220a20c75 100644
--- a/spec/views/projects/builds/show.html.haml_spec.rb
+++ b/spec/views/projects/builds/show.html.haml_spec.rb
@@ -3,8 +3,12 @@ require 'spec_helper'
 describe 'projects/builds/show' do
   include Devise::TestHelpers
 
-  let(:build) { create(:ci_build) }
-  let(:project) { build.project }
+  let(:project) { create(:project) }
+  let(:pipeline) do
+    create(:ci_pipeline, project: project,
+                         sha: project.commit.id)
+  end
+  let(:build) { create(:ci_build, pipeline: pipeline) }
 
   before do
     assign(:build, build)
@@ -34,4 +38,15 @@ describe 'projects/builds/show' do
       expect(rendered).to have_link('Retry')
     end
   end
+
+  describe 'commit title in sidebar' do
+    let(:commit_title) { project.commit.title }
+
+    it 'shows commit title and not show commit message' do
+      render
+      
+      expect(rendered).to have_css('p.build-light-text.append-bottom-0',
+        text: /\A\n#{Regexp.escape(commit_title)}\n\Z/)
+    end
+  end
 end
diff --git a/spec/workers/emails_on_push_worker_spec.rb b/spec/workers/emails_on_push_worker_spec.rb
index 439da765c2c..796751efe8d 100644
--- a/spec/workers/emails_on_push_worker_spec.rb
+++ b/spec/workers/emails_on_push_worker_spec.rb
@@ -12,6 +12,42 @@ describe EmailsOnPushWorker do
   subject { EmailsOnPushWorker.new }
 
   describe "#perform" do
+    context "when push is a new branch" do
+      let(:email) { ActionMailer::Base.deliveries.last }
+
+      before do
+        data_new_branch = data.stringify_keys.merge("before" => Gitlab::Git::BLANK_SHA)
+
+        subject.perform(project.id, recipients, data_new_branch)
+      end
+
+      it "sends a mail with the correct subject" do
+        expect(email.subject).to include("Pushed new branch")
+      end
+
+      it "sends the mail to the correct recipient" do
+        expect(email.to).to eq([user.email])
+      end
+    end
+
+    context "when push is a deleted branch" do
+      let(:email) { ActionMailer::Base.deliveries.last }
+
+      before do
+        data_deleted_branch = data.stringify_keys.merge("after" => Gitlab::Git::BLANK_SHA)
+
+        subject.perform(project.id, recipients, data_deleted_branch)
+      end
+
+      it "sends a mail with the correct subject" do
+        expect(email.subject).to include("Deleted branch")
+      end
+
+      it "sends the mail to the correct recipient" do
+        expect(email.to).to eq([user.email])
+      end
+    end
+
     context "when there are no errors in sending" do
       let(:email) { ActionMailer::Base.deliveries.last }
 
diff --git a/vendor/assets/javascripts/task_list.js b/vendor/assets/javascripts/task_list.js
new file mode 100644
index 00000000000..bc451506b6a
--- /dev/null
+++ b/vendor/assets/javascripts/task_list.js
@@ -0,0 +1,119 @@
+
+/*= provides tasklist:enabled */
+
+
+/*= provides tasklist:disabled */
+
+
+/*= provides tasklist:change */
+
+
+/*= provides tasklist:changed */
+
+(function() {
+  var codeFencesPattern, complete, completePattern, disableTaskList, disableTaskLists, enableTaskList, enableTaskLists, escapePattern, incomplete, incompletePattern, itemPattern, itemsInParasPattern, updateTaskList, updateTaskListItem,
+    indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
+
+  incomplete = "[ ]";
+
+  complete = "[x]";
+
+  escapePattern = function(str) {
+    return str.replace(/([\[\]])/g, "\\$1").replace(/\s/, "\\s").replace("x", "[xX]");
+  };
+
+  incompletePattern = RegExp("" + (escapePattern(incomplete)));
+
+  completePattern = RegExp("" + (escapePattern(complete)));
+
+  itemPattern = RegExp("^(?:\\s*(?:>\\s*)*(?:[-+*]|(?:\\d+\\.)))\\s*(" + (escapePattern(complete)) + "|" + (escapePattern(incomplete)) + ")\\s+(?!\\(.*?\\))(?=(?:\\[.*?\\]\\s*(?:\\[.*?\\]|\\(.*?\\))\\s*)*(?:[^\\[]|$))");
+
+  codeFencesPattern = /^`{3}(?:\s*\w+)?[\S\s].*[\S\s]^`{3}$/mg;
+
+  itemsInParasPattern = RegExp("^(" + (escapePattern(complete)) + "|" + (escapePattern(incomplete)) + ").+$", "g");
+
+  updateTaskListItem = function(source, itemIndex, checked) {
+    var clean, index, line, result;
+    clean = source.replace(/\r/g, '').replace(codeFencesPattern, '').replace(itemsInParasPattern, '').split("\n");
+    index = 0;
+    result = (function() {
+      var i, len, ref, results;
+      ref = source.split("\n");
+      results = [];
+      for (i = 0, len = ref.length; i < len; i++) {
+        line = ref[i];
+        if (indexOf.call(clean, line) >= 0 && line.match(itemPattern)) {
+          index += 1;
+          if (index === itemIndex) {
+            line = checked ? line.replace(incompletePattern, complete) : line.replace(completePattern, incomplete);
+          }
+        }
+        results.push(line);
+      }
+      return results;
+    })();
+    return result.join("\n");
+  };
+
+  updateTaskList = function($item) {
+    var $container, $field, checked, event, index;
+    $container = $item.closest('.js-task-list-container');
+    $field = $container.find('.js-task-list-field');
+    index = 1 + $container.find('.task-list-item-checkbox').index($item);
+    checked = $item.prop('checked');
+    event = $.Event('tasklist:change');
+    $field.trigger(event, [index, checked]);
+    if (!event.isDefaultPrevented()) {
+      $field.val(updateTaskListItem($field.val(), index, checked));
+      $field.trigger('change');
+      return $field.trigger('tasklist:changed', [index, checked]);
+    }
+  };
+
+  $(document).on('change', '.task-list-item-checkbox', function() {
+    return updateTaskList($(this));
+  });
+
+  enableTaskList = function($container) {
+    if ($container.find('.js-task-list-field').length > 0) {
+      $container.find('.task-list-item').addClass('enabled').find('.task-list-item-checkbox').attr('disabled', null);
+      return $container.addClass('is-task-list-enabled').trigger('tasklist:enabled');
+    }
+  };
+
+  enableTaskLists = function($containers) {
+    var container, i, len, results;
+    results = [];
+    for (i = 0, len = $containers.length; i < len; i++) {
+      container = $containers[i];
+      results.push(enableTaskList($(container)));
+    }
+    return results;
+  };
+
+  disableTaskList = function($container) {
+    $container.find('.task-list-item').removeClass('enabled').find('.task-list-item-checkbox').attr('disabled', 'disabled');
+    return $container.removeClass('is-task-list-enabled').trigger('tasklist:disabled');
+  };
+
+  disableTaskLists = function($containers) {
+    var container, i, len, results;
+    results = [];
+    for (i = 0, len = $containers.length; i < len; i++) {
+      container = $containers[i];
+      results.push(disableTaskList($(container)));
+    }
+    return results;
+  };
+
+  $.fn.taskList = function(method) {
+    var $container, methods;
+    $container = $(this).closest('.js-task-list-container');
+    methods = {
+      enable: enableTaskLists,
+      disable: disableTaskLists
+    };
+    return methods[method || 'enable']($container);
+  };
+
+}).call(this);
diff --git a/vendor/assets/javascripts/task_list.js.coffee b/vendor/assets/javascripts/task_list.js.coffee
deleted file mode 100644
index 584751af8ea..00000000000
--- a/vendor/assets/javascripts/task_list.js.coffee
+++ /dev/null
@@ -1,258 +0,0 @@
-# The MIT License (MIT)
-#
-# Copyright (c) 2014 GitHub, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# TaskList Behavior
-#
-#= provides tasklist:enabled
-#= provides tasklist:disabled
-#= provides tasklist:change
-#= provides tasklist:changed
-#
-#
-# Enables Task List update behavior.
-#
-# ### Example Markup
-#
-#   <div class="js-task-list-container">
-#     <ul class="task-list">
-#       <li class="task-list-item">
-#         <input type="checkbox" class="js-task-list-item-checkbox" disabled />
-#         text
-#       </li>
-#     </ul>
-#     <form>
-#       <textarea class="js-task-list-field">- [ ] text</textarea>
-#     </form>
-#   </div>
-#
-# ### Specification
-#
-# TaskLists MUST be contained in a `(div).js-task-list-container`.
-#
-# TaskList Items SHOULD be an a list (`UL`/`OL`) element.
-#
-# Task list items MUST match `(input).task-list-item-checkbox` and MUST be
-# `disabled` by default.
-#
-# TaskLists MUST have a `(textarea).js-task-list-field` form element whose
-# `value` attribute is the source (Markdown) to be udpated. The source MUST
-# follow the syntax guidelines.
-#
-# TaskList updates trigger `tasklist:change` events. If the change is
-# successful, `tasklist:changed` is fired. The change can be canceled.
-#
-# jQuery is required.
-#
-# ### Methods
-#
-# `.taskList('enable')` or `.taskList()`
-#
-# Enables TaskList updates for the container.
-#
-# `.taskList('disable')`
-#
-# Disables TaskList updates for the container.
-#
-## ### Events
-#
-# `tasklist:enabled`
-#
-# Fired when the TaskList is enabled.
-#
-# * **Synchronicity** Sync
-# * **Bubbles** Yes
-# * **Cancelable** No
-# * **Target** `.js-task-list-container`
-#
-# `tasklist:disabled`
-#
-# Fired when the TaskList is disabled.
-#
-# * **Synchronicity** Sync
-# * **Bubbles** Yes
-# * **Cancelable** No
-# * **Target** `.js-task-list-container`
-#
-# `tasklist:change`
-#
-# Fired before the TaskList item change takes affect.
-#
-# * **Synchronicity** Sync
-# * **Bubbles** Yes
-# * **Cancelable** Yes
-# * **Target** `.js-task-list-field`
-#
-# `tasklist:changed`
-#
-# Fired once the TaskList item change has taken affect.
-#
-# * **Synchronicity** Sync
-# * **Bubbles** Yes
-# * **Cancelable** No
-# * **Target** `.js-task-list-field`
-#
-# ### NOTE
-#
-# Task list checkboxes are rendered as disabled by default because rendered
-# user content is cached without regard for the viewer.
-
-incomplete = "[ ]"
-complete   = "[x]"
-
-# Escapes the String for regular expression matching.
-escapePattern = (str) ->
-  str.
-    replace(/([\[\]])/g, "\\$1"). # escape square brackets
-    replace(/\s/, "\\s").         # match all white space
-    replace("x", "[xX]")          # match all cases
-
-incompletePattern = ///
-  #{escapePattern(incomplete)}
-///
-completePattern = ///
-  #{escapePattern(complete)}
-///
-
-# Pattern used to identify all task list items.
-# Useful when you need iterate over all items.
-itemPattern = ///
-  ^
-  (?:                     # prefix, consisting of
-    \s*                   # optional leading whitespace
-    (?:>\s*)*             # zero or more blockquotes
-    (?:[-+*]|(?:\d+\.))   # list item indicator
-  )
-  \s*                     # optional whitespace prefix
-  (                       # checkbox
-    #{escapePattern(complete)}|
-    #{escapePattern(incomplete)}
-  )
-  \s+                     # is followed by whitespace
-  (?!
-    \(.*?\)               # is not part of a [foo](url) link
-  )
-  (?=                     # and is followed by zero or more links
-    (?:\[.*?\]\s*(?:\[.*?\]|\(.*?\))\s*)*
-    (?:[^\[]|$)           # and either a non-link or the end of the string
-  )
-///
-
-# Used to filter out code fences from the source for comparison only.
-# http://rubular.com/r/x5EwZVrloI
-# Modified slightly due to issues with JS
-codeFencesPattern = ///
-  ^`{3}           # ```
-    (?:\s*\w+)?   # followed by optional language
-    [\S\s]        # whitespace
-  .*              # code
-  [\S\s]          # whitespace
-  ^`{3}$          # ```
-///mg
-
-# Used to filter out potential mismatches (items not in lists).
-# http://rubular.com/r/OInl6CiePy
-itemsInParasPattern = ///
-  ^
-  (
-    #{escapePattern(complete)}|
-    #{escapePattern(incomplete)}
-  )
-  .+
-  $
-///g
-
-# Given the source text, updates the appropriate task list item to match the
-# given checked value.
-#
-# Returns the updated String text.
-updateTaskListItem = (source, itemIndex, checked) ->
-  clean = source.replace(/\r/g, '').replace(codeFencesPattern, '').
-    replace(itemsInParasPattern, '').split("\n")
-  index = 0
-  result = for line in source.split("\n")
-    if line in clean && line.match(itemPattern)
-      index += 1
-      if index == itemIndex
-        line =
-          if checked
-            line.replace(incompletePattern, complete)
-          else
-            line.replace(completePattern, incomplete)
-    line
-  result.join("\n")
-
-# Updates the $field value to reflect the state of $item.
-# Triggers the `tasklist:change` event before the value has changed, and fires
-# a `tasklist:changed` event once the value has changed.
-updateTaskList = ($item) ->
-  $container = $item.closest '.js-task-list-container'
-  $field     = $container.find '.js-task-list-field'
-  index      = 1 + $container.find('.task-list-item-checkbox').index($item)
-  checked    = $item.prop 'checked'
-
-  event = $.Event 'tasklist:change'
-  $field.trigger event, [index, checked]
-
-  unless event.isDefaultPrevented()
-    $field.val updateTaskListItem($field.val(), index, checked)
-    $field.trigger 'change'
-    $field.trigger 'tasklist:changed', [index, checked]
-
-# When the task list item checkbox is updated, submit the change
-$(document).on 'change', '.task-list-item-checkbox', ->
-  updateTaskList $(this)
-
-# Enables TaskList item changes.
-enableTaskList = ($container) ->
-  if $container.find('.js-task-list-field').length > 0
-    $container.
-      find('.task-list-item').addClass('enabled').
-      find('.task-list-item-checkbox').attr('disabled', null)
-    $container.addClass('is-task-list-enabled').
-      trigger 'tasklist:enabled'
-
-# Enables a collection of TaskList containers.
-enableTaskLists = ($containers) ->
-  for container in $containers
-    enableTaskList $(container)
-
-# Disable TaskList item changes.
-disableTaskList = ($container) ->
-  $container.
-    find('.task-list-item').removeClass('enabled').
-    find('.task-list-item-checkbox').attr('disabled', 'disabled')
-  $container.removeClass('is-task-list-enabled').
-    trigger 'tasklist:disabled'
-
-# Disables a collection of TaskList containers.
-disableTaskLists = ($containers) ->
-  for container in $containers
-    disableTaskList $(container)
-
-$.fn.taskList = (method) ->
-  $container = $(this).closest('.js-task-list-container')
-
-  methods =
-    enable: enableTaskLists
-    disable: disableTaskLists
-
-  methods[method || 'enable']($container)