summaryrefslogtreecommitdiff
path: root/db
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into per-build-tokenKamil Trzcinski2016-09-195-5/+42
|\
| * Cleanup changesKamil Trzcinski2016-09-191-20/+0
| |
| * Added missing db/schema changesKamil Trzcinski2016-09-191-1/+2
| |
| * Add support for dynamic environmentsKamil Trzcinski2016-09-191-0/+29
| | | | | | | | Environments that can have a URL with predefined CI variables.
| * Merge branch 'increase_artifact_size_column' into 'master' Yorick Peterse2016-09-162-2/+17
| |\ | | | | | | | | | | | | Increase ci_builds artifacts_size column to 8-byte integer to allow larger files See merge request !6333
| | * Increase ci_builds artifacts_size column to 8-byte integer to allow larger filesDrew Blessing2016-09-152-2/+17
| | |
| * | Merge branch 'group-specific-lfs-settings' into 'master' Rémy Coutable2016-09-162-0/+13
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added group-specific setting for LFS. Groups can enable/disable LFS, but this setting can be overridden at the project level. **Admin only** Closes #18092 See merge request !6164
| | * | Improved helper methods, better flow for `project.lfs_enabled?`, and UI fixes.Patricio Cano2016-09-151-17/+0
| | | |
| | * | Added group-specific setting for LFS.Patricio Cano2016-09-152-0/+30
| | |/ | | | | | | | | | Groups can enable/disable LFS, but this setting can be overridden at the project level. Admin only
| * | Fix undefined method when reverting migration RemoveProjectsPushesSinceGcfix/irreversible-migrationDouglas Barbosa Alexandre2016-09-151-1/+1
| |/
* | Merge remote-tracking branch 'origin/lfs-support-for-ssh' into per-build-tokenKamil Trzcinski2016-09-152-4/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/git_http_client_controller.rb # app/helpers/lfs_helper.rb # lib/gitlab/auth.rb # spec/requests/lfs_http_spec.rb
| * | Refactor LFS token logic to use a Redis key instead of a DB field, making it ↵Patricio Cano2016-09-152-32/+0
| | | | | | | | | | | | a 1 use only token.
| * | Added LFS support to SSHPatricio Cano2016-09-152-0/+32
| |/ | | | | | | - Required on the GitLab Rails side is mostly authentication and API related.
| * Merge branch 'fix-old-migration-repos-path-key' into 'master' Robert Speicher2016-09-151-1/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update references to deprecated `repos_path` configuration key to avoid ## What does this MR do? Update references to deprecated `repos_path` configuration key to avoid errors when updating GitLab from older versions ## Why was this MR needed? Users were reporting errors when upgrading from GitLab 6.7 ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1464 See merge request !6350
| | * Update references to deprecated `repos_path` configuration key to avoidfix-old-migration-repos-path-keyAlejandro Rodríguez2016-09-141-1/+4
| | | | | | | | | | | | errors on updates from older versions
| * | Merge branch 'group-similar' into 'master' Rémy Coutable2016-09-151-3/+7
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group similar builds We group builds by removing from the builds name two numbers which are delimited by whitespace or colon: * `name 0 1` => `name` * `name 0:1` => `name` * `name 0/1` => `name` * `name 0:1 ruby` => `name ruby` * `name 0/1 ruby` => `name ruby` * `0 1 name ruby` => `name ruby` * `0:1 name ruby` => `name ruby` * `0/1 name ruby` => `name ruby` See merge request !6242
| | * Group similar buildsKamil Trzcinski2016-09-071-3/+7
| | |
* | | Merge remote-tracking branch 'origin/master' into per-build-tokenKamil Trzcinski2016-09-153-5/+38
|\ \ \ | |/ / | | | | | | | | | # Conflicts: # db/schema.rb
| * | Fix migration for removing MR diff indexesYorick Peterse2016-09-141-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For whatever reason on some PostgreSQL installations there would be a separate UNIQUE constraint on the merge_request_id column. Rails' index_exists?() returns false for this constraint (even when using the full name), yet the indexes() method returns it. This commit changes the migration so that the constraint is dropped as well. MySQL installations don't appear to be affected. Fixes gitlab-org/gitlab-ce#22136
| * | Move pushes_since_gc to Redispushes-since-gc-redisYorick Peterse2016-09-132-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves tracking of the pushes since the last Git GC from PostgreSQL to Redis. This reduces the number of writes on the "projects" table. This in turn reduces the vacuuming overhead. The lease used for incrementing the counter has been removed. This lease was mostly put in place to prevent high database load but this isn't needed anymore due to the counter now being stored in Redis. Fixes gitlab-org/gitlab-ce#22125
* | | Update db/schema.rbKamil Trzcinski2016-09-131-1/+3
| | |
* | | Use a permissions of user to access all dependent projects from CI jobs ↵Kamil Trzcinski2016-09-132-0/+22
|/ / | | | | | | (this also includes a container images, and in future LFS files)
* | Fix DB schema to match latest migrationsh-update-db-schemaStan Hu2016-09-081-1/+1
|/
* Support empty PG database toozj-gitorious-migration-empty-pg-databaseZ.J. van de Weg2016-09-061-2/+1
| | | | | First check if there is a result on the migration, else there is nothing to do
* Don't fail on an empty databasezj-drop-gitorious-fieldZ.J. van de Weg2016-09-052-6/+11
|
* Support MySQL too, when removing gitorious from import_sourcesZ.J. van de Weg2016-09-051-1/+5
|
* Remove gitorious from import_sources on ApplicationSetting modelZ.J. van de Weg2016-09-052-1/+32
|
* Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhqRémy Coutable2016-09-054-24/+71
|\ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Add migration to set confidential issues events on web hooksDouglas Barbosa Alexandre2016-09-012-1/+16
| |
| * Add option to confidential issues events to trigger servicesDouglas Barbosa Alexandre2016-08-312-12/+28
| |
| * Add option to confidential issues events to trigger WebhooksDouglas Barbosa Alexandre2016-08-312-11/+27
| |
* | Project tools visibility levelFelipe Artur2016-09-014-6/+103
|/
* Remove not-null constraint on lock_version column if it existsStan Hu2016-08-302-1/+14
| | | | Closes #21678
* Merge branch 'project-specific-lfs' into 'master' Robert Speicher2016-08-302-0/+30
|\ | | | | | | | | | | | | | | | | | | | | | | | | Added project specific enable/disable setting for LFS ## What does this MR do? Adds project specific enable/disable setting for LFS ## What are the relevant issue numbers? Needed for #18092 See merge request !5997
| * Renamed `enable_lfs` to `lfs_enabled` for the Project field, and related fixes.project-specific-lfsPatricio Cano2016-08-302-3/+3
| |
| * Added project specific enable/disable setting for LFSPatricio Cano2016-08-302-0/+30
| |
* | Remove default value for lock_versionValery Sizov2016-08-302-1/+17
|/
* Drop unused CI tables and fileszj-remove-unused-ci-tablesZ.J. van de Weg2016-08-262-18/+12
| | | | | | | | These tables, web hooks and services, are unused but where not dropped with the commits d5c91bb9a601a1a344d94763654f0b0996857497 and 2988e1fbf50b3c9e803a9358933e3e969e64dcc3. The file was left too, but never called.
* Add lock_version to merge_requests tableadd-lock-version-to-mr-schemaStan Hu2016-08-251-0/+1
| | | | | | | Closes #21465 It appears this column was mistakenly omitted in !5623 due to rebasing issues in earlier comments.
* Merge branch 'dz-merge-request-version'Douwe Maan2016-08-253-2/+39
|\
| * Fix db schema via db:migrate:resetDmitriy Zaporozhets2016-08-221-18/+16
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-227-44/+158
| |\ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-1913-42/+296
| |\ \ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * \ \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-1513-93/+240
| |\ \ \ | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Change merge request diff index to be not uniqDmitriy Zaporozhets2016-08-023-7/+45
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Change merge_error column from string to text typeStan Hu2016-08-232-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases, the artificial 255-character limit would cause an error in MergeWorker. Closes #20593
* | | | | Revert the revert of Optimistic Lockingrevert_revert_issuable_lockValery Sizov2016-08-222-15/+35
| |_|_|/ |/| | |
* | | | Merge branch 'fix-diff-note-discussion-id' into 'master' Rubén Dávila Santos2016-08-203-1/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call `set_discussion_id` again in DiffNote `before_validation` because the order is important See merge request !5913
| * | | | Call `set_discussion_id` again in DiffNote `before_validation` because the ↵Douwe Maan2016-08-193-1/+28
| | | | | | | | | | | | | | | | | | | | order is important
* | | | | Support integration with Koding (online IDE)Gokmen Goksel2016-08-192-0/+12
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Koding: #index: landing page for Koding integration If enabled it will provide a link to open remote Koding instance url for now we are also providing the sneak preview video for how integration works in detail. Repository: check whether .koding.yml file exists on repository Projects: landing page: show Run in IDE (Koding) button if repo has stack file Projects: MR: show Run in IDE Koding button if repo has stack file on active branch ProjectHelpers: add_koding_stack: stack generator for provided project With this helper we will auto-generate the required stack template for a given project. For the feature we can request this base template from the running Koding instance on integration. Currently this will provide users to create a t2.nano instance on aws and it'll automatically configures the instance for basic requirements. Projects: empty state and landing page provide shortcuts to create stack projects_helper: use branch on checkout and provide an entry point This ${var.koding_queryString_branch} will be replaced with the branch provided in query string which will allow us to use same stack template for different branches of the same repository. ref: https://github.com/koding/koding/pull/8597/commits/b8c0e43c4c24bf132670aa8a3cfb0d634acfd09b projects_helper: provide sha info in query string to use existing vms With this change we'll be able to query existing vms on Koding side based on the commit id that they've created. ref: https://github.com/koding/koding/pull/8597/commits/1d630fadf31963fa6ccd3bed92e526761a30a343 Integration: Docs: Koding documentation added Disable /koding route if integration is disabled Use application settings to enable Koding Projects_helper: better indentation with strip_heredoc usage Projects_helper: return koding_url as is if there is no project provided current_settings: set koding_enabled: false by default Koding_Controller: to render not_found once integration is disabled Dashboard_specs: update spec for Koding enabled case Projects_Helper: make repo dynamic ref: https://github.com/koding/koding/pull/8597/commits/4d615242f45aaea4c4986be84ecc612b0bb1514c Updated documentation to have right format