Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add table for files in merge request diffs | Sean McGivern | 2017-06-16 | 4 | -1/+53 |
| | | | | | | | | | | | | | | | | This adds an ID-less table containing one row per file, per merge request diff. It has a column for each attribute on Gitlab::Git::Diff that is serialised currently, with the advantage that we can easily query the attributes of this new table. It does not migrate existing data, so we have fallback code when the legacy st_diffs column is present instead. For a merge request diff to be valid, it should have at most one of: * Rows in this new table, with the correct merge_request_diff_id. * A non-NULL st_diffs column. It may have neither, if the diff is empty. | ||||
* | Migration - Remove position field from issues and merge requests | Felipe Artur | 2017-06-16 | 2 | -3/+9 |
| | |||||
* | Deserialise existing custom notification settingsdeserialize-custom-notifications | Sean McGivern | 2017-06-15 | 2 | -1/+56 |
| | | | | | | Create a post-deployment migration to update all existing notification settings with at least one custom level enabled to the new format. Also handle the same conversion when updating settings, to catch any stragglers. | ||||
* | Add columns for custom notification settings | Sean McGivern | 2017-06-15 | 2 | -0/+38 |
| | | | | | | Add columns for each custom notification level, defaulting to null. Read from those columns if non-null, otherwise fall back to the serialized column. Writing will write to the new column if `events` isn't manually set. | ||||
* | Help landing page customizations - db changes | Robin Bobbitt | 2017-06-13 | 3 | -0/+21 |
| | |||||
* | Add database helpers 'add_timestamps_with_timezone' and ↵32054-rails-should-use-timestamptz-database-type-for-postgresql | blackst0ne | 2017-06-13 | 36 | -0/+41 |
| | | | | 'timestamps_with_timezone' | ||||
* | Bring in security changes from the 9.2.5 release | DJ Mountney | 2017-06-07 | 6 | -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 changes | Robin Bobbitt | 2017-06-07 | 4 | -2/+42 |
| | |||||
* | Merge branch 'feature/gb/migrate-pipeline-stages' into 'master' | Kamil Trzciński | 2017-06-07 | 6 | -1/+126 |
|\ | | | | | | | | | Migrate pipeline stages in the database See merge request !11714 | ||||
| * | Fix reverting builds stage ref migration on MySQL | Grzegorz Bizon | 2017-06-06 | 1 | -1/+1 |
| | | |||||
| * | Migrate stages only with correct foreign references | Grzegorz Bizon | 2017-06-06 | 1 | -1/+4 |
| | | |||||
| * | Create index on pipeline stages after migrating stages | Grzegorz Bizon | 2017-06-06 | 1 | -0/+0 |
| | | |||||
| * | Improve indexes and refs in pipeline stages migrations | Grzegorz Bizon | 2017-06-06 | 5 | -43/+31 |
| | | |||||
| * | Fix typo in build stages reference migration | Grzegorz Bizon | 2017-06-06 | 1 | -1/+1 |
| | | |||||
| * | Improve order of columns in pipeline stages table | Grzegorz Bizon | 2017-06-06 | 1 | -1/+1 |
| | | |||||
| * | Make pipeline stages ref migration more readable | Grzegorz Bizon | 2017-06-06 | 1 | -3/+5 |
| | | |||||
| * | Use the latest migration version as a schema version | Grzegorz Bizon | 2017-06-05 | 1 | -1/+1 |
| | | |||||
| * | Remove stage index concurrently on migration rollback | Grzegorz Bizon | 2017-06-05 | 1 | -1/+1 |
| | | |||||
| * | Disable timeouts in foreign keys for stages migration | Grzegorz Bizon | 2017-06-05 | 1 | -0/+2 |
| | | |||||
| * | Remove obsolete stages/build before adding foreign keys | Grzegorz Bizon | 2017-06-05 | 1 | -0/+16 |
| | | |||||
| * | Create indexes on pipeline stages before migration | Grzegorz Bizon | 2017-06-05 | 1 | -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 already | Grzegorz Bizon | 2017-06-05 | 1 | -1/+3 |
| | | |||||
| * | Migrate pipeline stages only when not migrated already | Grzegorz Bizon | 2017-06-05 | 1 | -3/+3 |
| | | |||||
| * | Merge branch 'master' into feature/gb/migrate-pipeline-stages | Grzegorz Bizon | 2017-06-05 | 29 | -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 migrations | Grzegorz Bizon | 2017-05-26 | 3 | -1/+1 |
| | | | |||||
| * | | Create foreign keys for pipeline stages in migration | Grzegorz Bizon | 2017-05-26 | 2 | -1/+20 |
| | | | |||||
| * | | Migrate build stage reference in a separate migration | Grzegorz Bizon | 2017-05-26 | 3 | -9/+22 |
| | | | |||||
| * | | Add stage_id column to ci_builds in a separate migration | Grzegorz Bizon | 2017-05-26 | 2 | -2/+9 |
| | | | |||||
| * | | Use a separate migration to create pipeline stages index | Grzegorz Bizon | 2017-05-26 | 2 | -10/+15 |
| | | | |||||
| * | | Add pipeline stages post deployment migration | Grzegorz Bizon | 2017-05-26 | 3 | -2/+48 |
| | | | |||||
| * | | Simplify migrations for specific database schema | Grzegorz Bizon | 2017-05-25 | 2 | -2/+10 |
| | | | |||||
| * | | Add PoC of ActiveRecord migration testing | Grzegorz Bizon | 2017-05-25 | 1 | -0/+14 |
| | | | |||||
* | | | Merge branch 'instrument-infra' into 'master' | Grzegorz Bizon | 2017-06-07 | 3 | -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 Chojnacki | 2017-06-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | defaulting to false | ||||
| * | | | Make production settings fixture use ↵ | Pawel Chojnacki | 2017-06-02 | 1 | -13/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::CurrentSettings.current_application_settings small code formatting changes | ||||
| * | | | Make fixture message more descriptive | Pawel Chojnacki | 2017-06-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | + use strip_heredoc to make the text in tests much more readable | ||||
| * | | | Allow enabling Prometheus metrics via ENV variable when db is seeded | Pawel Chojnacki | 2017-06-02 | 1 | -7/+20 |
| | | | | |||||
| * | | | Make login_counter instance variable instead of class one. | Pawel Chojnacki | 2017-06-02 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | + remove unecessarey require + fix small formatiing issues | ||||
| * | | | Mark migration as requiring no downtime | Pawel Chojnacki | 2017-06-02 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | + Add spaces for four phases approach + fix InfluxDB rename | ||||
| * | | | Add Prometheus metrics configuration | Pawel Chojnacki | 2017-06-02 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | + Cleanup Gemfile | ||||
| * | | | Prometheus settings | Pawel Chojnacki | 2017-06-02 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch '12910-snippets-description' into 'master' | Phil Hughes | 2017-06-07 | 2 | -0/+14 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support descriptions for snippets Closes #31894 See merge request !11071 | ||||
| * | | | | Support descriptions for snippets | Jarka Kadlecova | 2017-05-31 | 2 | -0/+14 |
| | | | | | |||||
* | | | | | Fix error while seeding projects in databaseda-fix-db-seed | Douglas Barbosa Alexandre | 2017-06-06 | 1 | -1/+3 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master' | Phil Hughes | 2017-06-05 | 1 | -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-3 | Luke "Jared" Bennett | 2017-06-02 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'sidekiq-transaction' into 'master' | Sean McGivern | 2017-06-05 | 1 | -1/+10 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forbid Sidekiq scheduling in transactions Closes #27233 See merge request !9376 | ||||
| * | | | | Fix keys seed | Douwe Maan | 2017-06-02 | 1 | -1/+10 |
| |/ / / | |||||
* | | | | Merge branch '30469-convdev-index' into 'master' | Sean McGivern | 2017-06-05 | 3 | -0/+104 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ConvDev Index Closes #30469 See merge request !11377 | ||||
| * | | | | Add Conversational Development Index page to admin panel | Taurie Davis, Simon Knox and Adam Niedzielski | 2017-06-01 | 3 | -0/+104 |
| | | | | |