home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,145 Commits 48 Branches 340 Tags
ce6b0519ccddff2476d2255df49b39ccdb07013e
Commit Graph
367 Commits
Author SHA1 Message Date
Valery Sizov e41dadcb33 Doorkeeper integration 2014-12-24 15:38:07 +02:00
Dmitriy Zaporozhets 554719d985 Merge branch 'fix-mysql-migration' into 'master' 
Fix mysql migration

Fixes exception noted in https://gitlab.com/gitlab-org/gitlab-ce/issues/913

```
** Invoke db:migrate (first_time)
** Invoke environment (first_time)
** Execute environment
** Invoke db:load_config (first_time)
** Execute db:load_config
** Execute db:migrate
== 20141121161704 AddIdentityTable: migrating =================================
-- create_table(:identities)
   -> 0.1214s
-- add_index(:identities, :user_id)
   -> 0.1660s
-- execute("INSERT INTO identities (provider, extern_uid, user_id)\nSELECT provider, extern_uid, id FROM users\nWHERE provider IS NOT NULL\n")
   -> 0.0518s
-- remove_column(:users, :extern_uid)
rake aborted!
StandardError: An error has occurred, all later migrations canceled:

Mysql2::Error: Duplicate entry 'ldap' for key 'index_users_on_extern_uid_and_provider': ALTER TABLE `users` DROP `extern_uid`/home/git/gitlab/vendor/bundle/ruby/2.1.0/gems/activerecord-4.1.1/lib/active_record/connection_adapters/abstract_mysql_adapter.rb:301:in `query'
/home/git/gitlab/vendor/bundle/ruby/2.1.0/gems/activerecord-4.1.1/lib/active_record/connection_adapters/abstract_mysql_adapter.rb:301:in `block in execute'
```

See merge request !1344
 2014-12-23 09:58:54 +00:00
Dmitriy Zaporozhets 1440ac8154 Remove index only if exists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-23 11:05:50 +02:00
Dmitriy Zaporozhets 031461e106 Fix migration issue for mysql with index not being removed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-23 10:52:21 +02:00
Dmitriy Zaporozhets 223e509f70 Merge pull request #7894 from cirosantilli/fix-dev-user-seed 
Fix dev user seed: ID was used twice.
 2014-12-20 20:18:15 +02:00
Valery Sizov 7d8dfccf70 speed up migration to identities 2014-12-08 15:15:11 +02:00
Dmitriy Zaporozhets 1961b59070 Add locked_at to merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 15:42:26 +02:00
Valery Sizov 3a5ed5260b Supporting for multiple omniauth provider for the same user 2014-12-04 13:03:55 +02:00
Valery Sizov 1a80d13a39 Multi-provider auth. LDAP is not reworked 2014-12-04 13:01:50 +02:00
Jacob Vosmaer 4053c055be Add missing timestamps to the 'members' table 2014-11-21 15:02:23 +01:00
Dmitriy Zaporozhets f56541de9a Revert "Create dev fixture projects with fixed visibility" 
This reverts commit a9fadce361.
 2014-11-10 16:17:04 +02:00
Marin Jankovski 1d337defec Merge pull request #8168 from cirosantilli/dev-fixtures-visibility 
Create dev fixture projects with fixed visibility
 2014-11-07 15:26:48 +01:00
Don Luchini 019c0f9e0f Remove unnecessary lines. 2014-11-05 08:57:05 -05:00
Don Luchini bc403356bb Do not require immediate password reset if specifying one when seeding database. 2014-11-04 10:02:38 -05:00
Dmitriy Zaporozhets ff48e1eeb7 Save only valid record in service migrations 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-31 11:12:41 +02:00
Drew Blessing c3104abfd4 Fix serialize migration 2014-10-30 05:01:21 -05:00
Ciro Santilli a9fadce361 Create dev fixture projects with fixed visibility 2014-10-26 11:34:50 +01:00
Dmitriy Zaporozhets 32d0bf3afd Fix snippets seeds 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-16 16:50:09 +03:00
Valery Sizov 47f539f5a6 Snippets: public/internal/private 2014-10-09 17:09:53 +03:00
Marin Jankovski bbc52b0000 Use double quotes because we are inserting password now. 2014-10-07 11:48:25 +02:00
Marin Jankovski eceef546d1 Add slack service migration. 2014-10-06 16:50:24 +02:00
Ciro Santilli 083f1e2f13 Fix dev user seed: multiple ID was used twice. 2014-09-30 23:23:18 +02:00
Ciro Santilli 789b427592 Fix dev merge seed: update testme to gitlab-test. 2014-09-30 17:34:46 +02:00
Dmitriy Zaporozhets efcac2befc Merge pull request #7873 from cirosantilli/testme-to-gitlabtest 
Replace testme with gitlab-test.
 2014-09-29 19:49:59 +03:00
Dmitriy Zaporozhets 0a1176d62d Merge pull request #7897 from cirosantilli/predictable-merge-requests-dev-seed 
Add predictable merge requests on dev seed.
 2014-09-29 17:46:08 +03:00
Ciro Santilli 1ba26184eb Add predictable merge requests on dev seed. 2014-09-29 13:55:31 +02:00
Ciro Santilli a963e8c293 Prevent email sending on admin dev seed. 2014-09-29 13:38:54 +02:00
Ciro Santilli ac55373ff3 Replace empty? || nil? with blank?. 2014-09-27 11:15:08 +02:00
Ciro Santilli b49dd2c573 Replace testme with gitlab-test. 2014-09-27 10:11:20 +02:00
Dmitriy Zaporozhets e4bc359841 Fix dev fixtures 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-18 20:19:11 +03:00
Dmitriy Zaporozhets 1aa48174db Fix STI+polymorphic for Group <-> GroupMember 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 21:52:54 +03:00
Dmitriy Zaporozhets 13af7de941 Fix migration and association for new members table 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 20:38:57 +03:00
Dmitriy Zaporozhets e9b32005eb Migrate old membership objects to new Member model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 18:09:23 +03:00
Dmitriy Zaporozhets 3503b504ea Add members table migration 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 17:18:58 +03:00
Drew Blessing 09cdd94322 Fix serialize migration. Fixes #7734 2014-09-11 18:41:03 -05:00
Marin Jankovski 09e64ae605 Add an option to supply root password through an environmental variable. 2014-09-11 10:06:56 +02:00
Dmitriy Zaporozhets 6135eb0adf Merge pull request #7705 from dblessing/serialize_service_properties 
Serialize service properties
 2014-09-10 20:47:47 +03:00
Drew Blessing a0dbcd2365 Serialize services properties 2014-09-10 09:56:39 -05:00
Sytse Sijbrandij 07061b672c Link to the canonical repos. 2014-09-10 12:40:13 +02:00
Jacob Vosmaer b0435576df Fetch the testme repository from gitlab.com 
The repository was removed from github.com/gitlabhq.
 2014-09-10 12:22:47 +02:00
Jacob Vosmaer 042465c448 Use create-hooks instead of rewrite-hooks.sh 
The rewrite-hooks.sh script is a deprecated wrapper for gitlab-shell's
create-hooks script.
 2014-09-08 10:16:15 +02:00
Dmitriy Zaporozhets 6f423b987f Update repos hooks in migration 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-03 17:10:41 +03:00
Ciro Santilli 57fddea8bb Add users with predictable username and password 
to development seed.
 2014-09-01 13:48:35 +02:00
James Brooks 63e25c2bb4 Fixes #7571 2014-08-27 21:12:37 +01:00
Jacob Vosmaer 30ba7aea19 Document characters being stripped from labels 2014-08-20 09:56:49 +02:00
Jacob Vosmaer dfc5bf6bf7 Use the default color when migrating labels 2014-08-19 17:43:17 +02:00
Jacob Vosmaer e354e548b9 Remove invalid characters from the label name 2014-08-19 17:42:55 +02:00
Jacob Vosmaer 7e0a2b3b3d Test if the label is valid before creating link 2014-08-19 17:42:34 +02:00
Dmitriy Zaporozhets 2804902cfc Improve developer seeds 
* Improt projects inline so after seeds you have repos
* Fix merge request seeds
* Add comment seeds to both issues and merge requests
* Remove some projects from seeds to increase speed

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-11 17:55:31 +03:00
Dmitriy Zaporozhets 3cc2c6ef79 Remove outdated seeds 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-11 16:01:07 +03:00