Rémy CoutableandRobert Speicher 6e8864132e Merge branch 'fix/import-export-events' into 'master' ...

Fixing problems with events for import/export

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19202

A couple of issues related to target being missing in exported `Events` (as being polymorphic and not have `ActiveRecord` relationships is a bit more tricky than normal models) plus as the export was in JSON, the import retrieves hashed fields as stringified hashes and not symbolized - so fixed that as well, which was the cause of https://gitlab.com/gitlab-org/gitlab-ce/issues/19202

Also fixed / refactored tests
:simpl
Import/Export Version has been bumped to 0.1.1 as theses changes to events won't work very well with old exports - forcing users to generate a new export in the new version.

See merge request !4987
(cherry picked from commit c368cb605b)

2016-07-06 12:43:23 -04:00

..

auth

Fix tests

2016-06-06 17:40:26 +02:00

backend

Merge branch 'ci-lfs-fetch' into 'master'

2016-06-21 11:50:51 -04:00

badge

Extend build status badge, add html/markdown methods

2016-04-06 19:56:34 +02:00

bitbucket_import

Enable Performance/RangeInclude cop and fix single offense

2016-05-23 13:10:42 -04:00

ci

Merge branch 'validate-only-except-regexp' into 'master'

2016-06-17 14:15:14 -04:00

database

Merge branch 'update-column-in-batches-where' into 'master'

2016-06-17 14:14:25 -04:00

diff

Add leading comment space cop

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

email

Merge branch 'limit-email-diff-size' into 'master'

2016-06-20 10:14:20 -04:00

fogbugz_import

create import data in service

2016-05-10 11:10:51 +02:00

gfm

Remove reduntant move_to_store override

2016-03-30 12:50:19 +02:00

git

Fire update hook from GitLab

2015-11-30 18:36:34 +02:00

github_import

Merge branch 'gh-webhooks' into 'master'

2016-06-17 22:10:08 -04:00

gitlab_import

Merge branch 'feature/project-export' into 'master'

2016-06-17 14:18:15 -04:00

gitorious_import

Fixed Rubocop offenses

2015-12-15 00:53:52 -02:00

google_code_import

create import data in service

2016-05-10 11:10:51 +02:00

graphs

Refactor commits graph

2014-09-29 12:05:17 +03:00

import_export

Merge branch 'fix/import-export-events' into 'master'

2016-07-06 12:43:23 -04:00

ldap

Enable Style/EmptyLinesAroundAccessModifier rubocop cop

2016-06-03 10:34:20 +02:00

lfs

Merge branch 'ci-lfs-fetch' into 'master'

2016-06-21 11:50:51 -04:00

markdown

Prevent circular reference error in Banzai

2016-01-14 11:30:28 +01:00

metrics

Merge branch 'performance-clock-adjustments' into 'master'

2016-06-28 16:46:07 -04:00

middleware

Enable Style/Semicolon rubocop style cop

2016-06-01 08:45:14 +02:00

o_auth

Merge branch '19312-confidential-issue' into 'master'

2016-06-30 14:40:58 -04:00

saml

Moved find_or_create_ldap_user method to parent class and added logging.

2016-06-07 11:21:20 -05:00

sanitizers

Refactored SVG sanitizer

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

sherlock

Added total query time to Sherlock

2015-11-24 10:57:21 +01:00

sidekiq_middleware

Merge branch 'fix/sidekiq-mem-killer-debug' into 'master'

2016-06-28 16:47:38 -04:00

sql

Fix UNION syntax for MySQL

2015-11-18 13:31:18 +01:00

template

Merge branch '17521-gitlab-ci-yml-templates' into 'master'

2016-06-21 12:17:47 -04:00

access.rb

Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-executed' into 'master'

2016-06-22 15:50:04 +02:00

akismet_helper.rb

Use ActionDispatch Remote IP for Akismet checking

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

app_logger.rb

Dry admin logs.

2014-10-06 00:14:46 +02:00

asciidoc.rb

Fix relative links in other markup formats

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

auth.rb

Improve Gitlab::Auth method names

2016-06-10 14:51:16 +02:00

award_emoji.rb

Incorportate feedback

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

bitbucket_import.rb

Fix specs.

2015-02-24 15:07:24 +01:00

blame.rb

Load all blob data when highlighting content for git-blame.

2016-02-11 18:30:05 -05:00

build_data_builder.rb

Try to use pipeline where applicable

2016-06-03 13:09:49 +02:00

closing_issue_extractor.rb

Allow invalid URLs in closing pattern

2015-12-02 18:48:39 +01:00

color_schemes.rb

Add count to Themes and ColorSchemes

2015-08-26 11:30:38 -07:00

config_helper.rb

Make app works with strong params

2014-06-26 23:24:17 +03:00

contributions_calendar.rb

Group the contributing calendar by day

2016-05-16 12:22:17 +01:00

contributor.rb

Move lib/gitlab/contributors to its correct path

2015-04-09 15:34:55 -04:00

current_settings.rb

Merge branch 'feature/project-export' into 'master'

2016-06-17 14:18:15 -04:00

database.rb

Merge branch 'fix-out-of-bounds-markdown-refs' into 'master'

2016-06-20 10:16:00 -04:00

devise_failure.rb

Use a custom Devise failure app to handle unauthenticated .zip requests

2016-03-08 23:49:30 -05:00

exclusive_lease.rb

clean up ExclusiveLease

2016-04-13 13:12:05 +03:00

force_push_check.rb

Replace all usages of git command with configurable binary path

2015-11-03 17:11:09 -05:00

git_access_status.rb

Rubocop enabled for: Use spaces inside hash literal braces

2015-02-02 20:36:54 -08:00

git_access_wiki.rb

Rename abilities to correspond contoller/model action names

2015-06-26 15:55:56 +02:00

git_access.rb

Improve multiple branch push performance by memoizing permission checking

2016-05-09 01:17:14 -07:00

git_logger.rb

Dry admin logs.

2014-10-06 00:14:46 +02:00

git_post_receive.rb

Back-porting PostReceive refactor made for EE 🍺

2016-03-17 00:24:12 -03:00

git_ref_validator.rb

Replace all usages of git command with configurable binary path

2015-11-03 17:11:09 -05:00

git.rb

Freeze the expression instead of the literal

2016-02-05 08:39:44 +01:00

gitorious_import.rb

Define GITORIOUS_HOST only once

2015-06-10 01:31:27 -04:00

gl_id.rb

Get rid of Gitlab::ShellEnv

2016-06-15 14:59:37 +02:00

gon_helper.rb

Move award_menu_url variable into gon object.

2016-06-09 03:37:40 +03:00

highlight.rb

Properly handle bigger files

2016-04-28 21:28:39 +02:00

identifier.rb

Use project.commit convenience method.

2015-04-24 12:29:36 +02:00

import_export.rb

Merge branch 'fix/import-export-events' into 'master'

2016-07-06 12:43:23 -04:00

import_formatter.rb

Fix bug where only the first 15 Bitbucket issues would be imported.

2015-09-01 08:50:20 -07:00

import_sources.rb

Merge branch 'feature/project-export' into 'master'

2016-06-17 14:18:15 -04:00

incoming_email.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

issues_labels.rb

remove feature label

2014-10-31 17:22:16 -07:00

key_fingerprint.rb

Enable Lint/AmbiguousOperator rubocop cop

2016-06-03 10:59:43 +02:00

lazy.rb

Added Gitlab::Lazy

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

logger.rb

Dry admin logs.

2014-10-06 00:14:46 +02:00

markup_helper.rb

Enable Rubocop Casecmp Performance Cop.

2016-05-10 18:23:25 -06:00

metrics.rb

Fix setting of "action" for Grape transactions

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

note_data_builder.rb

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

2016-04-13 16:07:04 +02:00

other_markup.rb

Fix relative links in other markup formats

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

popen.rb

Style/RedundantReturn enabled

2015-03-24 18:35:57 -07:00

production_logger.rb

Dry admin logs.

2014-10-06 00:14:46 +02:00

project_search_results.rb

Confidential notes data leak

2016-05-31 21:32:53 +03:00

push_data_builder.rb

API support for the 'since' and 'until' operators on commit requests

2016-04-29 09:26:52 +02:00

recaptcha.rb

reCAPTCHA is configurable through Admin Settings, no reload needed.

2015-12-28 18:50:29 -02:00

redis.rb

Codestyle: make sure we have space around operators

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

reference_extractor.rb

Split Markdown rendering & reference gathering

2016-05-26 17:14:00 +02:00

regex.rb

Validate environment name with regex

2016-06-14 13:04:21 +02:00

repository_check_logger.rb

Rename almost all the things

2016-04-06 13:47:05 +02:00

routing.rb

Added & use Gitlab::Routing for URL helpers

2016-04-01 11:13:48 +02:00

search_results.rb

Restrict access to confidential issues on search results

2016-03-17 20:55:59 -03:00

seeder.rb

Replace colorize gem with rainbow.

2016-06-03 10:37:09 -06:00

sherlock.rb

Only load rblineprof when actually needed

2015-11-09 15:54:13 +01:00

sidekiq_logger.rb

Dry admin logs.

2014-10-06 00:14:46 +02:00

snippet_search_results.rb

Refactor Gitlab::SnippetSearchResults

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

themes.rb

Add count to Themes and ColorSchemes

2015-08-26 11:30:38 -07:00

upgrader.rb

Replace all usages of git command with configurable binary path

2015-11-03 17:11:09 -05:00

uploads_transfer.rb

Fix: Images cannot show when projects' path was changed

2015-10-14 18:50:35 +03:00

url_builder.rb

Use the relative url prefix for links in Wiki

2016-05-13 22:42:07 +02:00

url_sanitizer.rb

fix changelog and merge

2016-05-23 09:11:21 +02:00

user_access.rb

Move method to User

2016-03-10 12:37:14 +01:00

utils.rb

add common method to force utf8 and force oauth properties to be utf8

2015-05-03 00:43:46 +03:00

version_info.rb

Fix abort gitlab:app:check

2013-06-06 10:10:51 +09:00

visibility_level.rb

Fix forks creation when visibility level is restricted

2016-05-25 10:57:00 -04:00

workhorse.rb

Get rid of Gitlab::ShellEnv

2016-06-15 14:59:37 +02:00