Revert "Fix merge conflicts - squashed commit"

This reverts commit 3e991230.

Revert "Fix merge conflicts - squashed commit"
721014c9 · James Lopez · 3e991230 · 721014c9 · 721014c9 · 721014c9
Commit 721014c9 authored 8 years ago by James Lopez
--- a/.gitignore
+++ b/.gitignore
@@ -4,46 +4,46 @@
 .bundle
 .chef
 .directory
-/.envrc
+.envrc
-/.gitlab_shell_secret
+.gitlab_shell_secret
 .idea
-/.rbenv-version
+.rbenv-version
 .rbx/
-/.ruby-gemset
+.ruby-gemset
-/.ruby-version
+.ruby-version
-/.rvmrc
+.rvmrc
 .sass-cache/
-/.secret
+.secret
-/.vagrant
+.vagrant
-/.byebug_history
+.byebug_history
-/Vagrantfile
+Vagrantfile
-/backups/*
+backups/*
-/config/aws.yml
+config/aws.yml
-/config/database.yml
+config/database.yml
-/config/gitlab.yml
+config/gitlab.yml
-/config/gitlab_ci.yml
+config/gitlab_ci.yml
-/config/initializers/rack_attack.rb
+config/initializers/rack_attack.rb
-/config/initializers/smtp_settings.rb
+config/initializers/smtp_settings.rb
-/config/initializers/relative_url.rb
+config/initializers/relative_url.rb
-/config/resque.yml
+config/resque.yml
-/config/unicorn.rb
+config/unicorn.rb
-/config/secrets.yml
+config/secrets.yml
-/config/sidekiq.yml
+config/sidekiq.yml
-/coverage/*
+coverage/*
-/db/*.sqlite3
+db/*.sqlite3
-/db/*.sqlite3-journal
+db/*.sqlite3-journal
-/db/data.yml
+db/data.yml
-/doc/code/*
+doc/code/*
-/dump.rdb
+dump.rdb
-/log/*.log*
+log/*.log*
-/nohup.out
+nohup.out
-/public/assets/
+public/assets/
-/public/uploads.*
+public/uploads.*
-/public/uploads/
+public/uploads/
-/shared/artifacts/
+shared/artifacts/
-/rails_best_practices_output.html
+rails_best_practices_output.html
 /tags
-/tmp/*
+tmp/
-/vendor/bundle/*
+vendor/bundle/*
-/builds/*
+builds/*
-/shared/*
+shared/*
--- a/.rubocop.yml
+++ b/.rubocop.yml
-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
+  Enabled: false
-# Checks for a line break before the first parameter in a multi-line method
-# parameter definition.
-Style/FirstMethodParameterLineBreak:
-  Enabled: true
 # 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: false
-  Enabled: true
 # 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: false
-  Enabled: true
 # 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: false
-  Enabled: true
 # 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:
+  Enabled: false
-    intern: to_sym
-  Enabled: true
 # 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: false
-  Enabled: true
 # 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
--- a/CHANGELOG
+++ b/CHANGELOG
 Please view this file on the master branch, on stable branches it's out of date.
-v 8.9.0 (unreleased)
+v 8.8.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
  - 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 unintentional filtering bug in issues 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)
 v 8.7.4
-  - Links for Redmine issue references are generated correctly again !4048 (Benedikt Huss)
+  - Fix always showing build notification message when switching between merge requests
-  - 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
 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

--- a/CONTRIBUTING.md
+++ b/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]

--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
-3.0.0
+2.7.2
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
-0.7.4
+0.7.1
--- a/Gemfile
+++ b/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', '~> 0.38.0', require: false
-  gem 'rubocop-rspec', '~> 1.5.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'
--- a/Gemfile.lock
+++ b/Gemfile.lock
 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)
+    activerecord-deprecated_finders (1.0.4)
-      actionpack (>= 4.0, < 5.1)
+    activerecord-session_store (0.1.2)
-      activerecord (>= 4.0, < 5.1)
+      actionpack (>= 4.0.0, < 5)
-      multi_json (~> 1.11, >= 1.11.2)
+      activerecord (>= 4.0.0, < 5)
-      rack (>= 1.5.2, < 3)
+      railties (>= 4.0.0, < 5)
-      railties (>= 4.0, < 5.1)
    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)
+    attr_encrypted (1.3.4)
-      encryptor (~> 3.0.0)
+      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.10)
-    bcrypt (3.1.11)
    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)
+      attr_encrypted (~> 1.3.2)
-      devise (~> 4.0)
+      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-powerdns (0.1.1)
      fog-core (~> 1.27)
-    fog-openstack (0.1.6)
+      fog-json (~> 1.0)
-      fog-core (>= 1.39)
+      fog-xml (~> 0.1)
-      fog-json (>= 1.0)
+    fog-profitbricks (0.0.5)
-      ipaddress (>= 0.8)
+      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)
+    rubocop (0.38.0)
-      parser (>= 2.3.1.0, < 3.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)
+    state_machines-activemodel (0.3.0)
-      activemodel (>= 4.1, < 5.1)
+      activemodel (~> 4.1)
      state_machines (>= 0.4.0)
-    state_machines-activerecord (0.4.0)
+    state_machines-activerecord (0.3.0)
-      activerecord (>= 4.1, < 5.1)
+      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)
+  ace-rails-ap (~> 2.0.1)
-  activerecord-session_store (~> 1.0.0)
+  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 (~> 3.5.4)
-  devise-two-factor (~> 3.0.0)
+  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 (~> 1.36.0)
-  fog-core (~> 1.40)
-  fog-google (~> 0.3)
-  fog-local (~> 0.3)
-  fog-openstack (~> 0.1)
  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.16.3)
-  kaminari (~> 0.17.0)
  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 (~> 0.38.0)
-  rubocop-rspec (~> 1.5.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
--- a/README.md
+++ b/README.md
 # 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

--- a/VERSION
+++ b/VERSION
-8.9.0-pre
+8.8.0-pre
--- a/app/assets/images/ci/arch.jpg
+++ b/app/assets/images/ci/arch.jpg
--- a/app/assets/images/ci/favicon.ico
+++ b/app/assets/images/ci/favicon.ico
--- a/app/assets/images/ci/loader.gif
+++ b/app/assets/images/ci/loader.gif
--- a/app/assets/images/ci/no_avatar.png
+++ b/app/assets/images/ci/no_avatar.png
--- a/app/assets/images/ci/rails.png
+++ b/app/assets/images/ci/rails.png
--- a/app/assets/images/ci/service_sample.png
+++ b/app/assets/images/ci/service_sample.png
--- a/app/assets/images/mailers/gitlab_header_logo.png
+++ b/app/assets/images/mailers/gitlab_header_logo.png
--- a/app/assets/images/mailers/gitlab_tanuki_2x.png
+++ b/app/assets/images/mailers/gitlab_tanuki_2x.png
--- a/app/assets/javascripts/api.js.coffee
+++ b/app/assets/javascripts/api.js.coffee
 @Api =
-  groupsPath: "/api/:version/groups.json"
+  groups_path: "/api/:version/groups.json"
-  groupPath: "/api/:version/groups/:id.json"
+  group_path: "/api/:version/groups/:id.json"
-  namespacesPath: "/api/:version/namespaces.json"
+  namespaces_path: "/api/:version/namespaces.json"
-  groupProjectsPath: "/api/:version/groups/:id/projects.json"
+  group_projects_path: "/api/:version/groups/:id/projects.json"
-  projectsPath: "/api/:version/projects.json"
+  projects_path: "/api/:version/projects.json"
-  labelsPath: "/api/:version/projects/:id/labels"
+  labels_path: "/api/:version/projects/:id/labels"
-  licensePath: "/api/:version/licenses/:key"
+  license_path: "/api/:version/licenses/:key"
-  gitignorePath: "/api/:version/gitignores/: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)
--- a/app/assets/javascripts/application.js.coffee
+++ b/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_tree .
-#= require_directory ./blob
-#= require_directory ./ci
-#= require_directory ./commit
-#= require_directory ./extensions
-#= require_directory ./lib
-#= require_directory .
 #= 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()