delta/gitlab/gitlab-ce.git/lib, branch update-gitlab-shell-in-tests

Update the gitlab-shell version in the tmp/tests directory to the right version

2016-08-03T18:39:19+00:00

Previously the gitlab-shell version would never be updated if the directory
existed via the `gitlab:shell:install` Rake task. This could lead to
incompatibility issues or random errors.

Merge branch 'fix-downtime-check-compare-with-branch' into 'master'

2016-08-02T10:36:30+00:00


Always compare with FETCH_HEAD in downtime_check

See merge request !5619

fix TODO comment [ci skip]

2016-08-02T10:05:05+00:00

Always compare with FETCH_HEAD in downtime_check

2016-08-02T09:57:14+00:00

This ensures this CI step works properly even when doing a shallow
clone.

Add support for relative links starting with ./ or / to RelativeLinkFilter (!5586)

2016-08-02T01:52:24+00:00

Catch what warden might throw when profiling requests to re-throw it

2016-08-01T20:10:04+00:00

Closes #20488

Merge branch 'fix/request-profiler-middleware-error-on-reload' into 'master'

2016-08-01T20:05:10+00:00


Fix RequestProfiler::Middleware error when code is reloaded in development

## What does this MR do?
It explicitly requires `Gitlab::RequestProfiler::Middleware` before inserting it in the stack instead of autoloading it.

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

## Why was this MR needed?
It fixes #20452

## What are the relevant issue numbers?
#20452 

## Screenshots (if relevant)
N/A

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- [ ] ~~API support added~~
- ~~Tests~~
  - [ ] ~~Added for this feature/bug~~
  - [ ] ~~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 !5593

Merge branch 'fix/use-fewer-queries-for-ci-charts' into 'master'

2016-08-01T19:57:27+00:00


Use fewer queries for CI charts

## What does this MR do?
It reduces number of queries sent for aggregating counts for CI graphs.

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

## Why was this MR needed?
For this project (gitlab-ce), loading `/graphs/master/ci` is so slow it times out eventually. I did a quick benchmarking on production and found that it can take 72.5 seconds to only load the controller action variables (there are queries done from the view, didn't look into those). This MR reduces the time to about 2.5 seconds.

Extra improvement could be done by introducing an index on `gl_project_id` and `created_at` for `ci_builds` table, but I can't confirm that right  now.

## What are the relevant issue numbers?
#20262 

## Screenshots (if relevant)
N/A

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- ~~[ ] API support added~~
- ~~Tests~~
  - ~~[ ] 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 !5502

Merge branch 'fix/importing-io-timing-issue' into 'master'

2016-08-01T13:18:39+00:00


Fix timing problems running imports on production

Fixes https://gitlab.com/gitlab-com/infrastructure/issues/151

I've found out that in staging, the imported file is not copied fully by the time sidekiq runs the job, this should hopefully fix it. (Tested against staging).

See merge request !5523

Merge branch '20473-rails-queue-duration' into 'master'

2016-08-01T13:00:19+00:00


Gitlab::Metrics.current_transaction needs to be public for RailsQueueDuration

See merge request !5592