Lin Jen-Shin 5174d6c146 Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-project ... * upstream/master: (337 commits) Update CHANGELOG for !4659 Center the header logo for all Devise emails Add previews for all customized Devise emails Customize the Devise `unlock_instructions` email Customize the Devise `reset_password_instructions` email Customize the Devise `password_change` emails Use gitlab-git 10.2.0 Use Git cached counters on project show page Fix indentation scss-lint errors Added title attribute to enties in tree view Closes #18353 Banzai::Filter::ExternalLinkFilter use XPath Reduce queries in IssueReferenceFilter Use gitlab_git 10.1.4 Fixed ordering in Project.find_with_namespace Fix images in emails Banzai::Filter::UploadLinkFilter use XPath Turn Group#owners into a has_many association Make project_id nullable CHANGELOG [ci skip] CHANGELOG [ci skip] ...		2016-06-17 19:52:55 +08:00
..
api	Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-project	2016-06-17 19:52:55 +08:00
ci/api	Improve tests	2016-06-13 16:05:23 +02:00
git_http_spec.rb	Fix spec description typo	2016-06-14 16:41:17 +01:00
jwt_controller_spec.rb	Improve Gitlab::Auth method names	2016-06-10 14:51:16 +02:00