delta/gitlab/gitlab-ce.git/app/services, branch tests-for-diff-notes

Merge branch 'expiration-date-on-memberships' into 'master'

2016-08-19T17:08:03+00:00


Expiration date on memberships

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17495

See merge request !5876

Fix notification_service argument error of declined invitation emails

2016-08-19T11:18:13+00:00

Removing unused access_level parameter.

Bug introduced here -> 6d103a2f4764441b1650ba6d790732056c9a8516
access_level parameter wasn’t needed since -> 88c2639356e6e4b4b05d96584768e07a9ce4b048

Merge branch 'master' into 'expiration-date-on-memberships'

2016-08-19T10:58:01+00:00

# Conflicts:
#   db/schema.rb

Merge branch 'diff-line-comment-vuejs' into 'master'

2016-08-19T02:24:34+00:00


Diff line comments resolve

## What does this MR do?

Diff line comments can be resolved.

Part of #10325 

To do:

- [x] Backend (@DouweM)
  - [x] Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13319326. Will be made easier by https://gitlab.com/gitlab-org/gitlab-ce/issues/17237#note_13370331
  - [x] System note when all discussions are resolved
  - [x] Notification when all discussions are resolved
  - [x] Write unit tests
  - [x] Look at resolve time https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13912743 - Fixed by 4a13aa9
- [x] Frontend (@iamphill)
  - [x] Fix bugs
  - [x] Write more feature tests 
- [x] Frontend (@connorshea)
  - [x] Address frontend feedback
  - [x] Feature specs for Jump feature
  - [x] Documentation
  - [x] Add Vue.js in a standard way

See merge request !5022

Merge branch 'master' into expiration-date-on-memberships

2016-08-18T21:50:28+00:00

Merge branch 'master' into diff-line-comment-vuejs

2016-08-18T21:43:26+00:00

# Conflicts:
#	db/schema.rb

Merge branch '4273-slash-commands' into 'master'

2016-08-18T21:41:16+00:00

Support slash commands in issues / MR description & comments

See merge request !5021

Ensure last group owner isn't removed on expiry

2016-08-18T20:32:42+00:00

Fix behavior around commands with optional arguments

2016-08-18T19:29:49+00:00

Fix behavior of label_ids and add/remove_label_ids

2016-08-18T19:29:49+00:00