| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch ↵ | Rémy Coutable | 2017-11-28 | 3 | -6/+51 |
| |\ | | | | | | | | | | | | | | | | | '40530-merge-request-generates-wrong-diff-when-branch-and-tag-have-the-same-name' into 'master' Resolve "Merge request generates wrong diff when branch and tag have the same name" Closes #40530 See merge request gitlab-org/gitlab-ce!15591 | ||||
| | * | Ensure MRs always use branch refs for comparison | Sean McGivern | 2017-11-28 | 3 | -6/+51 |
| | | | | | | | | | | | | | | | | | | | | | If a merge request was created with a branch name that also matched a tag name, we'd generate a comparison to or from the tag respectively, rather than the branch. Merging would still use the branch, of course. To avoid this, ensure that when we get the branch heads, we prepend the reference prefix for branches, which will ensure that we generate the correct comparison. | ||||
| * | | Merge branch 'hashed-storage-attachments-migration-path' into 'master' | Nick Thomas | 2017-11-28 | 4 | -62/+195 |
| |\ \ | | | | | | | | | | | | | Hashed storage attachments migration path See merge request gitlab-org/gitlab-ce!15352 | ||||
| | * | | Changes to Attachments Migration for EE and Geo compatibility | Gabriel Mazetto | 2017-11-28 | 1 | -1/+1 |
| | | | | |||||
| | * | | Backport EE changes to make test possible when prepending modules | Gabriel Mazetto | 2017-11-24 | 1 | -6/+10 |
| | | | | |||||
| | * | | fix exclusive lease specs fro hashed storage migration | Gabriel Mazetto | 2017-11-23 | 1 | -3/+9 |
| | | | | |||||
| | * | | Codestyle changes and Added Exclusive Lease to hashed storage migration | Gabriel Mazetto | 2017-11-23 | 1 | -13/+31 |
| | | | | |||||
| | * | | when rollingback repository migration, toggle readonly mode back | Gabriel Mazetto | 2017-11-23 | 1 | -3/+5 |
| | | | | |||||
| | * | | Raises error when migration cannot happen so job is cancelled | Gabriel Mazetto | 2017-11-23 | 1 | -5/+2 |
| | | | | |||||
| | * | | attachments migration should move only the base folder | Gabriel Mazetto | 2017-11-23 | 1 | -24/+18 |
| | | | | |||||
| | * | | WIP Attachments migration | Gabriel Mazetto | 2017-11-23 | 2 | -0/+112 |
| | | | | |||||
| | * | | Refactor Hashed Storage migration to add additional migration steps | Gabriel Mazetto | 2017-11-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch '40561-environment-scope-value-is-not-trimmed' into 'master' | Kamil Trzciński | 2017-11-28 | 1 | -0/+18 |
| |\ \ \ | | | | | | | | | | | | | | | | | Strip leading & trailing whitespaces in CI/CD secret variable keys See merge request gitlab-org/gitlab-ce!15615 | ||||
| | * | | | Strip leading & trailing whitespaces in CI/CD secret variable keys40561-environment-scope-value-is-not-trimmed | Rémy Coutable | 2017-11-27 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | Merge branch 'tm/feature/list-runners-jobs-api' into 'master' | Kamil Trzciński | 2017-11-28 | 2 | -0/+173 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new API endpoint - list jobs of a specified runner Closes #39699 See merge request gitlab-org/gitlab-ce!15432 | ||||
| | * | | | | Refactorize jobs finding logic | Tomasz Maczukin | 2017-11-28 | 2 | -4/+43 |
| | | | | | | |||||
| | * | | | | Use 'set' instead of 'let!' when it's possible | Tomasz Maczukin | 2017-11-28 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Allow filtering by 'status' | Tomasz Maczukin | 2017-11-28 | 1 | -4/+46 |
| | | | | | | |||||
| | * | | | | Add information about project | Tomasz Maczukin | 2017-11-28 | 1 | -4/+4 |
| | | | | | | |||||
| | * | | | | Add new API endpoint - list jobs of a specified runner | Tomasz Maczukin | 2017-11-28 | 1 | -0/+92 |
| | | | | | | |||||
| * | | | | | Merge branch 'icon-sizes' into 'master' | Tim Zallmann | 2017-11-28 | 1 | -3/+9 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | limit icon component size to valid values See merge request gitlab-org/gitlab-ce!15618 | ||||
| | * | | | | | limit icon component size to valid valuesicon-sizes | Simon Knox | 2017-11-28 | 1 | -3/+9 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'tm/feature/namespace-by-id-api' into 'master' | Kamil Trzciński | 2017-11-28 | 4 | -14/+269 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new API endpoint - get a namespace by ID Closes #40254 See merge request gitlab-org/gitlab-ce!15442 | ||||
| | * | | | | | | Update policies unit tests | Tomasz Maczukin | 2017-11-27 | 2 | -14/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit also makes spec/policies/namespace_policy_spec.rb file to be compatible with the same file in GitLab EE. | ||||
| | * | | | | | | Add some unit tests for lib/api/helpers.rb | Tomasz Maczukin | 2017-11-27 | 1 | -0/+109 |
| | | | | | | | | |||||
| | * | | | | | | Introduce :read_namespace access policy for namespace and group | Tomasz Maczukin | 2017-11-23 | 1 | -10/+48 |
| | | | | | | | | |||||
| | * | | | | | | Allow request namespace by ID or path | Tomasz Maczukin | 2017-11-23 | 1 | -11/+27 |
| | | | | | | | | |||||
| | * | | | | | | Add new API endpoint - get a namespace by ID | Tomasz Maczukin | 2017-11-23 | 1 | -0/+69 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch '40226-refactor-the-issuable-s-webhooks-data-architecture' into ↵ | Douwe Maan | 2017-11-28 | 2 | -8/+16 |
| |\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Refactor the way we pass `old associations` to issuable's update services Closes #40226 See merge request gitlab-org/gitlab-ce!15542 | ||||
| | * | | | | | | Refactor the way we pass `old associations` to issuable's update services40226-refactor-the-issuable-s-webhooks-data-architecture | Rémy Coutable | 2017-11-24 | 2 | -8/+16 |
| | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | Merge branch 'backport-epic-fullscreen' into 'master' | Fatih Acet | 2017-11-27 | 1 | -65/+81 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport epic fullscreen See merge request gitlab-org/gitlab-ce!15437 | ||||
| | * | | | | | | Backport fix epic fullscreenbackport-fix-epic-fullscreen | Clement Ho | 2017-11-22 | 1 | -65/+81 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'backport-add-epic-sidebar' into 'master' | Fatih Acet | 2017-11-27 | 7 | -5/+329 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of add-epic-sidebar See merge request gitlab-org/gitlab-ce!15335 | ||||
| | * \ \ \ \ \ \ | Merge branch 'master' into 'backport-add-epic-sidebar' | Clement Ho | 2017-11-15 | 38 | -216/+948 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/lib/utils/text_utility.js | ||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into backport-add-epic-sidebar | Clement Ho | 2017-11-13 | 28 | -150/+2273 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Backport of add-epic-sidebar | Clement Ho | 2017-11-10 | 7 | -9/+331 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch '39601-create-issuable-destroy-service' into 'master' | Rémy Coutable | 2017-11-27 | 1 | -0/+38 |
| |\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create issue and merge request destroy services Closes #39601 See merge request gitlab-org/gitlab-ce!15604 | ||||
| | * | | | | | | | | | Create issue and merge request destroy services | George Andrinopoulos | 2017-11-25 | 1 | -0/+38 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fix stuck jobs testsoptimise-stuck-ci-jobs-worker | Kamil Trzcinski | 2017-11-27 | 1 | -4/+4 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Allow to drop jobs for deleted projects | Kamil Trzcinski | 2017-11-27 | 1 | -2/+2 |
| | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | | static analysis fix | digitalMoksha | 2017-11-24 | 1 | -1/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | ignore hashed repositories when doing rake gitlab:cleanup:dirs | digitalMoksha | 2017-11-24 | 1 | -10/+37 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'jej/fix-protected-branch-validations-ce' into 'master' | Rémy Coutable | 2017-11-24 | 2 | -3/+3 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ProtectedBranch access level validations See merge request gitlab-org/gitlab-ce!15586 | ||||
| | * | | | | | | | | Deduplicate protected ref human_access_levelsjej/fix-protected-branch-validations-ce | James Edwards-Jones | 2017-11-24 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously these were duplicated so they could be different for push/merge, but this was no longer necessary after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11232 | ||||
| * | | | | | | | | | Merge branch 'dm-project-search-performance' into 'master' | Sean McGivern | 2017-11-24 | 3 | -21/+3 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drastically improve project search performance by no longer searching namespace name Closes #40510 and #39623 See merge request gitlab-org/gitlab-ce!15590 | ||||
| | * | | | | | | | | Drastically improve project search performance by no longer searching ↵dm-project-search-performance | Douwe Maan | 2017-11-24 | 3 | -21/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | namespace name | ||||
| * | | | | | | | | | Merge branch 'issue_40374' into 'master' | Sean McGivern | 2017-11-24 | 2 | -18/+61 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix WIP system note not being created Closes #40374 See merge request gitlab-org/gitlab-ce!15528 | ||||
| | * | | | | | | | | Fix WIP system note not being createdissue_40374 | Felipe Artur | 2017-11-23 | 2 | -18/+61 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Prevent 500 error when inspecting job after trigger was removed | Filipa Lacerda | 2017-11-24 | 1 | -0/+25 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'dm-fix-registry-with-sudo-token' into 'master' | Sean McGivern | 2017-11-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pulling and pushing using a personal access token with the sudo scope Closes #40466 See merge request gitlab-org/gitlab-ce!15571 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |