Grzegorz Bizon 2846f95d2a Merge branch 'master' into refactor/ci-config-move-global-entries ...

* master: (352 commits)
  Display last commit of deleted branch in push events (!4699)
  add changelog
  add missing attribute to attr_encrypted so it is fully backwards-compatible
  Add "GitLab team members only" to diagram link
  doc: note that .gitattributes uses default branch
  use the conf lexer so we have highlighted comments
  first draft of docs
  support cgi style options, such as erb?parent=json
  move the path alias to a more appropriate location
  make #custom_language private
  appease rubocop
  add an alias for Snippet#path
  appease rubocop
  check the tag so that an instance will pass too
  fix the spec, using project.change_head
  Revert "bump the master sha for gitlab-test!9"
  bump the master sha for gitlab-test!9
  add custom highlighting via .gitattributes
  Rename Licenses API to License Templates API
  Check for conflict with wiki projects when creating a new project.
  ...

2016-06-28 14:38:05 +02:00

..

backend

Test Grack::Auth via a request spec

2016-03-23 14:09:52 +01:00

badge

Fix tests failures

2016-06-07 10:25:57 +02:00

bitbucket_import

Make Omniauth providers specs to not modify global configuration

2016-06-08 16:50:05 +02:00

ci

Validate interface only with CI node validator

2016-06-27 14:16:57 +02:00

database

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

diff

Show a notice for diffs that are too large

2016-03-18 12:30:46 +01:00

email

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

fogbugz_import

updated spec

2016-03-31 09:22:28 +02:00

gfm

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

github_import

Merge branch 'gh-disable-webhooks'

2016-06-07 13:06:43 +02:00

gitlab_import

Make Omniauth providers specs to not modify global configuration

2016-06-08 16:50:05 +02:00

gitorious_import

Tag lib specs

2015-12-09 11:55:42 +01:00

google_code_import

refactored code based on feedback plus fixed a couple of other issues

2016-03-28 16:35:03 +02:00

import_export

fixed pipeline notes issue

2016-06-23 12:29:11 +02:00

ldap

Unblocks user when active_directory is disabled and it can be found

2016-04-05 16:34:31 -03:00

lfs

Add test coverage to LFS fetching

2016-06-21 11:26:44 +02:00

metrics

Add Sidekiq queue duration to transaction metrics.

2016-06-23 13:09:52 +02:00

middleware

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

o_auth

Added default setting for external_providers

2016-04-11 10:16:42 -05:00

saml

Fix subsequent SAML sign ins

2016-06-22 16:10:55 -05:00

sanitizers

Improved SVG sanitizer specs to include smoke tests for clean.

2016-06-12 21:05:58 -04:00

sherlock

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

sql

Tag lib specs

2015-12-09 11:55:42 +01:00

template

Refactor Gitlab::Gitignores

2016-06-20 14:48:28 -05:00

akismet_helper_spec.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

asciidoc_spec.rb

Fix relative links in other markup formats

2016-02-12 17:20:59 +01:00

auth_spec.rb

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

award_emoji_spec.rb

Merge branch 'master' into awardables

2016-05-30 18:54:08 +02:00

blame_spec.rb

Move blame group logic to dedicated class

2016-01-28 14:49:21 +01:00

build_data_builder_spec.rb

Suppress e-mails on failed builds if allow_failure is set

2016-01-07 10:45:39 -08:00

closing_issue_extractor_spec.rb

Remove dumb debug statement and add many tests.

2016-04-07 08:47:29 -04:00

color_schemes_spec.rb

Tag lib specs

2015-12-09 11:55:42 +01:00

database_spec.rb

Improve Issuable.order_labels_priority

2016-06-06 11:59:49 -05:00

exclusive_lease_spec.rb

Improve test descriptions

2016-03-10 12:55:06 +01:00

git_access_spec.rb

Tag lib specs

2015-12-09 11:55:42 +01:00

git_access_wiki_spec.rb

Tag lib specs

2015-12-09 11:55:42 +01:00

highlight_spec.rb

support cgi style options, such as erb?parent=json

2016-06-27 14:17:49 -07:00

incoming_email_spec.rb

Improve and finish the fallback to the In-Reply-To and References header for the reply-by-email feature

2016-03-25 13:05:15 +01:00

key_fingerprint_spec.rb

Tag lib specs

2015-12-09 11:55:42 +01:00

lazy_spec.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

markup_helper_spec.rb

Tag lib specs

2015-12-09 11:55:42 +01:00

metrics_spec.rb

Fix setting of "action" for Grape transactions

2016-04-20 22:42:52 +02:00

note_data_builder_spec.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

popen_spec.rb

Tag lib specs

2015-12-09 11:55:42 +01:00

project_search_results_spec.rb

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

push_data_builder_spec.rb

Using single builder for push and tag events

2016-04-19 11:00:30 +02:00

reference_extractor_spec.rb

Remove JiraIssue model and replace references with ExternalIssue

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

regex_spec.rb

Allow "@" in file names and path

2016-02-01 16:20:49 +01:00

search_results_spec.rb

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

snippet_search_results_spec.rb

Refactor Gitlab::SnippetSearchResults

2016-03-11 15:25:22 -05:00

themes_spec.rb

Tag lib specs

2015-12-09 11:55:42 +01:00

upgrader_spec.rb

Tag lib specs

2015-12-09 11:55:42 +01:00

uploads_transfer_spec.rb

Tag lib specs

2015-12-09 11:55:42 +01:00

url_builder_spec.rb

Revert "Merge branch 'wiki-fix' into 'master' "

2016-05-10 10:57:48 +02:00

url_sanitizer_spec.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

version_info_spec.rb

Tag lib specs

2015-12-09 11:55:42 +01:00

workhorse_spec.rb

Add workhorse controller and API helpers

2016-06-06 13:16:30 +02:00