delta/gitlab/gitlab-ce.git/spec/lib, branch koding-setting-api

Merge branch 'lfs-ssh-authorization-fix' into 'master'

2016-09-28T18:13:34+00:00


Do not regenerate the `lfs_token` every time `git-lfs-authenticate` is called

## What does this MR do?

 Do not regenerate the `lfs_token` every time `git-lfs-authenticate` is called, instead return the saved token if one is present.

This was causing a lot of 401s, leading to 403s, as state in #22527

As it turns out, when pushing a lot of LFS objects, the LFS client was calling `git-lfs-authenticate` in the middle of the request again. This caused the `lfs_token` to be regenerated. The problem lies in that the LFS client was not aware of this change, and was still using the old token. This caused all subsequent requests to fail with a 401 error.

Since HTTP Auth is protected by Rack Attack, this 401s where immediately flagged and resulted in the IP of the user being banned. 

With this change, GitLab returns the value stored in Redis, if one is present, thus if the LFS client calls `git-lfs-authenticate` again during the request, the auth header will remain unchanged, allowing all subsequent requests to continue without issues.

## What are the relevant issue numbers?

Fixes #22527

cc @SeanPackham @jacobvosmaer-gitlab

See merge request !6551

Handle LFS token creation and retrieval in the same method, and in the same Redis connection.

2016-09-28T17:13:48+00:00

Reset expiry time of token, if token is retrieved again before it expires.

Log LDAP lookup errors and don't swallow unrelated exceptions

2016-09-28T05:44:58+00:00

Signed-off-by: Roger Meier

Import all GitHub comments after importing issues and PRs

2016-09-27T18:45:07+00:00

Speed up label-applying process for GitHub importing

2016-09-27T18:45:07+00:00

* No need to re-fetch issues from GH to read their labels, the labels
  are already there from the index request.
* No need to look up labels on the database for every application, so we
  cache them.

Process each page of GitHub resources instead of concating them then processing

2016-09-27T18:45:07+00:00

This should avoid having large memory growth when importing GitHub repos
with lots of resources.

fix model order in import/export config and 1to1 relation issue. Added relevant specs.

2016-09-27T12:56:33+00:00

added more specs

2016-09-26T07:49:05+00:00

Fixes issue with rails reserved keyword type exporting/importing services. Also fixed CustomIssueTrackerService title setter and added relevant specs.

2016-09-26T07:49:05+00:00

Merge branch '22229-use-base-sha-when-downloading-merge-requests' into 'master'

2016-09-25T10:30:37+00:00


Use base SHA for patches and diffs

## What does this MR do?

Switch from using 'start SHA' to 'base SHA' for patches and diffs

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

## Why was this MR needed?

Makes the downloaded patches and diffs on the merge request page match the frontend-rendered "changes" in these scenarios:

* Unpatched gitlab-workhorse, downloading patchsets of open MRs (https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/68)
* Unpatched gitlab-workhorse, downloading diffs of open and merged MRs
* Patched gitlab-workhorse, downloading patchsets of merged merge requests

## What are the relevant issue numbers?

Closes #22229

See merge request !6435