| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch '46600-fix-gitlab-revision-when-not-in-git-repo' into 'master' | Rémy Coutable | 2018-05-25 | 5 | -5/+20 |
| |\ | | | | | | | | | | | | | Resolve "gitlab 10.8 assumes that installation is a git working copy." Closes #46600 See merge request gitlab-org/gitlab-ce!19125 | ||||
| | * | Replace Gitlab::REVISION with Gitlab.revision and handle installations ↵46600-fix-gitlab-revision-when-not-in-git-repo | Rémy Coutable | 2018-05-24 | 5 | -5/+20 |
| | | | | | | | | | | | | | without a .git directory Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Merge branch 'migrate-restore-repo-to-gitaly' into 'master' | Douwe Maan | 2018-05-24 | 1 | -45/+43 |
| |\ \ | | | | | | | | | | | | | | | | | | | Use gitaly repository_service.CreateRepositoryFromBundle to restore (rake task) Closes charts/gitlab#390 See merge request gitlab-org/gitlab-ce!18644 | ||||
| | * | | Remove unneeded gitaly_migrate functionmigrate-restore-repo-to-gitaly | Ahmad Hassan | 2018-05-24 | 1 | -8/+0 |
| | | | | |||||
| | * | | Take restoring custom hooks and the skip flag out of scope | Ahmad Hassan | 2018-05-23 | 1 | -4/+2 |
| | | | | |||||
| | * | | Remove gitaly_migrate blocks and replace by early return | Ahmad Hassan | 2018-05-21 | 1 | -33/+26 |
| | | | | |||||
| | * | | Move restore_custom_hooks to its seperate function | Ahmad Hassan | 2018-05-18 | 1 | -16/+20 |
| | | | | |||||
| | * | | Return from prepare directory if gitaly skip is enabled | Ahmad Hassan | 2018-05-17 | 1 | -0/+2 |
| | | | | |||||
| | * | | Call path_to_repo only when using gitaly | Ahmad Hassan | 2018-05-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | Link to upstream gitaly issues for the missing restore paths | DJ Mountney | 2018-05-16 | 1 | -6/+8 |
| | | | | |||||
| | * | | Fix the paths for wiki restore | DJ Mountney | 2018-05-15 | 1 | -7/+8 |
| | | | | |||||
| | * | | Output project name before restoring each project repo | DJ Mountney | 2018-05-15 | 1 | -0/+1 |
| | | | | |||||
| | * | | Remove hooks restore that is no longer necessary | DJ Mountney | 2018-05-15 | 1 | -7/+0 |
| | | | | |||||
| | * | | Add back some of the non-gitaly restore functionality behind gates | DJ Mountney | 2018-05-15 | 1 | -20/+66 |
| | | | | |||||
| | * | | Wrap create_from_bundle in a begin rescue block | Ahmad Hassan | 2018-05-15 | 1 | -5/+19 |
| | | | | |||||
| | * | | Better repo restore progress logging | Ahmad Hassan | 2018-05-15 | 1 | -1/+5 |
| | | | | |||||
| | * | | Remove useless print line | Ahmad Hassan | 2018-05-15 | 1 | -1/+0 |
| | | | | |||||
| | * | | Use gitaly repository_service.CreateFromBundle to restore | Ahmad Hassan | 2018-05-15 | 1 | -53/+2 |
| | | | | |||||
| * | | | Fix backup creation and restore for specific Rake tasks | Stan Hu | 2018-05-24 | 10 | -108/+141 |
| | |/ |/| | |||||
| * | | Simplify Gitlab::CurrentSettings now that the logic is in CacheableAttributes | Rémy Coutable | 2018-05-23 | 1 | -26/+18 |
| | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Use ApplicationSetting.current_without_cache instead of ↵ | Rémy Coutable | 2018-05-23 | 3 | -3/+3 |
| | | | | | | | | | | | | | ApplicationSetting.current where applicable Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Introduce a new CacheableAttributes concern | Rémy Coutable | 2018-05-23 | 1 | -0/+4 |
| | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Merge branch 'issue-25256' into 'master' | Douwe Maan | 2018-05-23 | 3 | -5/+12 |
| |\ \ | | | | | | | | | | | | | skip email trim when email is creating new issue See merge request gitlab-org/gitlab-ce!18865 | ||||
| | * | | skip email trim when email is creating new issue | Cameron Crockett | 2018-05-22 | 3 | -5/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates from MR discussion 1. Added test for ReplyParser 2. Changed param to trim_reply with default set as true Removed keyword param in favor of normal options param updates for MR discussion Resolutions for code review comments more code review fixes | ||||
| * | | | Merge branch 'gitaly-repo-squash-in-progress-opt-out' into 'master' | Douwe Maan | 2018-05-23 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | Make Repo#squash_in_progress Opt-Out See merge request gitlab-org/gitlab-ce!19088 | ||||
| | * | | | Make Repo#squash_in_progress Opt-Outgitaly-repo-squash-in-progress-opt-out | Kim Carlbäcker | 2018-05-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'gitaly-wiki-get-formatted-data-opt-out' into 'master' | Douwe Maan | 2018-05-23 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Move Wiki::GetFormattedData to OptOut See merge request gitlab-org/gitlab-ce!19091 | ||||
| | * | | | | Move Wiki::GetFormattedData to OptOutgitaly-wiki-get-formatted-data-opt-out | Kim Carlbäcker | 2018-05-22 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'gitaly-import-project-opt-out' into 'master' | Douwe Maan | 2018-05-23 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Move ImportProject to OptOut in Gitaly See merge request gitlab-org/gitlab-ce!19090 | ||||
| | * | | | | | Move ImportProject to OptOut in Gitalygitaly-import-project-opt-out | Kim Carlbäcker | 2018-05-22 | 1 | -1/+1 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'gitaly-repo-info-attributes-opt-out' into 'master' | Douwe Maan | 2018-05-23 | 1 | -1/+1 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | Move Repository#info_attributes to OptOut in gitaly See merge request gitlab-org/gitlab-ce!19092 | ||||
| | * | | | | Move Repository#info_attributes to OptOut in gitalygitaly-repo-info-attributes-opt-out | Kim Carlbäcker | 2018-05-22 | 1 | -1/+1 |
| | |/ / / | |||||
| * | | | | Merge branch 'dm-xcode-project-directory' into 'master' | Robert Speicher | 2018-05-22 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | Fix Xcode project detection by looking for dirs instead of files See merge request gitlab-org/gitlab-ce!19035 | ||||
| | * | | | Fix Xcode project detection by looking for dirs instead of filesdm-xcode-project-directory | Douwe Maan | 2018-05-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Increase text limit for GPG keys (mysql only).ab-46530-mediumtext-for-gpg-keys | Andreas Brandl | 2018-05-22 | 1 | -0/+2 |
| | |/ / |/| | | | | | | | | Closes #46530. | ||||
| * | | | Merge branch 'ab-42194-keyset-pagination' into 'master' | Yorick Peterse | 2018-05-22 | 2 | -42/+213 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | API: Keyset pagination support Closes #45756 See merge request gitlab-org/gitlab-ce!18584 | ||||
| | * | | | Add feature-flag for keyset pagination.ab-42194-keyset-pagination | Andreas Brandl | 2018-05-21 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Add keyset pagination for API calls. | Andreas Brandl | 2018-05-21 | 1 | -5/+165 |
| | | | | | | | | | | | | | | | | | Closes #45756. | ||||
| | * | | | Refactor and extract DefaultPaginationStrategy. | Andreas Brandl | 2018-05-21 | 2 | -45/+56 |
| | | | | | |||||
| * | | | | Merge branch 'ab-43706-composite-primary-keys' into 'master' | Yorick Peterse | 2018-05-22 | 1 | -0/+15 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migration to add primary key constraint for composite keys Closes #43706 and #32258 See merge request gitlab-org/gitlab-ce!18980 | ||||
| | * | | | | Migration to add/drop primary key constraints for composite keys.ab-43706-composite-primary-keys | Andreas Brandl | 2018-05-21 | 1 | -0/+15 |
| | |/ / / | | | | | | | | | | | | | Closes #43706. | ||||
| * | | | | Expose readme url in Project API | Imre Farkas | 2018-05-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix `expose_url` helper does not include custom base url if it is set | Francisco Javier López | 2018-05-22 | 1 | -2/+7 |
| |/ / / | |||||
| * | | | Merge branch 'create-live-trace-only-if-job-is-complete' into 'master' | Kamil Trzciński | 2018-05-21 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Append trace chunk only if job is running Closes #46383 See merge request gitlab-org/gitlab-ce!18969 | ||||
| | * | | | Add the same gurad clause with artifacts uplaoding | Shinya Maeda | 2018-05-21 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | Append trace only if the job is running | Shinya Maeda | 2018-05-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch '45528-repeated-calls-to-redis-for-flipper-feature-flag' into ↵ | Stan Hu | 2018-05-21 | 1 | -1/+16 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Repeated calls to Redis for Flipper feature flag" Closes #45528 See merge request gitlab-org/gitlab-ce!18490 | ||||
| | * | | | | Ensure Flipper memoizer is used in Sidekiq's context45528-repeated-calls-to-redis-for-flipper-feature-flag | Rémy Coutable | 2018-05-18 | 1 | -1/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, don't use the provided Middleware, which isn't thread-safe, and instantiate a new Flipper instance per thread instead. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | Merge branch '44799-api-naming-issue-scope' into 'master' | Rémy Coutable | 2018-05-21 | 2 | -8/+10 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "API naming for issue scope" Closes #44799 See merge request gitlab-org/gitlab-ce!18935 | ||||
| | * | | | | | Add created_by_me and assigned_to_me scopes44799-api-naming-issue-scope | Mark Chao | 2018-05-21 | 2 | -8/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate corresponding dash versions created-by-me and assigned-to-me | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |