| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fixing two migrations that could not be rolled backfix-migration-rc1-rollback | DJ Mountney | 2017-03-14 | 2 | -2/+6 |
| | | | | | when rolling back from 9-0-stable to 8.17.3 | ||||
| * | [Issue Sorting] Improve migration | Valery Sizov | 2017-03-14 | 1 | -4/+3 |
| | | |||||
| * | Added migration to reset existing relative_position for issues | Valery Sizov | 2017-03-14 | 1 | -0/+18 |
| | | |||||
| * | Merge branch 'dz-blacklist--names' into 'master' | Douwe Maan | 2017-03-13 | 2 | -1/+102 |
| |\ | | | | | | | | | | | | | Blacklist nested groups and project names that can cause ambiguous routing for HA Closes #29324 See merge request !9898 | ||||
| | * | Reserve few project and nested group paths | Dmitriy Zaporozhets | 2017-03-13 | 2 | -1/+102 |
| | | | | | | | | | | | | | | | That have wildcard routes associated and not reserved yet: artifacts, graphs, badges and refs Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Trigger refreshing of permissions in a migrationrefresh-permissions-recent-users | Yorick Peterse | 2017-03-13 | 1 | -0/+19 |
| |/ | | | | | | This migration resets `users.authorized_projects_populated` (in batches) so that active users' permissions are refreshed on the next request. This ensures that their permissions are properly stored. | ||||
| * | Merge branch 'master' into orderable-issues | Douwe Maan | 2017-03-07 | 28 | -30/+224 |
| |\ | |||||
| | * | Merge branch 'dm-add-concurrent-index-cop' into 'master' | Yorick Peterse | 2017-03-07 | 19 | -22/+116 |
| | |\ | | | | | | | | | | | | | Add cop to ensure reversibility of add_concurrent_index See merge request !9771 | ||||
| | | * | Add downtime constantsdm-add-concurrent-index-cop | Douwe Maan | 2017-03-07 | 3 | -0/+6 |
| | | | | |||||
| | | * | Add cop to ensure reversibility of add_concurrent_index | Douwe Maan | 2017-03-07 | 19 | -22/+110 |
| | | | | |||||
| | * | | Merge branch 'zj-variables-build-job' into 'master' | Kamil Trzciński | 2017-03-07 | 1 | -2/+2 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Rename BUILD to JOB in CI Variables Closes #29053 See merge request !9756 | ||||
| | | * | | Rename BUILD to JOB in CI Variableszj-variables-build-job | Z.J. van de Weg | 2017-03-07 | 1 | -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 '28447-hybrid-repository-storages' into 'master' | Sean McGivern | 2017-03-07 | 4 | -5/+5 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Update storage settings to allow extra values per shard See merge request !9597 | ||||
| | | * | | | Update storage settings to allow extra values per shard28447-hybrid-repository-storages | Alejandro Rodríguez | 2017-03-03 | 4 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be necessary when adding gitaly settings. This version doesn't make any functional changes, but allows us to include this breaking change in 9.0 and add the needed extra settings in the future with backwards compatibility | ||||
| | * | | | | Merge branch 'siemens/gitlab-ce-feature/openid-connect' | Sean McGivern | 2017-03-07 | 3 | -0/+63 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | | * | | | Implement OpenID Connect identity provider | Markus Koller | 2017-03-07 | 3 | -0/+63 |
| | | | |/ | | |/| | |||||
| | * | | | Merge remote-tracking branch ↵ | Douwe Maan | 2017-03-07 | 3 | -1/+38 |
| | |\ \ \ | | |/ / | |/| | | | | | | 'origin/personal_access_token_api_and_impersonation_token' | ||||
| | | * | | apply codestyle and implementation changes to the respective feature codepersonal_access_token_api_and_impersonation_token | Tiago Botelho | 2017-03-06 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | applies relevant changes to the code and code structure | Tiago Botelho | 2017-02-28 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | add impersonation token | Simon Vocella | 2017-02-28 | 2 | -0/+19 |
| | | | | | |||||
| | | * | | manage personal_access_tokens through api | Simon Vocella | 2017-02-28 | 2 | -1/+19 |
| | | | | | |||||
| * | | | | Fix AddRelativePositionToIssues migration | Valery Sizov | 2017-03-07 | 1 | -2/+8 |
| | | | | | |||||
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues | Valery Sizov | 2017-03-07 | 5 | -2/+84 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge branch '26371-native-emojis-v3' into 'master' | Filipa Lacerda | 2017-03-07 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add emoji images - Base Native Unicode Emojis Closes #26371 See merge request !9569 | ||||
| | | * | | | Fix up @DouweM review | Eric Eastwood | 2017-03-06 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into 'rs-carrierwave-db'rs-carrierwave-db | Douwe Maan | 2017-03-06 | 2 | -0/+29 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | # Conflicts: # spec/models/group_spec.rb | ||||
| | | * \ \ \ | Merge branch 'zj-create-mattermost-team' into 'master' | Kamil Trzciński | 2017-03-06 | 2 | -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 Weg | 2017-03-06 | 4 | -2/+34 |
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| | | | * \ \ \ \ | Merge branch 'master' into zj-create-mattermost-team | Z.J. van de Weg | 2017-03-06 | 1 | -2/+2 |
| | | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | |||||
| | | | * | | | | | Minor edits, incorporate review | Z.J. van de Weg | 2017-03-06 | 2 | -6/+4 |
| | | | | | | | | | |||||
| | | | * | | | | | Merge branch 'master' into zj-create-mattermost-team | Z.J. van de Weg | 2017-03-02 | 9 | -14/+155 |
| | | | |\ \ \ \ \ | |||||
| | | | * | | | | | | Improve UX | Z.J. van de Weg | 2017-03-02 | 2 | -7/+11 |
| | | | | | | | | | | |||||
| | | | * | | | | | | Fix tests | Z.J. van de Weg | 2017-02-24 | 1 | -2/+3 |
| | | | | | | | | | | |||||
| | | | * | | | | | | Merge branch 'master' into zj-create-mattermost-team | Z.J. van de Weg | 2017-02-24 | 14 | -24/+60 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | | Fix bad merge [ci skip] | Z.J. van de Weg | 2017-02-20 | 2 | -6/+6 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | Merge branch 'master' into zj-create-mattermost-team | Z.J. van de Weg | 2017-02-20 | 3 | -3/+16 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Improve DRYness of views | Z.J. van de Weg | 2017-02-16 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Create MM team for GitLab group | Z.J. van de Weg | 2017-02-16 | 2 | -0/+28 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Add Upload model and UploadChecksumWorker worker | Robert Speicher | 2017-03-06 | 2 | -0/+34 |
| | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge branch 'pipeline-blocking-actions' into 'master' | Kamil Trzciński | 2017-03-06 | 2 | -1/+20 |
| | |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make manual actions blocking Closes #26360 and #22628 See merge request !9585 | ||||
| | | * | | | | | | | | Migrate legacy actions in post deployment migration | Grzegorz Bizon | 2017-03-06 | 2 | -1/+1 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Merge branch 'master' into pipeline-blocking-actionspipeline-blocking-actions | Grzegorz Bizon | 2017-03-06 | 4 | -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 status | Grzegorz Bizon | 2017-03-06 | 2 | -1/+20 |
| | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues | Valery Sizov | 2017-03-06 | 5 | -3/+55 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| | * | | | | | | | | Remove unecessary defaults for uniq ip block, cleanup refactoring leftovers | Pawel Chojnacki | 2017-03-06 | 2 | -7/+6 |
| | | | | | | | | | | |||||
| | * | | | | | | | | align schema.rb with upstream and fix rubocop warning about not freezing ↵ | Pawel Chojnacki | 2017-03-06 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mutable constants and empty error classes | ||||
| | * | | | | | | | | Remove unecessary calls to limit_user!, UniqueIps Middleware, and address MR ↵ | Pawel Chojnacki | 2017-03-06 | 2 | -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 Chojnacki | 2017-03-06 | 2 | -1/+21 |
| | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | | Move foreign key to separate migration | Kamil Trzcinski | 2017-03-05 | 3 | -3/+13 |
| | | | | | | | | | |||||
| | * | | | | | | | Update db/schema | Kamil Trzcinski | 2017-03-05 | 3 | -3/+6 |
| | | | | | | | | | |||||
