summaryrefslogtreecommitdiff
path: root/db
Commit message (Collapse)AuthorAgeFilesLines
* Rename BUILD to JOB in CI Variableszj-variables-build-jobZ.J. van de Weg2017-03-071-2/+2
| | | | | | | | Given GitLab moves away from using the term build, everywhere, also the CI variables are being renamed. For now, both `CI_BUILD_X` and `CI_JOB_X` are supported, with the same values. However, in about 3 months, support will be dropped.
* Merge branch '26371-native-emojis-v3' into 'master' Filipa Lacerda2017-03-071-1/+1
|\ | | | | | | | | | | | | Add emoji images - Base Native Unicode Emojis Closes #26371 See merge request !9569
| * Fix up @DouweM reviewEric Eastwood2017-03-061-1/+1
| |
* | Merge branch 'master' into 'rs-carrierwave-db'rs-carrierwave-dbDouwe Maan2017-03-062-0/+29
|\ \ | | | | | | | | | # Conflicts: # spec/models/group_spec.rb
| * \ Merge branch 'zj-create-mattermost-team' into 'master' Kamil Trzciński2017-03-062-0/+29
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Create Mattermost Team from GitLab Closes #23964 See merge request !8746
| | * \ Merge branch 'master' into 'zj-create-mattermost-team'Zeger-Jan van de Weg2017-03-064-2/+34
| | |\ \ | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| | * \ \ Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-03-061-2/+2
| | |\ \ \
| | * | | | Minor edits, incorporate reviewZ.J. van de Weg2017-03-062-6/+4
| | | | | |
| | * | | | Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-03-029-14/+155
| | |\ \ \ \
| | * | | | | Improve UXZ.J. van de Weg2017-03-022-7/+11
| | | | | | |
| | * | | | | Fix testsZ.J. van de Weg2017-02-241-2/+3
| | | | | | |
| | * | | | | Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-02-2414-24/+60
| | |\ \ \ \ \
| | * | | | | | Fix bad merge [ci skip]Z.J. van de Weg2017-02-202-6/+6
| | | | | | | |
| | * | | | | | Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-02-203-3/+16
| | |\ \ \ \ \ \
| | * | | | | | | Improve DRYness of viewsZ.J. van de Weg2017-02-161-2/+2
| | | | | | | | |
| | * | | | | | | Create MM team for GitLab groupZ.J. van de Weg2017-02-162-0/+28
| | | | | | | | |
* | | | | | | | | Add Upload model and UploadChecksumWorker workerRobert Speicher2017-03-062-0/+34
|/ / / / / / / /
* | | | | | | | Merge branch 'pipeline-blocking-actions' into 'master' Kamil Trzciński2017-03-062-1/+20
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make manual actions blocking Closes #26360 and #22628 See merge request !9585
| * | | | | | | Migrate legacy actions in post deployment migrationGrzegorz Bizon2017-03-062-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into pipeline-blocking-actionspipeline-blocking-actionsGrzegorz Bizon2017-03-064-2/+34
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (26 commits) Fix UserBasic Rename `/take` to `/take_ownership`, expose `owner` in `v3`. Update after review Fix values being called at Array instead of Hash Fix json response in branches controller Improve docs and specs related to pages artifacts Add MR fo changelog about removing pages artifacts Delete artifacts for pages unless expiry date is specified Lint doc Improved team selection Move foreign key to separate migration Fix import model attributes Update documentation and expose ID Introduce tests for pipeline triggers Fix trigger model Update db/schema Make triggers to be user aware Make Pipeline Triggers to be user aware Update triggers API Remove remnants of git annex ... Conflicts: db/schema.rb
| * | | | | | | Add migration for manual actions with skipped statusGrzegorz Bizon2017-03-062-1/+20
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Remove unecessary defaults for uniq ip block, cleanup refactoring leftoversPawel Chojnacki2017-03-062-7/+6
| | | | | | |
* | | | | | | align schema.rb with upstream and fix rubocop warning about not freezing ↵Pawel Chojnacki2017-03-061-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | mutable constants and empty error classes
* | | | | | | Remove unecessary calls to limit_user!, UniqueIps Middleware, and address MR ↵Pawel Chojnacki2017-03-062-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | review - cleanup formating in haml - clarify time window is in seconds - cleanup straneous chunks in db/schema - rename count_uniqe_ips to update_and_return_ips_count - other
* | | | | | | Allow limiting logging in users from too many different IPs.Pawel Chojnacki2017-03-062-1/+21
| |/ / / / / |/| | | | |
* | | | | | Move foreign key to separate migrationKamil Trzcinski2017-03-053-3/+13
| | | | | |
* | | | | | Update db/schemaKamil Trzcinski2017-03-053-3/+6
| | | | | |
* | | | | | Make triggers to be user awareKamil Trzcinski2017-03-051-1/+1
| | | | | |
* | | | | | Make Pipeline Triggers to be user awareKamil Trzcinski2017-03-052-0/+19
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - they can have owner, - they can be edited, - they have description, - you can take ownership of them
* | | | | Fix the `Gitlab::Seeder` monkey patch to disable mail deliveryrs-dev-seed-timeRobert Speicher2017-03-021-2/+2
| |_|_|/ |/| | |
* | | | Merge branch 'fix/mwbs-to-mwps' into 'master' Douwe Maan2017-03-013-3/+61
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename MWBS to MWPS Closes #24707 See merge request !9335
| * | | | Update occurrences of MWBS to MWPSfix/mwbs-to-mwpsJames Lopez2017-03-013-3/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename column in the database Rename fields related to import/export feature Rename API endpoints Rename documentation links Rename the rest of occurrences in the code Replace the images that contain the words "build succeeds" and docs referencing to them Make sure pipeline is green and nothing is missing. updated doc images renamed only_allow_merge_if_build_succeeds in projects and fixed references more updates fix some spec failures fix rubocop offences fix v3 api spec fix MR specs fixed issues with partials fix MR spec fix alignment add missing v3 to v4 doc wip - refactor v3 endpoints fix specs fix a few typos fix project specs copy entities fully to V3 fix entity error more fixes fix failing specs fixed missing entities in V3 API remove comment updated code based on feedback typo fix spec
* | | | | Disable the inheritance column of services in DisableInvalidServiceTemplates ↵Rémy Coutable2017-03-011-4/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | migration The `unless defined?(Service)` was useless since in production env, models are eager loaded, thus we wouldn't disable the STI, resulting in the following error: The single-table inheritance mechanism failed to locate the subclass: 'GitlabCiService'. This error is raised because the column 'type' is reserved for storing the class in case of inheritance. Please rename this column if you didn't intend it to be used for storing the inheritance class or overwrite Service.inheritance_column to use another column for that information./opt/gitlab/embedded/service/gitlab-rails/db/post_migrate/20170211073944_disable_invalid_service_templates.rb:11:in `up' Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Fix migration without DOWNTIME clause specifiedRuben Davila2017-02-281-0/+2
| | | |
* | | | Add development fixtures for nested groupsdz-nested-groups-fixturesDmitriy Zaporozhets2017-02-271-0/+69
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'dm-fix-web-edit-new-lines' into 'master' Robert Speicher2017-02-241-9/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Consistently create, update, and delete files, taking CRLF settings into account See merge request !9207
| * | | | Rename commit_file, commit_dir and remove_file and update specsDouwe Maan2017-02-241-1/+1
| | | | |
| * | | | Consistently create, update, and delete files, taking CRLF settings into accountDouwe Maan2017-02-241-9/+1
| | | | |
* | | | | Remove the default value for the `users.ghost` database column.Timothy Andrew2017-02-242-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | The default (false) is not strictly required, and this lets us avoid a potentially expensive migration
* | | | | Use a `ghost` boolean to track ghost users.Timothy Andrew2017-02-242-0/+16
|/ / / / | | | | | | | | | | | | | | | | | | | | Rather than using a separate `ghost` state. This lets us have the benefits of both ghost and blocked users (ghost: true, state: blocked) without having to rewrite a number of queries to include cases for `state: ghost`.
* | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-02-2413-24/+44
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27762-add-default-artifacts-expiration * upstream/master: (247 commits) Switched CONTRIBUTING.md style guide recommendation for method chaining Fix new offenses Stylistic tweaks Fix OAuth/SAML user blocking behavior Revert "Enable Style/DotPosition" Revert "Prefer leading style for Style/DotPosition" Revert "Enable Style/BarePercentLiterals" Manually correct autocorrect Move up delegate calls Exclude migrations from Style/MutableConstant ActiveSupport delegation is preferred over Forwardable Update haml_lint to work with newest rubocop Add explanations to cops Update rubocop and rubocop-rspec and regenerate .rubocop_todo.yml Update rubocop and rubocop-rspec and regenerate .rubocop_todo.yml Order cops alphabetically Don’t exclude some file in lib from rubocop Fix new offenses Enable Rails/Delegate Enable Style/WordArray ...
| * | | Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-237-48/+48
| | | | | | | | | | | | | | | | This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.
| * | | Revert "Enable Style/BarePercentLiterals"Douwe Maan2017-02-232-4/+4
| | | | | | | | | | | | | | | | This reverts commit 96bef54154e669f9a3e92c3a4bc76c0be3a52e48.
| * | | Exclude migrations from Style/MutableConstantDouwe Maan2017-02-2334-44/+44
| | | |
| * | | Enable Style/WordArrayDouwe Maan2017-02-231-2/+2
| | | |
| * | | Prefer leading style for Style/DotPositionDouwe Maan2017-02-237-48/+48
| | | |
| * | | Old migration doesn’t require downtimeDouwe Maan2017-02-231-0/+2
| | | |
| * | | Enable Style/BarePercentLiteralsDouwe Maan2017-02-232-4/+4
| | | |
| * | | Enable Security/JSONLoadDouwe Maan2017-02-233-4/+4
| | | |
| * | | Enable Style/MutableConstantDouwe Maan2017-02-2336-38/+38
| | | |
View Lorry Controller Status