delta/gitlab/gitlab-ce.git, branch 24726-remove-across-gitlab

24726 Remove Across GitLab from side navigation

2016-12-01T21:45:14+00:00

Merge branch 'fix/github-importer' into 'master'

2016-12-01T18:22:24+00:00


Fix GitHub importer to import PR where source repo/fork was renamed/deleted

Closes #24594

See merge request !7865

Merge branch '25199-fix-broken-urls-in-help-page' into 'master'

2016-12-01T17:25:12+00:00


Fix URL rewritting in the Help section

Closes #25199

See merge request !7875

Merge branch 'shortcuts-issuable-fixture' into 'master'

2016-12-01T16:30:34+00:00


Replace static fixture for shortcuts_issuable_spec

## What does this MR do?

Replace `issuable.html.haml` for `shortcuts_issuable_spec.js` by already existing dynamically generated fixture.

## What are the relevant issue numbers?

#24753

See merge request !7685

Merge branch 'fix-optimistic-locking-for-destroy' into 'master'

2016-12-01T16:24:17+00:00


Make deleting with optimistic locking respect NULL

Make deleting with optimistic locking respect NULL

For now deleting with optimistic locking is broken when
lock_version is still NULL, because Rails would try to
delete with `lock_version = 0` while in the database
the column is still `NULL`.

The monkey patches would force Rails just pass whatever
in the column, and stop Rails from casting `NULL` into `0`
when the value is read from database.

Closes #24766

See merge request !7867

Merge branch '24669-merge-request-dashboard-page-takes-over-a-minute-to-load' into 'master'

2016-12-01T16:14:26+00:00


Resolve "Merge request dashboard page takes over a minute to load"

See merge request !7760

Merge branch 'rescue-from-redis-init-errors' into 'master'

2016-12-01T15:43:02+00:00


Gracefully recover from Redis connection failures in Sidekiq initializer

Precompiling assets and other Rake tasks would fail if Redis were not available in certain cases.

* Closes gitlab-org/gitlab-ce#25143
* Closes gitlab-org/omnibus-gitlab#1743

See merge request !7835

Fix URL rewritting in the Help section

2016-12-01T15:40:48+00:00

Signed-off-by: Rémy Coutable

Merge branch 'use-st-commits-where-possible' into 'master'

2016-12-01T15:23:30+00:00


Replace references to MergeRequestDiff#commits with st_commits when we care only about the number of commits

See merge request !7668

Gracefully recover from Redis connection failures in Sidekiq initializer

2016-12-01T14:24:59+00:00

* Closes gitlab-org/gitlab-ce#25143
* Closes gitlab-org/omnibus-gitlab#1743