diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-19 09:47:33 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-19 09:47:33 +0200 |
commit | a3e1d7cf9312ba543cf860dbc3e895b4839aba59 (patch) | |
tree | 9d48bc9e24149cd7b17de7aec57f19e16e89baa3 | |
parent | 91fa82d11f6346fecbcf4ec3754aa22cb2aad502 (diff) | |
parent | e56fd693eef2b8b24b136509b685746bc5416d06 (diff) | |
download | gitlab-ce-a3e1d7cf9312ba543cf860dbc3e895b4839aba59.tar.gz |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r-- | CHANGELOG | 2 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | doc/release/monthly.md | 1 | ||||
-rw-r--r-- | lib/api/entities.rb | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 43302425f14..21a935206c2 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 @@ -1 +1 @@ -7.14.0.pre +8.0.0.pre diff --git a/doc/release/monthly.md b/doc/release/monthly.md index b10e7420675..12d6a84b68e 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 09d231af41b..1f9dd6bc152 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 |