Lin Jen-Shin f673f1e3bd Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-build-name ... * upstream/master: (109 commits) Update CHANGELOG for 8.10.6, 8.9.7, and 8.8.8 Updated Akismet documentation Add hover state to todos (!5361) Load issues and merge requests templates from repository Backport EE assertions in protected branch related specs. Revert "Merge branch '19957-write-tests-for-adding-comments-for-different-line-types-in-diff' into 'master'" Fix a missed `before_action` for `AutocompleteController`. Backport `AutocompleteController#load_project` from EE!581. Fix API::BranchesSpec. Fix failing tests relating to backporting ee!581. Revert unrelevant changes Fix the protected branches factory. Improve EE compatibility with protected branch access levels. Move the "update" portion of the protected branch view into a partial. Don't select an access level if already selected. Backport changes from gitlab-org/gitlab-ee!581 to CE. Further refactor and syntax fixes. Upgrade httpclient gem from 2.7.0.1 to 2.8.2. Make rubocop happy Make rubocop happy ...		2016-08-17 13:40:18 +08:00
..
fixtures	Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-build-name	2016-08-17 13:40:18 +08:00
migrate	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into pipeline-hooks-without-slack	2016-08-16 21:17:15 +01:00
schema.rb	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into pipeline-hooks-without-slack	2016-08-16 21:17:15 +01:00
seeds.rb	init commit	2011-10-09 00:36:38 +03:00