| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into 'issue_38337' | Felipe Artur | 2018-03-06 | 3 | -8/+56 |
| |\ | | | | | | | | | # Conflicts: # app/models/group.rb # db/schema.rb | ||||
| | * | Merge branch 'gitaly-lfs-changes' into 'master' | Douwe Maan | 2018-03-05 | 1 | -4/+10 |
| | |\ | | | | | | | | | | | | | | | | | | | Incorporate Gitaly's RPCs for Gitlab::Git::LfsChanges Closes gitaly#1048 See merge request gitlab-org/gitlab-ce!16973 | ||||
| | | * | Incorporate Gitaly's RPCs for Gitlab::Git::LfsChangesgitaly-lfs-changes | Alejandro Rodríguez | 2018-03-02 | 1 | -4/+10 |
| | | | | |||||
| | * | | Merge branch '43334-reply-by-email-did-not-pick-up-unsubscribe-quick-action' ↵ | Rémy Coutable | 2018-03-05 | 1 | -4/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Reply-by-email did not pick up /unsubscribe quick action" Closes #43334 See merge request gitlab-org/gitlab-ce!17482 | ||||
| | | * | | Fix quick actions for users who cannot update issues and MRs43334-reply-by-email-did-not-pick-up-unsubscribe-quick-action | Sean McGivern | 2018-03-02 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | There are several quick actions now that don't need this access - /todo and /unsubscribe for instance - but when these were first added, there weren't. Quick actions are now responsible for checking their own permissions. | ||||
| | * | | | Merge branch 'ee-4862-verify-file-checksums' into 'master' | Sean McGivern | 2018-03-05 | 1 | -0/+45 |
| | |\ \ \ | | |_|/ | |/| | | | | | | | | | | Foreground verification of uploads and LFS objects See merge request gitlab-org/gitlab-ce!17402 | ||||
| | | * | | Foreground verification of uploads and LFS objectsee-4862-verify-file-checksums | Nick Thomas | 2018-03-02 | 1 | -0/+45 |
| | | |/ | |||||
| * | | | Bring one group board to CE | Felipe Artur | 2018-03-03 | 7 | -0/+349 |
| |/ / | |||||
| * | | Merge branch '33570-slack-notify-default-branch' into 'master' | Sean McGivern | 2018-03-02 | 1 | -0/+18 |
| |\ \ | |/ |/| | | | | | | | | | Slack notifications - Respect "Notify only default branch" for push events Closes #33570 See merge request gitlab-org/gitlab-ce!17345 | ||||
| | * | SlackService - respect `notify_only_default_branch` for push events | Mario de la Ossa | 2018-03-02 | 1 | -0/+18 |
| | | | |||||
| * | | Extend Cluster Applications to install GitLab Runner to Kubernetes cluster | Mayra Cabrera | 2018-03-01 | 3 | -105/+101 |
| | | | |||||
| * | | Merge branch 'feature/move_oauth_modules_to_auth_dir_structure' into 'master' | Douwe Maan | 2018-03-01 | 2 | -9/+9 |
| |\ \ | | | | | | | | | | | | | Moved o_auth/saml/ldap modules under gitlab/auth See merge request gitlab-org/gitlab-ce!17359 | ||||
| | * | | Moved o_auth/saml/ldap modules under gitlab/auth | Horatiu Eugen Vlad | 2018-02-28 | 2 | -9/+9 |
| | | | | |||||
| * | | | Merge branch '41777-include-cycle-time-in-usage-ping' into 'master' | Douwe Maan | 2018-03-01 | 1 | -19/+30 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Include cycle time in usage ping" Closes #41777 See merge request gitlab-org/gitlab-ce!16793 | ||||
| | * | | | Adapt cycle analytics spec helper and cycle analytics usage data spec41777-include-cycle-time-in-usage-ping | Tiago Botelho | 2018-03-01 | 1 | -20/+19 |
| | | | | | |||||
| | * | | | Refactors median code to work with both single and multiple projects | Tiago Botelho | 2018-02-28 | 2 | -1/+13 |
| | | | | | |||||
| | * | | | Restrict cycle analytics usage data to instances that use postgres only | Tiago Botelho | 2018-02-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add update for packed-refs with git v2.16sh-bump-git-2.16 | Stan Hu | 2018-02-28 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge branch '43275-improve-variables-validation-message' into 'master' | Kamil Trzciński | 2018-02-27 | 1 | -0/+2 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | Resolve "Improve Variables validation message" Closes #43275 See merge request gitlab-org/gitlab-ce!17135 | ||||
| | * | | Skip variables duplicates validator if variable is already a duplicate | Matija Čupić | 2018-02-22 | 1 | -0/+2 |
| | |/ | |||||
| * | | Merge branch ↵ | Stan Hu | 2018-02-23 | 1 | -2/+4 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | '43570-localstorage-clear-error-when-feature-test-fails-before-visiting-page' into 'master' Resolve "localStorage.clear() error when Capybara test fails before visiting page" Closes #43570 See merge request gitlab-org/gitlab-ce!17339 | ||||
| | * | | prevent localStorage.clear from running when it would cause an error | Mike Greiling | 2018-02-23 | 1 | -2/+4 |
| | | | | |||||
| * | | | Fix deletion attempts on dropped tables | Michael Kozono | 2018-02-23 | 1 | -2/+2 |
| |/ / | |||||
| * | | Backport custom metrics ce components | Paweł Chojnacki | 2018-02-23 | 1 | -7/+9 |
| | | | |||||
| * | | Merge branch 'bvl-external-auth-port' into 'master' | Douwe Maan | 2018-02-23 | 1 | -0/+18 |
| |\ \ | |/ |/| | | | | | Port `read_cross_project` ability from EE See merge request gitlab-org/gitlab-ce!17208 | ||||
| | * | Port `read_cross_project` ability from EE | Bob Van Landuyt | 2018-02-22 | 1 | -0/+18 |
| | | | |||||
| * | | Merge branch 'fix-500-for-invalid-upload-path' into 'master' | Sean McGivern | 2018-02-22 | 1 | -0/+13 |
| |\ \ | |/ |/| | | | | | | | | | Fix 500 error when loading an invalid upload URL Closes gitlab-ee#4998 See merge request gitlab-org/gitlab-ce!17267 | ||||
| | * | Fix 500 error when loading an invalid upload URL | Sean McGivern | 2018-02-22 | 1 | -0/+13 |
| | | | |||||
| * | | Merge branch 'mk-improve-background-migration-specs' into 'master' | Stan Hu | 2018-02-21 | 2 | -16/+128 |
| |\ \ | | | | | | | | | | | | | Improve background migration specs See merge request gitlab-org/gitlab-ce!17162 | ||||
| | * | | Move TrackUntrackedUploadsHelpers | Michael Kozono | 2018-02-20 | 2 | -126/+128 |
| | | | | | | | | | | | | | into MigrationsHelpers namespace just for organization. | ||||
| | * | | Remove more BG migration spec dependencies | Michael Kozono | 2018-02-16 | 1 | -4/+9 |
| | | | | | | | | | | | | | For the `PrepareUntrackedUploads` spec. | ||||
| | * | | Remove codebase dependencies from a BG migration | Michael Kozono | 2018-02-16 | 1 | -9/+114 |
| | |/ | | | | | | | Specifically, `PopulateUntrackedUploads` and its spec. | ||||
| * | | 36847 - update toml-rb to 1.0.0 | Ken | 2018-02-21 | 1 | -1/+1 |
| |/ | | | | | 36847 - add changelog | ||||
| * | Merge branch 'ce-rc/move-more-ee-only-spec-files' into 'master' | Sean McGivern | 2018-02-15 | 2 | -4/+4 |
| |\ | | | | | | | | | Port some changes from gitlab-ee!4532 back to CE See merge request gitlab-org/gitlab-ce!17120 | ||||
| | * | Port some changes from gitlab-ee!4532 back to CEce-rc/move-more-ee-only-spec-files | Rémy Coutable | 2018-02-14 | 2 | -4/+4 |
| | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Merge branch 'mc/fix/project-variables-scope' into 'master' | Kamil Trzciński | 2018-02-14 | 1 | -1/+1 |
| |\ \ | |/ |/| | | | | | | | | | Resolve "Project variables validate without any scopes disregarding environment_scope" Closes #43191 See merge request gitlab-org/gitlab-ce!17086 | ||||
| | * | Improve validation message and add changelogmc/fix/project-variables-scope | Kamil Trzciński | 2018-02-14 | 1 | -1/+1 |
| | | | |||||
| | * | Add more information in variable_duplicates validator error message | Matija Čupić | 2018-02-13 | 1 | -1/+1 |
| | | | |||||
| * | | Avoid dropping tables in test | Michael Kozono | 2018-02-14 | 1 | -4/+0 |
| | | | | | | | | | | | | | And use :migration tag to use deletion strategy, and to avoid caching tables, and to lock into a particular schema. Attempting to fix intermittent spec errors `PG::UndefinedTable: ERROR: relation "public.untracked_files_for_uploads" does not exist`. | ||||
| * | | Merge branch 'feature/include-custom-attributes-in-api' into 'master' | Douwe Maan | 2018-02-14 | 1 | -37/+121 |
| |\ \ | |/ |/| | | | | | Allow including custom attributes in API responses See merge request gitlab-org/gitlab-ce!16526 | ||||
| | * | Allow including custom attributes in API responses | Markus Koller | 2018-02-08 | 1 | -37/+121 |
| | | | |||||
| * | | Allow to use the latest migration in migration specs | Rémy Coutable | 2018-02-12 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | This is useful for migration tests that relies on factories and that are very old and/or tedious to modify to not use factories. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Call .reset_column_in_all_models! before migrating in ↵ | Rémy Coutable | 2018-02-12 | 1 | -0/+2 |
| | | | | | | | | | | | | | MigrationsHelpers.schema_migrate_up! Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Use the :migration metadata in migration specs | Rémy Coutable | 2018-02-12 | 1 | -4/+0 |
| | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Disable caching of tables for migration spec that drops a temporary table | Stan Hu | 2018-02-12 | 1 | -0/+4 |
| | | | | | | | | | This is to fix job failures, such as https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/51409392. | ||||
| * | | Merge branch '42928-default-protected-variables-to-off' into 'master' | Filipa Lacerda | 2018-02-12 | 1 | -4/+4 |
| |\ \ | | | | | | | | | | | | | | | | | | | Default CI variables to unprotected Closes #42928 See merge request gitlab-org/gitlab-ce!17039 | ||||
| | * | | Default CI variables to unprotected42928-default-protected-variables-to-off | Eric Eastwood | 2018-02-09 | 1 | -4/+4 |
| | |/ | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/42928 | ||||
| * | | Resolve failures in GitHub-ish import controller specsrs-pick-security | Robert Speicher | 2018-02-09 | 1 | -4/+4 |
| | | | |||||
| * | | Merge branch 'fix/gh-namespace-issue' into 'security-10-4' | James Lopez | 2018-02-09 | 1 | -3/+54 |
| | | | | | | | | | [10.4] Fix GH namespace security issue | ||||
| * | | Merge branch ↵ | Douwe Maan | 2018-02-09 | 1 | -0/+304 |
| | | | | | | | | | | | | | 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibility' into 'security-10-4' [Port for security-10-4]: Makes SnippetFinder ensure feature visibility | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |