delta/gitlab/gitlab-ce.git/spec/models, branch new-diff-notes gitlab.com: gitlab-org/gitlab-ce.git Make `DiffNote#update_position` private 2016-07-07T20:13:55+00:00 Douwe Maan douwe@selenight.nl 2016-07-07T20:13:55+00:00 6dd71888b310d2615d74ea129431fc6c9791b6b7 






Update test with new factory name
2016-07-07T19:57:38+00:00

Douwe Maan
douwe@selenight.nl

2016-07-07T19:57:38+00:00

70a64f6a57a2b4fd2874b0db03f4fe1f0c3794f8












Add tests for MergeRequest#reload_diff
2016-07-06T22:51:01+00:00

Douwe Maan
douwe@selenight.nl

2016-07-01T21:53:46+00:00

5ffb848ee6ecb66d4ff1b2d2bb21968f44f33f7e












Add tests for DiffNote
2016-07-06T22:51:01+00:00

Douwe Maan
douwe@selenight.nl

2016-07-01T20:53:02+00:00

3dff2867b7f57a783897c6fd18257f85ff53307e












Add DiffNote model
2016-07-06T22:50:59+00:00

Douwe Maan
douwe@selenight.nl

2016-06-20T17:20:39+00:00

2f30d00432e9727581e814062ea6117e1946a981












Rename MergeRequest methods that return commits or shas to be more clear and consistent
2016-07-06T22:50:58+00:00

Douwe Maan
douwe@selenight.nl

2016-06-20T16:48:04+00:00

6ce25e7b4caa9e94de74378729178c7060d640b2












Merge branch '19092-fix-event-for-legacydiffnote-not-considered-note' into 'master'

2016-07-06T15:25:54+00:00

Douwe Maan
douwe@gitlab.com

2016-07-06T15:25:54+00:00

b5b17d00eddef8011e3a71d5f4ad46c6d40cbf8a


Fix diff comments not showing up in activity feed

## What does this MR do?

It fixes the detection of note events to check for `Note` and `LegacyDiffNote`.

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

No? /cc @DouweM (since I believe you introduced `LegacyDiffNote`

## Why was this MR needed?

To fix #19092.

## What are the relevant issue numbers?

Fixes #19092.

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] 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 !5069





Fix diff comments not showing up in activity feed

## What does this MR do?

It fixes the detection of note events to check for `Note` and `LegacyDiffNote`.

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

No? /cc @DouweM (since I believe you introduced `LegacyDiffNote`

## Why was this MR needed?

To fix #19092.

## What are the relevant issue numbers?

Fixes #19092.

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] 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 !5069






Merge branch 'gh-labels' into 'master'

2016-07-06T15:11:20+00:00

Robert Speicher
robert@gitlab.com

2016-07-06T15:11:20+00:00

3df58f149979f98af9b52c9e08dd63d17344d1df


Allow `?`, or `&` for label names

Closes #18727 

See merge request !4724





Allow `?`, or `&` for label names

Closes #18727 

See merge request !4724






Merge branch 'fix/import-url-validator' into 'master'

2016-07-06T15:06:01+00:00

Robert Speicher
robert@gitlab.com

2016-07-06T15:06:01+00:00

be018ba8c4f61babfea494a3946df9931d476a8a


Fixing URL validation for import_url on projects

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

This MR fixes problems related to bypassing `import_url` validation on projects. This makes sure the URL is properly validated so we don't enter crap and fail while running workers that handle this URL.

It also adds a migration to fix current invalid `import_url`s

See merge request !4753





Fixing URL validation for import_url on projects

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

This MR fixes problems related to bypassing `import_url` validation on projects. This makes sure the URL is properly validated so we don't enter crap and fail while running workers that handle this URL.

It also adds a migration to fix current invalid `import_url`s

See merge request !4753






Use a more future-proof check for Note/LegacyDiffNote
2016-07-06T08:08:42+00:00

Rémy Coutable
remy@rymai.me

2016-07-06T08:08:42+00:00

19e15ae244776d4d148e6a65a1443f94bb59398c

Signed-off-by: Rémy Coutable <remy@rymai.me>





Signed-off-by: Rémy Coutable <remy@rymai.me>