delta/gitlab/gitlab-ce.git, branch fix-external-issue-rendering

Fix broken spec in git_push_service_spec by stubbing an external issue tracker

2016-06-30T09:52:49+00:00

Handle external issues in IssueReferenceFilter

2016-06-30T09:52:44+00:00

IssueReferenceFilter will end up processing internal issue references
when a project uses an external issues tracker while still using
internal issue references (in the form of `#\d+`). This commit ensures
that these links are rendered as external issue links, regardless of
whether the project one currently views uses an internal or external
issues tracker.

Fixes gitlab-org/gitlab-ce#19036, gitlab-com/performance#16

Merge branch 'filter-fade-fix' into 'master'

2016-06-29T12:49:19+00:00


Removed fade when filtering results

## What does this MR do?

Removes the `opacity` change when filtering results seeing as we now do `Turbolinks.visit` it isn't required.

Best way to see issue - filter issues & then go back. Will still have opacity styling.

See merge request !4932

Merge branch '14669-bugzilla-integration' into 'master'

2016-06-29T12:37:38+00:00


Bugzilla Integration

## What does this MR do?
Adds Bugzilla as a project service for external issue tracking

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?
Provides a notable Bugzilla option for use as an external issue tracker.  Existing Custom Issue tracker can be used to setup Bugzilla but this makes it clear that Bugzilla is an option.

## What are the relevant issue numbers?
Closes #14669

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)


See merge request !4930

Merge branch 'fograckspace' into 'master'

2016-06-29T12:31:57+00:00


Add fog-rackspace microgem to support backups using rackspace provider

## What does this MR do?

Adds fog-rackspace gem to Gemfile.

## Why was this MR needed?

Because fog moved the rackspace provider to separate gem.

## What are the relevant issue numbers?

#19197

See merge request !4986

Merge branch '18663-avoid-extra-yaml-serializations' into 'master'

2016-06-29T12:20:31+00:00


Use update_columns to by_pass all the dirty code on active_record

See merge request !4985

Use update_columns to by_pass all the dirty code on active_record

2016-06-29T11:13:54+00:00

We think this is valid because we’re just storing new data that always will be valid

Merge branch 'make-max-member-access-faster' into 'master'

2016-06-29T10:53:59+00:00


Reduce overhead and optimize ProjectTeam#max_member_access performance

See merge request !4973

Reduce overhead and optimize ProjectTeam#max_member_access performance

2016-06-29T10:12:57+00:00

The previous implementation would load the entire team member list and their
respective attributes. Now we only search for the user's specific
access level.

In gitlab-com/operations#42, this reduces the overall overhead of rendering
the issue from 28% to 20%.

First step of optimizing #19273

Moved CHANGELOG entry up to help avoid future conflicts

2016-06-29T10:05:08+00:00

rebased with latest changes from master