Commit Graph
356 Commits
Author SHA1 Message Date
Stan Hu 24a0e86dd3 Remove deleted milestones from merge requests
Closes https://github.com/gitlabhq/gitlabhq/issues/9643
2015-09-21 12:05:01 -07:00
Douwe Maan 3377808193 Fix reply by email for comments on a specific line in a diff/commit. 2015-09-20 18:18:39 +02:00
Douwe Maan 2c0704fabc Merge branch 'rs-bump-two-factor' into 'master'
Bump devise-two-factor to 2.0.0

Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605

See https://github.com/tinfoil/devise-two-factor/pull/43

See merge request !1363
2015-09-20 15:07:58 +00:00
Robert Speicher 259851c0d6 Bump devise-two-factor to 2.0.0
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605

See https://github.com/tinfoil/devise-two-factor/pull/43
2015-09-19 21:16:18 -04:00
Hannes Rosenögger a22b6c591f fix failing migration on mysql
We didn't specify that the db user needs the right to create
temporary tables before.
That's why the migration will fail on most installations.
This commits removes the "TEMPORARY" from the migration
and changes the documentation to include the necessary rights for the future.
2015-09-18 19:49:04 +02:00
Kamil Trzcinski e41a29b0c3 Allow to disable GitLab CI 2015-09-18 12:46:47 +02:00
Jeroen van Baarsen fe17a236e3 Allow custom info to be added to Help page
Fixes #2536

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-09-18 10:15:40 +02:00
Valery SizovandValery Sizov ce4defaf2f enable SSL by default 2015-09-17 09:51:24 +03:00
Kamil Trzcinski 912f470497 Fix ordering issue 2015-09-16 16:59:54 +02:00
Kamil Trzcinski 9a3d0f1d92 Add rake task to migrate CI tags 2015-09-15 00:29:20 +02:00
Dmitriy Zaporozhets 81f9ee48b1 Fix mysql migration 2015-09-09 16:08:09 +02:00
Dmitriy Zaporozhets 0b5d627cd4 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-09 14:56:02 +02:00
Valery Sizov 57d0013090 CRUD for admin labels 2015-09-03 15:50:23 +03:00
Douwe Maan fe86c8dfbd Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993 2015-08-29 11:49:14 -07:00
Douwe Maan 843694f902 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-08-26 17:53:31 -07:00
Valery Sizov bafffb2d14 Enable SSL verification for Webhooks 2015-08-26 15:48:31 +03:00
Douwe Maan 046b283127 Groundwork for merging CI into CE 2015-08-25 18:42:46 -07:00
Stan Hu ed1d4fa477 Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab
and request them each session. Pass these tokens to the project import data.

This prevents the need to encrypt these tokens and clear them in case they
expire or get revoked.

For example, if you deleted and re-created OAuth2 keys for Bitbucket, you would get
an Error 500 with no way to recover:

```
Started GET "/import/bitbucket/status" for x.x.x.x at 2015-08-07 05:24:10 +0000
Processing by Import::BitbucketController#status as HTML
Completed 500 Internal Server Error in 607ms (ActiveRecord: 2.3ms)

NameError (uninitialized constant Import::BitbucketController::Unauthorized):
  app/controllers/import/bitbucket_controller.rb:77:in `rescue in go_to_bitbucket_for_permissions'
  app/controllers/import/bitbucket_controller.rb:74:in `go_to_bitbucket_for_permissions'
  app/controllers/import/bitbucket_controller.rb:86:in `bitbucket_unauthorized'
```

Closes #1871
2015-08-23 09:23:44 -07:00
Joel KoglinandJoel Koglin 4d2f36118a Issue #993: Fixed login failure when extern_uid changes 2015-08-21 09:36:27 -07:00
Douwe Maan 3d51a6d435 Merge branch 'master' into reply-by-email 2015-08-20 12:19:19 -07:00
Artem Sidorenko 55dca86b98 Import sources: settings in the admin interface 2015-08-20 11:28:27 +02:00
Douwe Maan f76eac56b9 Reply by email POC 2015-08-18 15:46:36 -07:00
Douwe Maan ad55f0d6f9 Merge branch 'master' into comment-updated-by 2015-08-07 15:05:17 +02:00
Dmitriy Zaporozhets cba7f20dc8 Allow users to send abuse reports
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-06 14:03:27 +02:00
Douwe Maan 36bd6c8494 Show who last edited a comment if it wasn't the original author 2015-07-30 14:45:54 +02:00
Marin Jankovski 6e08e7aac4 Check if session_expire_delay column exists before adding the column. 2015-07-22 17:04:49 +02:00
Dmitriy Zaporozhets f0116f1335 Store commit count in project table
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-17 15:22:56 +02:00
Dmitriy Zaporozhets 5f34759ecb Allow user to specify content he wants to see on project page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-13 18:24:15 +02:00
Valery Sizov 411829fdb5 Audit log for user authentication 2015-07-06 12:36:08 +03:00
Robert Speicher aedb546964 Correct AddDefaultOtpRequiredForLoginValue migration
Also MySQL complains when you change a field to be not null if any
existing records already have a null value, so this updates those rows.
2015-06-22 11:36:11 -04:00
Robert Speicher d3ff8c1a95 Make default value for otp_required_for_login false instead of null 2015-06-20 19:40:48 -04: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
Eric Maziade 84a414fe53 Add session expiration delay configuration through UI application
settings
2015-06-05 11:50:37 -04: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
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 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