diff --git a/CHANGELOG b/CHANGELOG index 43302425f14b73c54a0404dc338a73a92d59caa6..21a935206c2ed2071a899171686e8e0f014d5a30 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. +v 8.0.0 (unreleased) + v 7.14.0 (unreleased) - Update default robots.txt rules to disallow crawling of irrelevant pages (Ben Bodenmiller) - Fix redirection after sign in when using auto_sign_in_with_provider diff --git a/VERSION b/VERSION index da8322eb293f8f754dd0e64a7f9cbaf9fcf8a1d1..939cbc3ea745c36481e91417ddd41ee4d7c21774 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.14.0.pre +8.0.0.pre diff --git a/doc/release/monthly.md b/doc/release/monthly.md index b10e7420675d67477e7247dd4b0b18f52c004fe4..12d6a84b68e5ec4ac7c62174a50beddf6f7e06be 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -156,6 +156,7 @@ Tweet about the RC release: 1. Also check the CI changelog 1. Add a proposed tweet text to the blog post WIP MR description. 1. Create a WIP MR for the blog post +1. Make sure merge request title starts with `WIP` so it can not be accidently merged until ready. 1. Ask Dmitriy (or a team member with OS X) to add screenshots to the WIP MR. 1. Decide with core team who will be the MVP user. 1. Create WIP MR for adding MVP to MVP page on website diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 09d231af41b75ce4c947dad0c6c9985085d22697..1f9dd6bc152a6c1bda336462234e6c10893654b6 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -221,6 +221,7 @@ module API expose(:line) { |note| note.diff_new_line } expose(:line_type) { |note| note.diff_line_type } expose :author, using: Entities::UserBasic + expose :created_at end class Event < Grape::Entity