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

..

ci

Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-project

2016-06-17 19:52:55 +08:00

concerns

Include user relationship when retrieving award_emoji

2016-06-15 06:50:12 +02:00

hooks

Merge branch 'hook-docs-behavior' into 'master'

2016-05-11 16:34:00 +00:00

members

UI and copywriting improvements

2016-06-14 13:18:14 +02:00

network

Merge branch 'style/enable-semicolon-rubocop-cop' into 'master'

2016-06-01 17:41:19 +00:00

project_services

Fix broken URI joining for teamcity_url with suffixes

2016-06-14 10:07:37 +02:00

.gitkeep

init commit

2011-10-09 00:36:38 +03:00

ability.rb

Merge branch 'environments-and-deployments' into 'master'

2016-06-15 13:48:09 +00:00

abuse_report.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

appearance.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

application_setting.rb

Allow custom text on 'almost there' page

2016-06-08 19:08:53 +01:00

audit_event.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

award_emoji.rb

Fix latests concerns

2016-05-18 08:47:15 -05:00

blob.rb

Fix Error 500 when viewing a blob with binary characters after the 1024-byte mark

2016-06-12 07:36:25 -07:00

broadcast_message.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

commit_range.rb

Don't modify arguments in CommitRange#initialize

2016-05-26 13:58:01 +02:00

commit_status.rb

Delegate to pipeline instead of commit

2016-06-03 13:34:38 +02:00

commit.rb

Remove projects inclusion in notes_with_associations to skip some unnecessary queries

2016-06-08 10:26:05 -04:00

deploy_key.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

deploy_keys_project.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

deployment.rb

Use validate and required for environment and project

2016-06-15 15:09:50 +02:00

email.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

environment.rb

Use validate and required for environment and project

2016-06-15 15:09:50 +02:00

event.rb

Reduce duplication and branching logic in EventsHelper

2016-05-16 14:52:04 -05:00

external_issue.rb

Merge branch 'master' into number_sign_for_external_issue_ref

2016-04-17 18:17:27 +02:00

forked_project_link.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

generic_commit_status.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

global_label.rb

Updates from last code review.

2016-03-06 23:07:19 -05:00

global_milestone.rb

Ruby fixes

2016-03-29 12:19:09 +01:00

group.rb

Turn Group#owners into a has_many association

2016-06-16 11:10:41 +02:00

identity.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

issue.rb

Use Issue.visible_to_user in Notes.search to avoid query duplication

2016-06-13 19:32:00 -03:00

key.rb

Add leading comment space cop

2016-05-31 19:33:46 -03:00

label_link.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

label.rb

Fix label order by priority on labels page

2016-06-07 14:01:30 +01:00

legacy_diff_note.rb

Incorportate feedback

2016-06-01 12:10:08 +02:00

lfs_object.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

lfs_objects_project.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

member.rb

UI and copywriting improvements

2016-06-14 13:18:14 +02:00

merge_request_diff.rb

Maintain commit order in MRs

2016-05-18 17:14:55 +01:00

merge_request.rb

Remove unused MergeRequest#gitlab_merge_status method

2016-06-10 18:42:03 +02:00

milestone.rb

Address Yorick's feedback

2016-05-18 23:45:25 -05:00

namespace.rb

Merge branch 'docker-registry' into docker-registry-view

2016-05-13 17:15:01 -05:00

note.rb

Award Emoji can't be awarded on system notes backend

2016-06-15 15:06:34 +02:00

notification_setting.rb

Remove notification level from user model

2016-06-10 10:58:13 -03:00

oauth_access_token.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

personal_snippet.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

project_group_link.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

project_import_data.rb

Upgrade attr_encrypted and encryptor

2016-05-30 13:51:21 -06:00

project_snippet.rb

Refactor Participable

2016-06-01 16:22:35 +02:00

project_team.rb

UI and copywriting improvements

2016-06-14 13:18:14 +02:00

project_wiki.rb

Codestyle changes

2016-05-31 11:24:58 -03:00

project.rb

Merge branch 'fix-project-find-with-namespace-order' into 'master'

2016-06-17 00:18:10 +00:00

protected_branch.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

release.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

repository.rb

Use Git cached counters on project show page

2016-06-16 17:14:35 +02:00

security_event.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

sent_notification.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

service.rb

Set inverse_of for Project/Services relation

2016-06-15 18:54:23 +02:00

snippet.rb

Remove projects inclusion in notes_with_associations to skip some unnecessary queries

2016-06-08 10:26:05 -04:00

spam_log.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

spam_report.rb

Support Akismet spam checking for creation of issues via API

2016-02-02 11:25:44 -02:00

subscription.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

todo.rb

Manually create todo for issuable

2016-06-14 08:36:07 +01:00

tree.rb

Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobs

2016-02-01 13:51:05 +01:00

u2f_registration.rb

Add a U2fRegistrations table/model.

2016-06-06 12:50:31 +05:30

user.rb

Add request access for groups

2016-06-14 13:07:26 +02:00

users_star_project.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

wiki_page.rb

add slack notifications for wiki pages

2016-04-20 08:25:40 +08:00