Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-09-21Remove deleted milestones from merge requestsStan Hu
Closes https://github.com/gitlabhq/gitlabhq/issues/9643
2015-09-20Fix reply by email for comments on a specific line in a diff/commit.Douwe Maan
2015-09-20Merge branch 'rs-bump-two-factor' into 'master' Douwe Maan
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-20Bump devise-two-factor to 2.0.0Robert Speicher
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605 See https://github.com/tinfoil/devise-two-factor/pull/43
2015-09-18fix failing migration on mysqlHannes Rosenögger
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-18Allow to disable GitLab CIKamil Trzcinski
2015-09-18Allow custom info to be added to Help pageJeroen van Baarsen
Fixes #2536 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-09-17enable SSL by defaultValery Sizov
2015-09-16Fix ordering issueKamil Trzcinski
2015-09-15Add rake task to migrate CI tagsKamil Trzcinski
2015-09-09Fix mysql migrationDmitriy Zaporozhets
2015-09-09Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets
2015-09-03CRUD for admin labelsValery Sizov
2015-08-29Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993Douwe Maan
2015-08-27Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDouwe Maan
2015-08-26Enable SSL verification for WebhooksValery Sizov
2015-08-26Groundwork for merging CI into CEDouwe Maan
2015-08-23Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLabStan Hu
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-21Issue #993: Fixed login failure when extern_uid changesJoel Koglin
2015-08-20Merge branch 'master' into reply-by-emailDouwe Maan
2015-08-20Import sources: settings in the admin interfaceArtem Sidorenko
2015-08-19Reply by email POCDouwe Maan
2015-08-07Merge branch 'master' into comment-updated-byDouwe Maan
2015-08-06Allow users to send abuse reportsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-30Show who last edited a comment if it wasn't the original authorDouwe Maan
2015-07-22Check if session_expire_delay column exists before adding the column.Marin Jankovski
2015-07-17Store commit count in project tableDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-13Allow user to specify content he wants to see on project pageDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-06Audit log for user authenticationValery Sizov
2015-06-22Correct AddDefaultOtpRequiredForLoginValue migrationRobert Speicher
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-21Make default value for otp_required_for_login false instead of nullRobert Speicher
2015-06-14Add `dashboard` attribute to User modelRobert Speicher
2015-06-11session_expire_seconds => session_expire_delaythemaze75
delay is in seconds more legible code in session_store Added `GitLab restart required` help block to session_expire_delay
2015-06-05Add session expiration delay configuration through UI applicationEric Maziade
settings
2015-05-29Allow to configure a URL to show after sign outAlex Lossent
2015-05-29Add option to disallow users from registering any application to use GitLab ↵Douwe Maan
as an OAuth provider
2015-05-22Add support for Webhook note eventsStan Hu
Closes https://github.com/gitlabhq/gitlabhq/issues/6745
2015-05-13Make more migrations reversibleRobert Speicher
[ci skip]
2015-05-13Merge branch 'version-check' into 'master'Dmitriy Zaporozhets
Version check See merge request !1509
2015-05-12Merge branch 'rs-system-note' into 'master'Dmitriy Zaporozhets
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-12Merge branch 'fix_migration' into 'master'Valery Sizov
Make migrations reversible /cc @jacobvosmaer @marin See merge request !622
2015-05-11Add migration to convert legacy system notesRobert Speicher
2015-05-10Make otp_backup_codes a text fieldRobert Speicher
2015-05-10Add support for backup codesDmitriy Zaporozhets
2015-05-10Init 2 factor authentication for user modelDmitriy Zaporozhets
2015-05-08Adding quote_string to migrationValery Sizov
2015-05-08Merge branch 'version-check' into gl-version-checkDmitriy Zaporozhets
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-08Merge branch 'tag_dup' into 'master'Valery Sizov
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-08Merge branch 'fix-mysql-migration-with-tags' into 'master'Valery Sizov
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-08Conditionally remove indices that may not exist in pre-GitLab v6.7 installationsStan Hu
Closes #1593