home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 10:36:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,647 Commits 48 Branches 340 Tags
758ea7520e69feeac4ffdf2a9e4e2752e5ff91fb
Commit Graph
425 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets ae713ae8fc Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
	doc/README.md
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.12.md
	doc/workflow/README.md
 2015-06-17 11:25:59 +02:00
Robert Speicher 2bc4fd2d04 Add dashboard attribute to User model 2015-06-13 17:59:11 -04:00
themaze75andEric Maziade 1d080f5745 session_expire_seconds => session_expire_delay 
delay is in seconds
more legible code in session_store
Added `GitLab restart required` help block to session_expire_delay
 2015-06-10 22:10:00 -04:00
Dmitriy Zaporozhets 747f66559e Merge branch 'mr-approves' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
 2015-06-10 16:51:07 +02:00
Dmitriy Zaporozhets 73faf3c728 Rename approve->approval. Add approval count to project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 15:57:34 +02:00
Dmitriy Zaporozhets 7ba4e05ffa Create Approve model for merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 13:38:47 +02:00
Douwe Maan 844cca4a1e Add Git hook to validate maximum file size. 2015-06-09 10:23:38 +02:00
Eric Maziade 84a414fe53 Add session expiration delay configuration through UI application 
settings
 2015-06-05 11:50:37 -04:00
Dmitriy Zaporozhets 935fc796d1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb
 2015-06-05 11:40:36 +02:00
Alex Lossent 60225a067d Allow to configure a URL to show after sign out 2015-05-29 18:20:15 +02:00
Douwe Maan 96d6fdc27c Add option to disallow users from registering any application to use GitLab as an OAuth provider 2015-05-29 13:29:16 +02:00
Stan Hu deeff56967 Add support for Webhook note events 
Closes https://github.com/gitlabhq/gitlabhq/issues/6745
 2015-05-21 23:48:16 -04:00
Dmitriy Zaporozhets 1af8b1e4f8 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/views/help/index.html.haml
	lib/gitlab/git_access.rb
	public/500.html
	public/502.html
 2015-05-15 13:29:58 +03:00
Robert Speicher a9103eae3a Make more migrations reversible 
[ci skip]
 2015-05-13 11:03:29 -04:00
Dmitriy Zaporozhets f32a045ef4 Merge branch 'version-check' into 'master' 
Version check

See merge request !1509
 2015-05-13 11:17:16 +00:00
Dmitriy Zaporozhets b2d45bb544 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/controllers/uploads_controller.rb
	app/helpers/application_helper.rb
	app/models/note.rb
	app/services/test_hook_service.rb
	db/schema.rb
	spec/models/note_spec.rb
 2015-05-13 14:10:14 +03:00
Dmitriy Zaporozhets 1a1e42ad31 Merge branch 'rs-system-note' into 'master' 
Add SystemNoteService class

The Note model was basically two models crammed together - one handling user-created notes
(i.e., comments on things) and one handling system-created notes (i.e., references).
This splits out the system-specific stuff to a new SystemNoteService class.

See merge request !595
 2015-05-12 10:45:42 +00:00
Valery Sizov 071f07b673 Merge branch 'fix_migration' into 'master' 
Make migrations reversible

/cc @jacobvosmaer @marin

See merge request !622
 2015-05-12 09:51:14 +00:00
Robert Speicher cdb69d728c Add migration to convert legacy system notes 2015-05-11 00:01:15 -04:00
Robert Speicher 0c113c8dcb Make otp_backup_codes a text field 2015-05-09 17:32:46 -04:00
Dmitriy ZaporozhetsandRobert Speicher 802fcd051f Add support for backup codes 2015-05-09 17:31:37 -04:00
Dmitriy ZaporozhetsandRobert Speicher 7302395142 Init 2 factor authentication for user model 2015-05-09 17:31:07 -04:00
Valery Sizov 3bc717f010 Adding quote_string to migration 2015-05-08 16:54:45 +03:00
Dmitriy Zaporozhets c3cf32e863 Merge branch 'version-check' into gl-version-check 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/admin/application_settings_controller.rb
	app/views/admin/application_settings/_form.html.haml
	db/schema.rb
 2015-05-08 16:05:00 +03:00
Valery Sizov cd2659fdb5 Merge branch 'tag_dup' into 'master' 
Remove tag duplicates

Prevention of getting this error:

```
ActiveRecord::RecordNotUnique: PG::Error: ERROR:  could not create unique index "index_tags_on_name"
DETAIL:  Key (name)=(XSS') is duplicated.
: CREATE UNIQUE INDEX  "index_tags_on_name" ON "tags"  ("name")
```

This migration fails if there are duplicates:
https://github.com/mbleigh/acts-as-taggable-on/blob/v3.5.0/db/migrate/2_add_missing_unique_indices.rb#L3

See merge request !623
 2015-05-08 08:30:05 +00:00
Valery Sizov d881345ed7 Merge branch 'fix-mysql-migration-with-tags' into 'master' 
Change the MySQL collation type to utf8_bin to ensure case-sensitive tags are supported

MySQL tables had a collation type of utf8_ci, which makes the name case-insensitive. Previously this migration was run only after indices were built, but it needs to happen before if there is existing data that is case-sensitive. This is an idempotent change, so applying it again in the existing migration (20150425164651) should not change anything.

This is related to !623, but this migration should run before that one.

* Closes #1589
* Closes https://github.com/gitlabhq/gitlabhq/issues/9255

See merge request !625
 2015-05-08 08:29:07 +00:00
Stan Hu f6c0ef5553 Conditionally remove indices that may not exist in pre-GitLab v6.7 installations 
Closes #1593
 2015-05-08 00:43:19 -07:00
Stan Hu 548cec6ea4 Change the MySQL collation type to utf8_bin to ensure case-sensitive tags are supported 2015-05-07 16:33:11 -07:00
Douwe Maan 85c04a8aa6 Track historical active user count. 2015-05-07 22:38:17 +02:00
Valery Sizov b60717604c remove tag duplicates 2015-05-07 18:17:58 +03:00
Valery Sizov 3e6181db14 Make migrations reversible 2015-05-07 17:29:15 +03:00
Douwe Maan 2bb2ade50d Merge branch 'master' into license 
# Conflicts:
#	db/schema.rb
 2015-05-05 13:03:33 +02:00
Douwe Maan 68ac20604b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee 
# Conflicts:
#	app/controllers/groups/application_controller.rb
#	app/services/test_hook_service.rb
#	app/views/admin/groups/show.html.haml
#	app/views/groups/_settings_nav.html.haml
#	app/views/groups/show.html.haml
#	app/views/layouts/_head.html.haml
#	app/views/projects/_settings_nav.html.haml
#	db/schema.rb
#	features/project/project.feature
#	features/steps/project/project.rb
 2015-05-05 10:18:27 +02:00
Stan Hu eb4f1eb5f5 Add application setting to restrict user signups to e-mail domains 
This feature was requested long ago:

http://feedback.gitlab.com/forums/176466-general/suggestions/4118466-ability-to-register-only-from-ceratain-domains

This MR is based off !253 but changed to use application settings and use wildcard strings
to give more flexibility in pattern matching. Regexps seemed overkill and easy to get wrong.

Only restrict e-mail addresses upon creation
 2015-05-02 09:36:52 -07:00
Douwe Maan d1f2b09fad Allow license to be uploaded and enforce its validity. 2015-05-01 14:52:30 +02:00
Douwe Maan 2f4426b7e4 Merge branch 'fix-project-tags' into 'master' 
Fix DB error when trying to tag a repository

Steps to reproduce: Go to a project settings, add tags, click on save changes

Observed behavior: Error 500

```
    PG::Error: ERROR:  column "taggings_count" does not exist
        LINE 1: UPDATE "tags" SET "taggings_count" = COALESCE("taggings_coun...
```

Ran `rake acts_as_taggable_on_engine:install:migrations`, removed the first
migration that created the `tags` and `taggings` table, and added the rest.

* Closes #1512
* Closes #1550
* Closes https://github.com/gitlabhq/gitlabhq/issues/6867
* Closes https://github.com/gitlabhq/gitlabhq/issues/9194

See merge request !577
 2015-04-30 17:20:36 +00:00
Valery Sizov 4d3a93af2d Remove abandoned GroupMembers 2015-04-29 13:46:57 +03:00
Stan Hu 44afcd2019 Fix DB error when trying to tag a repository 
Upon tagging a repository, an error due to a missing migration occurred:

```
    PG::Error: ERROR:  column "taggings_count" does not exist
        LINE 1: UPDATE "tags" SET "taggings_count" = COALESCE("taggings_coun...
```

Ran `rake acts_as_taggable_on_engine:install:migrations`, removed the first
migration that created the `tags` and `taggings` table, and added the rest.

Closes #1512
Closes https://github.com/gitlabhq/gitlabhq/issues/6867
Closes https://github.com/gitlabhq/gitlabhq/issues/9194
 2015-04-27 06:09:20 -07:00
Dmitriy Zaporozhets 2e243fc321 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	README.md
	VERSION
	app/controllers/projects/services_controller.rb
	app/controllers/projects/uploads_controller.rb
	app/services/test_hook_service.rb
	db/schema.rb
	features/steps/admin/settings.rb
	lib/gitlab/reference_extractor.rb
	spec/models/note_spec.rb
 2015-04-27 11:53:31 +03:00
Vinnie Okada bd557e4b64 Add new admin settings 
Add new global application settings for default project and snippet
visibility levels.
 2015-04-26 07:48:19 -06:00
Douwe Maan 70f9893ed6 Explain namespace clearn regex. 2015-04-24 14:49:23 +02:00
Douwe Maan 2fd47a0e95 Don't attempt to move if original path only contains periods. 2015-04-24 14:49:23 +02:00
Douwe Maan 4934bc0312 Change migration timestamp. 2015-04-24 14:49:23 +02:00
Douwe Maan fac1f83fd5 Properly migrate users with usernames like "." or "..". 2015-04-24 14:49:23 +02:00
Douwe Maan 1d2a5ee188 Revert "Revert disallowing usernames to end in period." 
This reverts commit c75c6b840b.
 2015-04-24 14:47:49 +02:00
Dmitriy Zaporozhets 5b10796235 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/project.rb
	db/schema.rb
 2015-04-20 19:19:27 +03:00
Douwe Maan c75c6b840b Revert disallowing usernames to end in period. 2015-04-20 12:41:44 +02:00
Dmitriy Zaporozhets e1099f9717 Merge branch 'google-code-import-performance' into 'master' 
Decrease memory use and increase performance of Google Code importer.

Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2241.

See merge request !536
 2015-04-17 14:01:33 +00:00
Douwe Maan 7d98c8842d Move import data out of project so it doesn't take ages to load. 2015-04-17 14:49:00 +02:00
Douwe Maan 46524ecb33 Fix username period migration to preserve uniqueness of names and paths. 2015-04-17 12:03:54 +02:00