James Lopez ad68bc63b5 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import ...

# Conflicts:
#	app/models/project.rb
#	db/schema.rb
#	lib/gitlab/import_export/import_export_reader.rb

2016-06-13 12:43:25 +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

Improve Ci config loader by changing method signature

2016-06-07 12:53:46 +02:00

database

change add_concurrent_index function arguments

2016-06-06 13:06:21 -03: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

Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import

2016-06-13 12:43:25 +02:00

ldap

Unblocks user when active_directory is disabled and it can be found

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

lfs

Revert "Fix merge conflicts - squashed commit"

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

metrics

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +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

Syntax fixes and better logging around the ldap_person method.

2016-06-08 18:09:43 -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

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

Changes after more review from Rémy

2016-06-03 14:57:34 +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

gitignore_spec.rb

Revert "Fix merge conflicts - squashed commit"

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

highlight_spec.rb

Add missing specs

2016-01-19 16:26:44 +01: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

Restrict access to confidential issues on search results

2016-03-17 20:55:59 -03: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

Update reference unfolder according to recent ability changes

2016-03-19 18:58:52 +01:00

regex_spec.rb

Allow "@" in file names and path

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

search_results_spec.rb

Restrict access to confidential issues on search results

2016-03-17 20:55:59 -03: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