Dmitriy Zaporozhets 28e13634dc Merge branch 'improve/mr_diff' ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: features/steps/project/project_fork.rb features/steps/project/project_forked_merge_requests.rb features/steps/project/project_issue_tracker.rb features/steps/project/project_markdown_render.rb features/steps/shared/project.rb		2014-01-23 14:38:23 +02:00
..
20110913200833_devise_create_users.rb	fix devise migrations issue	2012-07-06 20:46:26 +05:00
20110913204141_create_projects.rb	init commit	2011-10-09 00:36:38 +03:00
20110914221600_create_users_projects.rb	init commit	2011-10-09 00:36:38 +03:00
20110915205627_add_private_flag_to_project.rb	init commit	2011-10-09 00:36:38 +03:00
20110915213352_create_keys.rb	init commit	2011-10-09 00:36:38 +03:00
20110916123731_add_name_to_user.rb	init commit	2011-10-09 00:36:38 +03:00
20110916162511_add_key_title_to_key.rb	init commit	2011-10-09 00:36:38 +03:00
20110917212932_add_identifier_to_key.rb	init commit	2011-10-09 00:36:38 +03:00
20110921192501_create_issues.rb	init commit	2011-10-09 00:36:38 +03:00
20110922110156_add_code_to_project.rb	init commit	2011-10-09 00:36:38 +03:00
20110923211333_add_status_to_issue.rb	init commit	2011-10-09 00:36:38 +03:00
20110924214549_create_rails_admin_histories_table.rb	init commit	2011-10-09 00:36:38 +03:00
20110924215658_add_admin_field_to_user.rb	init commit	2011-10-09 00:36:38 +03:00
20110926082616_remove_admin.rb	init commit	2011-10-09 00:36:38 +03:00
20110927130352_create_notes.rb	init commit	2011-10-09 00:36:38 +03:00
20110928140106_add_project_id_for_note.rb	init commit	2011-10-09 00:36:38 +03:00
20110928142747_change_noteable_id_for_note.rb	init commit	2011-10-09 00:36:38 +03:00
20110928161328_add_attachment_to_note.rb	init commit	2011-10-09 00:36:38 +03:00
20111005193700_add_allow_repo_creation_for_user.rb	init commit	2011-10-09 00:36:38 +03:00
20111009101738_add_ownerto_project.rb	Issue #82 - Add owner to project	2011-10-09 04:05:31 -07:00
20111009110913_add_projects_limit_to_user.rb	Issue #83 - Project limit	2011-10-09 11:15:01 -07:00
20111009111204_remove_allow_create_repo_from_user.rb	Issue #83 - Project limit	2011-10-09 11:15:01 -07:00
20111015154310_add_position_to_issues.rb	icon for handler of sortable	2011-10-15 20:41:38 +03:00
20111016183422_create_snippets.rb	snippets are ready	2011-10-17 00:07:10 +03:00
20111016193417_add_content_type_to_snippets.rb	snippets are ready	2011-10-17 00:07:10 +03:00
20111016195506_add_file_name_to_snippets.rb	snippets are ready	2011-10-17 00:07:10 +03:00
20111019212429_add_social_to_user.rb	extended user profile with social fields	2011-10-20 01:34:05 +03:00
20111021101550_change_social_fields_in_users.rb	corrected last migration	2011-10-22 14:08:03 +03:00
20111025134235_add_high_label_to_issue.rb	Add critical status to issues	2011-10-25 07:34:02 +03:00
20111027051828_add_expires_at_to_snippets.rb	add expires_at column to snippets	2011-10-27 10:20:45 +05:00
20111027142641_change_note_note_to_text.rb	Fixed a bug in the bundle exec rake db:migrate RAILS_ENV=production that causes the rake to fail and the system not properly install the default user and password.	2012-04-30 11:33:00 -03:00
20111027152724_issue_conten_to_note.rb	clean up whitespace from project	2011-11-15 12:34:30 +04:00
20111101222453_acts_as_taggable_on_migration.rb	integrate tags plugins	2011-11-04 09:44:43 +02:00
20111111093150_remove_content_from_issues.rb	remove content column from issues	2011-11-11 13:35:02 +04:00
20111115063954_add_authentication_token_to_users.rb	add auth token for users	2011-11-15 11:08:05 +04:00
20111124115339_add_extra_field_to_issue.rb	ability to attach branch to issue	2011-11-24 08:08:20 -05:00
20111127155345_create_merge_requests.rb	merge request entity	2011-11-28 09:39:43 +02:00
20111206213842_add_advanced_rights_to_team_member.rb	repo & project access separated. critical gitolite bugfix	2011-12-07 01:27:07 +02:00
20111206222316_migrate_to_new_rights.rb	repo & project access separated. critical gitolite bugfix	2011-12-07 01:27:07 +02:00
20111207211728_add_default_branch_to_project.rb	default_branch for project & fixed project destroy	2011-12-07 23:56:57 +02:00
20111214091851_create_web_hooks.rb	Added web hooks functionality	2011-12-14 17:38:52 +01:00
20111220190817_add_coloscheme_option_to_user.rb	Design tab for profile. Colorscheme as db value	2011-12-20 22:47:09 +02:00
20111231111825_add_project_id_to_key.rb	DeployKey moved to Key model	2011-12-31 16:24:10 +02:00
20120110180749_add_line_number_to_note.rb	per line comments display	2012-01-10 22:08:46 +02:00
20120119202326_add_indexes.rb	add db indexes	2012-01-19 22:54:22 +02:00
20120121122616_fix_noteable_id.rb	removed broken migration	2012-01-22 20:52:06 +02:00
20120206170141_add_modularity_fields_to_project.rb	Issues, MR, Wall can be enabled/disabled per project	2012-02-06 19:40:32 +02:00
20120215182305_create_protected_branches.rb	ProtectedBranches model, Master permission for repo\n Allow push to protected branch for masters only	2012-02-15 22:02:33 +02:00
20120216085842_move_to_roles_permissions.rb	Fixed mistype in permissions, Fixed migration	2012-02-16 09:04:56 +02:00
20120216215008_create_wikis.rb	wiki base sceleton	2012-02-19 19:50:13 +02:00
20120219130957_add_slug_to_wiki.rb	wiki base sceleton	2012-02-19 19:50:13 +02:00
20120219140810_add_wiki_enabled_to_project.rb	wiki base sceleton	2012-02-19 19:50:13 +02:00
20120219193300_add_user_to_wiki.rb	Wiki: history	2012-02-19 21:52:05 +02:00
20120228130210_create_events.rb	Observe issue, merge request, note creation - create event	2012-02-28 16:01:14 +02:00
20120228134252_add_action_to_event.rb	Observe issue, merge request, note creation - create event	2012-02-28 16:01:14 +02:00
20120301185805_add_theme_to_user.rb	design tab improved. Themes added	2012-03-01 21:23:50 +02:00
20120307095918_add_author_id_to_event.rb	Events improved. Open/close issue, merge request events displayed	2012-03-07 00:13:43 -08:00
20120315111711_add_commits_diff_store_to_merge_request.rb	Persist Merge Request diff. Auto merge request close on push	2012-03-15 00:57:43 +02:00
20120315132931_add_merged_to_merge_request.rb	Fixed migration, test for MR	2012-03-15 19:39:03 +02:00
20120317095543_add_description_to_issues.rb	db migrate file	2012-03-17 01:17:37 -03:00
20120323221339_add_bio_field_to_user.rb	Improved profile & team member show	2012-03-24 01:01:36 +02:00
20120329170745_add_automerge_to_merge_request.rb	Better merge handling. show if MR can be accepted or not	2012-03-30 08:05:04 +03:00
20120405211750_increase_mr_text_column_size.rb	Fix mysql issue fix broken diff for Merge Request	2012-04-06 00:22:48 +03:00
20120408180246_create_milestones.rb	Milestone basic scaffold	2012-04-09 00:28:58 +03:00
20120408181910_add_milestone_id_to_issue.rb	Milestone basic scaffold	2012-04-09 00:28:58 +03:00
20120413135904_add_blocked_field_to_user.rb	Ability to block user	2012-04-13 08:12:34 +03:00
20120627145613_remove_critical_from_issue.rb	Remove critical status from Issue. Move sort instead	2012-06-27 21:30:35 +03:00
20120706065612_add_lockable_to_users.rb	enable lockable strategy for users	2012-07-06 00:05:31 -07:00
20120712080407_add_type_to_web_hook.rb	Refactoring of hook functionality & bootsrap system hooks	2012-07-19 00:25:10 +03:00
20120729131232_add_extern_auth_provider_to_users.rb	Change identification of users with extern auth provider (LDAP)	2012-07-29 16:15:52 +02:00
20120905043334_set_default_branch_default_to_nil.rb	Add SetDefaultBranchDefaultToNil migration	2012-09-05 01:00:07 -04:00
20121002150926_create_groups.rb	Group entity. Group has many projects	2012-10-02 18:17:12 +03:00
20121002151033_add_group_id_to_project.rb	Group entity. Group has many projects	2012-10-02 18:17:12 +03:00
20121009205010_postgres_create_integer_cast.rb	add support use string FK with integer PK	2012-10-10 03:58:34 +04:00
20121026114600_add_milestone_id_to_merge_requests.rb	Add Milestone information in Merge Requests	2012-10-26 16:12:40 +02:00
20121119170638_create_services.rb	Service model and service hook	2012-11-20 11:33:49 +02:00
20121120051432_add_service_id_to_web_hook.rb	Service model and service hook	2012-11-20 11:33:49 +02:00
20121120103700_add_active_to_service.rb	GitLabCi Service imtegration	2012-11-19 22:34:05 +03:00
20121120113838_add_project_url_to_service.rb	GitLabCi Service imtegration	2012-11-19 22:34:05 +03:00
20121122145155_convert_group_to_namespace.rb	Namespace model added. Migration to convert exit project/groups	2012-11-22 21:34:26 +03:00
20121122150932_add_namespace_id_to_project.rb	Namespace model added. Migration to convert exit project/groups	2012-11-22 21:34:26 +03:00
20121123104937_add_username_to_user.rb	Init username migration and rake task for create appropriate namespace	2012-11-23 06:34:09 +03:00
20121123164910_rename_code_to_path.rb	Deprecate code for Project. Use title and path	2012-11-23 21:11:09 +03:00
20121203154450_add_events_indices.rb	Event indices related to #2159	2012-12-03 17:50:33 +02:00
20121203160507_more_indices.rb	More indices for asscociations. related to #2159	2012-12-03 18:11:47 +02:00
20121205201726_add_more_indexes.rb	Add more indexes (see #2159)	2012-12-05 21:50:20 +01:00
20121218164840_move_noteable_commit_to_own_field.rb	index for commit_id. Schema rebuiled. Non rollback migration exception added	2012-12-19 12:08:27 +02:00
20121219095402_indices_for_notes.rb	index for commit_id. Schema rebuiled. Non rollback migration exception added	2012-12-19 12:08:27 +02:00
20121219183753_create_user_teams.rb	Added UserTeam core models (team and m-t-m relationships) and updated other models	2013-01-24 22:31:23 +02:00
20121220064104_create_user_team_project_relationships.rb	Added UserTeam core models (team and m-t-m relationships) and updated other models	2013-01-24 22:31:23 +02:00
20121220064453_create_user_team_user_relationships.rb	Added UserTeam core models (team and m-t-m relationships) and updated other models	2013-01-24 22:31:23 +02:00
20130102143055_rename_owner_to_creator_for_project.rb	Project has now correct owner and creator. Increased test coverage	2013-01-02 19:00:00 +02:00
20130110172407_add_public_to_project.rb	Public git read-only access via http	2013-01-13 17:25:18 +02:00
20130123114545_add_issues_tracker_to_project.rb	Issue tracker field added to projects	2013-02-28 16:10:00 +04:00
20130125090214_add_user_permissions.rb	can_create_group, can_create_team boolean fields for user	2013-01-25 11:08:22 +02:00
20130131070232_remove_private_flag_from_project.rb	add path and path_with_namespace to api project entity	2013-01-31 09:11:35 +02:00
20130206084024_add_description_to_namsespace.rb	Description to groups added	2013-02-28 17:14:21 +04:00
20130207104426_add_description_to_teams.rb	Description added to temas	2013-02-28 17:15:22 +04:00
20130211085435_add_issues_tracker_id_to_project.rb	Migration added	2013-02-28 16:11:13 +04:00
20130214154045_rename_state_to_merge_status_in_milestone.rb	State renamed to merge_status	2013-02-18 14:43:49 +04:00
20130218140952_add_state_to_issue.rb	Migrations refactored ro support data convertion	2013-02-18 18:54:30 +04:00
20130218141038_add_state_to_merge_request.rb	Migrations refactored ro support data convertion	2013-02-18 18:54:30 +04:00
20130218141117_add_state_to_milestone.rb	Migrations refactored ro support data convertion	2013-02-18 18:54:30 +04:00
20130218141258_convert_closed_to_state_in_issue.rb	Data converting migrations was wrong. Fixed	2013-02-27 12:53:36 +04:00
20130218141327_convert_closed_to_state_in_merge_request.rb	Data converting migrations was wrong. Fixed	2013-02-27 12:53:36 +04:00
20130218141344_convert_closed_to_state_in_milestone.rb	Data converting migrations was wrong. Fixed	2013-02-27 12:53:36 +04:00
20130218141444_remove_merged_from_merge_request.rb	Migrations refactored ro support data convertion	2013-02-18 18:54:30 +04:00
20130218141507_remove_closed_from_issue.rb	Migrations refactored ro support data convertion	2013-02-18 18:54:30 +04:00
20130218141536_remove_closed_from_merge_request.rb	Migrations refactored ro support data convertion	2013-02-18 18:54:30 +04:00
20130218141554_remove_closed_from_milestone.rb	Migrations refactored ro support data convertion	2013-02-18 18:54:30 +04:00
20130220124204_add_new_merge_status_to_merge_request.rb	Migrations for convertion merge_status added	2013-02-20 17:49:33 +04:00
20130220125544_convert_merge_status_in_merge_request.rb	Migrations for convertion merge_status added	2013-02-20 17:49:33 +04:00
20130220125545_remove_merge_status_from_merge_request.rb	Migrations for convertion merge_status added	2013-02-20 17:49:33 +04:00
20130220133245_rename_new_merge_status_to_merge_status_in_milestone.rb	Migrations for convertion merge_status added	2013-02-20 17:49:33 +04:00
20130304104623_add_state_to_user.rb	Migrations added	2013-03-04 18:51:00 +04:00
20130304104740_convert_blocked_to_state.rb	Typo fixed	2013-03-05 14:29:44 +04:00
20130304105317_remove_blocked_from_user.rb	Migrations added	2013-03-04 18:51:00 +04:00
20130315124931_user_color_scheme.rb	add dark solarized theme for code preview	2013-03-15 15:09:34 +02:00
20130318212250_add_snippets_to_features.rb	Move snippets to own tab as feature. Make it disabled for new projects by default	2013-03-18 23:33:41 +02:00
20130319214458_create_forked_project_links.rb	Made fixes suggested by @randx in pull request	2013-05-02 16:41:33 -04:00
20130323174317_add_private_to_snippets.rb	Migrations to convert data added	2013-03-25 00:39:38 +04:00
20130324151736_add_type_to_snippets.rb	Project snippet moved to separate model	2013-03-24 19:26:49 +04:00
20130324172327_change_project_id_to_null_in_snipepts.rb	Snippets feature refactored. Tests now use spinach	2013-03-24 22:31:14 +04:00
20130324203535_add_type_value_for_snippets.rb	Migrations to convert data added	2013-03-25 00:39:38 +04:00
20130325173941_add_notification_level_to_user.rb	notification level for user	2013-03-26 10:48:07 +02:00
20130326142630_add_index_to_users_authentication_token.rb	add db index for authentication_token column in users table	2013-06-14 22:07:09 +05:00
20130403003950_add_last_activity_column_into_project.rb	Improve migration AddLastActivityColumnIntoProject to use real last activity date if present	2013-04-09 20:58:47 +03:00
20130404164628_add_notification_level_to_user_project.rb	add notification level to UsersProject	2013-04-04 22:11:15 +03:00
20130410175022_remove_wiki_table.rb	Remove Wiki and db table since we use gollum now	2013-04-10 22:20:00 +03:00
20130419190306_allow_merges_for_forks.rb	Update 20130419190306_allow_merges_for_forks.rb	2013-08-25 21:47:04 +03:00
20130506085413_add_type_to_key.rb	migrations for ssh key STI and deploy keys <-> projects relation	2013-05-06 12:27:54 +03:00
20130506090604_create_deploy_keys_projects.rb	migrations for ssh key STI and deploy keys <-> projects relation	2013-05-06 12:27:54 +03:00
20130506095501_remove_project_id_from_key.rb	Remove deprecated finders	2014-01-19 23:39:56 +04:00
20130522141856_add_more_fields_to_service.rb	Add more fields to project service model	2013-05-22 17:21:05 +03:00
20130528184641_add_system_to_notes.rb	Link issues from comments and automatically close them	2013-08-25 18:58:41 -04:00
20130611210815_increase_snippet_text_column_size.rb	Increase snippet content column size.	2013-06-11 21:11:05 -05:00
20130613165816_add_password_expires_at_to_users.rb	Add password_expires_at to users table	2013-06-13 20:01:35 +03:00
20130613173246_add_created_by_id_to_user.rb	Force user password change for users created by admin	2013-06-13 21:06:27 +03:00
20130614132337_add_improted_to_project.rb	Add imported boolean to project. Prevent shell from creating repo after it was imported	2013-06-14 16:30:48 +03:00
20130617095603_create_users_groups.rb	create UsersGroup entity. Modify ability to check group owners instead one owner	2013-06-18 17:47:52 +03:00
20130621195223_add_notification_level_to_user_group.rb	Add notification level to group membership	2013-06-21 23:17:20 +03:00
20130622115340_add_more_db_index.rb	More db index	2013-06-22 15:01:08 +03:00
20130624162710_add_fingerprint_to_key.rb	store and display public key fingerprint	2013-06-24 20:07:21 +03:00
20130804151314_add_st_diff_to_note.rb	st_diff field for Note	2013-08-04 19:00:41 +03:00
20130812143708_add_import_url_to_project.rb	Repository import during project creation often return timeout for medium and large repos.	2013-08-12 18:21:47 +03:00
20130819182730_add_internal_ids_to_issues_and_mr.rb	Add iid field to issues and MR	2013-08-19 22:10:21 +03:00
20130821090530_remove_deprecated_tables.rb	Drop deprecated tables	2013-08-21 12:08:10 +03:00
20130821090531_add_internal_ids_to_milestones.rb	Add iids to milestones. Moved iids logic to separate concern	2013-08-21 12:16:26 +03:00
20130909132950_add_description_to_merge_request.rb	Add description to MergeRequest model	2013-09-09 16:32:43 +03:00
20130926081215_change_owner_id_for_group.rb	Namespaces.owner_id can be null	2013-09-26 14:48:58 +03:00
20131005191208_add_avatar_to_users.rb	avatar upload on profile page	2013-10-09 09:05:09 +02:00
20131009115346_add_confirmable_to_users.rb	Enable confirmable and reconfirmable modules for User	2013-10-15 09:56:04 +03:00
20131106151520_remove_default_branch.rb	Project#default_branch use repo HEAD instead of DB value now	2013-11-06 18:45:39 +02:00
20131112114325_create_broadcast_messages.rb	Broadcast message model + migrations	2013-11-12 13:47:28 +02:00
20131112220935_add_visibility_level_to_projects.rb	Adding authenticated public mode (internal).	2013-11-26 22:22:07 -06:00
20131129154016_add_archived_to_projects.rb	Archiving old projects; archived projects aren't shown on dashboard	2013-12-16 14:39:14 +01:00
20131130165425_add_color_and_font_to_broadcast_messages.rb	Customization and previewing of broadcast messages	2013-12-18 17:43:45 -05:00
20131202192556_add_event_fields_for_web_hook.rb	Add new fields to web_hooks table.	2013-12-04 13:37:17 +02:00
20131214224427_add_hide_no_ssh_key_to_users.rb	Allow user to hide the message to add an ssh key permanently	2013-12-14 20:21:12 -06:00
20131217102743_add_recipients_to_service.rb	Create EmailsOnPushService model	2013-12-17 12:42:40 +02:00
20140116231608_add_website_url_to_users.rb	Add website url to user	2014-01-18 19:15:10 +00:00
20140122112253_create_merge_request_diffs.rb	Improve db schema for merge request diffs	2014-01-22 15:17:41 +02:00
20140122114406_migrate_mr_diffs.rb	Create separate table to store Merge request commits/diffs	2014-01-22 14:22:47 +02:00
20140122122549_remove_m_rdiff_fields.rb	Improve db schema for merge request diffs	2014-01-22 15:17:41 +02:00