delta/gitlab/gitlab-ce.git/config/initializers, branch task_list_refactor

rspec_profiling: Discover the correct branch name in GitLab CI

2017-02-10T15:34:23+00:00

Merge branch 'remove-sidekiq-backup-ar-threads' into 'master'

2017-02-06T19:24:46+00:00


Don't use backup AR connections for Sidekiq

Closes #27713

See merge request !9001

Don't use backup AR connections for Sidekiq

2017-02-06T15:35:41+00:00

Adding two extra connections does nothing other than increasing the
number of idle database connections. Given Sidekiq uses N threads it can
never use more than N AR connections at a time, thus we don't need more.

The initializer mentioned the Sidekiq upgrade guide stating this was
required.  This is false, the Sidekiq upgrade guide states this is
necessary for Redis and not ActiveRecord.

On GitLab.com this resulted in a reduction of about 80-100 PostgreSQL
connections.

Fixes #27713

Merge branch 'master' into 'jej-pages-to-ce'

2017-02-06T15:12:27+00:00

# Conflicts:
#   db/schema.rb

Merge branch 'master' into go-go-gadget-webpack

2017-02-03T19:17:03+00:00

* master: (181 commits)
  Fixed adding to list bug
  Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index
  Fixed modal lists dropdown not updating when list is deleted
  Fixed remove btn error after creating new issue in list
  Removed duplicated test
  Removed Masonry, instead uses groups of data
  Uses mixins for repeated functions
  Fixed up specs
  Props use objects with required & type values
  Removes labels instead of closing issue when clicking remove button
  Fixed JS lint errors
  Fixed issue card spec
  Added webkit CSS properties
  Fixed bug with empty state showing after search Fixed users href path being incorrect
  Fixed bug where 2 un-selected issues would stay on selected tab
  Fixed DB schema Changed how components are added in objects
  Added remove button
  Add optional id property to the issue schema
  Fixed issue link href
  Disabled add issues button if no lists exist
  ...

Merge branch 'master' into jej-pages-picked-from-ee

2017-02-03T17:25:26+00:00

PlantUML support for Markdown

2017-02-02T23:49:48+00:00

Allow rendering of PlantUML diagrams in Markdown documents using fenced blocks:

    ```plantuml
    Bob -> Sara : Hello
    Sara -> Bob : Go away
    ```

Closes: #4048

DRY with Gitlab.config.webpack.dev_server references

2017-02-02T20:07:33+00:00

disable webpack proxy in rspec environment due to conflicts with webmock gem

2017-02-02T16:46:47+00:00

Don't require lib/gitlab/request_profiler/middleware.rb in config/initializers/request_profiler.rb

2017-02-02T16:22:10+00:00

Signed-off-by: Rémy Coutable