Commit a3e1d7cf authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of github.com:gitlabhq/gitlabhq

parents 91fa82d1 e56fd693
Please view this file on the master branch, on stable branches it's out of date. 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) v 7.14.0 (unreleased)
- Update default robots.txt rules to disallow crawling of irrelevant pages (Ben Bodenmiller) - 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 - Fix redirection after sign in when using auto_sign_in_with_provider
......
7.14.0.pre 8.0.0.pre
...@@ -156,6 +156,7 @@ Tweet about the RC release: ...@@ -156,6 +156,7 @@ Tweet about the RC release:
1. Also check the CI changelog 1. Also check the CI changelog
1. Add a proposed tweet text to the blog post WIP MR description. 1. Add a proposed tweet text to the blog post WIP MR description.
1. Create a WIP MR for the blog post 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. 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. Decide with core team who will be the MVP user.
1. Create WIP MR for adding MVP to MVP page on website 1. Create WIP MR for adding MVP to MVP page on website
......
...@@ -221,6 +221,7 @@ module API ...@@ -221,6 +221,7 @@ module API
expose(:line) { |note| note.diff_new_line } expose(:line) { |note| note.diff_new_line }
expose(:line_type) { |note| note.diff_line_type } expose(:line_type) { |note| note.diff_line_type }
expose :author, using: Entities::UserBasic expose :author, using: Entities::UserBasic
expose :created_at
end end
class Event < Grape::Entity class Event < Grape::Entity
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment