Dmitriy Zaporozhets 9b140b22fb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee ...

Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb

2015-02-04 18:19:22 -08:00

..

20121220064453_init_schema.rb

Squash migrations for years 2011 and 2012

2014-02-04 17:11:30 +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

20130711063759_create_project_group_links.rb

ProjectGroupLink model with migration and specs

2013-07-11 09:47:46 +03:00

20130802124933_add_ldap_settings_to_group.rb

Add ldap_cn field to Group

2013-08-02 15:58:40 +03:00

20130804151314_add_st_diff_to_note.rb

st_diff field for Note

2013-08-04 19:00:41 +03:00

20130809090140_add_ldap_access_to_group.rb

ldap_access field added to group. set ldap group membership based on ldap_access value

2013-08-09 12:53:52 +03:00

20130809124851_add_permission_check_to_user.rb

Add User#last_credential_check_at

2014-03-11 10:07:22 +02: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

20130820102832_add_access_to_project_group_link.rb

ProjectGroupLink access level

2013-08-20 13:59:43 +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

Fix merge_request_diffs migrations for postgresql

2014-01-27 18:50:53 +04:00

20140122122549_remove_m_rdiff_fields.rb

Fix merge_request_diffs migrations for postgresql

2014-01-27 18:50:53 +04:00

20140125162722_add_avatar_to_projects.rb

adding avatar to project settings page added avatar removal show project avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix

2015-01-24 18:51:16 +01:00

20140127170938_add_group_avatars.rb

added group avatars

2014-01-28 08:38:00 +01:00

20140209025651_create_emails.rb

Add email aliases for users

2014-02-13 22:59:39 -06:00

20140214102325_add_api_key_to_services.rb

Add Gemnasium Service for Gitlab

2014-02-21 16:25:22 +01:00

20140304005354_add_index_merge_request_diffs_on_merge_request_id.rb

Add index_merge_request_diffs_on_merge_request_id

2014-03-04 10:38:09 +09:00

20140305193308_add_tag_push_hooks_to_project_hook.rb

Added tag_push_events to the web_hooks

2014-03-05 20:44:01 +01:00

20140312145357_add_import_status_to_project.rb

Add Project#import_status field

2014-03-12 17:14:28 +02:00

20140313092127_migrate_already_imported_projects.rb

Add migration for already imported projects

2014-03-13 11:28:41 +02:00

20140319135450_create_git_hooks.rb

Create git_hooks db table

2014-03-20 14:07:48 +02:00

20140407135544_fix_namespaces.rb

Add trailing newline to all text files.

2014-06-21 11:20:22 +02:00

20140414093351_create_appearances.rb

Appearance model for custom signin page

2014-04-14 22:14:50 +03:00

20140414131055_change_state_to_allow_empty_merge_request_diffs.rb

Fixed some hound notices

2014-04-14 15:24:37 +02:00

20140415124820_limits_to_mysql.rb

Adjust MySQL limits for existing installations

2014-04-23 11:07:36 +02:00

20140416074002_add_index_on_iid.rb

Migrate invalid rows with missing iids or duplicates

2014-04-24 19:39:33 +02:00

20140416185734_index_on_current_sign_in_at.rb

Add db index for active user display.

2014-04-16 21:05:13 +02:00

20140428105831_add_notes_index_updated_at.rb

Add an index for Note#updated_at

2014-04-28 13:02:05 +02:00

20140502115131_add_repo_size_to_db.rb

Save repository size to projects table

2014-05-02 16:05:08 +03:00

20140502125220_migrate_repo_size.rb

Save repository size to projects table

2014-05-02 16:05:08 +03:00

20140508105809_add_mr_template_to_project.rb

Add template for merge request descriptions to projects.

2014-05-14 15:24:14 +02:00

20140513095908_add_username_password_api_version_to_services.rb

Add Jira service.

2014-05-13 12:12:16 +02:00

20140611135229_add_position_to_merge_request.rb

Add sorting to merge requests on milestone page

2014-06-11 17:11:52 +03:00

20140625115202_create_users_star_projects.rb

Add star count, view logic, more tests.

2014-07-17 22:47:16 +02:00

20140729134820_create_labels.rb

Label and LabelLink models for implementing own GitLab labels

2014-07-29 17:10:15 +03:00

20140729140420_create_label_links.rb

Label and LabelLink models for implementing own GitLab labels

2014-07-29 17:10:15 +03:00

20140729145339_migrate_project_tags.rb

Replace project labels with tags to prevent name conflict with GitLab labels

2014-07-29 18:23:18 +03:00

20140729152420_migrate_taggable_labels.rb

Fixes #7571

2014-08-27 21:12:37 +01:00

20140730111702_add_index_to_labels.rb

Add indicies to labels

2014-07-30 14:25:27 +03:00

20140811083829_add_unsubscribed_at_field_to_users.rb

Add unsubscribe field for admin emails

2014-08-11 10:41:50 +02:00

20140811155127_add_jira_issue_transition_id_to_services.rb

Add transition id to database

2014-08-11 17:57:29 +02:00

20140813090117_add_ldap_groups_table.rb

Add backwards compatible accessors for ldap_cn and ldap_access

2014-08-15 15:40:32 +02:00

20140813133925_rename_ldap_group_to_ldap_group_link.rb

Fix broken ldap migration.

2014-11-07 13:50:54 +01:00

20140903115954_migrate_to_new_shell.rb

Use create-hooks instead of rewrite-hooks.sh

2014-09-08 10:16:15 +02:00

20140907220153_serialize_service_properties.rb

Save only valid record in service migrations

2014-10-31 11:12:41 +02:00

20140907223153_remove_columns_for_services.rb

Complete serialization of service properties for EE

2014-09-11 05:44:00 -05:00

20140914113604_add_members_table.rb

Fix migration and association for new members table

2014-09-14 20:38:57 +03:00

20140914145549_migrate_to_new_members_model.rb

Fix STI+polymorphic for Group <-> GroupMember

2014-09-14 21:52:54 +03:00

20140914173417_remove_old_member_tables.rb

Fix migration and association for new members table

2014-09-14 20:38:57 +03:00

20141006143943_move_slack_service_to_webhook.rb

Save only valid record in service migrations

2014-10-31 11:12:41 +02:00

20141007100818_add_visibility_level_to_snippet.rb

Snippets: public/internal/private

2014-10-09 17:09:53 +03:00

20141010132608_add_provider_to_ldap_group_links.rb

Add provider to LDAP group links

2014-10-10 16:16:29 +02:00

20141027173526_add_author_email_regex_to_git_hook.rb

Git hooks for checking email

2014-10-29 11:42:51 +02:00

20141030133853_add_member_check_to_git_hooks.rb

Git Hook to check whether author is a GitLab member

2014-10-31 16:19:58 +02:00

20141103160516_add_file_name_regex_to_git_hooks.rb

Ability to block commits with certain filenames

2014-11-03 18:22:43 +02:00

20141118150935_add_audit_event.rb

Add audit event table.

2014-11-18 16:51:05 +01:00

20141121133009_add_timestamps_to_members.rb

Add missing timestamps to the 'members' table

2014-11-21 15:02:23 +01:00

20141121161704_add_identity_table.rb

Remove index only if exists

2014-12-23 11:05:50 +02:00

20141126120926_add_merge_request_rebase_enabled_to_projects.rb

Add merge request rebase enabled column to projects table.

2014-11-26 13:15:42 +01:00

20141205134006_add_locked_at_to_merge_request.rb

Add locked_at to merge request

2014-12-05 15:42:26 +02:00

20141212124604_add_group_membership_lock.rb

Add group membership lock field to namespaces.

2014-12-12 13:52:36 +01:00

20141213212220_add_header_logos_to_appearances.rb

Custom header logo

2014-12-29 13:42:15 -06:00

20141216155758_create_doorkeeper_tables.rb

Doorkeeper integration

2014-12-24 15:38:07 +02:00

20141217125223_add_owner_to_application.rb

Doorkeeper integration

2014-12-24 15:38:07 +02:00

20141223135007_add_import_data_to_project_table.rb

Github Importer

2015-01-10 09:51:43 -08:00

20141226080412_add_developers_can_push_to_protected_branches.rb

Add migration for developers can push to protected branches flag.

2014-12-26 09:07:02 +01:00

20141230100055_remove_old_fields_from_namespace.rb

Remove ldap_cn and ldap_access fields from namespaces table

2014-12-30 12:03:40 +02:00

20150108073740_create_application_settings.rb

Init ApplicationSettings resource with defaults from config file

2015-01-08 00:22:50 -08:00

20150116234544_add_home_page_url_for_application_settings.rb

Allow to specify home page for non logged-in users

2015-01-16 16:01:15 -08:00

20150116234545_add_gitlab_access_token_to_user.rb

an ability to clone project with oauth2 token

2015-01-28 15:57:31 -08:00

20150125163100_add_default_branch_protection_setting.rb

Allow configuring protection of the default branch upon first push

2015-01-25 17:09:10 +01:00

limits_to_mysql.rb

Move the adapter check to the migration

2014-04-23 11:08:51 +02:00