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

UI and copywriting improvements

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

hooks

Codestyle: make sure we have space around operators

2016-05-13 04:46:56 -03:00

members

UI and copywriting improvements

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

project_services

Remove JiraIssue model and replace references with ExternalIssue

2016-06-16 01:25:18 +03:00

ability_spec.rb

Refactor Participable

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

abuse_report_spec.rb

Remove the annotate gem and delete old annotations

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

appearance_spec.rb

Branded login page also in CE

2016-02-26 15:50:51 +01:00

application_setting_spec.rb

stub Devise.omniauth_providers to return GitHub even if the gitlab.yml has no omniauth provider enabled

2016-05-12 13:44:46 +03:00

award_emoji_spec.rb

Incorportate feedback

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

blob_spec.rb

Add a Blob model that wraps Gitlab::Git::Blob

2016-02-18 22:45:30 -05:00

broadcast_message_spec.rb

Remove the annotate gem and delete old annotations

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

build_spec.rb

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

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

commit_range_spec.rb

Fix note validation spec failures

2016-06-01 10:31:46 -07:00

commit_spec.rb

Refactor Participable

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

commit_status_spec.rb

Rename all [ci_]commit to [ci_]pipeline in specs and features

2016-06-03 16:22:26 +02:00

deploy_key_spec.rb

Remove the annotate gem and delete old annotations

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

deploy_keys_project_spec.rb

Remove the annotate gem and delete old annotations

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

deployment_spec.rb

Add specs for models and services

2016-06-14 13:51:12 +02:00

email_spec.rb

Remove the annotate gem and delete old annotations

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

environment_spec.rb

Add specs for models and services

2016-06-14 13:51:12 +02:00

event_spec.rb

Project members with guest role can't access confidential issues

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

external_issue_spec.rb

Hide number sign for string prefixed external issues

2016-04-12 10:01:52 +02:00

forked_project_link_spec.rb

Remove the annotate gem and delete old annotations

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

generic_commit_status_spec.rb

Rename all [ci_]commit to [ci_]pipeline in specs and features

2016-06-03 16:22:26 +02:00

global_milestone_spec.rb

Fix Error 500 when global milestones have slashes

2015-12-22 13:15:32 -08:00

group_spec.rb

Turn Group#owners into a has_many association

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

identity_spec.rb

Remove the annotate gem and delete old annotations

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

issue_spec.rb

Update specs. Add CHANGELOG entry

2016-06-02 09:25:40 -04:00

key_spec.rb

Remove the annotate gem and delete old annotations

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

label_link_spec.rb

Remove the annotate gem and delete old annotations

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

label_spec.rb

Merge branch 'remove-annotate-gem' into 'master'

2016-05-10 09:08:30 +00:00

legacy_diff_note_spec.rb

Improve note factory

2016-05-29 15:03:00 -04:00

member_spec.rb

UI and copywriting improvements

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

merge_request_spec.rb

Rename ci_commit -> pipeline

2016-06-10 14:41:38 +02:00

milestone_spec.rb

Return a relation with Postgres

2016-05-16 10:25:24 +01:00

namespace_spec.rb

Improve test coverage

2016-05-16 18:03:55 -05:00

note_spec.rb

Project members with guest role can't access confidential issues

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

notification_setting_spec.rb

Remove notification level from user model

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

project_group_link_spec.rb

Bring ProjectGroupLink model and migrations from EE

2016-03-11 17:47:05 +01:00

project_security_spec.rb

Fix some specs

2016-03-20 22:55:08 +01:00

project_snippet_spec.rb

Remove the annotate gem and delete old annotations

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

project_spec.rb

Fixed ordering in Project.find_with_namespace

2016-06-16 13:04:59 +02:00

project_team_spec.rb

UI and copywriting improvements

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

project_wiki_spec.rb

Fix hook data for Wiki Page event

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

protected_branch_spec.rb

Remove the annotate gem and delete old annotations

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

release_spec.rb

Remove the annotate gem and delete old annotations

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

repository_spec.rb

Remove main_language and tests

2016-05-25 17:16:42 -04:00

service_spec.rb

Cache the presence of an issue_tracker at project level

2016-06-10 15:41:56 +02:00

snippet_spec.rb

Refactor Participable

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

spam_log_spec.rb

Refactor Admin::SpamLogsController to block user before destroying

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

todo_spec.rb

Remove the annotate gem and delete old annotations

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

tree_spec.rb

Prioritize previewable over plain README files

2016-01-25 11:27:07 -02:00

user_spec.rb

Add a blank line between before and it:

2016-06-07 22:34:09 +08:00

wiki_page_spec.rb

Fix old version warning when viewing wiki latest version via version_id

2016-01-29 14:17:00 -02:00