summaryrefslogtreecommitdiff
path: root/db
Commit message (Collapse)AuthorAgeFilesLines
* Add database helpers 'add_timestamps_with_timezone' and ↵32054-rails-should-use-timestamptz-database-type-for-postgresqlblackst0ne2017-06-1336-0/+41
| | | | 'timestamps_with_timezone'
* Bring in security changes from the 9.2.5 releaseDJ Mountney2017-06-076-2/+455
| | | | | | | | | | | | | Ran: - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch - git checkout -b 9-2-5-security-patch origin/v9.2.2 - git apply patchfile.patch - git commit - [Got the sha ref for the commit] - git checkout -b upstream-9-2-security master - git cherry-pick <SHA of the patchfile commit> - [Resolved conflicts] - git cherry-pick --continue
* Sync email address from specified omniauth provider - db changesRobin Bobbitt2017-06-074-2/+42
|
* Merge branch 'feature/gb/migrate-pipeline-stages' into 'master'Kamil Trzciński2017-06-076-1/+126
|\ | | | | | | | | Migrate pipeline stages in the database See merge request !11714
| * Fix reverting builds stage ref migration on MySQLGrzegorz Bizon2017-06-061-1/+1
| |
| * Migrate stages only with correct foreign referencesGrzegorz Bizon2017-06-061-1/+4
| |
| * Create index on pipeline stages after migrating stagesGrzegorz Bizon2017-06-061-0/+0
| |
| * Improve indexes and refs in pipeline stages migrationsGrzegorz Bizon2017-06-065-43/+31
| |
| * Fix typo in build stages reference migrationGrzegorz Bizon2017-06-061-1/+1
| |
| * Improve order of columns in pipeline stages tableGrzegorz Bizon2017-06-061-1/+1
| |
| * Make pipeline stages ref migration more readableGrzegorz Bizon2017-06-061-3/+5
| |
| * Use the latest migration version as a schema versionGrzegorz Bizon2017-06-051-1/+1
| |
| * Remove stage index concurrently on migration rollbackGrzegorz Bizon2017-06-051-1/+1
| |
| * Disable timeouts in foreign keys for stages migrationGrzegorz Bizon2017-06-051-0/+2
| |
| * Remove obsolete stages/build before adding foreign keysGrzegorz Bizon2017-06-051-0/+16
| |
| * Create indexes on pipeline stages before migrationGrzegorz Bizon2017-06-051-0/+0
| | | | | | | | | | Creates an index in ci_stages before migrating pipeline stages from ci_builds, to improve migration performance.
| * Migrate stage_id only it job does not have it alreadyGrzegorz Bizon2017-06-051-1/+3
| |
| * Migrate pipeline stages only when not migrated alreadyGrzegorz Bizon2017-06-051-3/+3
| |
| * Merge branch 'master' into feature/gb/migrate-pipeline-stagesGrzegorz Bizon2017-06-0529-34/+535
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (524 commits) Improve user experience around slash commands in instant comments Fix LFS timeouts when trying to save large files retryable? is now available for CommitStatus Resolve "Documentation of `.gitlab-ci.yml` states incorrect example for variables" Fix test failures Add slugify project path to CI enviroment variables Fixed typo: craeted -> created 32118 Make New environment empty state btn lowercase Expose import_status in Projects API 32832 Remove overflow from comment form for confidential issues and vertically aligns confidential issue icon Fix test failures Allow manual bypass of auto_sign_in_with_provider Fix keys seed Allow users to be hard-deleted from the API fixup some classnames and media queries Enable the Style/PreferredHashMethods cop Lint our factories creation in addition to their build Don’t schedule workers from inside transactions Allow scheduling from after_commit hooks Forbid Sidekiq scheduling in transactions ... Conflicts: db/schema.rb spec/spec_helper.rb
| * | Reorder pipeline stages-related migrationsGrzegorz Bizon2017-05-263-1/+1
| | |
| * | Create foreign keys for pipeline stages in migrationGrzegorz Bizon2017-05-262-1/+20
| | |
| * | Migrate build stage reference in a separate migrationGrzegorz Bizon2017-05-263-9/+22
| | |
| * | Add stage_id column to ci_builds in a separate migrationGrzegorz Bizon2017-05-262-2/+9
| | |
| * | Use a separate migration to create pipeline stages indexGrzegorz Bizon2017-05-262-10/+15
| | |
| * | Add pipeline stages post deployment migrationGrzegorz Bizon2017-05-263-2/+48
| | |
| * | Simplify migrations for specific database schemaGrzegorz Bizon2017-05-252-2/+10
| | |
| * | Add PoC of ActiveRecord migration testingGrzegorz Bizon2017-05-251-0/+14
| | |
* | | Merge branch 'instrument-infra' into 'master'Grzegorz Bizon2017-06-073-7/+34
|\ \ \ | | | | | | | | | | | | | | | | Add Prometheus metrics endpoint and basic infrastructure to meter code See merge request !11553
| * | | Handle case where GITLAB_PROMETHEUS_METRICS_ENABLED is non boolean value by ↵Pawel Chojnacki2017-06-061-1/+1
| | | | | | | | | | | | | | | | defaulting to false
| * | | Make production settings fixture use ↵Pawel Chojnacki2017-06-021-13/+10
| | | | | | | | | | | | | | | | | | | | | | | | Gitlab::CurrentSettings.current_application_settings small code formatting changes
| * | | Make fixture message more descriptivePawel Chojnacki2017-06-021-1/+1
| | | | | | | | | | | | | | | | + use strip_heredoc to make the text in tests much more readable
| * | | Allow enabling Prometheus metrics via ENV variable when db is seededPawel Chojnacki2017-06-021-7/+20
| | | |
| * | | Make login_counter instance variable instead of class one.Pawel Chojnacki2017-06-021-0/+1
| | | | | | | | | | | | | | | | | | | | + remove unecessarey require + fix small formatiing issues
| * | | Mark migration as requiring no downtimePawel Chojnacki2017-06-021-0/+2
| | | | | | | | | | | | | | | | | | | | + Add spaces for four phases approach + fix InfluxDB rename
| * | | Add Prometheus metrics configurationPawel Chojnacki2017-06-021-0/+13
| | | | | | | | | | | | | | | | + Cleanup Gemfile
| * | | Prometheus settingsPawel Chojnacki2017-06-021-0/+1
| | | |
* | | | Merge branch '12910-snippets-description' into 'master'Phil Hughes2017-06-072-0/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support descriptions for snippets Closes #31894 See merge request !11071
| * | | | Support descriptions for snippetsJarka Kadlecova2017-05-312-0/+14
| | | | |
* | | | | Fix error while seeding projects in databaseda-fix-db-seedDouglas Barbosa Alexandre2017-06-061-1/+3
| |_|_|/ |/| | |
* | | | Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master'Phil Hughes2017-06-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master. See merge request !11478
| * | | | Fix up merge issuesfix-realtime-edited-text-for-issues-9-3Luke "Jared" Bennett2017-06-021-1/+1
| | |/ / | |/| |
* | | | Merge branch 'sidekiq-transaction' into 'master'Sean McGivern2017-06-051-1/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forbid Sidekiq scheduling in transactions Closes #27233 See merge request !9376
| * | | | Fix keys seedDouwe Maan2017-06-021-1/+10
| |/ / /
* | | | Merge branch '30469-convdev-index' into 'master'Sean McGivern2017-06-053-0/+104
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ConvDev Index Closes #30469 See merge request !11377
| * | | | Add Conversational Development Index page to admin panelTaurie Davis, Simon Knox and Adam Niedzielski2017-06-013-0/+104
| | | | |
* | | | | Make sure that environment was created before deployingLin Jen-Shin2017-06-021-0/+4
| | | | |
* | | | | Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URLLin Jen-Shin2017-06-024-2/+100
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (39 commits) Resolve "Improve Container Registry description" Add username parameter to gravatar URL Fix replying to a commit discussion displayed in the context of an MR Add fog-aliyun as backup storage provider Add missing specs Make sure protected can't be null; Test protected! Update session cookie key name to be unique to instance in development Just mention which GitLab version is required Fix data inconsistency issue for old artifacts by moving them to a currently used path Fix N+1 queries for non-members in comment threads Fix rubocop in spec/helpers/diff_helper_spec.rb Merge two items into one in the doc Only remove FK if it exists Maintain notes avatar at smaller breakpoint Fix pipeline schedule value name in documentation Add test for Project#protected_for? Update diff discussion position per discussion instead of per note Display Shared Runner status in Admin Dashboard Make sure we're loading the fresh variables Now secret_variables_for would return the variables ...
| * | | | Merge branch '24196-protected-variables' into 'master'Kamil Trzciński2017-06-012-1/+17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implementation for protected variables Closes #24196 See merge request !11688
| | * | | | Make sure protected can't be null; Test protected!24196-protected-variablesLin Jen-Shin2017-06-011-2/+2
| | | | | |
| | * | | | Merge branch 'master' into '24196-protected-variables'Kamil Trzciński2017-06-015-4/+58
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
View Lorry Controller Status