summaryrefslogtreecommitdiff
path: root/db
Commit message (Collapse)AuthorAgeFilesLines
* Add `dashboard` attribute to User modelRobert Speicher2015-06-162-3/+14
| | | | cherry-picked
* Allow to configure a URL to show after sign outAlex Lossent2015-05-292-1/+7
|
* Add option to disallow users from registering any application to use GitLab ↵user-oauth-applicationsDouwe Maan2015-05-292-1/+7
| | | | as an OAuth provider
* Merge branch 'rs-gems' into 'master'Dmitriy Zaporozhets2015-05-267-14/+14
|\ | | | | | | | | | | | | | | | | | | | | | | Update ffaker gem Adds a version requirement which it didn't have before, at 2.0.0. This version has breaking API changes in that the namespace is now `FFaker` instead of `Faker`. Prior, if a new developer checked out the repo, ran `bundle install` and then tried `rake dev:setup`, seeding would fail due to having the latest version of ffaker without the API changes in this MR. Also updates `spring` version and the binstubs, just for kicks. See merge request !686
| * Update ffaker gemRobert Speicher2015-05-207-14/+14
| | | | | | | | | | | | Adds a version requirement which it didn't have before, at 2.0.0. This version has breaking API changes in that the namespace is now `FFaker` instead of `Faker`.
* | Add support for Webhook note eventsStan Hu2015-05-212-1/+11
|/ | | | Closes https://github.com/gitlabhq/gitlabhq/issues/6745
* Make more migrations reversiblers-reversable-migrationsRobert Speicher2015-05-133-3/+22
| | | | [ci skip]
* Merge branch 'version-check' into 'master'Dmitriy Zaporozhets2015-05-132-0/+6
|\ | | | | | | | | | | Version check See merge request !1509
| * Merge branch 'version-check' into gl-version-checkDmitriy Zaporozhets2015-05-082-0/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Add feature to disable version checkDmitriy Zaporozhets2015-03-102-1/+7
| | |
* | | Fix Gemfile.lockDmitriy Zaporozhets2015-05-121-1/+1
| | |
* | | Merge branch 'rs-system-note' into 'master'Dmitriy Zaporozhets2015-05-122-1/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Add migration to convert legacy system notesRobert Speicher2015-05-112-1/+17
| | | |
* | | | Merge branch 'fix_migration' into 'master'Valery Sizov2015-05-122-2/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make migrations reversible /cc @jacobvosmaer @marin See merge request !622
| * | | | Make migrations reversiblefix_migrationValery Sizov2015-05-072-2/+9
| | | | |
* | | | | Make otp_backup_codes a text fieldRobert Speicher2015-05-092-1/+6
| | | | |
* | | | | Add support for backup codesDmitriy Zaporozhets2015-05-091-0/+5
| | | | |
* | | | | Init 2 factor authentication for user modelDmitriy Zaporozhets2015-05-091-0/+8
| |/ / / |/| | |
* | | | Adding quote_string to migrationquote_stringValery Sizov2015-05-081-1/+2
| |/ / |/| |
* | | Merge branch 'tag_dup' into 'master'Valery Sizov2015-05-081-0/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | remove tag duplicatestag_dupValery Sizov2015-05-071-0/+16
| |/ /
* | | Merge branch 'fix-mysql-migration-with-tags' into 'master'Valery Sizov2015-05-081-0/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Change the MySQL collation type to utf8_bin to ensure case-sensitive tags ↵Stan Hu2015-05-071-0/+10
| |/ / | | | | | | | | | are supported
* | | Conditionally remove indices that may not exist in pre-GitLab v6.7 installationsStan Hu2015-05-081-2/+9
|/ / | | | | | | Closes #1593
* | Remove project dropdown and fix db sche,aDmitriy Zaporozhets2015-05-051-26/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add application setting to restrict user signups to e-mail domainsStan Hu2015-05-022-1/+7
| | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'fix-project-tags' into 'master'Douwe Maan2015-04-305-2/+60
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Fix DB error when trying to tag a repositoryStan Hu2015-04-275-2/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'search-layout' into 'master'Dmitriy Zaporozhets2015-04-291-2/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improvements to search layout Improve search layout to match new UI style and make it more mobile-firendly See merge request !585
| * | | Continue refactoring and restyle of search layoutDmitriy Zaporozhets2015-04-281-2/+26
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Remove abandoned GroupMembersValery Sizov2015-04-292-1/+7
|/ /
* | Add new admin settingsVinnie Okada2015-04-263-2/+18
| | | | | | | | | | Add new global application settings for default project and snippet visibility levels.
* | Explain namespace clearn regex.Douwe Maan2015-04-241-0/+5
| |
* | Update schema.Douwe Maan2015-04-241-1/+1
| |
* | Don't attempt to move if original path only contains periods.Douwe Maan2015-04-241-0/+3
| |
* | Change migration timestamp.Douwe Maan2015-04-241-0/+0
| |
* | Properly migrate users with usernames like "." or "..".Douwe Maan2015-04-241-0/+4
| |
* | Revert "Revert disallowing usernames to end in period."Douwe Maan2015-04-241-0/+76
| | | | | | | | This reverts commit c75c6b840ba9ed82bb01eca52e968c2b0ec985e6.
* | Fixed the Rails/ActionFilter copJeroen van Baarsen2015-04-201-1/+1
| | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | Revert disallowing usernames to end in period.revert-username-periodDouwe Maan2015-04-201-76/+0
| |
* | Merge branch 'google-code-import-performance' into 'master'Dmitriy Zaporozhets2015-04-173-2/+19
|\ \ | | | | | | | | | | | | | | | | | | | | | 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
| * | Move import data out of project so it doesn't take ages to load.Douwe Maan2015-04-173-2/+19
| | |
* | | Fix username period migration to preserve uniqueness of names and paths.Douwe Maan2015-04-171-5/+5
|/ /
* | Merge branch 'invitation' into 'master'Dmitriy Zaporozhets2015-04-152-1/+18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to be invited. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2058. The "Add members" panes for both Group Members and Project Members have gained a line of text by the People field. ![Screen_Shot_2015-04-10_at_14.14.32](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fe990e65eccd9203d7324b492941362b/Screen_Shot_2015-04-10_at_14.14.32.png) Entering an email address that is not already a member will give you the option to invite them. ![Screen_Shot_2015-04-10_at_14.14.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d6b0d4571ea90f2a2e4af8f5b336e8e1/Screen_Shot_2015-04-10_at_14.14.48.png) Choosing the option will add them to the People field. This works the right way (TM) in combination with adding existing users as members. ![Screen_Shot_2015-04-10_at_14.15.09](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a618e5ec292d79578b16400dca6d4cfe/Screen_Shot_2015-04-10_at_14.15.09.png) The invited member will be shown in the members list as such. The access level can be changed, and the invite can be revoked by deleting the member. ![Screen_Shot_2015-04-10_at_14.15.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3695b9a6778d367b275115747579b46e/Screen_Shot_2015-04-10_at_14.15.19.png) The invited user will receive an email with an "Accept invitation" link. ![Screen_Shot_2015-04-10_at_14.17.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/730121888153117d83c3cd0e4f5c90f6/Screen_Shot_2015-04-10_at_14.17.52.png) If they're not already logged in, clicking this link will redirect them to the sign in/up page with a helpful notice. ![Screen_Shot_2015-04-10_at_14.18.12](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1a26a5fa13321e7ef77ed8b538c8557d/Screen_Shot_2015-04-10_at_14.18.12.png) Signing in or signing up will redirect them back to the invite detail page, where they can actually accept the invitation, which will update the member record in question to point to the user in question. ![Screen_Shot_2015-04-10_at_14.18.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7ac33085463a99b8cfa6baa13bfa1235/Screen_Shot_2015-04-10_at_14.18.48.png) Accepting the invitation will redirect them to the group (or project) with an appropriate notice. ![Screen_Shot_2015-04-10_at_14.18.58](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7bf02a2e3bea589a11df401c23e68648/Screen_Shot_2015-04-10_at_14.18.58.png) As currently, they will also receive this information by email. ![Screen_Shot_2015-04-10_at_14.24.00](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b44a342068433a268c0a06ed9e791ffa/Screen_Shot_2015-04-10_at_14.24.00.png) At the same time, the person who initially invited the email address is sent a notification as well, so they know of the new member and to tell them what name the user signed up with. ![Screen_Shot_2015-04-10_at_14.19.07](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b29fea128186f938ec76bd7dec016b83/Screen_Shot_2015-04-10_at_14.19.07.png) The member row on the Members page will now have been updated with the new user account. ![Screen_Shot_2015-04-10_at_14.19.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cf503d3d1679614e03acec2e946a28c3/Screen_Shot_2015-04-10_at_14.19.23.png) See merge request !500
| * | Add spinach tests around accepting and declining invitations.Douwe Maan2015-04-141-1/+2
| | |
| * | Add invite data to member.Douwe Maan2015-04-142-1/+18
| | |
* | | Merge branch 'google-code-import' into 'master'Douwe Maan2015-04-152-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import projects from Google Code. Resolves #1257. Issue import logic almost entirely taken from https://gitlab.com/o9000/google-code-to-gitlab ( :hearts: @o9000). ### To do - [x] List projects from Google Takeout file - [x] Import Git repository - [x] Import issues - [x] Link to correct attachment URL (https://code.google.com/p/support-tools/issues/detail?id=50) - [x] Handle deleted attachments - [x] Handle blockedOn attribute - [x] Add directions on how to get data from Google Takeout ### Import instructions ![Screen_Shot_2015-04-03_at_16.02.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4a87038035fbad9441cf613b8cdcc690/Screen_Shot_2015-04-03_at_16.02.21.png) ### Imported issue ![Screen_Shot_2015-04-03_at_16.25.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b2c2eaf5ecfcf57b3c48511eb5d26db4/Screen_Shot_2015-04-03_at_16.25.49.png) See merge request !471
| * | | Allow projects to be imported from Google Code.Douwe Maan2015-04-032-0/+6
| | | |
* | | | Remove unnecessary semicolonsJacob Vosmaer2015-04-141-2/+2
| | | | | | | | | | | | | | | | I could not help myself
* | | | Use different queries for MySQL and PostgresJacob Vosmaer2015-04-141-1/+14
| | | | | | | | | | | | | | | | | | | | I could not find a query that worked on both; these two queries look very similar and seem to do the same thing.