Revert "Fix merge conflicts - squashed commit"

This reverts commit 3e99123095.

.gitignore

@@ -4,46 +4,46 @@
 .bundle
 .chef
 .directory
-/.envrc
-/.gitlab_shell_secret
+.envrc
+.gitlab_shell_secret
 .idea
-/.rbenv-version
+.rbenv-version
 .rbx/
-/.ruby-gemset
-/.ruby-version
-/.rvmrc
+.ruby-gemset
+.ruby-version
+.rvmrc
 .sass-cache/
-/.secret
-/.vagrant
-/.byebug_history
-/Vagrantfile
-/backups/*
-/config/aws.yml
-/config/database.yml
-/config/gitlab.yml
-/config/gitlab_ci.yml
-/config/initializers/rack_attack.rb
-/config/initializers/smtp_settings.rb
-/config/initializers/relative_url.rb
-/config/resque.yml
-/config/unicorn.rb
-/config/secrets.yml
-/config/sidekiq.yml
-/coverage/*
-/db/*.sqlite3
-/db/*.sqlite3-journal
-/db/data.yml
-/doc/code/*
-/dump.rdb
-/log/*.log*
-/nohup.out
-/public/assets/
-/public/uploads.*
-/public/uploads/
-/shared/artifacts/
-/rails_best_practices_output.html
+.secret
+.vagrant
+.byebug_history
+Vagrantfile
+backups/*
+config/aws.yml
+config/database.yml
+config/gitlab.yml
+config/gitlab_ci.yml
+config/initializers/rack_attack.rb
+config/initializers/smtp_settings.rb
+config/initializers/relative_url.rb
+config/resque.yml
+config/unicorn.rb
+config/secrets.yml
+config/sidekiq.yml
+coverage/*
+db/*.sqlite3
+db/*.sqlite3-journal
+db/data.yml
+doc/code/*
+dump.rdb
+log/*.log*
+nohup.out
+public/assets/
+public/uploads.*
+public/uploads/
+shared/artifacts/
+rails_best_practices_output.html
 /tags
-/tmp/*
-/vendor/bundle/*
-/builds/*
-/shared/*
+tmp/
+vendor/bundle/*
+builds/*
+shared/*

.rubocop.yml

@@ -1,5 +1,3 @@
-require: rubocop-rspec
-
 AllCops:
   TargetRubyVersion: 2.1
   # Cop names are not displayed in offense messages by default. Change behavior
@@ -23,7 +21,6 @@ AllCops:
     - 'lib/email_validator.rb'
     - 'lib/gitlab/upgrader.rb'
     - 'lib/gitlab/seeder.rb'
-    - 'generator_templates/**/*'
 
 
 ##################### Style ##################################
@@ -59,7 +56,7 @@ Style/AndOr:
 
 # Use `Array#join` instead of `Array#*`.
 Style/ArrayJoin:
-  Enabled: true
+  Enabled: false
 
 # Use only ascii symbols in comments.
 Style/AsciiComments:
@@ -71,7 +68,7 @@ Style/AsciiIdentifiers:
 
 # Checks for uses of Module#attr.
 Style/Attr:
-  Enabled: true
+  Enabled: false
 
 # Avoid the use of BEGIN blocks.
 Style/BeginBlock:
@@ -83,7 +80,7 @@ Style/BarePercentLiterals:
 
 # Do not use block comments.
 Style/BlockComments:
-  Enabled: true
+  Enabled: false
 
 # Put end statement of multiline block on its own line.
 Style/BlockEndNewline:
@@ -124,7 +121,7 @@ Style/ClassCheck:
 
 # Use self when defining module/class methods.
 Style/ClassMethods:
-  Enabled: true
+  Enabled: false
 
 # Avoid the use of class variables.
 Style/ClassVars:
@@ -154,7 +151,7 @@ Style/ConstantName:
 
 # Use def with parentheses when there are arguments.
 Style/DefWithParentheses:
-  Enabled: true
+  Enabled: false
 
 # Checks for use of deprecated Hash methods.
 Style/DeprecatedHashMethods:
@@ -218,15 +215,15 @@ Style/EmptyLiteral:
 
 # Avoid the use of END blocks.
 Style/EndBlock:
-  Enabled: true
+  Enabled: false
 
 # Use Unix-style line endings.
 Style/EndOfLine:
-  Enabled: true
+  Enabled: false
 
 # Favor the use of Fixnum#even? && Fixnum#odd?
 Style/EvenOdd:
-  Enabled: true
+  Enabled: false
 
 # Do not use unnecessary spacing.
 Style/ExtraSpacing:
@@ -234,20 +231,15 @@ Style/ExtraSpacing:
 
 # Use snake_case for source file names.
 Style/FileName:
-  Enabled: true
-
-# Checks for a line break before the first parameter in a multi-line method
-# parameter definition.
-Style/FirstMethodParameterLineBreak:
-  Enabled: true
+  Enabled: false
 
 # Checks for flip flops.
 Style/FlipFlop:
-  Enabled: true
+  Enabled: false
 
 # Checks use of for or each in multiline loops.
 Style/For:
-  Enabled: true
+  Enabled: false
 
 # Enforce the use of Kernel#sprintf, Kernel#format or String#%.
 Style/FormatString:
@@ -255,7 +247,7 @@ Style/FormatString:
 
 # Do not introduce global variables.
 Style/GlobalVars:
-  Enabled: true
+  Enabled: false
 
 # Check for conditionals that can be replaced with guard clauses.
 Style/GuardClause:
@@ -276,7 +268,7 @@ Style/IfUnlessModifier:
 
 # Do not use if x; .... Use the ternary operator instead.
 Style/IfWithSemicolon:
-  Enabled: true
+  Enabled: false
 
 # Checks that conditional statements do not have an identical line at the
 # end of each branch, which can validly be moved out of the conditional.
@@ -284,9 +276,9 @@ Style/IdenticalConditionalBranches:
   Enabled: false
 
 # Checks the indentation of the first line of the right-hand-side of a
-# multi-line assignment.
+# multi-line assignment. 
 Style/IndentAssignment:
-  Enabled: true
+  Enabled: false
 
 # Keep indentation straight.
 Style/IndentationConsistency:
@@ -306,7 +298,7 @@ Style/IndentHash:
 
 # Use Kernel#loop for infinite loops.
 Style/InfiniteLoop:
-  Enabled: true
+  Enabled: false
 
 # Use the new lambda literal syntax for single-line blocks.
 Style/Lambda:
@@ -314,11 +306,11 @@ Style/Lambda:
 
 # Use lambda.call(...) instead of lambda.(...).
 Style/LambdaCall:
-  Enabled: true
+  Enabled: false
 
 # Comments should start with a space.
 Style/LeadingCommentSpace:
-  Enabled: true
+  Enabled: false
 
 # Use \ instead of + or << to concatenate two string literals at line end.
 Style/LineEndConcatenation:
@@ -330,22 +322,16 @@ Style/MethodCallParentheses:
 
 # Checks if the method definitions have or don't have parentheses.
 Style/MethodDefParentheses:
-  Enabled: true
+  Enabled: false
 
 # Use the configured style when naming methods.
 Style/MethodName:
-  Enabled: true
+  Enabled: false
 
 # Checks for usage of `extend self` in modules.
 Style/ModuleFunction:
   Enabled: false
 
-# Checks that the closing brace in an array literal is either on the same line
-# as the last array element, or a new line.
-Style/MultilineArrayBraceLayout:
-  Enabled: false
-  EnforcedStyle: symmetrical
-
 # Avoid multi-line chains of blocks.
 Style/MultilineBlockChain:
   Enabled: false
@@ -354,32 +340,15 @@ Style/MultilineBlockChain:
 Style/MultilineBlockLayout:
   Enabled: true
 
-# Checks that the closing brace in a hash literal is either on the same line as
-# the last hash element, or a new line.
-Style/MultilineHashBraceLayout:
-  Enabled: false
-  EnforcedStyle: symmetrical
-
 # Do not use then for multi-line if/unless.
 Style/MultilineIfThen:
-  Enabled: true
-
-# Checks that the closing brace in a method call is either on the same line as
-# the last method argument, or a new line.
-Style/MultilineMethodCallBraceLayout:
   Enabled: false
-  EnforcedStyle: symmetrical
 
 # Checks indentation of method calls with the dot operator that span more than
 # one line.
 Style/MultilineMethodCallIndentation:
   Enabled: false
 
-# Checks that the closing brace in a method definition is symmetrical with
-# respect to the opening brace and the method parameters.
-Style/MultilineMethodDefinitionBraceLayout:
-  Enabled: false
-
 # Checks indentation of binary operations that span more than one line.
 Style/MultilineOperationIndentation:
   Enabled: false
@@ -394,7 +363,7 @@ Style/MutableConstant:
 
 # Favor unless over if for negative conditions (or control flow or).
 Style/NegatedIf:
-  Enabled: true
+  Enabled: false
 
 # Favor until over while for negative conditions.
 Style/NegatedWhile:
@@ -402,7 +371,7 @@ Style/NegatedWhile:
 
 # Avoid using nested modifiers.
 Style/NestedModifier:
-  Enabled: true
+  Enabled: false
 
 # Parenthesize method calls which are nested inside the argument list of
 # another parenthesized method call.
@@ -439,7 +408,7 @@ Style/OneLineConditional:
 
 # When defining binary operators, name the argument other.
 Style/OpMethod:
-  Enabled: true
+  Enabled: false
 
 # Check for simple usages of parallel assignment. It will only warn when
 # the number of variables matches on both sides of the assignment.
@@ -486,9 +455,10 @@ Style/RedundantException:
 Style/RedundantFreeze:
   Enabled: false
 
+# TODO: Enable RedundantParentheses Cop.
 # Checks for parentheses that seem not to serve any purpose.
 Style/RedundantParentheses:
-  Enabled: true
+  Enabled: false
 
 # Don't use return where it's not required.
 Style/RedundantReturn:
@@ -514,12 +484,11 @@ Style/SelfAssignment:
 
 # Don't use semicolons to terminate expressions.
 Style/Semicolon:
-  Enabled: true
+  Enabled: false
 
 # Checks for proper usage of fail and raise.
 Style/SignalException:
-  EnforcedStyle: only_raise
-  Enabled: true
+  Enabled: false
 
 # Enforces the names of some block params.
 Style/SingleLineBlockParams:
@@ -540,28 +509,29 @@ Style/SpaceAfterComma:
 # Do not put a space between a method name and the opening parenthesis in a
 # method definition.
 Style/SpaceAfterMethodName:
-  Enabled: true
+  Enabled: false
 
 # Tracks redundant space after the ! operator.
 Style/SpaceAfterNot:
-  Enabled: true
+  Enabled: false
 
 # Use spaces after semicolons.
 Style/SpaceAfterSemicolon:
-  Enabled: true
+  Enabled: false
 
 # Checks that the equals signs in parameter default assignments have or don't
 # have surrounding space depending on configuration.
 Style/SpaceAroundEqualsInParameterDefault:
   Enabled: false
 
+# TODO: Enable SpaceAroundKeyword Cop.
 # Use a space around keywords if appropriate.
 Style/SpaceAroundKeyword:
-  Enabled: true
+  Enabled: false
 
 # Use a single space around operators.
 Style/SpaceAroundOperators:
-  Enabled: true
+  Enabled: false
 
 # Checks that the left block brace has or doesn't have space before it.
 Style/SpaceBeforeBlockBraces:
@@ -569,11 +539,11 @@ Style/SpaceBeforeBlockBraces:
 
 # No spaces before commas.
 Style/SpaceBeforeComma:
-  Enabled: true
+  Enabled: false
 
 # Checks for missing space between code and a comment on the same line.
 Style/SpaceBeforeComment:
-  Enabled: true
+  Enabled: false
 
 # Checks that exactly one space is used between a method name and the first
 # argument for method calls without parentheses.
@@ -582,7 +552,7 @@ Style/SpaceBeforeFirstArg:
 
 # No spaces before semicolons.
 Style/SpaceBeforeSemicolon:
-  Enabled: true
+  Enabled: false
 
 # Checks that block braces have or don't have surrounding space.
 # For blocks taking parameters, checks that the left brace has or doesn't
@@ -604,12 +574,11 @@ Style/SpaceInsideParens:
 
 # No spaces inside range literals.
 Style/SpaceInsideRangeLiteral:
-  Enabled: true
+  Enabled: false
 
 # Checks for padding/surrounding spaces inside string interpolation.
 Style/SpaceInsideStringInterpolation:
-  EnforcedStyle: no_space
-  Enabled: true
+  Enabled: false
 
 # Avoid Perl-style global variables.
 Style/SpecialGlobalVars:
@@ -617,8 +586,7 @@ Style/SpecialGlobalVars:
 
 # Check for the usage of parentheses around stabby lambda arguments.
 Style/StabbyLambdaParentheses:
-  EnforcedStyle: require_parentheses
-  Enabled: true
+  Enabled: false
 
 # Checks if uses of quotes match the configured preference.
 Style/StringLiterals:
@@ -631,9 +599,7 @@ Style/StringLiteralsInInterpolation:
 
 # Checks if configured preferred methods are used over non-preferred.
 Style/StringMethods:
-  PreferredMethods:
-    intern: to_sym
-  Enabled: true
+  Enabled: false
 
 # Use %i or %I for arrays of symbols.
 Style/SymbolArray:
@@ -691,24 +657,23 @@ Style/UnneededPercentQ:
 
 # Don't interpolate global, instance and class variables directly in strings.
 Style/VariableInterpolation:
-  Enabled: true
+  Enabled: false
 
 # Use the configured style when naming variables.
 Style/VariableName:
-  EnforcedStyle: snake_case
-  Enabled: true
+  Enabled: false
 
 # Use when x then ... for one-line cases.
 Style/WhenThen:
-  Enabled: true
+  Enabled: false
 
 # Checks for redundant do after while or until.
 Style/WhileUntilDo:
-  Enabled: true
+  Enabled: false
 
 # Favor modifier while/until usage when you have a single-line body.
 Style/WhileUntilModifier:
-  Enabled: true
+  Enabled: false
 
 # Use %w or %W for arrays of words.
 Style/WordArray:
@@ -784,28 +749,28 @@ Lint/AssignmentInCondition:
 
 # Align block ends correctly.
 Lint/BlockAlignment:
-  Enabled: true
+  Enabled: false
 
 # Default values in optional keyword arguments and optional ordinal arguments
 # should not refer back to the name of the argument.
 Lint/CircularArgumentReference:
-  Enabled: true
+  Enabled: false
 
 # Checks for condition placed in a confusing position relative to the keyword.
 Lint/ConditionPosition:
-  Enabled: true
+  Enabled: false
 
 # Check for debugger calls.
 Lint/Debugger:
-  Enabled: true
+  Enabled: false
 
 # Align ends corresponding to defs correctly.
 Lint/DefEndAlignment:
-  Enabled: true
+  Enabled: false
 
 # Check for deprecated class method calls.
 Lint/DeprecatedClassMethods:
-  Enabled: true
+  Enabled: false
 
 # Check for duplicate method definitions.
 Lint/DuplicateMethods:
@@ -817,15 +782,15 @@ Lint/DuplicatedKey:
 
 # Check for immutable argument given to each_with_object.
 Lint/EachWithObjectArgument:
-  Enabled: true
+  Enabled: false
 
 # Check for odd code arrangement in an else block.
 Lint/ElseLayout:
-  Enabled: true
+  Enabled: false
 
 # Checks for empty ensure block.
 Lint/EmptyEnsure:
-  Enabled: true
+  Enabled: false
 
 # Checks for empty string interpolation.
 Lint/EmptyInterpolation:
@@ -833,36 +798,37 @@ Lint/EmptyInterpolation:
 
 # Align ends correctly.
 Lint/EndAlignment:
-  Enabled: true
+  Enabled: false
 
 # END blocks should not be placed inside method definitions.
 Lint/EndInMethod:
-  Enabled: true
+  Enabled: false
 
 # Do not use return in an ensure block.
 Lint/EnsureReturn:
-  Enabled: true
+  Enabled: false
 
 # The use of eval represents a serious security risk.
 Lint/Eval:
-  Enabled: true
+  Enabled: false
 
 # Catches floating-point literals too large or small for Ruby to represent.
 Lint/FloatOutOfRange:
-  Enabled: true
+  Enabled: false
 
 # The number of parameters to format/sprint must match the fields.
 Lint/FormatParameterMismatch:
-  Enabled: true
+  Enabled: false
 
 # Don't suppress exception.
 Lint/HandleExceptions:
   Enabled: false
 
+# TODO: Enable ImplicitStringConcatenation Cop.
 # Checks for adjacent string literals on the same line, which could better be
 # represented as a single string literal.
 Lint/ImplicitStringConcatenation:
-  Enabled: true
+  Enabled: false
 
 # TODO: Enable IneffectiveAccessModifier Cop.
 # Checks for attempts to use `private` or `protected` to set the visibility
@@ -873,15 +839,15 @@ Lint/IneffectiveAccessModifier:
 # Checks for invalid character literals with a non-escaped whitespace
 # character.
 Lint/InvalidCharacterLiteral:
-  Enabled: true
+  Enabled: false
 
 # Checks of literals used in conditions.
 Lint/LiteralInCondition:
-  Enabled: true
+  Enabled: false
 
 # Checks for literals used in interpolation.
 Lint/LiteralInInterpolation:
-  Enabled: true
+  Enabled: false
 
 # Use Kernel#loop with break rather than begin/end/until or begin/end/while
 # for post-loop tests.
@@ -890,11 +856,11 @@ Lint/Loop:
 
 # Do not use nested method definitions.
 Lint/NestedMethodDefinition:
-  Enabled: true
+  Enabled: false
 
 # Do not omit the accumulator when calling `next` in a `reduce`/`inject` block.
 Lint/NextWithoutAccumulator:
-  Enabled: true
+  Enabled: false
 
 # Checks for method calls with a space before the opening parenthesis.
 Lint/ParenthesesAsGroupedExpression:
@@ -903,11 +869,11 @@ Lint/ParenthesesAsGroupedExpression:
 # Checks for `rand(1)` calls. Such calls always return `0` and most likely
 # a mistake.
 Lint/RandOne:
-  Enabled: true
+  Enabled: false
 
 # Use parentheses in the method call to avoid confusion about precedence.
 Lint/RequireParentheses:
-  Enabled: true
+  Enabled: false
 
 # Avoid rescuing the Exception class.
 Lint/RescueException:
@@ -942,7 +908,7 @@ Lint/UnusedMethodArgument:
 
 # Unreachable code.
 Lint/UnreachableCode:
-  Enabled: true
+  Enabled: false
 
 # Checks for useless access modifiers.
 Lint/UselessAccessModifier:
@@ -954,31 +920,33 @@ Lint/UselessAssignment:
 
 # Checks for comparison of something with itself.
 Lint/UselessComparison:
-  Enabled: true
+  Enabled: false
 
 # Checks for useless `else` in `begin..end` without `rescue`.
 Lint/UselessElseWithoutRescue:
-  Enabled: true
+  Enabled: false
 
 # Checks for useless setter call to a local variable.
 Lint/UselessSetterCall:
-  Enabled: true
+  Enabled: false
 
 # Possible use of operator/literal/variable in void context.
 Lint/Void:
-  Enabled: true
+  Enabled: false
 
 
 ##################### Performance ############################
 
+# TODO: Enable Casecmp Cop.
 # Use `casecmp` rather than `downcase ==`.
 Performance/Casecmp:
-  Enabled: true
+  Enabled: false
 
+# TODO: Enable DoubleStartEndWith Cop.
 # Use `str.{start,end}_with?(x, ..., y, ...)` instead of
 # `str.{start,end}_with?(x, ...) || str.{start,end}_with?(y, ...)`.
 Performance/DoubleStartEndWith:
-  Enabled: true
+  Enabled: false
 
 # TODO: Enable EndWith Cop.
 # Use `end_with?` instead of a regex match anchored to the end of a string.
@@ -989,9 +957,10 @@ Performance/EndWith:
 Performance/LstripRstrip:
   Enabled: true
 
+# TODO: Enable RangeInclude Cop.
 # Use `Range#cover?` instead of `Range#include?`.
 Performance/RangeInclude:
-  Enabled: true
+  Enabled: false
 
 # TODO: Enable RedundantBlockCall Cop.
 # Use `yield` instead of `block.call`.
@@ -1011,24 +980,26 @@ Performance/RedundantMerge:
   MaxKeyValuePairs: 2
   Enabled: false
 
+# TODO: Enable RedundantSortBy Cop.
 # Use `sort` instead of `sort_by { |x| x }`.
 Performance/RedundantSortBy:
-  Enabled: true
+  Enabled: false
 
+# TODO: Enable StartWith Cop.
 # Use `start_with?` instead of a regex match anchored to the beginning of a
 # string.
 Performance/StartWith:
-  Enabled: true
-
+  Enabled: false
 # Use `tr` instead of `gsub` when you are replacing the same number of
 # characters. Use `delete` instead of `gsub` when you are deleting
 # characters.
 Performance/StringReplacement:
-  Enabled: true
+  Enabled: false
 
+# TODO: Enable TimesMap Cop.
 # Checks for `.times.map` calls.
 Performance/TimesMap:
-  Enabled: true
+  Enabled: false
 
 
 ##################### Rails ##################################
@@ -1053,11 +1024,11 @@ Rails/Delegate:
 
 # Prefer `find_by` over `where.first`.
 Rails/FindBy:
-  Enabled: true
+  Enabled: false
 
 # Prefer `all.find_each` over `all.find`.
 Rails/FindEach:
-  Enabled: true
+  Enabled: false
 
 # Prefer has_many :through to has_and_belongs_to_many.
 Rails/HasAndBelongsToMany:
@@ -1069,7 +1040,7 @@ Rails/Output:
 
 # Checks for incorrect grammar when using methods like `3.day.ago`.
 Rails/PluralizationGrammar:
-  Enabled: true
+  Enabled: false
 
 # Checks for `read_attribute(:attr)` and `write_attribute(:attr, val)`.
 Rails/ReadWriteAttribute:
@@ -1077,7 +1048,7 @@ Rails/ReadWriteAttribute:
 
 # Checks the arguments of ActiveRecord scopes.
 Rails/ScopeArgs:
-  Enabled: true
+  Enabled: false
 
 # Checks the correct usage of time zone aware methods.
 # http://danilenko.org/2012/7/6/rails_timezones
@@ -1087,65 +1058,3 @@ Rails/TimeZone:
 # Use validates :attribute, hash of validations.
 Rails/Validation:
   Enabled: false
-
-##################### RSpec ##################################
-
-# Check that instances are not being stubbed globally.
-RSpec/AnyInstance:
-  Enabled: false
-
-# Check that the first argument to the top level describe is the tested class or
-# module.
-RSpec/DescribeClass:
-  Enabled: false
-
-# Use `described_class` for tested class / module.
-RSpec/DescribeMethod:
-  Enabled: false
-
-# Checks that the second argument to top level describe is the tested method
-# name.
-RSpec/DescribedClass:
-  Enabled: false
-
-# Checks for long example.
-RSpec/ExampleLength:
-  Enabled: false
-  Max: 5
-
-# Do not use should when describing your tests.
-RSpec/ExampleWording:
-  Enabled: false
-  CustomTransform:
-    be: is
-    have: has
-    not: does not
-  IgnoredWords: []
-
-# Checks the file and folder naming of the spec file.
-RSpec/FilePath:
-  Enabled: false
-  CustomTransform:
-    RuboCop: rubocop
-    RSpec: rspec
-
-# Checks if there are focused specs.
-RSpec/Focus:
-  Enabled: true
-
-# Checks for the usage of instance variables.
-RSpec/InstanceVariable:
-  Enabled: false
-
-# Checks for multiple top-level describes.
-RSpec/MultipleDescribes:
-  Enabled: false
-
-# Enforces the usage of the same method on all negative message expectations.
-RSpec/NotToNot:
-  EnforcedStyle: not_to
-  Enabled: true
-
-# Prefer using verifying doubles over normal doubles.
-RSpec/VerifiedDoubles:
-  Enabled: false

CHANGELOG

@@ -1,180 +1,47 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
-v 8.9.0 (unreleased)
-  - Allow enabling wiki page events from Webhook management UI
-  - Make EmailsOnPushWorker use Sidekiq mailers queue
-  - Fix wiki page events' webhook to point to the wiki repository
-  - Fix issue todo not remove when leave project !4150 (Long Nguyen)
-  - Allow forking projects with restricted visibility level
-  - Improve note validation to prevent errors when creating invalid note via API
-  - Reduce number of fog gem dependencies
-  - Remove project notification settings associated with deleted projects
-  - Fix 404 page when viewing TODOs that contain milestones or labels in different projects
-  - Redesign navigation for project pages
-  - Fix groups API to list only user's accessible projects
-  - Redesign account and email confirmation emails
-  - Use gitlab-shell v3.0.0
-  - Add DB index on users.state
-  - Add rake task 'gitlab:db:configure' for conditionally seeding or migrating the database
-  - Changed the Slack build message to use the singular duration if necessary (Aran Koning)
-  - Fix issues filter when ordering by milestone
-  - Todos will display target state if issuable target is 'Closed' or 'Merged'
-  - Fix bug when sorting issues by milestone due date and filtering by two or more labels
-  - Link to blank group icon doesn't throw a 404 anymore
-  - Remove 'main language' feature
-  - Pipelines can be canceled only when there are running builds
-  - Use downcased path to container repository as this is expected path by Docker
-  - Projects pending deletion will render a 404 page
-  - Measure queue duration between gitlab-workhorse and Rails
-  - Make authentication service for Container Registry to be compatible with < Docker 1.11
-  - Add Application Setting to configure Container Registry token expire delay (default 5min)
-  - Cache assigned issue and merge request counts in sidebar nav
-  - Cache project build count in sidebar nav
-  - Reduce number of queries needed to render issue labels in the sidebar
-  - Improve error handling importing projects
-  - Put project Files and Commits tabs under Code tab
-
-v 8.8.3
-  - Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312
-  - Fixed JS error when trying to remove discussion form. !4303
-  - Fixed issue with button color when no CI enabled. !4287
-  - Fixed potential issue with 2 CI status polling events happening. !3869
-  - Improve design of Pipeline view. !4230
-  - Fix gitlab importer failing to import new projects due to missing credentials. !4301
-  - Fix import URL migration not rescuing with the correct Error. !4321
-  - Fix health check access token changing due to old application settings being used. !4332
-  - Make authentication service for Container Registry to be compatible with Docker versions before 1.11. !4363
-  - Add Application Setting to configure Container Registry token expire delay (default 5 min). !4364
-  - Pass the "Remember me" value to the 2FA token form. !4369
-  - Fix incorrect links on pipeline page when merge request created from fork.  !4376
-  - Use downcased path to container repository as this is expected path by Docker. !4420
-  - Fix wiki project clone address error (chujinjin). !4429
-  - Fix serious performance bug with rendering Markdown with InlineDiffFilter.  !4392
-  - Fix missing number on generated ordered list element. !4437
-  - Prevent disclosure of notes on confidential issues in search results.
-
-v 8.8.2
-  - Added remove due date button. !4209
-  - Fix Error 500 when accessing application settings due to nil disabled OAuth sign-in sources. !4242
-  - Fix Error 500 in CI charts by gracefully handling commits with no durations. !4245
-  - Fix table UI on CI builds page. !4249
-  - Fix backups if registry is disabled. !4263
-  - Fixed issue with merge button color. !4211
-  - Fixed issue with enter key selecting wrong option in dropdown. !4210
-  - When creating a .gitignore file a dropdown with templates will be provided. !4075
-  - Fix concurrent request when updating build log in browser. !4183
-
-v 8.8.1
-  - Add documentation for the "Health Check" feature
-  - Allow anonymous users to access a public project's pipelines !4233
-  - Fix MySQL compatibility in zero downtime migrations helpers
-  - Fix the CI login to Container Registry (the gitlab-ci-token user)
-
-v 8.8.0
-  - Implement GFM references for milestones (Alejandro Rodríguez)
-  - Snippets tab under user profile. !4001 (Long Nguyen)
-  - Fix error when using link to uploads in global snippets
-  - Fix Error 500 when attempting to retrieve project license when HEAD points to non-existent ref
+v 8.8.0 (unreleased)
   - Assign labels and milestone to target project when moving issue. !3934 (Long Nguyen)
-  - Use a case-insensitive comparison in sanitizing URI schemes
-  - Toggle sign-up confirmation emails in application settings
-  - Make it possible to prevent tagged runner from picking untagged jobs
-  - Added `InlineDiffFilter` to the markdown parser. (Adam Butler)
-  - Added inline diff styling for `change_title` system notes. (Adam Butler)
   - Project#open_branches has been cleaned up and no longer loads entire records into memory.
   - Escape HTML in commit titles in system note messages
-  - Improve design of Pipeline View
-  - Fix scope used when accessing container registry
-  - Fix creation of Ci::Commit object which can lead to pending, failed in some scenarios
   - Improve multiple branch push performance by memoizing permission checking
   - Log to application.log when an admin starts and stops impersonating a user
-  - Changing the confidentiality of an issue now creates a new system note (Alex Moore-Niemi)
   - Updated gitlab_git to 10.1.0
   - GitAccess#protected_tag? no longer loads all tags just to check if a single one exists
   - Reduce delay in destroying a project from 1-minute to immediately
   - Make build status canceled if any of the jobs was canceled and none failed
   - Upgrade Sidekiq to 4.1.2
-  - Added /health_check endpoint for checking service status
-  - Make 'upcoming' filter for milestones work better across projects
   - Sanitize repo paths in new project error message
   - Bump mail_room to 0.7.0 to fix stuck IDLE connections
   - Remove future dates from contribution calendar graph.
   - Support e-mail notifications for comments on project snippets
-  - Fix API leak of notes of unauthorized issues, snippets and merge requests
   - Use ActionDispatch Remote IP for Akismet checking
   - Fix error when visiting commit builds page before build was updated
   - Add 'l' shortcut to open Label dropdown on issuables and 'i' to create new issue on a project
   - Update SVG sanitizer to conform to SVG 1.1
-  - Speed up push emails with multiple recipients by only generating the email once
   - Updated search UI
-  - Added authentication service for Container Registry
   - Display informative message when new milestone is created
-  - Sanitize milestones and labels titles
-  - Support multi-line tag messages. !3833 (Calin Seciu)
-  - Force users to reset their password after an admin changes it
   - Allow "NEWS" and "CHANGES" as alternative names for CHANGELOG. !3768 (Connor Shea)
   - Added button to toggle whitespaces changes on diff view
   - Backport GitHub Enterprise import support from EE
   - Create tags using Rugged for performance reasons. !3745
-  - Allow guests to set notification level in projects
-  - API: Expose Issue#user_notes_count. !3126 (Anton Popov)
-  - Don't show forks button when user can't view forks
-  - Fix atom feed links and rendering
   - Files over 5MB can only be viewed in their raw form, files over 1MB without highlighting !3718
   - Add support for supressing text diffs using .gitattributes on the default branch (Matt Oakes)
-  - Add eager load paths to help prevent dependency load issues in Sidekiq workers. !3724
   - Added multiple colors for labels in dropdowns when dups happen.
-  - Show commits in the same order as `git log`
   - Improve description for the Two-factor Authentication sign-in screen. (Connor Shea)
   - API support for the 'since' and 'until' operators on commit requests (Paco Guzman)
   - Fix Gravatar hint in user profile when Gravatar is disabled. !3988 (Artem Sidorenko)
   - Expire repository exists? and has_visible_content? caches after a push if necessary
-  - Fix unintentional filtering bug in Issue/MR sorted by milestone due (Takuya Noguchi)
-  - Fix adding a todo for private group members (Ahmad Sherif)
-  - Bump ace-rails-ap gem version from 2.0.1 to 4.0.2 which upgrades Ace Editor from 1.1.2 to 1.2.3
-  - Total method execution timings are no longer tracked
-  - Allow Admins to remove the Login with buttons for OAuth services and still be able to import !4034. (Andrei Gliga)
-  - Add API endpoints for un/subscribing from/to a label. !4051 (Ahmad Sherif)
-  - Hide left sidebar on phone screens to give more space for content
-  - Redesign navigation for profile and group pages
-  - Add counter metrics for rails cache
-  - Import pull requests from GitHub where the source or target branches were removed
-  - All Grape API helpers are now instrumented
-  - Improve Issue formatting for the Slack Service (Jeroen van Baarsen)
-  - Fixed advice on invalid permissions on upload path !2948 (Ludovic Perrine)
-  - Allows MR authors to have the source branch removed when merging the MR. !2801 (Jeroen Jacobs)
-  - When creating a .gitignore file a dropdown with templates will be provided
-
-v 8.7.7
-  - Fix import by `Any Git URL` broken if the URL contains a space
-
-v 8.7.6
-  - Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)
-  - Fix import from GitLab.com to a private instance failure. !4181
-  - Fix external imports not finding the import data. !4106
-  - Fix notification delay when changing status of an issue
-
-v 8.7.5
-  - Fix relative links in wiki pages. !4050
-  - Fix always showing build notification message when switching between merge requests !4086
-  - Fix an issue when filtering merge requests with more than one label. !3886
-  - Fix short note for the default scope on build page (Takuya Noguchi)
+  - Fix unintentional filtering bug in issues sorted by milestone due (Takuya Noguchi)
 
 v 8.7.4
-  - Links for Redmine issue references are generated correctly again !4048 (Benedikt Huss)
-  - Fix setting trusted proxies !3970
-  - Fix BitBucket importer bug when throwing exceptions !3941
-  - Use sign out path only if not empty !3989
-  - Running rake gitlab:db:drop_tables now drops tables with cascade !4020
-  - Running rake gitlab:db:drop_tables uses "IF EXISTS" as a precaution !4100
-  - Use a case-insensitive comparison in sanitizing URI schemes
+  - Fix always showing build notification message when switching between merge requests
 
 v 8.7.3
   - Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented
   - Merge request widget displays TeamCity build state and code coverage correctly again.
   - Fix the line code when importing PR review comments from GitHub. !4010
   - Wikis are now initialized on legacy projects when checking repositories
-  - Remove animate.css in favor of a smaller subset of animations. !3937 (Connor Shea)
 
 v 8.7.2
   - The "New Branch" button is now loaded asynchronously
@@ -983,7 +850,7 @@ v 8.1.3
   - Use issue editor as cross reference comment author when issue is edited with a new mention
   - Add Facebook authentication
 
-v 8.1.1
+v 8.1.2
   - Fix cloning Wiki repositories via HTTP (Stan Hu)
   - Add migration to remove satellites directory
   - Fix specific runners visibility
@@ -1608,17 +1475,20 @@ v 7.10.0
   - Fix stuck Merge Request merging events from old installations (Ben Bodenmiller)
   - Fix merge request comments on files with multiple commits
   - Fix Resource Owner Password Authentication Flow
-  - Add icons to Add dropdown items.
-  - Allow admin to create public deploy keys that are accessible to any project.
-  - Warn when gitlab-shell version doesn't match requirement.
-  - Skip email confirmation when set by admin or via LDAP.
-  - Only allow users to reference groups, projects, issues, MRs, commits they have access to.
 
 v 7.9.4
   - Security: Fix project import URL regex to prevent arbitary local repos from being imported
   - Fixed issue where only 25 commits would load in file listings
   - Fix LDAP identities  after config update
 
+v 7.9.3
+  - Contains no changes
+  - Add icons to Add dropdown items.
+  - Allow admin to create public deploy keys that are accessible to any project.
+  - Warn when gitlab-shell version doesn't match requirement.
+  - Skip email confirmation when set by admin or via LDAP.
+  - Only allow users to reference groups, projects, issues, MRs, commits they have access to.
+
 v 7.9.3
   - Contains no changes
 

CONTRIBUTING.md

@@ -311,11 +311,13 @@ request is as follows:
 1. Create a feature branch
 1. Write [tests](https://gitlab.com/gitlab-org/gitlab-development-kit#running-the-tests) and code
 1. Add your changes to the [CHANGELOG](CHANGELOG)
-1. If you are writing documentation, make sure to read the [documentation styleguide][doc-styleguide]
+1. If you are changing the README, some documentation or other things which
+   have no effect on the tests, add `[ci skip]` somewhere in the commit message
+   and make sure to read the [documentation styleguide][doc-styleguide]
 1. If you have multiple commits please combine them into one commit by
    [squashing them][git-squash]
 1. Push the commit(s) to your fork
-1. Submit a merge request (MR) to the `master` branch
+1. Submit a merge request (MR) to the master branch
 1. The MR title should describe the change you want to make
 1. The MR description should give a motive for your change and the method you
    used to achieve it, see the [merge request description format]

GITLAB_SHELL_VERSION

@@ -1 +1 @@
-3.0.0
+2.7.2

GITLAB_WORKHORSE_VERSION

@@ -1 +1 @@
-0.7.4
+0.7.1

Gemfile

@@ -18,8 +18,9 @@ gem "mysql2", '~> 0.3.16', group: :mysql
 gem "pg", '~> 0.18.2', group: :postgres
 
 # Authentication libraries
-gem 'devise',                 '~> 4.0'
+gem 'devise',                 '~> 3.5.4'
 gem 'doorkeeper',             '~> 3.1'
+gem 'devise-async',           '~> 0.9.0'
 gem 'omniauth',               '~> 1.3.1'
 gem 'omniauth-auth0',         '~> 1.4.1'
 gem 'omniauth-azure-oauth2',  '~> 0.0.6'
@@ -35,16 +36,15 @@ gem 'omniauth-shibboleth',    '~> 1.2.0'
 gem 'omniauth-twitter',       '~> 1.2.0'
 gem 'omniauth_crowd',         '~> 2.2.0'
 gem 'rack-oauth2',            '~> 1.2.1'
-gem 'jwt'
 
 # Spam and anti-bot protection
 gem 'recaptcha', require: 'recaptcha/rails'
 gem 'akismet', '~> 2.0'
 
 # Two-factor authentication
-gem 'devise-two-factor', '~> 3.0.0'
+gem 'devise-two-factor', '~> 2.0.0'
 gem 'rqrcode-rails3', '~> 0.1.7'
-gem 'attr_encrypted', '~> 3.0.0'
+gem 'attr_encrypted', '~> 1.3.4'
 
 # Browser detection
 gem "browser", '~> 1.0.0'
@@ -72,7 +72,7 @@ gem 'grape-entity', '~> 0.4.2'
 gem 'rack-cors',    '~> 0.4.0', require: 'rack/cors'
 
 # Pagination
-gem "kaminari", "~> 0.17.0"
+gem "kaminari", "~> 0.16.3"
 
 # HAML
 gem "haml-rails", '~> 0.9.0'
@@ -83,14 +83,8 @@ gem "carrierwave", '~> 0.10.0'
 # Drag and Drop UI
 gem 'dropzonejs-rails', '~> 0.7.1'
 
-# for backups
-gem 'fog-aws', '~> 0.9'
-gem 'fog-core', '~> 1.40'
-gem 'fog-local', '~> 0.3'
-gem 'fog-google', '~> 0.3'
-gem 'fog-openstack', '~> 0.1'
-
 # for aws storage
+gem "fog", "~> 1.36.0"
 gem "unf", '~> 0.1.4'
 
 # Authorization
@@ -126,7 +120,7 @@ group :unicorn do
 end
 
 # State machine
-gem "state_machines-activerecord", '~> 0.4.0'
+gem "state_machines-activerecord", '~> 0.3.0'
 # Run events after state machine commits
 gem 'after_commit_queue'
 
@@ -183,6 +177,9 @@ gem 'ruby-fogbugz', '~> 0.2.1'
 # d3
 gem 'd3_rails', '~> 3.5.0'
 
+#cal-heatmap
+gem 'cal-heatmap-rails', '~> 3.6.0'
+
 # underscore-rails
 gem "underscore-rails", "~> 1.8.0"
 
@@ -200,7 +197,7 @@ gem 'licensee', '~> 8.0.0'
 gem "rack-attack", '~> 4.3.1'
 
 # Ace editor
-gem 'ace-rails-ap', '~> 4.0.2'
+gem 'ace-rails-ap', '~> 2.0.1'
 
 # Keyboard shortcuts
 gem 'mousetrap-rails', '~> 1.4.6'
@@ -221,13 +218,13 @@ gem 'gitlab_emoji',       '~> 0.3.0'
 gem 'gon',                '~> 6.0.1'
 gem 'jquery-atwho-rails', '~> 1.3.2'
 gem 'jquery-rails',       '~> 4.1.0'
+gem 'jquery-scrollto-rails', '~> 1.4.3'
 gem 'jquery-ui-rails',    '~> 5.0.0'
 gem 'raphael-rails',      '~> 2.1.2'
 gem 'request_store',      '~> 1.3.0'
 gem 'select2-rails',      '~> 3.5.9'
 gem 'virtus',             '~> 1.0.1'
 gem 'net-ssh',            '~> 3.0.1'
-gem 'base32',             '~> 0.3.0'
 
 # Sentry integration
 gem 'sentry-raven', '~> 0.15'
@@ -245,6 +242,7 @@ group :development do
   gem "foreman"
   gem 'brakeman', '~> 3.2.0', require: false
 
+  gem "annotate", "~> 2.7.0"
   gem 'letter_opener_web', '~> 1.3.0'
   gem 'quiet_assets', '~> 1.0.2'
   gem 'rerun', '~> 0.11.0'
@@ -295,10 +293,9 @@ 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-rspec', '~> 1.5.0', require: false
+  gem 'rubocop', '~> 0.38.0', require: false
   gem 'scss_lint', '~> 0.47.0', require: false
-  gem 'coveralls', '~> 0.8.2', require: false
+  gem 'coveralls',  '~> 0.8.2', require: false
   gem 'simplecov', '~> 0.11.0', require: false
   gem 'flog', require: false
   gem 'flay', require: false
@@ -328,7 +325,8 @@ gem "mail_room", "~> 0.7"
 gem 'email_reply_parser', '~> 0.5.8'
 
 ## CI
-gem 'activerecord-session_store', '~> 1.0.0'
+gem 'activerecord-deprecated_finders', '~> 1.0.3'
+gem 'activerecord-session_store', '~> 0.1.0'
 gem "nested_form", '~> 0.3.2'
 
 # OAuth
@@ -336,6 +334,3 @@ gem 'oauth2', '~> 1.0.0'
 
 # Soft deletion
 gem "paranoia", "~> 2.0"
-
-# Health check
-gem 'health_check', '~> 1.5.1'

Gemfile.lock

@@ -1,8 +1,9 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    CFPropertyList (2.3.2)
     RedCloth (4.2.9)
-    ace-rails-ap (4.0.2)
+    ace-rails-ap (2.0.1)
     actionmailer (4.2.6)
       actionpack (= 4.2.6)
       actionview (= 4.2.6)
@@ -32,12 +33,11 @@ GEM
       activemodel (= 4.2.6)
       activesupport (= 4.2.6)
       arel (~> 6.0)
-    activerecord-session_store (1.0.0)
-      actionpack (>= 4.0, < 5.1)
-      activerecord (>= 4.0, < 5.1)
-      multi_json (~> 1.11, >= 1.11.2)
-      rack (>= 1.5.2, < 3)
-      railties (>= 4.0, < 5.1)
+    activerecord-deprecated_finders (1.0.4)
+    activerecord-session_store (0.1.2)
+      actionpack (>= 4.0.0, < 5)
+      activerecord (>= 4.0.0, < 5)
+      railties (>= 4.0.0, < 5)
     activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
@@ -51,6 +51,9 @@ GEM
       activerecord (>= 3.0)
     akismet (2.0.0)
     allocations (1.0.4)
+    annotate (2.7.0)
+      activerecord (>= 3.2, < 6.0)
+      rake (~> 10.4)
     arel (6.0.3)
     asana (0.4.0)
       faraday (~> 0.9)
@@ -59,8 +62,8 @@ GEM
       oauth2 (~> 1.0)
     asciidoctor (1.5.3)
     ast (2.2.0)
-    attr_encrypted (3.0.1)
-      encryptor (~> 3.0.0)
+    attr_encrypted (1.3.4)
+      encryptor (>= 1.3.0)
     attr_required (1.0.0)
     autoprefixer-rails (6.2.3)
       execjs
@@ -71,8 +74,7 @@ GEM
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     babosa (1.0.2)
-    base32 (0.3.2)
-    bcrypt (3.1.11)
+    bcrypt (3.1.10)
     benchmark-ips (2.3.0)
     better_errors (1.0.1)
       coderay (>= 1.0.0)
@@ -101,6 +103,7 @@ GEM
       bundler (~> 1.2)
       thor (~> 0.18)
     byebug (8.2.1)
+    cal-heatmap-rails (3.6.0)
     capybara (2.6.2)
       addressable
       mime-types (>= 1.16)
@@ -154,18 +157,21 @@ GEM
       activerecord (>= 3.2.0, < 5.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (4.1.1)
+    devise (3.5.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.1)
+      railties (>= 3.2.6, < 5)
       responders
+      thread_safe (~> 0.1)
       warden (~> 1.2.3)
-    devise-two-factor (3.0.0)
+    devise-async (0.9.0)
+      devise (~> 3.2)
+    devise-two-factor (2.0.1)
       activesupport
-      attr_encrypted (>= 1.3, < 4, != 2)
-      devise (~> 4.0)
+      attr_encrypted (~> 1.3.2)
+      devise (~> 3.5.0)
       railties
-      rotp (~> 2.0)
+      rotp (~> 2)
     diff-lcs (1.2.5)
     diffy (3.0.7)
     docile (1.1.5)
@@ -177,12 +183,12 @@ GEM
     email_spec (1.6.0)
       launchy (~> 2.1)
       mail (~> 2.2)
-    encryptor (3.0.0)
+    encryptor (1.3.0)
     equalizer (0.0.11)
     erubis (2.7.0)
     escape_utils (1.1.1)
     eventmachine (1.0.8)
-    excon (0.49.0)
+    excon (0.45.4)
     execjs (2.6.0)
     expression_parser (0.9.0)
     factory_girl (4.5.0)
@@ -199,6 +205,8 @@ GEM
       multi_json
     ffaker (2.0.0)
     ffi (1.9.10)
+    fission (0.5.0)
+      CFPropertyList (~> 2.2)
     flay (2.6.1)
       ruby_parser (~> 3.0)
       sexp_processor (~> 4.0)
@@ -208,28 +216,109 @@ GEM
     flowdock (0.7.1)
       httparty (~> 0.7)
       multi_json
-    fog-aws (0.9.2)
+    fog (1.36.0)
+      fog-aliyun (>= 0.1.0)
+      fog-atmos
+      fog-aws (>= 0.6.0)
+      fog-brightbox (~> 0.4)
+      fog-core (~> 1.32)
+      fog-dynect (~> 0.0.2)
+      fog-ecloud (~> 0.1)
+      fog-google (<= 0.1.0)
+      fog-json
+      fog-local
+      fog-powerdns (>= 0.1.1)
+      fog-profitbricks
+      fog-radosgw (>= 0.0.2)
+      fog-riakcs
+      fog-sakuracloud (>= 0.0.4)
+      fog-serverlove
+      fog-softlayer
+      fog-storm_on_demand
+      fog-terremark
+      fog-vmfusion
+      fog-voxel
+      fog-xenserver
+      fog-xml (~> 0.1.1)
+      ipaddress (~> 0.5)
+      nokogiri (~> 1.5, >= 1.5.11)
+    fog-aliyun (0.1.0)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      ipaddress (~> 0.8)
+      xml-simple (~> 1.1)
+    fog-atmos (0.1.0)
+      fog-core
+      fog-xml
+    fog-aws (0.8.1)
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (1.40.0)
+    fog-brightbox (0.10.1)
+      fog-core (~> 1.22)
+      fog-json
+      inflecto (~> 0.0.2)
+    fog-core (1.35.0)
       builder
-      excon (~> 0.49)
+      excon (~> 0.45)
       formatador (~> 0.2)
-    fog-google (0.3.2)
+    fog-dynect (0.0.2)
+      fog-core
+      fog-json
+      fog-xml
+    fog-ecloud (0.3.0)
+      fog-core
+      fog-xml
+    fog-google (0.1.0)
       fog-core
       fog-json
       fog-xml
     fog-json (1.0.2)
       fog-core (~> 1.0)
       multi_json (~> 1.10)
-    fog-local (0.3.0)
+    fog-local (0.2.1)
       fog-core (~> 1.27)
-    fog-openstack (0.1.6)
-      fog-core (>= 1.39)
-      fog-json (>= 1.0)
-      ipaddress (>= 0.8)
+    fog-powerdns (0.1.1)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+    fog-profitbricks (0.0.5)
+      fog-core
+      fog-xml
+      nokogiri
+    fog-radosgw (0.0.5)
+      fog-core (>= 1.21.0)
+      fog-json
+      fog-xml (>= 0.0.1)
+    fog-riakcs (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-sakuracloud (1.7.5)
+      fog-core
+      fog-json
+    fog-serverlove (0.1.2)
+      fog-core
+      fog-json
+    fog-softlayer (1.0.3)
+      fog-core
+      fog-json
+    fog-storm_on_demand (0.1.1)
+      fog-core
+      fog-json
+    fog-terremark (0.1.0)
+      fog-core
+      fog-xml
+    fog-vmfusion (0.1.0)
+      fission
+      fog-core
+    fog-voxel (0.1.0)
+      fog-core
+      fog-xml
+    fog-xenserver (0.2.2)
+      fog-core
+      fog-xml
     fog-xml (0.1.2)
       fog-core
       nokogiri (~> 1.5, >= 1.5.11)
@@ -316,8 +405,6 @@ GEM
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
     hashie (3.4.3)
-    health_check (1.5.1)
-      rails (>= 2.3.0)
     highline (1.7.8)
     hipchat (1.5.2)
       httparty
@@ -338,15 +425,18 @@ GEM
     httpclient (2.7.0.1)
     i18n (0.7.0)
     ice_nine (0.11.1)
+    inflecto (0.0.2)
     influxdb (0.2.3)
       cause
       json
-    ipaddress (0.8.3)
+    ipaddress (0.8.2)
     jquery-atwho-rails (1.3.2)
     jquery-rails (4.1.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    jquery-scrollto-rails (1.4.3)
+      railties (> 3.1, < 5.0)
     jquery-turbolinks (2.1.0)
       railties (>= 3.1.0)
       turbolinks
@@ -354,7 +444,7 @@ GEM
       railties (>= 3.2.16)
     json (1.8.3)
     jwt (1.5.2)
-    kaminari (0.17.0)
+    kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.10.0)
@@ -462,7 +552,7 @@ GEM
     orm_adapter (0.5.0)
     paranoia (2.1.4)
       activerecord (~> 4.0)
-    parser (2.3.1.0)
+    parser (2.3.0.6)
       ast (~> 2.2)
     pg (0.18.4)
     poltergeist (1.9.0)
@@ -568,7 +658,7 @@ GEM
     responders (2.1.1)
       railties (>= 4.2.0, < 5.1)
     rinku (1.7.3)
-    rotp (2.1.2)
+    rotp (2.1.1)
     rouge (1.10.1)
     rqrcode (0.7.0)
       chunky_png
@@ -597,17 +687,15 @@ GEM
     rspec-retry (0.4.5)
       rspec-core
     rspec-support (3.4.1)
-    rubocop (0.40.0)
-      parser (>= 2.3.1.0, < 3.0)
+    rubocop (0.38.0)
+      parser (>= 2.3.0.6, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-rspec (1.5.0)
-      rubocop (>= 0.40.0)
     ruby-fogbugz (0.2.1)
       crack (~> 0.4)
-    ruby-progressbar (1.8.1)
+    ruby-progressbar (1.7.5)
     ruby-saml (1.1.2)
       nokogiri (>= 1.5.10)
       uuid (~> 2.3)
@@ -701,11 +789,11 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     state_machines (0.4.0)
-    state_machines-activemodel (0.4.0)
-      activemodel (>= 4.1, < 5.1)
+    state_machines-activemodel (0.3.0)
+      activemodel (~> 4.1)
       state_machines (>= 0.4.0)
-    state_machines-activerecord (0.4.0)
-      activerecord (>= 4.1, < 5.1)
+    state_machines-activerecord (0.3.0)
+      activerecord (~> 4.1)
       state_machines-activemodel (>= 0.3.0)
     stringex (2.5.2)
     systemu (2.6.5)
@@ -754,7 +842,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
-    unicode-display_width (1.0.5)
+    unicode-display_width (1.0.2)
     unicorn (4.9.0)
       kgio (~> 2.6)
       rack
@@ -771,7 +859,7 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    warden (1.2.6)
+    warden (1.2.4)
       rack (>= 1.0)
     web-console (2.3.0)
       activemodel (>= 4.0)
@@ -788,6 +876,7 @@ GEM
       builder
       expression_parser
       rinku
+    xml-simple (1.1.5)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -796,19 +885,20 @@ PLATFORMS
 
 DEPENDENCIES
   RedCloth (~> 4.2.9)
-  ace-rails-ap (~> 4.0.2)
-  activerecord-session_store (~> 1.0.0)
+  ace-rails-ap (~> 2.0.1)
+  activerecord-deprecated_finders (~> 1.0.3)
+  activerecord-session_store (~> 0.1.0)
   acts-as-taggable-on (~> 3.4)
   addressable (~> 2.3.8)
   after_commit_queue
   akismet (~> 2.0)
   allocations (~> 1.0)
+  annotate (~> 2.7.0)
   asana (~> 0.4.0)
   asciidoctor (~> 1.5.2)
-  attr_encrypted (~> 3.0.0)
+  attr_encrypted (~> 1.3.4)
   awesome_print (~> 1.2.0)
   babosa (~> 1.0.2)
-  base32 (~> 0.3.0)
   benchmark-ips
   better_errors (~> 1.0.1)
   binding_of_caller (~> 0.7.2)
@@ -818,6 +908,7 @@ DEPENDENCIES
   bullet
   bundler-audit
   byebug
+  cal-heatmap-rails (~> 3.6.0)
   capybara (~> 2.6.2)
   capybara-screenshot (~> 1.0.0)
   carrierwave (~> 0.10.0)
@@ -830,8 +921,9 @@ DEPENDENCIES
   d3_rails (~> 3.5.0)
   database_cleaner (~> 1.4.0)
   default_value_for (~> 3.0.0)
-  devise (~> 4.0)
-  devise-two-factor (~> 3.0.0)
+  devise (~> 3.5.4)
+  devise-async (~> 0.9.0)
+  devise-two-factor (~> 2.0.0)
   diffy (~> 3.0.3)
   doorkeeper (~> 3.1)
   dropzonejs-rails (~> 0.7.1)
@@ -841,11 +933,7 @@ DEPENDENCIES
   ffaker (~> 2.0.0)
   flay
   flog
-  fog-aws (~> 0.9)
-  fog-core (~> 1.40)
-  fog-google (~> 0.3)
-  fog-local (~> 0.3)
-  fog-openstack (~> 0.1)
+  fog (~> 1.36.0)
   font-awesome-rails (~> 4.2)
   foreman
   fuubar (~> 2.0.0)
@@ -863,17 +951,16 @@ DEPENDENCIES
   grape (~> 0.13.0)
   grape-entity (~> 0.4.2)
   haml-rails (~> 0.9.0)
-  health_check (~> 1.5.1)
   hipchat (~> 1.5.0)
   html-pipeline (~> 1.11.0)
   httparty (~> 0.13.3)
   influxdb (~> 0.2)
   jquery-atwho-rails (~> 1.3.2)
   jquery-rails (~> 4.1.0)
+  jquery-scrollto-rails (~> 1.4.3)
   jquery-turbolinks (~> 2.1.0)
   jquery-ui-rails (~> 5.0.0)
-  jwt
-  kaminari (~> 0.17.0)
+  kaminari (~> 0.16.3)
   letter_opener_web (~> 1.3.0)
   licensee (~> 8.0.0)
   loofah (~> 2.0.3)
@@ -929,8 +1016,7 @@ DEPENDENCIES
   rqrcode-rails3 (~> 0.1.7)
   rspec-rails (~> 3.4.0)
   rspec-retry
-  rubocop (~> 0.40.0)
-  rubocop-rspec (~> 1.5.0)
+  rubocop (~> 0.38.0)
   ruby-fogbugz (~> 0.2.1)
   sanitize (~> 2.0)
   sass-rails (~> 5.0.0)
@@ -955,7 +1041,7 @@ DEPENDENCIES
   spring-commands-spinach (~> 1.1.0)
   spring-commands-teaspoon (~> 0.0.2)
   sprockets (~> 3.6.0)
-  state_machines-activerecord (~> 0.4.0)
+  state_machines-activerecord (~> 0.3.0)
   task_list (~> 1.0.2)
   teaspoon (~> 1.1.0)
   teaspoon-jasmine (~> 2.2.0)
@@ -975,4 +1061,4 @@ DEPENDENCIES
   wikicloth (= 0.8.1)
 
 BUNDLED WITH
-   1.12.4
+   1.12.1

README.md

@@ -1,7 +1,9 @@
 # GitLab
 
 [![build status](https://gitlab.com/gitlab-org/gitlab-ce/badges/master/build.svg)](https://gitlab.com/gitlab-org/gitlab-ce/commits/master)
+[![Build Status](https://semaphoreci.com/api/v1/projects/2f1a5809-418b-4cc2-a1f4-819607579fe7/400484/shields_badge.svg)](https://semaphoreci.com/gitlabhq/gitlabhq)
 [![Code Climate](https://codeclimate.com/github/gitlabhq/gitlabhq.svg)](https://codeclimate.com/github/gitlabhq/gitlabhq)
+[![Coverage Status](https://coveralls.io/repos/gitlabhq/gitlabhq/badge.svg?branch=master)](https://coveralls.io/r/gitlabhq/gitlabhq?branch=master)
 
 ## Canonical source
 
@@ -33,11 +35,11 @@ There are two editions of GitLab:
 
 On [about.gitlab.com](https://about.gitlab.com/) you can find more information about:
 
-- [Subscriptions](https://about.gitlab.com/pricing/)
+- [Subscriptions](https://about.gitlab.com/subscription/)
 - [Consultancy](https://about.gitlab.com/consultancy/)
 - [Community](https://about.gitlab.com/community/)
 - [Hosted GitLab.com](https://about.gitlab.com/gitlab-com/) use GitLab as a free service
-- [GitLab Enterprise Edition](https://about.gitlab.com/features/#enterprise) with additional features aimed at larger organizations.
+- [GitLab Enterprise Edition](https://about.gitlab.com/gitlab-ee/) with additional features aimed at larger organizations.
 - [GitLab CI](https://about.gitlab.com/gitlab-ci/) a continuous integration (CI) server that is easy to integrate with GitLab.
 
 ## Requirements

VERSION

@@ -1 +1 @@
-8.9.0-pre
+8.8.0-pre

app/assets/javascripts/api.js.coffee

@@ -1,15 +1,14 @@
 @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"
-  labelsPath: "/api/:version/projects/:id/labels"
-  licensePath: "/api/:version/licenses/:key"
-  gitignorePath: "/api/:version/gitignores/:key"
+  groups_path: "/api/:version/groups.json"
+  group_path: "/api/:version/groups/:id.json"
+  namespaces_path: "/api/:version/namespaces.json"
+  group_projects_path: "/api/:version/groups/:id/projects.json"
+  projects_path: "/api/:version/projects.json"
+  labels_path: "/api/:version/projects/:id/labels"
+  license_path: "/api/:version/licenses/:key"
 
   group: (group_id, callback) ->
-    url = Api.buildUrl(Api.groupPath)
+    url = Api.buildUrl(Api.group_path)
     url = url.replace(':id', group_id)
 
     $.ajax(
@@ -23,7 +22,7 @@
   # Return groups list. Filtered by query
   # Only active groups retrieved
   groups: (query, skip_ldap, callback) ->
-    url = Api.buildUrl(Api.groupsPath)
+    url = Api.buildUrl(Api.groups_path)
 
     $.ajax(
       url: url
@@ -37,7 +36,7 @@
 
   # Return namespaces list. Filtered by query
   namespaces: (query, callback) ->
-    url = Api.buildUrl(Api.namespacesPath)
+    url = Api.buildUrl(Api.namespaces_path)
 
     $.ajax(
       url: url
@@ -51,7 +50,7 @@
 
   # Return projects list. Filtered by query
   projects: (query, order, callback) ->
-    url = Api.buildUrl(Api.projectsPath)
+    url = Api.buildUrl(Api.projects_path)
 
     $.ajax(
       url: url
@@ -65,7 +64,7 @@
       callback(projects)
 
   newLabel: (project_id, data, callback) ->
-    url = Api.buildUrl(Api.labelsPath)
+    url = Api.buildUrl(Api.labels_path)
     url = url.replace(':id', project_id)
 
     data.private_token = gon.api_token
@@ -81,7 +80,7 @@
 
   # Return group projects list. Filtered by query
   groupProjects: (group_id, query, callback) ->
-    url = Api.buildUrl(Api.groupProjectsPath)
+    url = Api.buildUrl(Api.group_projects_path)
     url = url.replace(':id', group_id)
 
     $.ajax(
@@ -96,7 +95,7 @@
 
   # Return text for a specific license
   licenseText: (key, data, callback) ->
-    url = Api.buildUrl(Api.licensePath).replace(':key', key)
+    url = Api.buildUrl(Api.license_path).replace(':key', key)
 
     $.ajax(
       url: url
@@ -104,12 +103,6 @@
     ).done (license) ->
       callback(license)
 
-  gitignoreText: (key, callback) ->
-    url = Api.buildUrl(Api.gitignorePath).replace(':key', key)
-
-    $.get url, (gitignore) ->
-      callback(gitignore)
-
   buildUrl: (url) ->
     url = gon.relative_url_root + url if gon.relative_url_root?
     return url.replace(':version', gon.api_version)

app/assets/javascripts/application.js.coffee

@@ -18,6 +18,8 @@
 #= require jquery.atwho
 #= require jquery.scrollTo
 #= require jquery.turbolinks
+#= require d3
+#= require cal-heatmap
 #= require turbolinks
 #= require autosave
 #= require bootstrap/affix
@@ -50,13 +52,7 @@
 #= require shortcuts_network
 #= require jquery.nicescroll
 #= require date.format
-#= require_directory ./behaviors
-#= require_directory ./blob
-#= require_directory ./ci
-#= require_directory ./commit
-#= require_directory ./extensions
-#= require_directory ./lib
-#= require_directory .
+#= require_tree .
 #= require fuzzaldrin-plus
 #= require cropper
 
@@ -208,7 +204,6 @@ $ ->
     $('.header-content .title').toggle()
     $('.header-content .navbar-collapse').toggle()
     $('.navbar-toggle').toggleClass('active')
-    $('.navbar-toggle i').toggleClass("fa-angle-right fa-angle-left")
 
   # Show/hide comments on diff
   $("body").on "click", ".js-toggle-diff-comments", (e) ->
@@ -250,6 +245,38 @@ $ ->
         if $navIcon.hasClass('fa-angle-left')
           $navIconToggle.trigger('click')
 
+  $(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: '/' })
+
   fitSidebarForSize = ->
     oldBootstrapBreakpoint = bootstrapBreakpoint
     bootstrapBreakpoint = bp.getBreakpointSize()

app/assets/javascripts/blob/blob_gitignore_selector.js.coffee

@@ -1,58 +0,0 @@
-class @BlobGitignoreSelector
-  constructor: (opts) ->
-    {
-      @dropdown
-      @editor
-      @$wrapper        = @dropdown.closest('.gitignore-selector')
-      @$filenameInput  = $('#file_name')
-      @data           = @dropdown.data('filenames')
-    } = opts
-
-    @dropdown.glDropdown(
-      data: @data,
-      filterable: true,
-      selectable: true,
-      search:
-        fields: ['name']
-      clicked: @onClick
-      text: (gitignore) ->
-        gitignore.name
-    )
-
-    @toggleGitignoreSelector()
-    @bindEvents()
-
-  bindEvents: ->
-    @$filenameInput
-      .on 'keyup blur', (e) =>
-        @toggleGitignoreSelector()
-
-  toggleGitignoreSelector: ->
-    filename = @$filenameInput.val() or $('.editor-file-name').text().trim()
-    @$wrapper.toggleClass 'hidden', filename isnt '.gitignore'
-
-  onClick: (item, el, e) =>
-    e.preventDefault()
-    @requestIgnoreFile(item.name)
-
-  requestIgnoreFile: (name) ->
-    Api.gitignoreText name, @requestIgnoreFileSuccess.bind(@)
-
-  requestIgnoreFileSuccess: (gitignore) ->
-    @editor.setValue(gitignore.content, 1)
-    @editor.focus()
-
-class @BlobGitignoreSelectors
-  constructor: (opts) ->
-    {
-      @$dropdowns = $('.js-gitignore-selector')
-      @editor
-    } = opts
-
-    @$dropdowns.each (i, dropdown) =>
-      $dropdown = $(dropdown)
-
-      new BlobGitignoreSelector(
-        dropdown: $dropdown,
-        editor: @editor
-      )

app/assets/javascripts/blob/edit_blob.js.coffee

@@ -13,7 +13,6 @@ class @EditBlob
 
     @initModePanesAndLinks()
     new BlobLicenseSelector(@editor)
-    new BlobGitignoreSelectors(editor: @editor)
 
   initModePanesAndLinks: ->
     @$editModePanes = $(".js-edit-mode-pane")

app/assets/javascripts/calendar.js.coffee

@@ -0,0 +1,34 @@
+class @Calendar
+  constructor: (timestamps, starting_year, starting_month, calendar_activities_path) ->
+    cal = new CalHeatMap()
+    cal.init
+      itemName: ["contribution"]
+      data: timestamps
+      start: new Date(starting_year, starting_month)
+      domainLabelFormat: "%b"
+      id: "cal-heatmap"
+      domain: "month"
+      subDomain: "day"
+      range: 12
+      tooltip: true
+      label:
+        position: "top"
+      legend: [
+        0
+        10
+        20
+        30
+      ]
+      legendCellPadding: 3
+      cellSize: $('.user-calendar').width() / 73
+      onClick: (date, count) ->
+        formated_date = date.getFullYear() + "-" + (date.getMonth()+1) + "-" + date.getDate()
+        $.ajax
+          url: calendar_activities_path
+          data:
+            date: formated_date
+          cache: false
+          dataType: "html"
+          success: (data) ->
+            $(".user-calendar-activities").html data
+

app/assets/javascripts/ci/application.js.coffee

@@ -1,6 +1,34 @@
+# This is a manifest file that'll be compiled into application.js, which will include all the files
+# listed below.
+#
+# Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+# or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+#
+# It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+# the compiled file.
+#
+# WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+# GO AFTER THE REQUIRES BELOW.
+#
 #= require pager
 #= require jquery_nested_form
 #= require_tree .
+#
+$(document).on 'click', '.edit-runner-link', (event) ->
+  event.preventDefault()
+
+  descr = $(this).closest('.runner-description').first()
+  descr.addClass('hide')
+  form = descr.next('.runner-description-form')
+  descrInput = form.find('input.description')
+  originalValue = descrInput.val()
+  form.removeClass('hide')
+  form.find('.cancel').on 'click', (event) ->
+    event.preventDefault()
+
+    form.addClass('hide')
+    descrInput.val(originalValue)
+    descr.removeClass('hide')
 
 $(document).on 'click', '.assign-all-runner', ->
   $(this).replaceWith('<i class="fa fa-refresh fa-spin"></i> Assign in progress..')

app/assets/javascripts/ci/build.coffee

@@ -1,12 +1,9 @@
 class CiBuild
   @interval: null
-  @state: null
 
-  constructor: (build_url, build_status, build_state) ->
+  constructor: (build_url, build_status) ->
     clearInterval(CiBuild.interval)
 
-    @state = build_state
-
     @initScrollButtonAffix()
 
     if build_status == "running" || build_status == "pending"
@@ -28,22 +25,15 @@ class CiBuild
       #
       CiBuild.interval = setInterval =>
         if window.location.href.split("#").first() is build_url
-          last_state = @state
           $.ajax
-            url: build_url + "/trace.json?state=" + encodeURIComponent(@state)
+            url: build_url
             dataType: "json"
-            success: (log) =>
-              return unless last_state is @state
-
-              if log.state and log.status is "running"
-                @state = log.state
-                if log.append
-                  $('.fa-refresh').before log.html
-                else
-                  $('#build-trace code').html log.html
-                  $('#build-trace code').append '<i class="fa fa-refresh fa-spin"/>'
+            success: (build) =>
+              if build.status == "running"
+                $('#build-trace code').html build.trace_html
+                $('#build-trace code').append '<i class="fa fa-refresh fa-spin"/>'
                 @checkAutoscroll()
-              else if log.status isnt build_status
+              else if build.status != build_status
                 Turbolinks.visit build_url
       , 4000
 

app/assets/javascripts/dispatcher.js.coffee

@@ -16,6 +16,7 @@ class Dispatcher
     shortcut_handler = null
     switch page
       when 'projects:issues:index'
+        Issues.init()
         Issuable.init()
         shortcut_handler = new ShortcutsNavigation()
       when 'projects:issues:show'
@@ -118,7 +119,7 @@ class Dispatcher
             new UsersSelect()
           when 'projects'
             new NamespaceSelect()
-      when 'dashboard', 'root'
+      when 'dashboard'
         shortcut_handler = new ShortcutsDashboardNavigation()
       when 'profiles'
         new Profile()

app/assets/javascripts/due_date_select.js.coffee

@@ -11,7 +11,6 @@ class @DueDateSelect
       $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')
@@ -24,15 +23,11 @@ class @DueDateSelect
           $value.removeAttr('style')
       )
 
-      addDueDate = (isDropdown) ->
+      addDueDate = ->
         # 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 = 'None'
+        date = new Date value.replace(new RegExp('-', 'g'), ',')
+        mediumDate = $.datepicker.formatDate 'M d, yy', date
 
         data = {}
         data[abilityName] = {}
@@ -44,35 +39,23 @@ class @DueDateSelect
           data: data
           beforeSend: ->
             $loading.fadeIn()
-            if isDropdown
-              $dropdown.trigger('loading.gl.dropdown')
-              $selectbox.hide()
+            $dropdown.trigger('loading.gl.dropdown')
+            $selectbox.hide()
             $value.removeAttr('style')
 
-            $valueContent.html(mediumDate)
+            $value.html(mediumDate)
             $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')
+          $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)
+          addDueDate()
       )
 
     $(document)

app/assets/javascripts/gfm_auto_complete.js.coffee

@@ -18,10 +18,6 @@ GitLab.GfmAutoComplete =
   Issues:
     template: '<li><small>${id}</small> ${title}</li>'
 
-  # Milestones
-  Milestones:
-    template: '<li>${title}</li>'
-
   # Add GFM auto-completion to all input fields, that accept GFM input.
   setup: (wrap) ->
     @input = $('.js-gfm-input')
@@ -85,19 +81,6 @@ GitLab.GfmAutoComplete =
             title:  sanitize(i.title)
             search: "#{i.iid} #{i.title}"
 
-    @input.atwho
-      at: '%'
-      alias: 'milestones'
-      searchKey: 'search'
-      displayTpl: @Milestones.template
-      insertTpl: '${atwho-at}"${title}"'
-      callbacks:
-        beforeSave: (milestones) ->
-          $.map milestones, (m) ->
-            id:     m.iid
-            title:  sanitize(m.title)
-            search: "#{m.title}"
-
     @input.atwho
       at: '!'
       alias: 'mergerequests'
@@ -122,8 +105,6 @@ GitLab.GfmAutoComplete =
     @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

app/assets/javascripts/gl_dropdown.js.coffee

@@ -60,36 +60,9 @@ class GitLabDropdownFilter
       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
+        results = fuzzaldrinPlus.filter(data, search_text,
+          key: @options.keys
+        )
 
       @options.callback results
     else
@@ -168,9 +141,8 @@ class GitLabDropdown
     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)
+      # If data is an array
+      if _.isArray @options.data
         @fullData = @options.data
         @parseData @options.data
       else
@@ -258,33 +230,19 @@ class GitLabDropdown
   parseData: (data) ->
     @renderedData = data
 
+    # Render each row
+    html = $.map data, (obj) =>
+      return @renderItem(obj)
+
     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.join(""))
 
     @appendMenu(full_html)
 
-  renderData: (data, group = false) ->
-    data.map (obj, index) =>
-      return @renderItem(obj, group, index)
-
   shouldPropagate: (e) =>
     if @options.multiSelect
       $target = $(e.target)
@@ -341,10 +299,11 @@ class GitLabDropdown
     selector = '.dropdown-content'
     if @dropdown.find(".dropdown-toggle-page").length
       selector = ".dropdown-page-one .dropdown-content"
+
     $(selector, @dropdown).html html
 
   # Render the row
-  renderItem: (data, group = false, index = false) ->
+  renderItem: (data) ->
     html = ""
 
     # Divider
@@ -387,13 +346,8 @@ class GitLabDropdown
       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}'>
+        <a href='#{url}' class='#{cssClass}'>
           #{text}
         </a>
       </li>"
@@ -423,15 +377,9 @@ class GitLabDropdown
 
   rowClicked: (el) ->
     fieldName = @options.fieldName
+    selectedIndex = el.parent().index()
     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]
-
+      selectedObject = @renderedData[selectedIndex]
     value = if @options.id then @options.id(selectedObject, el) else selectedObject.id
     field = @dropdown.parent().find("input[name='#{fieldName}'][value='#{value}']")
     if el.hasClass(ACTIVE_CLASS)
@@ -512,7 +460,7 @@ class GitLabDropdown
         return false
 
       if currentKeyCode is 13
-        @selectRowAtIndex if currentIndex < 0 then 0 else currentIndex
+        @selectRowAtIndex currentIndex
 
   removeArrayKeyEvent: ->
     $('body').off 'keydown'

app/assets/javascripts/graphs/application.js.coffee

@@ -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 .

app/assets/javascripts/issuable.js.coffee

@@ -1,11 +1,7 @@
-issuable_created = false
 @Issuable =
   init: ->
-    unless issuable_created
-      issuable_created = true
-      Issuable.initTemplates()
-      Issuable.initSearch()
-      Issuable.initChecks()
+    Issuable.initTemplates()
+    Issuable.initSearch()
 
   initTemplates: ->
     Issuable.labelRow = _.template(
@@ -23,16 +19,7 @@ issuable_created = false
       .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
+          Issuable.filterResults $('#issue_search_form')
         , 500)
 
   toggleLabelFilters: ->
@@ -72,22 +59,15 @@ issuable_created = false
       dataType: "json"
 
   reload: ->
-    if Issuable.created
-      Issuable.initChecks()
+    if Issues.created
+      Issues.initChecks()
 
     $('#filter_issue_search').val($('#issue_search').val())
 
-  initChecks: ->
-    $('.check_all_issues').on 'click', ->
-      $('.selected_issue').prop('checked', @checked)
-      Issuable.checkChanged()
-
-    $('.selected_issue').on 'change', Issuable.checkChanged
-
   updateStateFilters: ->
-    stateFilters =  $('.issues-state-filters, .dropdown-menu-sort')
+    stateFilters =  $('.issues-state-filters')
     newParams = {}
-    paramKeys = ['author_id', 'milestone_title', 'assignee_id', 'issue_search', 'issue_search']
+    paramKeys = ['author_id', 'milestone_title', 'assignee_id', 'issue_search']
 
     for paramKey in paramKeys
       newParams[paramKey] = gl.utils.getParameterValues(paramKey)[0] or ''
@@ -102,17 +82,3 @@ issuable_created = false
         else
           newUrl = gl.utils.mergeUrlParams(newParams, initialUrl)
         $(this).attr 'href', newUrl
-
-  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()

app/assets/javascripts/issuable_form.js.coffee

@@ -19,16 +19,6 @@ class @IssuableForm
     @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, [
@@ -90,19 +80,3 @@ class @IssuableForm
 
   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
-            }
-        formatResult: (project) ->
-          project.name_with_namespace
-        formatSelection: (project) ->
-          project.name_with_namespace

app/assets/javascripts/issues.js.coffee

@@ -0,0 +1,38 @@
+@Issues =
+  init: ->
+    Issues.created = true
+    Issues.initChecks()
+
+    $("body").on "ajax:success", ".close_issue, .reopen_issue", ->
+      t = $(this)
+      totalIssues = undefined
+      reopen = t.hasClass("reopen_issue")
+      $(".issue_counter").each ->
+        issue = $(this)
+        totalIssues = parseInt($(this).html(), 10)
+        if reopen and issue.closest(".main_menu").length
+          $(this).html totalIssues + 1
+        else
+          $(this).html totalIssues - 1
+
+  initChecks: ->
+    $(".check_all_issues").click ->
+      $(".selected_issue").prop("checked", @checked)
+      Issues.checkChanged()
+
+    $(".selected_issue").bind "change", Issues.checkChanged
+
+  checkChanged: ->
+    checked_issues = $(".selected_issue:checked")
+    if checked_issues.length > 0
+      ids = []
+      $.each checked_issues, (index, value) ->
+        ids.push $(value).attr("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()

app/assets/javascripts/layout_nav.js.coffee

@@ -1,14 +0,0 @@
-class @LayoutNav
-  $ ->
-    $('.fade-left').addClass('end-scroll')
-    $('.scrolling-tabs').on 'scroll', (event) ->
-      $this = $(this)
-      $el = $(event.target)
-      currentPosition = $this.scrollLeft()
-      size = bp.getBreakpointSize()
-      controlBtnWidth = $('.controls').width()
-      maxPosition = $this.get(0).scrollWidth - $this.parent().width()
-      maxPosition += controlBtnWidth if size isnt 'xs' and $('.nav-control').length
-
-      $el.find('.fade-left').toggleClass('end-scroll', currentPosition is 0)
-      $el.find('.fade-right').toggleClass('end-scroll', currentPosition is maxPosition)

app/assets/javascripts/lib/type_utility.js.coffee

@@ -1,9 +0,0 @@
-((w) ->
-
-  w.gl ?= {}
-  w.gl.utils ?= {}
-
-  w.gl.utils.isObject = (obj) ->
-    obj? and (obj.constructor is Object)
-
-) window

app/assets/javascripts/lib/url_utility.js.coffee

@@ -26,19 +26,10 @@
     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
+      if url.search(pattern) >= 0
         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

app/assets/javascripts/merge_request_tabs.js.coffee

@@ -75,9 +75,6 @@ class @MergeRequestTabs
       @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()

app/assets/javascripts/merge_request_widget.js.coffee

@@ -10,7 +10,6 @@ class @MergeRequestWidget
     $('#modal_merge_info').modal(show: false)
     @firstCICheck = true
     @readyForCICheck = false
-    @cancel = false
     clearInterval @fetchBuildStatusInterval
 
     @clearEventListeners()
@@ -22,16 +21,10 @@ class @MergeRequestWidget
   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
+      if $('body').data('page') isnt 'projects:merge_requests:show'
         clearInterval @fetchBuildStatusInterval
-        @cancelPolling()
         @clearEventListeners()
 
   mergeInProgress: (deleteSourceBranch = false)->
@@ -74,7 +67,6 @@ class @MergeRequestWidget
     $('.ci-widget-fetching').show()
 
     $.getJSON @opts.ci_status_url, (data) =>
-      return if @cancel
       @readyForCICheck = true
 
       if data.status is ''
@@ -114,7 +106,6 @@ class @MergeRequestWidget
         @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
@@ -122,7 +113,7 @@ class @MergeRequestWidget
       switch state
         when "failed", "canceled", "not_found"
           @setMergeButtonClass('btn-danger')
-        when "running"
+        when "running", "pending"
           @setMergeButtonClass('btn-warning')
         when "success"
           @setMergeButtonClass('btn-create')
@@ -135,6 +126,6 @@ class @MergeRequestWidget
     $('.ci_widget:visible .ci-coverage').text(text)
 
   setMergeButtonClass: (css_class) ->
-    $('.js-merge-button,.accept-action .dropdown-toggle')
+    $('.accept_merge_request')
       .removeClass('btn-danger btn-warning btn-create')
       .addClass(css_class)

app/assets/javascripts/notes.js.coffee

@@ -114,9 +114,9 @@ class @Notes
       @refresh()
     , @pollingInterval
 
-  refresh: =>
+  refresh: ->
     return if @refreshing is true
-    @refreshing = true
+    refreshing = true
     if not document.hidden and document.URL.indexOf(@noteable_url) is 0
       @getContent()
 
@@ -134,8 +134,8 @@ class @Notes
             @renderDiscussionNote(note)
           else
             @renderNote(note)
-    .always () =>
-      @refreshing = false
+      always: =>
+        @refreshing = false
 
   ###
   Increase @pollingInterval up to 120 seconds on every function call,
@@ -285,7 +285,6 @@ class @Notes
     form.addClass "js-main-target-form"
 
     form.find("#note_line_code").remove()
-    form.find("#note_type").remove()
 
   ###
   General note form setup.
@@ -329,7 +328,7 @@ class @Notes
     @renderDiscussionNote(note)
 
     # cleanup after successfully creating a diff/discussion note
-    @removeDiscussionNoteForm($(xhr.target))
+    @removeDiscussionNoteForm($("#new-discussion-note-form-#{note.discussion_id}"))
 
   ###
   Called in response to the edit note form being submitted
@@ -473,7 +472,6 @@ class @Notes
   setupDiscussionNoteForm: (dataHolder, form) =>
     # setup note target
     form.attr 'id', "new-discussion-note-form-#{dataHolder.data("discussionId")}"
-    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")

app/assets/javascripts/right_sidebar.js.coffee

@@ -10,40 +10,6 @@ class @Sidebar
     $('.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: '/' })
-
-
   sidebarDropdownLoading: (e) ->
     $sidebarCollapsedIcon = $(@).closest('.block').find('.sidebar-collapsed-icon')
     img = $sidebarCollapsedIcon.find('img')
@@ -110,7 +76,7 @@ class @Sidebar
       @triggerOpenSidebar() if not @isOpen()
 
     if action is 'hide'
-      @triggerOpenSidebar() if @isOpen()
+      @triggerOpenSidebar() is @isOpen()
 
   isOpen: ->
     @sidebar.is('.right-sidebar-expanded')

app/assets/javascripts/search_autocomplete.js.coffee

@@ -20,7 +20,8 @@ class @SearchAutocomplete
     @dropdown = @wrap.find('.dropdown')
     @dropdownContent = @dropdown.find('.dropdown-content')
 
-    @locationBadgeEl = @getElement('.location-badge')
+    @locationBadgeEl = @getElement('.search-location-badge')
+    @locationText = @getElement('.location-text')
     @scopeInputEl = @getElement('#scope')
     @searchInput = @getElement('.search-input')
     @projectInputEl = @getElement('#search_project_id')
@@ -132,7 +133,7 @@ class @SearchAutocomplete
       scope: @scopeInputEl.val()
 
       # Location badge
-      _location: @locationBadgeEl.text()
+      _location: @locationText.text()
     }
 
   bindEvents: ->
@@ -142,14 +143,12 @@ class @SearchAutocomplete
     @searchInput.on 'click', @onSearchInputClick
     @searchInput.on 'focus', @onSearchInputFocus
     @clearInput.on 'click', @onClearInputClick
-    @locationBadgeEl.on 'click', =>
-      @searchInput.focus()
 
   onDocumentClick: (e) =>
     # If clicking outside the search box
     # And search input is not focused
     # And we are not clicking inside a suggestion
-    if not $.contains(@dropdown[0], e.target) and @isFocused and not $(e.target).closest('.search-form').length
+    if not $.contains(@dropdown[0], e.target) and @isFocused and not $(e.target).parents('ul').length
       @onSearchInputBlur()
 
   enableAutocomplete: ->
@@ -222,8 +221,10 @@ class @SearchAutocomplete
     category = if item.category? then "#{item.category}: " else ''
     value = if item.value? then item.value else ''
 
-    badgeText = "#{category}#{value}"
-    @locationBadgeEl.text(badgeText).show()
+    html = "<span class='location-badge'>
+              <i class='location-text'>#{category}#{value}</i>
+            </span>"
+    @locationBadgeEl.html(html)
     @wrap.addClass('has-location-badge')
 
   restoreOriginalState: ->
@@ -232,8 +233,9 @@ class @SearchAutocomplete
     for input in inputs
       @getElement("##{input}").val(@originalState[input])
 
+
     if @originalState._location is ''
-      @locationBadgeEl.hide()
+      @locationBadgeEl.empty()
     else
       @addLocationBadge(
         value: @originalState._location
@@ -242,7 +244,7 @@ class @SearchAutocomplete
     @dropdown.removeClass 'open'
 
   badgePresent: ->
-    @locationBadgeEl.length
+    @locationBadgeEl.children().length
 
   resetSearchState: ->
     inputs = Object.keys @originalState
@@ -255,7 +257,7 @@ class @SearchAutocomplete
       @getElement("##{input}").val('')
 
   removeLocationBadge: ->
-    @locationBadgeEl.hide()
+    @locationBadgeEl.empty()
 
     # Reset state
     @resetSearchState()

app/assets/javascripts/shortcuts_dashboard_navigation.js.coffee

@@ -3,10 +3,10 @@
 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'))
+   Mousetrap.bind('g a', -> ShortcutsDashboardNavigation.findAndFollowLink('.shortcuts-activity'))
+   Mousetrap.bind('g i', -> ShortcutsDashboardNavigation.findAndFollowLink('.shortcuts-issues'))
+   Mousetrap.bind('g m', -> ShortcutsDashboardNavigation.findAndFollowLink('.shortcuts-merge_requests'))
+   Mousetrap.bind('g p', -> ShortcutsDashboardNavigation.findAndFollowLink('.shortcuts-projects'))
 
  @findAndFollowLink: (selector) ->
    link = $(selector).attr('href')

app/assets/javascripts/shortcuts_issuable.coffee

@@ -6,10 +6,6 @@ class @ShortcutsIssuable extends ShortcutsNavigation
     super()
     Mousetrap.bind('a', @openSidebarDropdown.bind(@, 'assignee'))
     Mousetrap.bind('m', @openSidebarDropdown.bind(@, 'milestone'))
-    Mousetrap.bind('r', =>
-      @replyWithSelectedText()
-      return false
-    )
     Mousetrap.bind('j', =>
       @prevIssue()
       return false

app/assets/javascripts/sidebar.js.coffee

@@ -12,7 +12,7 @@ toggleSidebar = ->
     niceScrollBars.updateScrollBar();
   ), 300
 
-$(document).on("click", '.toggle-nav-collapse, .side-nav-toggle', (e) ->
+$(document).on("click", '.toggle-nav-collapse', (e) ->
   e.preventDefault()
 
   toggleSidebar()

app/assets/javascripts/stat_graph_contributors.js.coffee

@@ -1,4 +1,5 @@
 #= require d3
+#= require stat_graph_contributors_util
 
 class @ContributorsStatGraph
   init: (log) ->

app/assets/javascripts/stat_graph_contributors_graph.js.coffee

@@ -1,4 +1,6 @@
 #= require d3
+#= require jquery
+#= require underscore
 
 class @ContributorsGraph
   MARGIN:

app/assets/javascripts/user_tabs.js.coffee

@@ -26,10 +26,6 @@
 #         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">
@@ -45,9 +41,6 @@
 #     <div class="tab-pane" id="projects">
 #       Projects content
 #     </div>
-#     <div class="tab-pane" id="snippets">
-#       Snippets content
-#     </div>
 #   </div>
 #
 #   <div class="loading-status">
@@ -107,7 +100,7 @@ class @UserTabs
     if action is 'activity'
       @loadActivities(source)
 
-    if action in ['groups', 'contributed', 'projects', 'snippets']
+    if action in ['groups', 'contributed', 'projects']
       @loadTab(source, action)
 
   loadTab: (source, action) ->

app/assets/javascripts/users/application.js.coffee

@@ -1,8 +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 d3
-#= require_tree .

app/assets/javascripts/users/calendar.js.coffee

@@ -1,198 +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 = []
-    @highestValue = 0
-
-    # Get the highest value from the timestampes
-    _.each timestamps, (count) =>
-      if count > @highestValue
-        @highestValue = count
-
-    # 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
-    @color = @initColor()
-    @colorKey = @initColorKey()
-
-    # 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) =>
-        contribText = 'No contributions'
-
-        if stamp.count > 0
-          contribText = "#{stamp.count} contribution#{if stamp.count > 1 then 's' else ''}"
-
-        date = dateFormat(stamp.date, 'mmm d, yyyy')
-
-        "#{contribText}<br />#{date}"
-      .attr 'class', 'user-contrib-cell js-tooltip'
-      .attr 'fill', (stamp) =>
-        if stamp.count isnt 0
-          @color(stamp.count)
-        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: ->
-    d3.scale
-      .linear()
-      .range(['#acd5f2', '#254e77'])
-      .domain([0, @highestValue])
-
-  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

app/assets/javascripts/users_select.js.coffee

@@ -93,9 +93,7 @@ class @UsersSelect
 
       $dropdown.glDropdown(
         data: (term, callback) =>
-          isAuthorFilter = $('.js-author-search')
-
-          @users term, term is '' and isAuthorFilter, (users) =>
+          @users term, (users) =>
             if term.length is 0
               showDivider = 0
 
@@ -140,7 +138,7 @@ class @UsersSelect
 
         toggleLabel: (selected) ->
           if selected && 'id' of selected
-            if selected.text then selected.text else selected.name
+            selected.name
           else
             defaultLabel
 
@@ -221,7 +219,7 @@ class @UsersSelect
         multiple: $(select).hasClass('multiselect')
         minimumInputLength: 0
         query: (query) =>
-          @users query.term, @projectId?, (users) =>
+          @users query.term, (users) =>
             data = { results: users }
 
             if query.term.length == 0
@@ -304,7 +302,7 @@ class @UsersSelect
 
   # Return users list. Filtered by query
   # Only active users retrieved
-  users: (query, fromProject, callback) =>
+  users: (query, callback) =>
     url = @buildUrl(@usersPath)
 
     $.ajax(
@@ -313,7 +311,7 @@ class @UsersSelect
         search: query
         per_page: 20
         active: true
-        project_id: @projectId if fromProject
+        project_id: @projectId
         group_id: @groupId
         current_user: @showCurrentUser
         author_id: @authorId

app/assets/stylesheets/application.scss

@@ -8,7 +8,9 @@
  *= require select2
  *= require_self
  *= require dropzone/basic
+ *= require cal-heatmap
  *= require cropper.css
+ *= require animate
 */
 
 /*

app/assets/stylesheets/framework.scss

@@ -5,7 +5,6 @@
 @import 'framework/tw_bootstrap';
 @import "framework/layout";
 
-@import "framework/animations.scss";
 @import "framework/avatar.scss";
 @import "framework/blocks.scss";
 @import "framework/buttons.scss";

app/assets/stylesheets/framework/animations.scss

@@ -1,72 +0,0 @@
-// This file is based off animate.css 3.5.1, available here:
-// https://github.com/daneden/animate.css/blob/3.5.1/animate.css
-// 
-// animate.css - http://daneden.me/animate
-// Version - 3.5.1
-// Licensed under the MIT license - http://opensource.org/licenses/MIT
-// 
-// Copyright (c) 2016 Daniel Eden
-
-.animated {
-  -webkit-animation-duration: 1s;
-  animation-duration: 1s;
-  -webkit-animation-fill-mode: both;
-  animation-fill-mode: both;
-}
-
-.animated.infinite {
-  -webkit-animation-iteration-count: infinite;
-  animation-iteration-count: infinite;
-}
-
-.animated.hinge {
-  -webkit-animation-duration: 2s;
-  animation-duration: 2s;
-}
-
-.animated.flipOutX,
-.animated.flipOutY,
-.animated.bounceIn,
-.animated.bounceOut {
-  -webkit-animation-duration: .75s;
-  animation-duration: .75s;
-}
-
-@-webkit-keyframes pulse {
-  from {
-    -webkit-transform: scale3d(1, 1, 1);
-    transform: scale3d(1, 1, 1);
-  }
-
-  50% {
-    -webkit-transform: scale3d(1.05, 1.05, 1.05);
-    transform: scale3d(1.05, 1.05, 1.05);
-  }
-
-  to {
-    -webkit-transform: scale3d(1, 1, 1);
-    transform: scale3d(1, 1, 1);
-  }
-}
-
-@keyframes pulse {
-  from {
-    -webkit-transform: scale3d(1, 1, 1);
-    transform: scale3d(1, 1, 1);
-  }
-
-  50% {
-    -webkit-transform: scale3d(1.05, 1.05, 1.05);
-    transform: scale3d(1.05, 1.05, 1.05);
-  }
-
-  to {
-    -webkit-transform: scale3d(1, 1, 1);
-    transform: scale3d(1, 1, 1);
-  }
-}
-
-.pulse {
-  -webkit-animation-name: pulse;
-  animation-name: pulse;
-}

app/assets/stylesheets/framework/avatar.scss

@@ -45,7 +45,6 @@
   &.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; }

app/assets/stylesheets/framework/blocks.scss

@@ -24,8 +24,8 @@
   background-color: $background-color;
   padding: $gl-padding;
   margin-bottom: 0;
-  border-top: 1px solid $white-dark;
-  border-bottom: 1px solid $white-dark;
+  border-top: 1px solid $border-color;
+  border-bottom: 1px solid $border-color;
   color: $gl-gray;
 
   &.oneline-block {
@@ -110,9 +110,9 @@
   .cover-title {
     color: $gl-header-color;
     margin: 0;
-    font-size: 24px;
+    font-size: 23px;
     font-weight: normal;
-    margin-bottom: 5px;
+    margin: 16px 0 5px;
     color: #4c4e54;
     font-size: 23px;
     line-height: 1.1;
@@ -137,6 +137,7 @@
   }
 
   .cover-desc {
+    padding: 0 $gl-padding 3px;
     color: $gl-text-color;
 
     &.username:last-child {
@@ -204,7 +205,7 @@
 
 .content-block {
   padding: $gl-padding 0;
-  border-bottom: 1px solid $white-dark;
+  border-bottom: 1px solid $border-color;
 
   &.oneline-block {
     line-height: 36px;

app/assets/stylesheets/framework/buttons.scss

@@ -16,19 +16,6 @@
   @include btn-default;
 }
 
-@mixin btn-outline($background, $text, $border, $hover-background, $hover-text, $hover-border) {
-  background-color: $background;
-  color: $text;
-  border-color: $border;
-
-  &:hover,
-  &:focus {
-    background-color: $hover-background;
-    color: $hover-text;
-    border-color: $hover-border;;
-  }
-}
-
 @mixin btn-color($light, $border-light, $normal, $border-normal, $dark, $border-dark, $color) {
   background-color: $light;
   border-color: $border-light;
@@ -119,14 +106,11 @@
     @include btn-blue;
   }
 
+  &.btn-close,
   &.btn-warning {
     @include btn-orange;
   }
 
-  &.btn-close {
-    @include btn-outline($white-light, $orange-normal, $orange-normal, $orange-light, $white-light, $orange-light);
-  }
-
   &.btn-danger,
   &.btn-remove,
   &.btn-red {

app/assets/stylesheets/framework/calendar.scss

@@ -1,44 +1,70 @@
 .calender-block {
-  padding-left: 0;
-  padding-right: 0;
-
   @media (min-width: $screen-sm-min) and (max-width: $screen-lg-min) {
     overflow-x: scroll;
   }
 }
 
 .user-calendar-activities {
+  .calendar_onclick_hr {
+    padding: 0;
+    margin: 10px 0;
+  }
+
   .str-truncated {
     max-width: 70%;
   }
 
-  .user-calendar-activities-loading {
-    font-size: 24px;
-  }
-}
-
-.user-calendar {
-  text-align: center;
-
-  .calendar {
-    display: inline-block;
-  }
-}
-
-.user-contrib-cell {
-  &:hover {
+  .text-expander {
+    background: #eee;
+    color: #555;
+    padding: 0 5px;
     cursor: pointer;
-    stroke: #000;
+    margin-left: 4px;
+    &:hover {
+      background-color: #ddd;
+    }
   }
 }
 
-.user-contrib-text {
-  font-size: 12px;
-  fill: #959494;
-}
+/**
+* This overwrites the default values of the cal-heatmap gem
+*/
+.calendar {
+  .qi {
+    fill: #fff;
+  }
 
-.calendar-hint {
-  margin-top: -23px;
-  float: right;
-  font-size: 12px;
+  .q1 {
+    fill: #ededed !important;
+  }
+
+  .q2 {
+    fill: #acd5f2 !important;
+  }
+
+  .q3 {
+    fill: #7fa8d1 !important;
+  }
+
+  .q4 {
+    fill: #49729b !important;
+  }
+
+  .q5 {
+    fill: #254e77 !important;
+  }
+
+  .future {
+    visibility: hidden;
+  }
+
+  .domain-background {
+    fill: none;
+    shape-rendering: crispedges;
+  }
+
+  .ch-tooltip {
+    padding: 3px;
+    font-weight: 550;
+  }
 }

app/assets/stylesheets/framework/common.scss

@@ -289,7 +289,7 @@ table {
   text-shadow: none;
 
   @media (min-width: $screen-sm-min) {
-    margin-top: 8px;
+    margin-top: 11px;
   }
 }
 

app/assets/stylesheets/framework/dropdowns.scss

@@ -154,7 +154,7 @@
     color: $dropdown-header-color;
     font-size: 13px;
     line-height: 22px;
-    padding: 0 10px;
+    padding: 0 10px 10px;
   }
 
   .separator + .dropdown-header {
@@ -162,10 +162,6 @@
   }
 }
 
-.dropdown-menu-full-width {
-  width: 100%;
-}
-
 .dropdown-menu-paging {
   .dropdown-page-two,
   .dropdown-menu-back {

app/assets/stylesheets/framework/files.scss

@@ -5,10 +5,6 @@
 .file-holder {
   border: 1px solid $border-color;
 
-  &.file-holder-no-border {
-    border: 0;
-  }
-
   &.readme-holder {
     margin: $gl-padding-top 0;
   }
@@ -27,17 +23,8 @@
     word-wrap: break-word;
     border-radius: 3px 3px 0 0;
 
-    &.file-title-clear {
-      padding-left: 0;
-      padding-right: 0;
-      background-color: transparent;
-
-      .file-actions {
-        right: 0;
-      }
-    }
-
     .file-actions {
+      float: right;
       position: absolute;
       top: 5px;
       right: 15px;
@@ -49,6 +36,22 @@
       }
     }
 
+    .filename {
+      &.old {
+        display: inline-block;
+        span.idiff {
+          background-color: #f8cbcb;
+        }
+      }
+
+      &.new {
+        display: inline-block;
+        span.idiff {
+          background-color: #a6f3a6;
+        }
+      }
+    }
+
     a:not(.btn) {
       color: $gl-dark-link-color;
     }

app/assets/stylesheets/framework/forms.scss

@@ -28,6 +28,10 @@ input[type='text'].danger {
 }
 
 label {
+  &.control-label {
+    @extend .col-sm-2;
+  }
+
   &.inline-label {
     margin: 0;
   }
@@ -37,10 +41,6 @@ label {
   }
 }
 
-.control-label {
-  @extend .col-sm-2;
-}
-
 .inline-input-group {
   width: 250px;
 }

app/assets/stylesheets/framework/gitlab-theme.scss

@@ -9,7 +9,8 @@
 @mixin gitlab-theme($color-light, $color, $color-darker, $color-dark) {
   .page-with-sidebar {
     .header-logo {
-      background: $color-darker;
+      background-color: $color;
+      border-color: $color;
 
       a {
         color: $color-light;
@@ -20,13 +21,9 @@
       }
 
       &:hover {
-        background-color: $color-dark;
+        background-color: $color-darker;
         a {
           color: #fff;
-
-          h3 {
-            color: #fff;
-          }
         }
       }
     }
@@ -90,8 +87,8 @@
 }
 
 $theme-blue: #2980b9;
-$theme-charcoal: #3d454d;
-$theme-graphite: #666;
+$theme-charcoal: #333c47;
+$theme-graphite: #888;
 $theme-gray: #373737;
 $theme-green: #019875;
 $theme-violet: #548;
@@ -102,11 +99,11 @@ body {
   }
 
   &.ui_charcoal {
-    @include gitlab-theme(#d6d7d9, #485157, $theme-charcoal, #353b41);
+    @include gitlab-theme(#c5d0de, $theme-charcoal, #2b333d, #24272d);
   }
 
   &.ui_graphite {
-    @include gitlab-theme(#ccc, #777, $theme-graphite, #555);
+    @include gitlab-theme(#ccc, $theme-graphite, #777, #666);
   }
 
   &.ui_gray {

app/assets/stylesheets/framework/header.scss

@@ -6,12 +6,12 @@ header {
   transition-duration: .3s;
 
   &.navbar-empty {
-    height: $header-height;
+    height: 58px;
     background: #fff;
-    border-bottom: 1px solid $btn-gray-hover;
+    border-bottom: 1px solid #eee;
 
     .center-logo {
-      margin: 8px 0;
+      margin: 11px 0;
       text-align: center;
 
       #tanuki-logo, img {
@@ -22,18 +22,14 @@ header {
   }
 
   &.navbar-gitlab {
-    padding: 0 16px;
+    padding: 0 20px;
     z-index: 100;
     margin-bottom: 0;
-    height: $header-height;
+    min-height: $header-height;
     background-color: $background-color;
     border: none;
     border-bottom: 1px solid $border-color;
 
-    @media (max-width: $screen-xs-min) {
-      padding: 0 16px;
-    }
-
     &.with-horizontal-nav {
       border-bottom: none;
     }
@@ -64,44 +60,16 @@ header {
         margin: 6px 0;
         border-radius: 0;
         position: absolute;
-        right: -10px;
-        padding: 6px 10px;
+        right: 2px;
 
         &:hover {
-          background-color: $btn-gray-hover;
+          background-color: #eee;
         }
-
         &.active {
           color: $gl-icon-color;
         }
       }
     }
-
-    &.header-collapsed {
-      padding: 0 16px;
-    }
-
-    .side-nav-toggle {
-      display: none;
-      position: absolute;
-      left: -10px;
-      margin: 6px 0;
-      padding: 6px 10px;
-      border: none;
-      background-color: $background-color;
-
-      &:hover {
-        background-color: $btn-gray-hover;
-      }
-
-      &:focus {
-        outline: none;
-      }
-
-      @media (max-width: $screen-xs-min) {
-        display: block;
-      }
-    }
   }
 
   .header-content {
@@ -109,10 +77,6 @@ header {
     height: $header-height;
     padding-right: 40px;
 
-    @media (max-width: $screen-xs-min) {
-      padding-left: 40px;
-    }
-
     @media (min-width: $screen-sm-min) {
       padding-right: 0;
     }
@@ -181,10 +145,6 @@ header {
   @media (min-width: $screen-md-min) {
     @include collapsed-header;
   }
-
-  @media (max-width: $screen-xs-min) {
-    margin-left: 0;
-  }
 }
 
 .header-expanded {
@@ -193,10 +153,6 @@ header {
   @media (min-width: $screen-md-min) {
     margin-left: $sidebar_width;
   }
-
-  @media (max-width: $screen-xs-min) {
-    margin-left: 0;
-  }
 }
 
 @media (max-width: $screen-xs-max) {

app/assets/stylesheets/framework/mobile.scss

@@ -48,6 +48,10 @@
       display: block;
     }
 
+    .project-home-desc {
+      font-size: 21px;
+    }
+
     .project-repo-buttons,
     .git-clone-holder {
       display: none;

app/assets/stylesheets/framework/nav.scss

@@ -1,34 +1,3 @@
-@mixin fade($gradient-direction, $rgba, $gradient-color) {
-  visibility: visible;
-  opacity: 1;
-  position: absolute;
-  bottom: 12px;
-  width: 43px;
-  height: 30px;
-  transition-duration: .3s;
-  -webkit-transform: translateZ(0);
-  background: -webkit-linear-gradient($gradient-direction, $rgba, $gradient-color 45%);
-  background: -o-linear-gradient($gradient-direction, $rgba, $gradient-color 45%);
-  background: -moz-linear-gradient($gradient-direction, $rgba, $gradient-color 45%);
-  background: linear-gradient($gradient-direction, $rgba, $gradient-color 45%);
-
-  &.end-scroll {
-    visibility: hidden;
-    opacity: 0;
-    transition-duration: .3s;
-  }
-}
-
-@mixin scrolling-links() {
-  white-space: nowrap;
-  overflow-x: auto;
-  overflow-y: hidden;
-  -webkit-overflow-scrolling: touch;
-  &::-webkit-scrollbar {
-    display: none;
-  }
-}
-
 .nav-links {
   padding: 0;
   margin: 0;
@@ -150,7 +119,7 @@
     }
 
     input {
-      height: 35px;
+      height: 34px;
       display: inline-block;
       position: relative;
       top: 2px;
@@ -227,22 +196,14 @@
   position: fixed;
   top: $header-height;
   width: 100%;
-  z-index: 11;
+  z-index: 1;
   background: $background-color;
   border-bottom: 1px solid $border-color;
   transition-duration: .3s;
 
-  .container-fluid {
-    position: relative;
-  }
-
   .controls {
     float: right;
-    padding: 7px 0 0;
-
-    @media (max-width: $screen-xs-max) {
-      display: none;
-    }
+    padding: 7px 5px 0 0;
 
     i {
       color: $layout-link-gray;
@@ -260,31 +221,14 @@
 
     .dropdown {
       margin-left: 7px;
-
-      @media (max-width: $screen-xs-min) {
-        margin-left: 0;
-      }
-
-      li.active {
-        font-weight: bold;
-      }
     }
   }
 
   .nav-links {
-    @include scrolling-links();
     border-bottom: none;
     height: 51px;
-
-    .fade-right {
-      @include fade(left, rgba(250, 250, 250, 0.4), $background-color);
-      right: 0;
-    }
-
-    .fade-left {
-      @include fade(right, rgba(250, 250, 250, 0.4), $background-color);
-      left: 0;
-    }
+    white-space: nowrap;
+    overflow-x: auto;
 
     li {
 
@@ -308,62 +252,8 @@
     }
   }
 
-  .nav-control {
-    .fade-right {
-
-      @media (min-width: $screen-xs-max) {
-        right: 67px;
-      }
-      @media (max-width: $screen-xs-min) {
-        right: 0;
-      }
-    }
-  }
-}
-
-.nav-block {
-  position: relative;
-
-  .nav-links {
-    @include scrolling-links();
-
-    .fade-right {
-      @include fade(left, rgba(255, 255, 255, 0.4), $white-light);
-      right: 0;
-    }
-
-    .fade-left {
-      @include fade(right, rgba(255, 255, 255, 0.4), $white-light);
-      left: 0;
-    }
-
-    &.event-filter {
-      .fade-right {
-        visibility: hidden;
-
-        @media (max-width: $screen-xs-max) {
-          visibility: visible;
-        }
-      }
-    }
-  }
 }
 
 .page-with-layout-nav {
-  margin-top: $header-height + 2;
-
-  .right-sidebar {
-    top: ($header-height * 2) + 2;
-  }
-}
-
-.activities {
-
-  .nav-block {
-    border-bottom: 1px solid $border-color;
-
-    .nav-links {
-      border-bottom: none;
-    }
-  }
+  margin-top: 50px;
 }

app/assets/stylesheets/framework/sidebar.scss

@@ -98,7 +98,7 @@
   }
 
   .sidebar-user {
-    padding: 7px 22px;
+    padding: 9px 22px;
     position: fixed;
     bottom: 40px;
     width: $sidebar_width;
@@ -210,33 +210,15 @@
   }
 }
 
-.sidebar-wrapper {
-  &.hidden-nav {
-    width: 0;
-  }
-}
-
 .page-sidebar-collapsed {
   padding-left: $sidebar_collapsed_width;
 
-  @media (max-width: $screen-xs-min) {
-    padding-left: 0;
-  }
-
   .sidebar-wrapper {
     width: $sidebar_collapsed_width;
 
-    @media (max-width: $screen-xs-min) {
-      width: 0;
-    }
-
     .header-logo {
       width: $sidebar_collapsed_width;
 
-      @media (max-width: $screen-xs-min) {
-        width: 0;
-      }
-
       a {
         padding-left: ($sidebar_collapsed_width - 36) / 2;
 
@@ -262,22 +244,12 @@
 
     .collapse-nav a {
       width: $sidebar_collapsed_width;
-
-      @media (max-width: $screen-xs-min) {
-        width: 0;
-      }
     }
 
     .sidebar-user {
       padding-left: ($sidebar_collapsed_width - 36) / 2;
       width: $sidebar_collapsed_width;
 
-      @media (max-width: $screen-xs-min) {
-        width: 0;
-        padding-left: 0;
-        padding-right: 0;
-      }
-
       .username {
         display: none;
       }
@@ -286,10 +258,6 @@
 
   .layout-nav {
     padding-right: $sidebar_collapsed_width;
-
-    @media (max-width: $screen-xs-min) {
-      padding-right: 0;;
-    }
   }
 }
 
@@ -300,10 +268,6 @@
     padding-left: $sidebar_width;
   }
 
-  @media (max-width: $screen-xs-min) {
-    padding-left: 0;
-  }
-
   .sidebar-wrapper {
     width: $sidebar_width;
 
@@ -312,7 +276,7 @@
     }
 
     .nav-sidebar li a {
-      width: $sidebar_width;
+      width: 230px;
 
       &.back-link {
         i {
@@ -323,17 +287,7 @@
   }
 
   .layout-nav {
-    @media (max-width: $screen-xs-min) {
-      padding-right: 0;
-    }
-
-    @media (min-width: $screen-xs-min) and (max-width: $screen-md-min) {
-      padding-right: 62px;
-    }
-
-    @media (min-width: $screen-md-min) {
-      padding-right: $sidebar_width;
-    }
+    padding-right: $sidebar_width;
   }
 }
 

app/assets/stylesheets/framework/typography.scss

@@ -269,11 +269,3 @@ h1, h2, h3, h4 {
     text-align: right;
   }
 }
-
-.idiff.deletion {
-  background: $line-removed-dark;
-}
-
-.idiff.addition {
-  background: $line-added-dark;
-}

app/assets/stylesheets/framework/variables.scss

@@ -2,7 +2,7 @@
  * Layout
  */
 $sidebar_collapsed_width: 62px;
-$sidebar_width: 220px;
+$sidebar_width: 230px;
 $gutter_collapsed_width: 62px;
 $gutter_width: 290px;
 $gutter_inner_width: 258px;
@@ -12,7 +12,7 @@ $gutter_inner_width: 258px;
  */
 $border-color:       #e5e5e5;
 $focus-border-color: #3aabf0;
-$table-border-color: #f0f0f0;
+$table-border-color: #ececec;
 $background-color:   #fafafa;
 
 /*
@@ -63,8 +63,7 @@ $gl-padding-top: 10px;
 /*
  * Misc
  */
-$row-hover: #f7faff;
-$row-hover-border: #b2d7ff;
+$row-hover: #f4f8fe;
 $progress-color: #c0392b;
 $avatar_radius: 50%;
 $header-height: 50px;
@@ -105,7 +104,7 @@ $blue-medium-light: #3498cb;
 $blue-medium: #2f8ebf;
 $blue-medium-dark: #2d86b4;
 
-$orange-light: #fc8a51;
+$orange-light: rgba(252, 109, 38, 0.80);
 $orange-normal: #e75e40;
 $orange-dark: #ce5237;
 
@@ -120,8 +119,8 @@ $border-white-light: #f1f2f4;
 $border-white-normal: #d6dae2;
 $border-white-dark: #c6cacf;
 
-$border-gray-light: #dcdcdc;
-$border-gray-normal: rgba(0, 0, 0, 0.10);
+$border-gray-light: rgba(0, 0, 0, 0.06);
+$border-gray-normal: rgba(0, 0, 0, 0.10);;
 $border-gray-dark: #c6cacf;
 
 $border-green-light: #2faa60;
@@ -179,7 +178,6 @@ $table-border-gray: #f0f0f0;
 $line-target-blue: #eaf3fc;
 $line-select-yellow: #fcf8e7;
 $line-select-yellow-dark: #f0e2bd;
-
 /*
  * Fonts
  */
@@ -217,7 +215,6 @@ $dropdown-toggle-hover-icon-color: $dropdown-toggle-hover-border-color;
 $btn-active-gray: #ececec;
 $btn-placeholder-gray: #c7c7c7;
 $btn-white-active: #848484;
-$btn-gray-hover: #eee;
 
 /*
  *  Award emoji

app/assets/stylesheets/framework/zen.scss

@@ -32,7 +32,7 @@
   }
 }
 
-.zen-control {
+.zen-cotrol {
   padding: 0;
   color: #555;
   background: none;

app/assets/stylesheets/mailers/devise.scss

@@ -1,134 +0,0 @@
-// NOTE: This stylesheet is for the exclusive use of the `devise_mailer` layout
-// used for Devise email templates, and _should not_ be included in any
-// application stylesheets.
-//
-// Styles defined here are embedded directly into the resulting email HTML via
-// the `premailer` gem.
-
-$body-background-color:    #363636;
-$message-background-color: #fafafa;
-
-$header-color:             #6b4fbb;
-$body-color:               #444;
-$cta-color:                #e14329;
-$footer-link-color:        #7e7e7e;
-
-$font-family: Helvetica, Arial, sans-serif;
-
-body {
-  background-color: $body-background-color;
-  font-family: $font-family;
-  margin: 0;
-  padding: 0;
-}
-
-table {
-  -premailer-cellpadding: 0;
-  -premailer-cellspacing: 0;
-
-  border: 0;
-  border-collapse: separate;
-
-  &#wrapper {
-    background-color: $body-background-color;
-    width: 100%;
-  }
-
-  &#header {
-    margin: 0 auto;
-    text-align: left;
-    width: 600px;
-  }
-
-  &#body {
-    background-color: $message-background-color;
-    border: 1px solid #000;
-    border-radius: 4px;
-    margin: 0 auto;
-    width: 600px;
-  }
-
-  &#footer {
-    color: $footer-link-color;
-    font-size: 14px;
-    text-align: center;
-    width: 100%;
-  }
-
-  td {
-    &#body-container {
-      padding: 20px 40px;
-    }
-  }
-}
-
-.center {
-  text-align: center;
-}
-
-#logo {
-  border: none;
-  outline: none;
-  min-height: 88px;
-  width: 134px;
-}
-
-#content {
-  h2 {
-    color: $header-color;
-    font-size: 30px;
-    font-weight: 400;
-    line-height: 34px;
-    margin-top: 0;
-  }
-
-  p {
-    color: $body-color;
-    font-size: 17px;
-    line-height: 24px;
-    margin-bottom: 0;
-  }
-}
-
-#cta {
-  border: 1px solid $cta-color;
-  border-radius: 3px;
-  display: inline-block;
-  margin: 20px 0;
-  padding: 12px 24px;
-
-  a {
-    background-color: $message-background-color;
-    color: $cta-color;
-    display: inline-block;
-    text-decoration: none;
-  }
-}
-
-#tanuki {
-  padding: 40px 0 0;
-
-  img {
-    border: none;
-    outline: none;
-    width: 37px;
-    min-height: 36px;
-  }
-}
-
-#tagline {
-  font-size: 22px;
-  font-weight: 100;
-  padding: 4px 0 40px;
-}
-
-#social {
-  padding: 0 10px 20px;
-  width: 600px;
-  word-spacing: 20px;
-
-  a {
-    color: $footer-link-color;
-    text-decoration: none;
-  }
-}

app/assets/stylesheets/mailers/repository_push_email.scss

@@ -1,43 +0,0 @@
-@import "framework/variables";
-
-table.code {
-  width: 100%;
-  font-family: monospace;
-  border: none;
-  border-collapse: separate;
-  margin: 0;
-  padding: 0;
-  -premailer-cellpadding: 0;
-  -premailer-cellspacing: 0;
-  -premailer-width: 100%;
-
-  td {
-    line-height: $code_line_height;
-    font-family: monospace;
-    font-size: $code_font_size;
-  }
-
-  td.diff-line-num {
-    margin: 0;
-    padding: 0;
-    border: none;
-    background: $background-color;
-    color: rgba(0, 0, 0, 0.3);
-    padding: 0 5px;
-    border-right: 1px solid $border-color;
-    text-align: right;
-    min-width: 35px;
-    max-width: 50px;
-    width: 35px;
-  }
-
-  td.line_content {
-    display: block;
-    margin: 0;
-    padding: 0 0.5em;
-    border: none;
-    white-space: pre;
-  }
-}
-
-@import "highlight/white";

app/assets/stylesheets/pages/commit.scss

@@ -26,28 +26,8 @@
 
 .commit-info-row {
   margin-bottom: 10px;
-
-  &.commit-info-row-header {
-    line-height: 34px;
-
-    @media (min-width: $screen-sm-min) {
-      margin-bottom: 0;
-    }
-
-    .commit-options-dropdown-caret {
-      @media (max-width: $screen-sm) {
-        margin-left: 0;
-      }
-    }
-  }
-
   .avatar {
     @extend .avatar-inline;
-    margin-left: 0;
-
-    @media (min-width: $screen-sm-min) {
-      margin-left: 4px;
-    }
   }
   .commit-committer-link,
   .commit-author-link {
@@ -55,6 +35,10 @@
     font-weight: bold;
   }
 
+  .time_ago {
+    margin-left: 8px;
+  }
+
   .fa-clipboard {
     color: $dropdown-title-btn-color;
   }

app/assets/stylesheets/pages/detail_page.scss

@@ -29,6 +29,8 @@
     margin-top: 6px;
 
     p {
+      overflow-x: auto;
+
       &:last-child {
         margin-bottom: 0;
       }

app/assets/stylesheets/pages/editor.scss

@@ -23,7 +23,7 @@
   .file-title {
     @extend .monospace;
 
-    line-height: 35px;
+    line-height: 42px;
     padding-top: 7px;
     padding-bottom: 7px;
 
@@ -43,7 +43,7 @@
 
   .editor-file-name {
     @extend .monospace;
-
+    
     float: left;
     margin-right: 10px;
   }
@@ -59,22 +59,7 @@
   }
 
   .encoding-selector,
-  .license-selector,
-  .gitignore-selector {
+  .license-selector {
     display: inline-block;
-    vertical-align: top;
-    font-family: $regular_font;
-  }
-
-  .gitignore-selector {
-
-    .dropdown {
-      line-height: 21px;
-    }
-
-    .dropdown-menu-toggle {
-      vertical-align: top;
-      width: 220px;
-    }
   }
 }

app/assets/stylesheets/pages/issuable.scss

@@ -125,7 +125,7 @@
 
 .right-sidebar {
   position: fixed;
-  top: $header-height;
+  top: 58px;
   bottom: 0;
   right: 0;
   z-index: 10;
@@ -150,10 +150,6 @@
       font-weight: 600;
     }
 
-    .light {
-      font-weight: normal;
-    }
-
     .sidebar-collapsed-icon {
       display: none;
     }

app/assets/stylesheets/pages/issues.scss

@@ -40,6 +40,11 @@
   }
 }
 
+.issue-search-form {
+  margin: 0;
+  height: 24px;
+}
+
 form.edit-issue {
   margin: 0;
 }
@@ -91,3 +96,8 @@ form.edit-issue {
 .issue-form .select2-container {
   width: 250px !important;
 }
+
+.issue-closed-by-widget {
+  color: $gl-text-color;
+  margin-left: 52px;
+}

app/assets/stylesheets/pages/merge_requests.scss

@@ -41,7 +41,7 @@
       margin: 0;
       margin-left: 20px;
       padding: 5px;
-      padding-top: 8px;
+      padding-top: 12px;
       line-height: 20px;
 
       &.right {
@@ -110,29 +110,6 @@
     p:last-child {
       margin-bottom: 0;
     }
-
-    @media (max-width: $screen-sm-max) {
-      h4 {
-        font-size: 15px;
-      }
-
-      p {
-        font-size: 13px;
-      }
-
-      .btn,
-      .btn-group,
-      .accept-action {
-        width: 100%;
-        margin-bottom: 4px;
-      }
-
-      .accept-control {
-        width: 100%;
-        text-align: center;
-        margin: 0;
-      }
-    }
   }
 
   .mr-widget-footer {
@@ -303,5 +280,11 @@
       background-color: $white-light;
       color: $gl-placeholder-color;
     }
+
+    th,
+    td {
+      padding: 16px;
+    }
   }
 }
+

app/assets/stylesheets/pages/notes.scss

@@ -226,7 +226,8 @@ ul.notes {
   }
 }
 
-.note-action-button {
+.note-action-button,
+.discussion-action-button {
   display: inline-block;
   margin-left: 10px;
   line-height: 24px;

app/assets/stylesheets/pages/pipelines.scss

@@ -1,24 +0,0 @@
-.pipelines {
-  .stage {
-    max-width: 100px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-
-  .duration, .finished_at {
-    margin: 4px 0;
-  }
-
-  .commit-title {
-    margin: 0;
-  }
-
-  .controls {
-    white-space: nowrap;
-  }
-
-  .btn {
-    margin: 4px;
-  }
-}

app/assets/stylesheets/pages/profile.scss

@@ -66,6 +66,12 @@
   }
 }
 
+.calendar-hint {
+  margin-top: -12px;
+  float: right;
+  font-size: 12px;
+}
+
 .profile-link-holder {
   display: inline;
 
@@ -128,6 +134,14 @@
   }
 }
 
+.change-username-title {
+  color: $gl-warning;
+}
+
+.remove-account-title {
+  color: $gl-danger;
+}
+
 .provider-btn-group {
   display: inline-block;
   margin-right: 10px;
@@ -204,7 +218,7 @@
 
       .btn {
         display: inline-block;
-        width: 46%;
+        width: 48%;
       }
     }
   }

app/assets/stylesheets/pages/projects.scss

@@ -7,10 +7,10 @@
 }
 .no-ssh-key-message, .project-limit-message {
   background-color: #f28d35;
-  margin-bottom: 0;
+  margin-bottom: 16px;
 }
 .new_project,
-.edit-project {
+.edit_project {
   fieldset.features {
     .control-label {
       font-weight: normal;
@@ -26,13 +26,8 @@
 }
 
 .project-home-panel {
-  background: $white-light;
-  text-align: left;
-  padding: 24px 0;
-
-  .container-fluid {
-    position: relative;
-  }
+  padding-bottom: 40px;
+  border-bottom: 1px solid $border-color;
 
   .cover-controls {
     .project-settings-dropdown {
@@ -48,55 +43,21 @@
     }
   }
 
-  .cover-title {
-    margin-bottom: 0;
-  }
+  .project-identicon-holder {
+    margin-bottom: 16px;
 
-  .project-image-container {
-    @include make-sm-column(1);
-    max-width: 86px;
-    min-width: 86px;
-    padding-right: 0;
-    margin: 11px 0;
-
-    @media (max-width: $screen-md-max) {
-      padding-left: 0;
-      margin: 0 0 10px;
-      max-width: none;
-      min-width: none;
-
-      .avatar.s70 {
-        margin: auto;
-      }
-    }
-  }
-
-  .project-info {
-    @include make-sm-column(10);
-
-    h1 {
-      font-size: 24px;
-      font-weight: normal;
-      margin: 0;
+    .avatar, .identicon {
+      margin: 0 auto;
+      float: none;
     }
 
-    .project-home-desc {
-      p {
-        margin: 0;
-      }
+    .identicon {
+      @include border-radius(50%);
     }
   }
 
-  .identicon {
-    float: left;
-    @include border-radius(50%);
-  }
-
-  .avatar {
-    float: none;
-  }
-
   .notifications-btn {
+    margin-top: -28px;
 
     .fa-bell {
       margin-right: 6px;
@@ -108,45 +69,28 @@
   }
 
   .project-repo-buttons {
-    font-size: 0;
+    margin-top: 20px;
+    margin-bottom: 0;
+
+    .count-buttons {
+      display: block;
+      margin-bottom: 20px;
+    }
+
+    .clone-row {
+      .split-repo-buttons,
+      .project-clone-holder {
+        display: inline-block;
+      }
+
+      .split-repo-buttons {
+        margin: 0 12px;
+      }
+    }
 
     .btn {
       @include btn-gray;
-      padding: 3px 10px;
       text-transform: none;
-      background-color: $background-color;
-
-      .fa {
-        color: $layout-link-gray;
-      }
-
-      .fa-caret-down {
-        margin-left: 3px;
-      }
-    }
-
-    .btn-group:not(:first-child):not(:last-child) > .btn {
-      border-top-right-radius: 3px;
-      border-bottom-right-radius: 3px;
-    }
-
-    form {
-      margin-left: 10px;
-    }
-
-    .count-buttons {
-      display: inline-block;
-      vertical-align: top;
-      margin-top: 16px;
-    }
-
-    .project-clone-holder {
-      display: inline-block;
-      margin-top: 16px;
-
-      input {
-        height: 29px;
-      }
     }
 
     .count-with-arrow {
@@ -196,18 +140,14 @@
         line-height: 13px;
         padding: $gl-vert-padding $gl-padding;
         letter-spacing: .4px;
-        padding: 7px 14px;
+        padding: 10px 14px;
         text-align: center;
         vertical-align: middle;
         touch-action: manipulation;
         cursor: pointer;
         background-image: none;
         white-space: nowrap;
-        margin: 0 10px 0 4px;
-
-        a {
-          color: inherit;
-        }
+        margin: 0 11px 0 4px;
 
         &:hover {
           background: #fff;
@@ -215,37 +155,13 @@
       }
     }
   }
-
-  .project-right-buttons {
-    position: absolute;
-    right: 16px;
-    bottom: 0;
-
-    .btn {
-      padding: 3px 10px;
-      background-color: $background-color;
-    }
-
-    @media (max-width: 1304px) {
-      top: 0;
-    }
-  }
-
-  @media (max-width: $screen-md-max) {
-    text-align: center;
-
-    .project-info,
-    .project-image-container {
-      width: 100%;
-    }
-  }
 }
 
 .split-one {
   display: inline-table;
   margin-right: 12px;
 
-  > a {
+  a {
     margin: -1px;
   }
 }
@@ -369,11 +285,11 @@ a.deploy-project-label {
 }
 
 .project-stats {
+  text-align: center;
   margin-top: $gl-padding;
   margin-bottom: 0;
-  padding: 16px 0;
-  background-color: $white-light;
-  font-size: 0;
+  padding-top: 10px;
+  padding-bottom: 4px;
 
   ul.nav {
     display: inline-block;
@@ -384,11 +300,12 @@ a.deploy-project-label {
   }
 
   .nav > li > a {
+    @include btn-default;
+    @include btn-gray;
+
     background-color: transparent;
-    margin-right: 12px;
-    padding: 0 10px;
-    font-size: 15px;
-    color: $notes-light-color;
+    border: 1px solid #f7f8fa;
+    margin-left: 12px;
   }
 
   li {
@@ -408,10 +325,6 @@ a.deploy-project-label {
       background-color: #f0f2f5;
     }
   }
-
-  &.row-content-block.second-block {
-    margin-top: 0;
-  }
 }
 
 pre.light-well {
@@ -529,14 +442,9 @@ pre.light-well {
   border-top: 0;
 
   .edit-project-readme {
-    z-index: 2;
+    z-index: 100;
     position: relative;
   }
-
-  .wiki h1 {
-    border-bottom: none;
-    padding: 0;
-  }
 }
 
 .git-clone-holder {

app/assets/stylesheets/pages/search.scss

@@ -28,7 +28,6 @@
   }
 
   .search-input {
-    padding-right: 20px;
     border: none;
     font-size: 14px;
     outline: none;
@@ -48,7 +47,6 @@
     display: inline-block;
     background-color: $location-badge-bg;
     vertical-align: top;
-    cursor: default;
   }
 
   .search-input-container {
@@ -57,7 +55,7 @@
     position: relative;
   }
 
-  .search-input-wrap {
+  .search-location-badge, .search-input-wrap {
     // Fallback if flexbox is not supported
     display: inline-block;
   }

app/assets/stylesheets/pages/settings.scss

@@ -12,11 +12,3 @@
   border: 1px solid $warning-message-border;
   border-radius: $border-radius-base;
 }
-
-.warning-title {
-  color: $gl-warning;
-}
-
-.danger-title {
-  color: $gl-danger;
-}

app/assets/stylesheets/pages/snippets.scss

@@ -16,6 +16,19 @@
   }
 }
 
+.snippet-box {
+  @include border-radius(2px);
+
+  display: block;
+  float: left;
+  padding: 0 $gl-padding;
+  font-weight: normal;
+  margin-right: 10px;
+  font-size: $gl-font-size;
+  border: 1px solid;
+  line-height: 32px;
+}
+
 .markdown-snippet-copy {
   position: fixed;
   top: -10px;
@@ -23,34 +36,3 @@
   max-height: 0;
   max-width: 0;
 }
-
-.file-holder.snippet-file-content {
-  padding-bottom: $gl-padding;
-  border-bottom: 1px solid $border-color;
-
-  .file-title {
-    padding-top: $gl-padding;
-    padding-bottom: $gl-padding;
-  }
-
-  .file-actions {
-    top: 12px;
-  }
-
-  .file-content {
-    border-left: 1px solid $border-color;
-    border-right: 1px solid $border-color;
-    border-bottom: 1px solid $border-color;
-  }
-}
-
-.snippet-title {
-  font-size: 24px;
-  font-weight: normal;
-}
-
-.snippet-actions {
-  @media (min-width: $screen-sm-min) {
-    float: right;
-  }
-}

app/assets/stylesheets/pages/todos.scss

@@ -29,17 +29,6 @@
 .todo-item {
   .todo-title {
     @include str-truncated(calc(100% - 174px));
-    overflow: visible;
-  }
-
-  .status-box {
-    margin: 0;
-    float: none;
-    display: inline-block;
-    font-weight: normal;
-    padding: 0 5px;
-    line-height: inherit;
-    font-size: 14px;
   }
 
   .todo-body {
@@ -87,11 +76,12 @@
 
 @media (max-width: $screen-xs-max) {
   .todo-item {
+    padding-left: $gl-padding;
+
     .todo-title {
       white-space: normal;
       overflow: visible;
       max-width: 100%;
-      margin-bottom: 10px;
     }
 
     .avatar {

app/assets/stylesheets/pages/tree.scss

@@ -15,23 +15,16 @@
     margin-bottom: 0;
 
     tr {
-      border-bottom: 1px solid $table-border-gray;
-      border-top: 1px solid $table-border-gray;
-
-      td, th {
+      > td, > th {
         line-height: 23px;
       }
 
       &:hover {
-        cursor: pointer;
-
         td {
-          background-color: $row-hover;
-          border-top: 1px solid $row-hover-border;
-          border-bottom: 1px solid $row-hover-border;
+          background: $row-hover;
         }
+        cursor: pointer;
       }
-
       &.selected {
         td {
           background: $gray-dark;

app/controllers/admin/abuse_reports_controller.rb

@@ -9,6 +9,6 @@ class Admin::AbuseReportsController < Admin::ApplicationController
     abuse_report.remove_user(deleted_by: current_user) if params[:remove_user]
     abuse_report.destroy
 
-    head :ok
+    render nothing: true
   end
 end

app/controllers/admin/application_settings_controller.rb

@@ -19,12 +19,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
     redirect_to admin_runners_path
   end
 
-  def reset_health_check_token
-    @application_setting.reset_health_check_access_token!
-    flash[:notice] = 'New health check access token has been generated!'
-    redirect_to :back
-  end
-
   def clear_repository_check_states
     RepositoryCheck::ClearWorker.perform_async
 
@@ -59,12 +53,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       end
     end
 
-    enabled_oauth_sign_in_sources = params[:application_setting].delete(:enabled_oauth_sign_in_sources)
-
-    params[:application_setting][:disabled_oauth_sign_in_sources] =
-      AuthHelper.button_based_providers.map(&:to_s) -
-      Array(enabled_oauth_sign_in_sources)
-
     params.require(:application_setting).permit(
       :default_projects_limit,
       :default_branch_protection,
@@ -106,11 +94,8 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       :email_author_in_body,
       :repository_checks_enabled,
       :metrics_packet_size,
-      :send_user_confirmation_email,
-      :container_registry_token_expire_delay,
       restricted_visibility_levels: [],
-      import_sources: [],
-      disabled_oauth_sign_in_sources: []
+      import_sources: []
     )
   end
 end

app/controllers/admin/broadcast_messages_controller.rb

@@ -32,7 +32,7 @@ class Admin::BroadcastMessagesController < Admin::ApplicationController
 
     respond_to do |format|
       format.html { redirect_back_or_default(default: { action: 'index' }) }
-      format.js { head :ok }
+      format.js { render nothing: true }
     end
   end
 

app/controllers/admin/health_check_controller.rb

@@ -1,5 +0,0 @@
-class Admin::HealthCheckController < Admin::ApplicationController
-  def show
-    @errors = HealthCheck::Utils.process_checks('standard')
-  end
-end

app/controllers/admin/keys_controller.rb

@@ -6,7 +6,7 @@ class Admin::KeysController < Admin::ApplicationController
 
     respond_to do |format|
       format.html
-      format.js { head :ok }
+      format.js { render nothing: true }
     end
   end
 

app/controllers/admin/runners_controller.rb

@@ -9,18 +9,23 @@ class Admin::RunnersController < Admin::ApplicationController
   end
 
   def show
-    assign_builds_and_projects
+    @builds = @runner.builds.order('id DESC').first(30)
+    @projects =
+      if params[:search].present?
+        ::Project.search(params[:search])
+      else
+        Project.all
+      end
+    @projects = @projects.where.not(id: @runner.projects.select(:id)) if @runner.projects.any?
+    @projects = @projects.page(params[:page]).per(30)
   end
 
   def update
-    if @runner.update_attributes(runner_params)
-      respond_to do |format|
-        format.js
-        format.html { redirect_to admin_runner_path(@runner) }
-      end
-    else
-      assign_builds_and_projects
-      render 'show'
+    @runner.update_attributes(runner_params)
+
+    respond_to do |format|
+      format.js
+      format.html { redirect_to admin_runner_path(@runner) }
     end
   end
 
@@ -53,18 +58,6 @@ class Admin::RunnersController < Admin::ApplicationController
   end
 
   def runner_params
-    params.require(:runner).permit(Ci::Runner::FORM_EDITABLE)
-  end
-
-  def assign_builds_and_projects
-    @builds = runner.builds.order('id DESC').first(30)
-    @projects =
-      if params[:search].present?
-        ::Project.search(params[:search])
-      else
-        Project.all
-      end
-    @projects = @projects.where.not(id: runner.projects.select(:id)) if runner.projects.any?
-    @projects = @projects.page(params[:page]).per(30)
+    params.require(:runner).permit(:token, :description, :tag_list, :active)
   end
 end

app/controllers/admin/spam_logs_controller.rb

@@ -11,7 +11,7 @@ class Admin::SpamLogsController < Admin::ApplicationController
       redirect_to admin_spam_logs_path, notice: "User #{spam_log.user.username} was successfully removed."
     else
       spam_log.destroy
-      head :ok
+      render nothing: true
     end
   end
 end

app/controllers/admin/users_controller.rb

@@ -119,7 +119,6 @@ class Admin::UsersController < Admin::ApplicationController
       user_params_with_pass.merge!(
         password: params[:user][:password],
         password_confirmation: params[:user][:password_confirmation],
-        password_expires_at: Time.now
       )
     end
 
@@ -154,7 +153,7 @@ class Admin::UsersController < Admin::ApplicationController
 
     respond_to do |format|
       format.html { redirect_back_or_admin_user(notice: "Successfully removed email.") }
-      format.js { head :ok }
+      format.js { render nothing: true }
     end
   end
 

app/controllers/application_controller.rb

@@ -176,7 +176,7 @@ class ApplicationController < ActionController::Base
   end
 
   def check_password_expiration
-    if current_user && current_user.password_expires_at && current_user.password_expires_at < Time.now && !current_user.ldap_user?
+    if current_user && current_user.password_expires_at && current_user.password_expires_at < Time.now  && !current_user.ldap_user?
       redirect_to new_profile_password_path and return
     end
   end
@@ -232,7 +232,7 @@ class ApplicationController < ActionController::Base
   end
 
   def configure_permitted_parameters
-    devise_parameter_sanitizer.permit(:sign_in, keys: [:username, :email, :password, :login, :remember_me, :otp_attempt])
+    devise_parameter_sanitizer.for(:sign_in) { |u| u.permit(:username, :email, :password, :login, :remember_me, :otp_attempt) }
   end
 
   def hexdigest(string)
@@ -263,7 +263,7 @@ class ApplicationController < ActionController::Base
       # internal repos where you are not a member. Enable this filter
       # or improve current implementation to filter only issues you
       # created or assigned or mentioned
-      # @filter_params[:authorized_only] = true
+      #@filter_params[:authorized_only] = true
     end
 
     @filter_params

app/controllers/autocomplete_controller.rb

@@ -31,24 +31,6 @@ class AutocompleteController < ApplicationController
     render json: @user, only: [:name, :username, :id], methods: [:avatar_url]
   end
 
-  def projects
-    project = Project.find_by_id(params[:project_id])
-
-    projects = current_user.authorized_projects
-    projects = projects.select do |project|
-      current_user.can?(:admin_issue, project)
-    end
-
-    no_project = {
-      id: 0,
-      name_with_namespace: 'No project',
-    }
-    projects.unshift(no_project)
-    projects.delete(project)
-
-    render json: projects.to_json(only: [:id, :name_with_namespace], methods: :name_with_namespace)
-  end
-
   private
 
   def find_users

app/controllers/concerns/creates_commit.rb

@@ -122,7 +122,7 @@ module CreatesCommit
       # Merge request from fork to this project
       @mr_source_project = @tree_edit_project
       @mr_target_project = @project
-      @mr_target_branch ||= @ref
+      @mr_target_branch  ||= @ref
     end
   end
 end

app/controllers/concerns/toggle_subscription_action.rb

@@ -6,7 +6,7 @@ module ToggleSubscriptionAction
 
     subscribable_resource.toggle_subscription(current_user)
 
-    head :ok
+    render nothing: true
   end
 
   private