Commits · 445edcfacc583ba613a4b865b104d7d7e1f7ec0f · Boxiang Sun / gitlab-ce

12 Aug, 2016 1 commit
- Remove unnecessary   in merge request versions dropdown · 445edcfa
  Dmitriy Zaporozhets authored Aug 12, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  445edcfa
09 Aug, 2016 1 commit
- Load merge request versions without loading whole diff from database · 28e33df4
  Dmitriy Zaporozhets authored Aug 09, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  28e33df4
08 Aug, 2016 1 commit
- Add MergeRequest#branch_merge_base_commit method · d99d5198
  Dmitriy Zaporozhets authored Aug 08, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d99d5198
03 Aug, 2016 3 commits
- Fix project id param for merge request version API · 08f5f897
  Dmitriy Zaporozhets authored Aug 03, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  08f5f897
- Update merge request versions API to match styleguide · 69096ad9
  Dmitriy Zaporozhets authored Aug 03, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  69096ad9
- Add API to list merge request diff versions · 9a5f4087
  Dmitriy Zaporozhets authored Aug 03, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9a5f4087
02 Aug, 2016 28 commits
- Fix merge request spec for update diff note · 159998a4
  Dmitriy Zaporozhets authored Aug 02, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  159998a4
- Build diff_refs for merge request if merge request diff does not exist · fc8d2fbc
  Dmitriy Zaporozhets authored Aug 02, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fc8d2fbc
- Fix creation and reload of the merge request diff · 7cb8ceb5
  Dmitriy Zaporozhets authored Aug 02, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7cb8ceb5
- Chnage the way how merge request diff is initialized and saved · 6515ec09
  Dmitriy Zaporozhets authored Aug 02, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6515ec09
- Change merge request diff creation from callback to part of the service · f8aeb8cd
  Dmitriy Zaporozhets authored Aug 01, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f8aeb8cd
- Add more tests to merge_request_diff and improve initialize · 3c1dca03
  Dmitriy Zaporozhets authored Jul 28, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3c1dca03
- Refactor MergeRequestDiff initialize method · 0e974b52
  Dmitriy Zaporozhets authored Jul 28, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0e974b52
- Reload merge request association reload when update code · b0a02384
  Dmitriy Zaporozhets authored Jul 28, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b0a02384
- Remove requirement for base_commit_sha to allow creation of merge requests for orphaned branches · 8e031ce3
  Dmitriy Zaporozhets authored Jul 28, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8e031ce3
- Add improvements to merge request versions · 5cad2d29
  Dmitriy Zaporozhets authored Jul 28, 2016
```
* show commits count in the merge request version dropdown
* initialize base/start commit sha for old merge request diffs from repo
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5cad2d29
- Ensure merge request is created with valid diff object · 964742f6
  Dmitriy Zaporozhets authored Jul 28, 2016
```
* Add merge_request_diff validation to merge_request model
* Improve initialize of merge_request_diff object
* Rename some merge_request_diff methods for clarity
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  964742f6
- Refactor MergeRequestDiff model · 988836bc
  Dmitriy Zaporozhets authored Jul 28, 2016
```
Since MergeRequestDiff is not about branches and current state of merge
request diff anymore I removed most of branch related method and added
validation for head/start/base commit sha. From this point
MergeRequestDiff is about saving diff between branches only once at moment of
creation. Once created MergeRequestDiff should not be changes. Because
of that we should not rely on changes in source/target branches when
read from MergeRequestDiff
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  988836bc
- Add feature test for merge request version · 5d5f2cf3
  Dmitriy Zaporozhets authored Jul 27, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5d5f2cf3
- Refactor merge request diff · 09fa0139
  Dmitriy Zaporozhets authored Jul 27, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  09fa0139
- Add small visual improvements to merge request version switch · 61902165
  Dmitriy Zaporozhets authored Jul 27, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  61902165
- Improve merge request version switcher · dbd58dc4
  Dmitriy Zaporozhets authored Jul 26, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  dbd58dc4
- Add ability to render different merge request versions · b8fef7eb
  Dmitriy Zaporozhets authored Jul 26, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b8fef7eb
- Improve merge request diff creation and update tests · 94ca25c9
  Dmitriy Zaporozhets authored Jul 25, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  94ca25c9
- Create merge request diff on merge request creation · ceff8106
  Dmitriy Zaporozhets authored Jul 25, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ceff8106
- Create new version of merge request diff on push instead of updating existing one · 2afcc9e9
  Dmitriy Zaporozhets authored Jul 25, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2afcc9e9
- Change merge request diff index to be not uniq · 2acb8a30
  Dmitriy Zaporozhets authored Jul 25, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2acb8a30
- Merge branch 'fix/import-export-note-attachments' into 'master' · 8e9b6019
  Rémy Coutable authored Aug 02, 2016
```
fix TODO comment

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20376

After some testing, I've found out this wasn't needed and attachments seemed to work fine for import/export between instances (omnibus & source).

See merge request !5617
```
  8e9b6019
- Merge branch 'handle-disabled-request-store' into 'master' · d3d4d9f8
  Yorick Peterse authored Aug 02, 2016
```
Only use RequestStore in ProjectTeam#max_member_access_for_users if it is active

See merge request !5604
```
  d3d4d9f8
- fix TODO comment [ci skip] · f611b7b3
  James Lopez authored Aug 02, 2016
  
  f611b7b3
- Merge branch 'relative-markdown-links' into 'master' · 632113e4
  Rémy Coutable authored Aug 02, 2016
```
Add support for relative links starting with ./ or / to RelativeLinkFilter

## What does this MR do?

- Allow explicit relative links in Markdown (starting with `./`).
- Allow absolute links (relative to the branch's root directory) in Markdown (starting with `/`).

## Why was this MR needed?

Those link types were not supported before.

## What are the relevant issue numbers?

fixes #19028

See merge request !5586
```
  632113e4
- Add support for relative links starting with ./ or / to RelativeLinkFilter (!5586) · 40da543f
  winniehell authored Aug 01, 2016
  
  40da543f
- Add failing tests for #19028 · 701e5ccb
  winniehell authored Aug 01, 2016
  
  701e5ccb
- Merge branch '8-11-guides' into 'master' · c009f620
  Robert Speicher authored Aug 02, 2016
```
Update installation guide for 8.11

[ci skip]

See merge request !5609
```
  c009f620
01 Aug, 2016 6 commits

Update installation guide for 8.11 · 6cee5190
Ruben Davila authored Aug 01, 2016

6cee5190
Update CHANGELOG for 8.10.3 · 957331bf
Robert Speicher authored Aug 01, 2016
```
[ci skip]
```
957331bf

Merge branch 'fix/request-profiler-error-when-unauthenticated' into 'master' · 27bd44a8

Douwe Maan authored Aug 01, 2016

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

## What does this MR do?
It fixes the error thrown when profiling a request unauthorized.

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

## Why was this MR needed?
It's a bug! :)

## What are the relevant issue numbers?
#20488

## 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 !5596

27bd44a8

Only use RequestStore in ProjectTeam#max_member_access_for_user if it is active · 99c02ed5
Stan Hu authored Aug 01, 2016

99c02ed5
Catch what warden might throw when profiling requests to re-throw it · 0720b9ce
Ahmad Sherif authored Aug 01, 2016
```
Closes #20488
```
0720b9ce

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

Douwe Maan authored Aug 01, 2016

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

0819461e