summaryrefslogtreecommitdiff
path: root/db
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into fix-restricted-visibilityVinnie Okada2015-03-144-17/+48
|\ | | | | | | | | Conflicts: db/schema.rb
| * remove duplicationValery Sizov2015-03-102-2/+23
| |
| * Fix importers with OCCValery Sizov2015-03-102-4/+13
| |
| * Fix user fixtures for developmentDmitriy Zaporozhets2015-03-081-13/+14
| |
* | Move restricted visibility settings to the UIVinnie Okada2015-03-072-3/+9
|/ | | | | Add checkboxes to the application settings page for restricted visibility levels, and remove those settings from gitlab.yml.
* Added comment notification events to HipChat and Slack services.Stan Hu2015-03-062-1/+7
| | | | | | | | | Supports four different event types all bundled under the "note" event type: - comments on a commit - comments on an issue - comments on a merge request - comments on a code snippet
* Issue #595: Support Slack notifications upon issue and merge request eventsStan Hu2015-03-032-2/+14
| | | | | | | | | | | 1) Adds a DB migration for all services to toggle on push, issue, and merge events. 2) Upon an issue or merge request event, fire service hooks. 3) Slack service supports custom messages for each of these events. Other services not supported at the moment. 4) Label merge request hooks with their corresponding actions.
* No need to block db:rollback for safe migrationDmitriy Zaporozhets2015-02-251-1/+0
|
* Merge branch 'fix-another-migration' into 'master'Dmitriy Zaporozhets2015-02-261-1/+1
|\ | | | | | | | | | | | | | | | | | | Prevent another migration from failing due to indirect use of model columns not yet created See https://github.com/gitlabhq/gitlabhq/issues/8817#issuecomment-76007077 cc @marin See merge request !1597
| * Prevent another migration from failing.Douwe Maan2015-02-251-1/+1
| |
* | Merge branch 'bitbucket-import'Dmitriy Zaporozhets2015-02-252-19/+27
|\ \ | |/ |/| | | | | | | Conflicts: app/views/import/gitorious/status.html.haml db/schema.rb
| * Add Bitbucket importer.Douwe Maan2015-02-242-19/+27
| |
* | Merge branch 'mwessel/gitlab-ce-set-last-activity-at' into 'master'Dmitriy Zaporozhets2015-02-242-2/+11
|\ \ | |/ |/| | | | | | | | | | | Give last_activity_at a default value so it will always be set For https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/345 See merge request !1589
| * Give last_activity_at a default value so it will always be setMarco Wessel2015-02-232-2/+11
| |
* | Make services migration more reliableDmitriy Zaporozhets2015-02-231-9/+15
|/
* Revert "Fix broken access control and refactor avatar upload"Dmitriy Zaporozhets2015-02-191-19/+0
| | | | This reverts commit 7d5f86f6cbd187e75a6ba164ad6bfd036977dd07.
* Merge branch 'fix_access_control_notes' into 'master'Dmitriy Zaporozhets2015-02-171-0/+19
|\ | | | | | | | | | | | | | | Fix broken access control for note attachments From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/332 by Hannes Rosenögger. See merge request !1528
| * Fix broken access control and refactor avatar uploadHannes Rosenögger2015-02-161-0/+19
| | | | | | | | | | | | | | | | | | | | | | This commit moves the note folder from /public/uploads/note to /uploads/note and changes the uploader accordingly. Now it's no longer possible to avoid the access control by modifing the url. The Avatar upload has been refactored to use an own uploader as well to cleanly seperate the two upload types.
* | Fix dev fixture for adminDmitriy Zaporozhets2015-02-171-0/+1
|/
* Merge branch 'tweet-new-project'Dmitriy Zaporozhets2015-02-151-0/+5
|\ | | | | | | | | Conflicts: db/schema.rb
| * Add link to share via twitter to "created project" event.Douwe Maan2015-02-132-3/+9
| |
* | Allow users that signed up via OAuth to set their password in order to use ↵Douwe Maan2015-02-133-19/+32
|/ | | | Git over HTTP(S).
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-02-121-1/+1
|\
| * Merge pull request #8445 from jvanbaarsen/project-spec-speed-upJeroen van Baarsen2015-02-121-1/+1
| |\ | | | | | | requests/api/project_spec.rb speed up
| | * Improved speed of the project_spec.rbJeroen van Baarsen2015-02-031-1/+1
| | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | Remove not null constraint on project_id in services.Marin Jankovski2015-02-112-2/+7
| | |
* | | Add template boolean to services.Marin Jankovski2015-02-112-1/+7
|/ /
* | Add index on order columns for services tableDmitriy Zaporozhets2015-02-092-1/+7
| |
* | Merge branch 'notification_email'Dmitriy Zaporozhets2015-02-072-1/+13
|\ \ | | | | | | | | | | | | Conflicts: db/schema.rb
| * | Allow notification email to be set separately from primary email.Douwe Maan2015-02-072-1/+13
| | | | | | | | | | | | Closes #1932.
* | | Add index on order columnsDmitriy Zaporozhets2015-02-062-1/+29
| | |
* | | Add timestamps to identityDmitriy Zaporozhets2015-02-052-6/+13
|/ /
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Marco Wessel2015-01-302-0/+6
|\ \ | |/ | | | | | | | | | | | | configure-protection Conflicts: CHANGELOG db/schema.rb
| * an ability to clone project with oauth2 tokenValery Sizov2015-01-282-1/+7
| |
* | Fix indentationMarco Wessel2015-01-251-3/+3
| |
* | Allow configuring protection of the default branch upon first pushMarco Wessel2015-01-252-1/+7
|/
* adding avatar to project settings page added avatar removal show project ↵Steven Thonus2015-01-242-0/+6
| | | | 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
* Merge pull request #7878 from cirosantilli/rm-seed-password-confirmationDmitriy Zaporozhets2015-01-182-2/+0
|\ | | | | Remove unneeded password_confirmation from seed.
| * Remove unneeded password_confirmation from seed.Ciro Santilli2014-12-282-2/+0
| |
* | Validate application settings only if column existsDmitriy Zaporozhets2015-01-161-1/+1
| |
* | Allow to specify home page for non logged-in usersDmitriy Zaporozhets2015-01-162-2/+8
| |
* | Update db schemaDmitriy Zaporozhets2015-01-131-1/+1
| |
* | Merge branch 'github_importer'Dmitriy Zaporozhets2015-01-132-1/+12
|\ \ | | | | | | | | | | | | Conflicts: app/helpers/projects_helper.rb
| * | Github ImporterValery Sizov2015-01-102-1/+12
| | |
* | | Init ApplicationSettings resource with defaults from config fileDmitriy Zaporozhets2015-01-082-1/+24
|/ /
* | Merge branch 'master' into developer_can_push_to_protected_branches_optionMarin Jankovski2014-12-293-0/+92
|\ \ | |/ | | | | | | Conflicts: db/schema.rb
| * Doorkeeper integrationValery Sizov2014-12-243-1/+93
| |
* | Add migration for developers can push to protected branches flag.Marin Jankovski2014-12-262-4/+10
|/
* Merge branch 'fix-mysql-migration' into 'master'Dmitriy Zaporozhets2014-12-231-0/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Remove index only if existsDmitriy Zaporozhets2014-12-231-2/+8
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status