diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-07-31 10:23:50 +0200 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-07-31 10:23:50 +0200 |
commit | 95f9d6d83bcb7a9f45601f828c34301e536fc195 (patch) | |
tree | ed5447c85eb35ac9b7a363dd5a83514578c2fb3e /changelogs/unreleased/feature-gpg-signed-commits.yml | |
parent | c92881c394a482bdb6d3f0f0a5f3cc95d5eed1fc (diff) | |
parent | 6fe736f2c927340ed8cf827080db781f7c8adcdf (diff) | |
download | gitlab-ce-95f9d6d83bcb7a9f45601f828c34301e536fc195.tar.gz |
Merge branch 'master' into issue-discussions-refactor
# Conflicts:
# app/controllers/concerns/notes_actions.rb
# spec/features/task_lists_spec.rb
# spec/support/features/issuable_slash_commands_shared_examples.rb
Diffstat (limited to 'changelogs/unreleased/feature-gpg-signed-commits.yml')
-rw-r--r-- | changelogs/unreleased/feature-gpg-signed-commits.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/feature-gpg-signed-commits.yml b/changelogs/unreleased/feature-gpg-signed-commits.yml new file mode 100644 index 00000000000..99bc5a309ef --- /dev/null +++ b/changelogs/unreleased/feature-gpg-signed-commits.yml @@ -0,0 +1,4 @@ +--- +title: GPG signed commits integration +merge_request: 9546 +author: Alexis Reigel |