diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-07-10 12:05:06 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-07-10 18:11:19 +0100 |
| commit | 135ead1d83d774a1bc0ed3ed947896b64d1755aa (patch) | |
| tree | 7625ab36e07b70af088d5584bc5fd082b857d77f /app/services/notes/update_service.rb | |
| parent | ac71675d3096ac9317ea230a408d69029bdadc73 (diff) | |
| parent | f3edbafe6310ca1584002b8a351048a3fb3309e3 (diff) | |
| download | gitlab-ce-135ead1d83d774a1bc0ed3ed947896b64d1755aa.tar.gz | |
Merge branch 'master' into 48237-toggle-file-comments
* master: (38 commits)
Update bitbucket.md to fix typo and small grammar touchups.
Update time_helper.rb to fix output for exact minutes.
Document update for GitLab Pages users.
Support manually stopping any environment from the UI
Fix link to frontend in handbook
Shorten CHANGELOG filename to avoid breaking ecryptfs users
Replace 48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace.yml
Fix mountComponent helper path in docs
Fix #48537 - Update avatar only via the projects API
Add additional headline for Adding SSH keys to GitLab
Request to be a proofreader.
Fix specs
Fix search bar text input alignment
Fix API docs on unauthenticated projects return
Adds with_projects optional parameter to /groups/:id API endpoint
Docs: make it clear that you need a completely separate domain for Pages
Document that we don't want to wait in tests
Removes unused store in diffs mr refactor Removes double export for actions in diffs module in mr refactor
Remove useless return
Use latest gitlab-styles
...
Diffstat (limited to 'app/services/notes/update_service.rb')
| -rw-r--r-- | app/services/notes/update_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/notes/update_service.rb b/app/services/notes/update_service.rb index 75fd08ea0a9..e16ef398184 100644 --- a/app/services/notes/update_service.rb +++ b/app/services/notes/update_service.rb @@ -5,7 +5,7 @@ module Notes old_mentioned_users = note.mentioned_users.to_a - note.update_attributes(params.merge(updated_by: current_user)) + note.update(params.merge(updated_by: current_user)) note.create_new_cross_references!(current_user) if note.previous_changes.include?('note') |