home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 05:06:46 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
392 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 2be3a012ff Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-12 14:43:02 -08:00
Jeroen van Baarsen d9f84f6867 Merge pull request #8445 from jvanbaarsen/project-spec-speed-up 
requests/api/project_spec.rb speed up
 2015-02-12 11:26:09 +01:00
Marin Jankovski 09d3d351a1 Remove not null constraint on project_id in services. 2015-02-11 09:47:21 -08:00
Marin Jankovski 5515366064 Add template boolean to services. 2015-02-11 09:24:40 -08:00
Dmitriy Zaporozhets aaa7a065c6 Add index on order columns for services table 2015-02-09 14:21:52 -08:00
Dmitriy Zaporozhets 3cd036e315 Merge branch 'notification_email' 
Conflicts:
	db/schema.rb
 2015-02-07 18:42:34 -08:00
Douwe Maan 9dbd7e5aec Allow notification email to be set separately from primary email. 
Closes #1932.
 2015-02-07 23:19:17 +01:00
Dmitriy Zaporozhets 3e97ac2022 Add index on order columns 2015-02-06 10:21:48 -08:00
Dmitriy Zaporozhets dbca8c9758 Add timestamps to identity 2015-02-05 13:23:32 -08:00
Jeroen van Baarsen 0ef495734d Improved speed of the project_spec.rb 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-03 18:26:17 +01:00
Marco Wessel 20e269cb92 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into configure-protection 
Conflicts:
	CHANGELOG
	db/schema.rb
 2015-01-30 00:16:24 +01:00
Valery Sizov 54f6d8c7b5 an ability to clone project with oauth2 token 2015-01-28 15:57:31 -08:00
Marco Wessel b20fc14133 Fix indentation 2015-01-25 18:34:02 +01:00
Marco Wessel aad6ceaef9 Allow configuring protection of the default branch upon first push 2015-01-25 17:09:10 +01:00
Steven ThonusandHannes Rosenögger 42bac7f9f2 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
Dmitriy Zaporozhets 577fe18073 Merge pull request #7878 from cirosantilli/rm-seed-password-confirmation 
Remove unneeded password_confirmation from seed.
 2015-01-18 10:38:41 -08:00
Dmitriy Zaporozhets 38600e328b Validate application settings only if column exists 2015-01-16 17:22:17 -08:00
Dmitriy Zaporozhets 41d7be3ce1 Allow to specify home page for non logged-in users 2015-01-16 16:01:15 -08:00
Dmitriy Zaporozhets 72c3d728c4 Update db schema 2015-01-13 10:45:14 -08:00
Dmitriy Zaporozhets bb1f8b1d8b Merge branch 'github_importer' 
Conflicts:
	app/helpers/projects_helper.rb
 2015-01-13 10:35:16 -08:00
Valery SizovandValery Sizov a9f7fd2c1a Github Importer 2015-01-10 09:51:43 -08:00
Dmitriy Zaporozhets 8589b4e137 Init ApplicationSettings resource with defaults from config file 2015-01-08 00:22:50 -08:00
Marin Jankovski 42fb42aed4 Merge branch 'master' into developer_can_push_to_protected_branches_option 
Conflicts:
	db/schema.rb
 2014-12-29 09:30:55 +01:00
Ciro Santilli faab452af9 Remove unneeded password_confirmation from seed. 2014-12-28 14:42:15 +01:00
Marin Jankovski 6ce3b1a311 Add migration for developers can push to protected branches flag. 2014-12-26 09:07:02 +01:00
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