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
..
application_controller.rb	Project#show on projects pending deletion will 404	2016-05-28 03:14:43 -07:00
artifacts_controller.rb	Test controllers if they allow to keep artifacts	2016-06-13 11:07:23 +01:00
avatars_controller.rb	Add workhorse controller and API helpers	2016-06-06 13:16:30 +02:00
badges_controller.rb
blame_controller.rb
blob_controller.rb
branches_controller.rb	Update tests to match new Code tab logic	2016-06-03 10:13:40 +03:00
builds_controller.rb	Remove keep_artifacts from BuildsController	2016-06-13 11:03:30 +01:00
commit_controller.rb	Added initial version of deployments	2016-06-10 23:36:54 +02:00
commits_controller.rb
compare_controller.rb
container_registry_controller.rb	Verify if registry is enabled in registry	2016-05-18 12:28:48 -05:00
deploy_keys_controller.rb
environments_controller.rb	Improve forms and specs	2016-06-15 12:07:06 +02:00
find_file_controller.rb	Enable Style/EndOfLine Rubocop style cop	2016-05-30 10:35:37 +02:00
forks_controller.rb
git_http_controller.rb	Improve Gitlab::Auth method names	2016-06-10 14:51:16 +02:00
graphs_controller.rb
group_links_controller.rb
hooks_controller.rb	Add Admin UI to enable Wiki Page events webhook in projects	2016-05-30 16:12:50 -03:00
imports_controller.rb
issues_controller.rb	Moved todo creation over to project todos controller	2016-06-14 08:36:07 +01:00
labels_controller.rb	add :set_priorities to :authorize_admin_labels!	2016-06-06 11:59:49 -05:00
merge_requests_controller.rb	Rename ci_commit to pipeline	2016-06-15 19:17:55 +02:00
milestones_controller.rb	Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage'	2016-05-18 12:48:23 -05:00
network_controller.rb
notes_controller.rb	Backend awardables on comments	2016-06-06 11:03:39 +02:00
notification_settings_controller.rb
pipelines_controller.rb	Make retry action on pipeline to save a user	2016-06-14 13:04:10 +02:00
project_members_controller.rb	UI and copywriting improvements	2016-06-14 13:18:14 +02:00
protected_branches_controller.rb
raw_controller.rb	Add workhorse controller and API helpers	2016-06-06 13:16:30 +02:00
refs_controller.rb
releases_controller.rb
repositories_controller.rb	Add workhorse controller and API helpers	2016-06-06 13:16:30 +02:00
runner_projects_controller.rb	Fix typo. It's ivar and the column was called locked	2016-06-15 17:29:07 +08:00
runners_controller.rb	Rename specific_for to available_for:	2016-06-14 16:07:57 +08:00
services_controller.rb
snippets_controller.rb
tags_controller.rb
todos_controller.rb	Returns created todos to control rather than re-query	2016-06-14 08:36:07 +01:00
tree_controller.rb
triggers_controller.rb
uploads_controller.rb
variables_controller.rb
wikis_controller.rb	Forbid scripting for wiki files	2016-06-14 11:28:58 +01:00