Fatih Acet bb883387f9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables ...

# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/models/note.rb
#	db/schema.rb
#	spec/models/note_spec.rb

2016-05-18 13:05:53 -05:00

..

backend

Fix after column rename

2015-12-11 18:02:10 +01:00

badge

Fix specs

2016-04-11 23:32:55 +02:00

bitbucket_import

fix failing spec

2016-04-28 11:40:23 +02:00

ci/build/artifacts

Codestyle: make sure we have space around operators

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

diff

Show a notice for diffs that are too large

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

email

Only generate repository push email once

2016-05-11 09:16:01 +01:00

fogbugz_import

updated spec

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

gfm

Fix rubocop offenses in upload rewriter specs

2016-03-31 10:41:57 +02:00

github_import

Fix validation method for Gitlab::GithubImport::PullRequestFormatter

2016-05-13 17:55:43 -05:00

gitlab_import

Tag lib specs

2015-12-09 11:55:42 +01: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

ldap

Unblocks user when active_directory is disabled and it can be found

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

lfs

Codestyle: make sure we have space around operators

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

metrics

Add cache count metrics to rails cache

2016-05-15 19:47:41 +01:00

middleware

Revert "Revert "Merge branch 'support-go-subpackages' into 'master' ""

2016-03-12 21:05:23 +00:00

o_auth

Added default setting for external_providers

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

saml

Implemented suggested fixes

2016-04-06 18:12:25 -05:00

sherlock

Tag lib specs

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

sql

Tag lib specs

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

akismet_helper_spec.rb

Use ActionDispatch Remote IP for Akismet checking

2016-04-27 22:12:55 -07:00

asciidoc_spec.rb

Fix relative links in other markup formats

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

auth_spec.rb

Tag lib specs

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

award_emoji_spec.rb

Create table for award emoji

2016-05-06 10:47:11 +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

Fix undefined method postgresql? during migration

2016-02-15 14:13:47 -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

Add missing specs

2016-01-19 16:26:44 +01:00

import_url_spec.rb

more refactoring

2016-03-21 15:11:05 +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

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

Refactor and expose only Gitlab::UrlBuilder.build(record)

2016-04-13 16:07:04 +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

version_info_spec.rb

Tag lib specs

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

workhorse_spec.rb

First version of "git archive" headers

2016-02-02 14:09:55 +01:00