Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Resolve "group request membership mail with too long list of "To:"" | 🙈 jacopo beschi 🙉 | 2018-02-19 | 1 | -20/+69 |
| | |||||
* | Remember assignee when moving an issue41949-move | Jan Provaznik | 2018-02-18 | 1 | -0/+22 |
| | | | | Related to #41949 | ||||
* | Merge branch ↵ | Rémy Coutable | 2018-02-14 | 1 | -117/+55 |
|\ | | | | | | | | | | | | | | | | | '43240-external-tracker-issues-don-t-have-the-correct-closing-text-appended-to-mrs' into 'master' Resolve "External tracker issues don't have the correct closing text appended to MRs" Closes #1 et #43240 See merge request gitlab-org/gitlab-ce!17109 | ||||
| * | Fix closing issues text added to MRs for external issue trackers | Sean McGivern | 2018-02-14 | 1 | -117/+55 |
| | | | | | | | | | | | | | | | | Before, this would: 1. Not use the correct reference for non-JIRA external trackers. 2. Append 'Closes ' if an external tracker was enabled, but no issue matched the branch name. | ||||
* | | Merge branch 'fix/template-project-visibility' into 'master' | Douwe Maan | 2018-02-14 | 1 | -2/+6 |
|\ \ | | | | | | | | | | | | | | | | | | | Respect description and visibility when creating project from template Closes #42601 See merge request gitlab-org/gitlab-ce!16820 | ||||
| * | | Add description, visibility to CreateFromTemplateService spec | George Tsiolis | 2018-02-14 | 1 | -2/+6 |
| | | | |||||
* | | | Resolve "Remove notification settings for groups and projects you were ↵ | 🙈 jacopo beschi 🙉 | 2018-02-14 | 1 | -6/+50 |
| |/ |/| | | | | | previously a member of" | ||||
* | | Merge branch '26466-natural-sort-mrs' into 'master' | Sean McGivern | 2018-02-13 | 1 | -0/+35 |
|\ \ | | | | | | | | | | | | | | | | | | | Group MR numbers on issue show page by project and namespace Closes #26466 See merge request gitlab-org/gitlab-ce!8494 | ||||
| * | | Change issue show page to group MRs by projects and namespaces | Jeff Stubler | 2018-02-13 | 1 | -0/+35 |
| | | | | | | | | | | | | Closes #26466. | ||||
* | | | Fix Error 500s creating merge requests with external issue trackersh-fix-issue-43193 | Stan Hu | 2018-02-12 | 1 | -11/+21 |
| |/ |/| | | | | | | | | | | | | | When JIRA or Redmine were enabled and the branch name did not match the matching regular expression, the `issue_iid` would be `nil`, preventing users from creating merge requests. Closes #43193 | ||||
* | | Merge branch ↵ | Douwe Maan | 2018-02-09 | 1 | -1/+1 |
| | | | | | | | | | | | | 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibility' into 'security-10-4' [Port for security-10-4]: Makes SnippetFinder ensure feature visibility | ||||
* | | Merge branch '40744-hashed-storage-specs' into 'master' | Sean McGivern | 2018-02-08 | 7 | -10/+12 |
|\ \ | | | | | | | | | | | | | | | | | | | Use hashed storage in the specs Closes #40744 See merge request gitlab-org/gitlab-ce!15681 | ||||
| * | | Use hashed storage in the specs40744-hashed-storage-specs | Nick Thomas | 2018-02-07 | 7 | -10/+12 |
| | | | |||||
* | | | Backport of LFS File Locking APIrd-35856-backport-lfs-file-locking-api | Rubén Dávila | 2018-02-07 | 3 | -0/+268 |
|/ / | |||||
* | | Merge commit '4457cf9d178dc9912fd9c16427ad81b389179d00' into ↵fix/gb/fix-redundant-pipeline-stages | Grzegorz Bizon | 2018-02-07 | 7 | -7/+129 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | fix/gb/fix-redundant-pipeline-stages * commit '4457cf9d178dc9912fd9c16427ad81b389179d00': (76 commits) Conflicts: spec/services/ci/retry_build_service_spec.rb | ||||
| * \ | Merge branch 'dm-route-path-validation' into 'master' | Sean McGivern | 2018-02-06 | 2 | -3/+3 |
| |\ \ | | | | | | | | | | | | | | | | | Validate user, group and project paths consistently, and only once See merge request gitlab-org/gitlab-ce!16903 | ||||
| | * | | Validate User username only on Namespace, and bubble up appropriately | Douwe Maan | 2018-02-06 | 1 | -1/+1 |
| | | | | |||||
| | * | | Validate path uniqueness only on Route, and bubble up appropriately | Douwe Maan | 2018-02-06 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'dm-user-namespace-route-path-validation' into 'master' | Sean McGivern | 2018-02-06 | 1 | -1/+1 |
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | Validate user namespace before saving so that errors persist on model Closes #42140 See merge request gitlab-org/gitlab-ce!16902 | ||||
| | * | | Validate user namespace before saving so that errors persist on modeldm-user-namespace-route-path-validation | Douwe Maan | 2018-02-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'gitaly-lfs-client-prep' into 'master' | Robert Speicher | 2018-02-06 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | Refactor Gitlab::Git code related to LFS changes for Gitaly migration Closes gitaly#980 See merge request gitlab-org/gitlab-ce!16835 | ||||
| | * | | Refactor Gitlab::Git code related to LFS changes for Gitaly migrationgitaly-lfs-client-prep | Alejandro RodrÃguez | 2018-02-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | We stop relying on Gitlab::Git::Env for the RevList class, and use Gitlab::Git::Repository#run_git methods inteaad. The refactor also fixes another issue, since we now top using "path_to_repo" (which is a Repository model method). | ||||
| * | | | Merge branch 'jej/upload-file-tracks-lfs' into 'master' | Sean McGivern | 2018-02-06 | 1 | -0/+78 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File upload UI obeys LFS filter Closes #29876 See merge request gitlab-org/gitlab-ce!16412 | ||||
| | * | | | File upload UI obeys LFS filters | James Edwards-Jones | 2018-02-06 | 1 | -0/+78 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses Lfs::FileModificationHandler to coordinate LFS detection, creation of LfsObject, etc Caveats: 1. This isn't used by the multi-file editor / Web IDE 2. This isn't used on rename. We'd need to be able to download LFS files and add them to the commit if they no longer match so not as simple. 3. We only check the root .gitattributes file, so this should be improved to correctly check for nested .gitattributes files in subfolders. | ||||
| * | | | | Fix tests for Drop filename enforcement | Shinya Maeda | 2018-02-06 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix retry_build_service_spec.rb with trace_artifact trait | Shinya Maeda | 2018-02-06 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add essential tests | Shinya Maeda | 2018-02-06 | 1 | -0/+43 |
| | | | | | |||||
| * | | | | Fix inital test failures | Shinya Maeda | 2018-02-06 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Make exception in ensure stage service more descriptive | Grzegorz Bizon | 2018-02-06 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'master' into fix/gb/fix-redundant-pipeline-stages | Grzegorz Bizon | 2018-02-06 | 14 | -73/+550 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (441 commits) Conflicts: db/schema.rb | ||||
| * | | | | 31885 - Ability to transfer a single group to another group | Mayra Cabrera | 2018-02-06 | 1 | -0/+414 |
| | | | | | |||||
| * | | | | Merge branch 'osw-markdown-bypass-for-commit-messages' into 'master' | Sean McGivern | 2018-02-05 | 1 | -19/+14 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bypass markdown for commit titles on MR notes Closes #37616 See merge request gitlab-org/gitlab-ce!16883 | ||||
| | * | | | | Bypass commits title markdown on notes | Oswaldo Ferreira | 2018-02-02 | 1 | -19/+14 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge branch '40793-fix-mr-title-for-jira' into 'master' | Sean McGivern | 2018-02-02 | 1 | -5/+53 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Incorrect merge request title when Jira activated and multiple commits on branch" Closes #40793 See merge request gitlab-org/gitlab-ce!16491 | ||||
| | * | | | | Resolve "Incorrect merge request title when Jira activated and multiple ↵ | Andrew McCallum | 2018-02-02 | 1 | -5/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | commits on branch" | ||||
| * | | | | | Merge branch 'osw-system-notes-for-commits-regression' into 'master' | Sean McGivern | 2018-02-02 | 1 | -31/+23 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reload source MRs memoization after diffs creation Closes #42668 See merge request gitlab-org/gitlab-ce!16868 | ||||
| | * | | | | Fix and improve stubbed test for WIP commit ref | Oswaldo Ferreira | 2018-02-02 | 1 | -31/+15 |
| | | | | | | |||||
| | * | | | | Reload MRs memoization after diffs creationosw-system-notes-for-commits-regression | Oswaldo Ferreira | 2018-02-01 | 1 | -0/+8 |
| | |/ / / | |||||
| * | | | | port of 594e6a0a625^..f74c90f68c6 | Micaël Bergeron | 2018-02-01 | 2 | -4/+4 |
| | | | | | |||||
| * | | | | Merge branch '36009-user-default-project-creator-in-factories' into 'master' | Robert Speicher | 2018-02-01 | 7 | -8/+13 |
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | Make user/author use project.creator in most factories Closes #36009 See merge request gitlab-org/gitlab-ce!13321 | ||||
| | * | | | Make user/author use project.creator in most factories | Rémy Coutable | 2018-01-31 | 7 | -8/+13 |
| | | |/ | | |/| | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | Enable RuboCop Style/RegexpLiteral | Takuya Noguchi | 2018-02-01 | 2 | -3/+3 |
| |/ / | |||||
| * | | Close and do not reload MR diffs when source branch is deleted | Oswaldo Ferreira | 2018-01-29 | 1 | -2/+23 |
| |/ | |||||
| * | Execute system hooks after-commit when executing project hooksdm-project-system-hooks-in-transaction | Douwe Maan | 2018-01-24 | 1 | -1/+3 |
| | | |||||
* | | Fix indentation offenses in ensure stage service | Grzegorz Bizon | 2018-02-06 | 1 | -12/+12 |
| | | |||||
* | | Fix transactions-related race condition in stages code | Grzegorz Bizon | 2018-02-05 | 1 | -0/+51 |
| | | |||||
* | | Revert create job service because of load balancing | Grzegorz Bizon | 2018-02-05 | 1 | -26/+0 |
| | | | | | | | | | | | | | | | | | | Currently we still need to run EnsureStageService within a transaction, because when it runs within in a transaction we are going to stick to the primary database when using database load balancing. Extracting this out of the transaction makes it possible to hit into problems with replication lag in pipeline commit status API, which can cause a lot of trouble. | ||||
* | | Fix specs for retry build after making stages unique | Grzegorz Bizon | 2018-01-25 | 1 | -16/+20 |
| | | |||||
* | | Do not raise an error when trying to persist a job | Grzegorz Bizon | 2018-01-24 | 1 | -0/+6 |
| | | |||||
* | | Add a new service for creating detached CI/CD jobs | Grzegorz Bizon | 2018-01-24 | 1 | -0/+20 |
|/ |