summaryrefslogtreecommitdiff
path: root/app/services
Commit message (Collapse)AuthorAgeFilesLines
* Remove allow_n_plus_1_calls from MergeRequests::CreateServicefix/reduce-number-of-ref-exists-callsAhmad Sherif2018-02-071-4/+1
| | | | | Fixes #37439 Fixes gitaly#1000
* Merge branch 'jej/upload-file-tracks-lfs' into 'master'Sean McGivern2018-02-062-1/+53
|\ | | | | | | | | | | | | File upload UI obeys LFS filter Closes #29876 See merge request gitlab-org/gitlab-ce!16412
| * File upload UI obeys LFS filtersJames Edwards-Jones2018-02-062-1/+53
| | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'winh-kubernetes-clusters' into 'master'Phil Hughes2018-02-062-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Replace "cluster" with "Kubernetes cluster" Closes #41963 See merge request gitlab-org/gitlab-ce!16778
| * | Replace "cluster" with "Kubernetes cluster"winh-kubernetes-clustersWinnie Hellmann2018-02-062-2/+2
| | |
* | | Fix inital test failuresShinya Maeda2018-02-061-4/+6
| | |
* | | Add worker queueShinya Maeda2018-02-061-1/+1
| | |
* | | Rename CreateArtifactsTraceService to CreateTraceArtifactServiceShinya Maeda2018-02-062-16/+14
| | |
* | | Add CreateArtifactsTraceWorkerShinya Maeda2018-02-061-0/+16
|/ /
* | 31885 - Ability to transfer a single group to another groupMayra Cabrera2018-02-061-0/+96
| |
* | Merge branch 'osw-markdown-bypass-for-commit-messages' into 'master'Sean McGivern2018-02-051-8/+18
|\ \ | | | | | | | | | | | | | | | | | | Bypass markdown for commit titles on MR notes Closes #37616 See merge request gitlab-org/gitlab-ce!16883
| * | Remove unnused escape_html methodosw-markdown-bypass-for-commit-messagesOswaldo Ferreira2018-02-021-4/+0
| | |
| * | Bypass commits title markdown on notesOswaldo Ferreira2018-02-021-4/+18
| | |
* | | use Gitlab::UserSettings directly as a singleton instead of ↵Mario de la Ossa2018-02-0212-34/+14
| | | | | | | | | | | | including/extending it
* | | Merge branch '40793-fix-mr-title-for-jira' into 'master'Sean McGivern2018-02-021-7/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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 McCallum2018-02-021-7/+23
| | | | | | | | | | | | | | | | commits on branch"
* | | | Merge branch 'osw-system-notes-for-commits-regression' into 'master'Sean McGivern2018-02-021-1/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Reload source MRs memoization after diffs creation Closes #42668 See merge request gitlab-org/gitlab-ce!16868
| * | | Reload MRs memoization after diffs creationosw-system-notes-for-commits-regressionOswaldo Ferreira2018-02-011-1/+6
| |/ /
* | | port of 594e6a0a625^..f74c90f68c6Micaël Bergeron2018-02-011-2/+2
|/ /
* | Close and do not reload MR diffs when source branch is deletedOswaldo Ferreira2018-01-291-2/+14
|/
* Merge branch '41532-email-reason' into 'master'Sean McGivern2018-01-192-34/+40
|\ | | | | | | | | | | | | Show why a notification email was sent Closes #41532 and #1366 See merge request gitlab-org/gitlab-ce!16160
| * Initial work to add notification reason to emailsMario de la Ossa2018-01-162-34/+40
| | | | | | | | | | | | | | | | | | | | | | Adds `#build_notification_recipients` to `NotificationRecipientService` that returns the `NotificationRecipient` objects in order to be able to access the new attribute `reason`. This new attribute is used in the different notifier methods in order to add the reason as a header: `X-GitLab-NotificationReason`. Only the reason with the most priority gets sent.
* | Merge branch 'feature/merge-request-system-hook' into 'master'Douwe Maan2018-01-183-2/+9
|\ \ | | | | | | | | | | | | System hooks for Merge Requests See merge request gitlab-org/gitlab-ce!14387
| * | use class reader instead of dynamic constantAlexis Reigel2018-01-171-1/+1
| | |
| * | use safer .hooks_for instead of .public_sendAlexis Reigel2018-01-171-1/+1
| | | | | | | | | | | | | | | with .public_send we can't make sure that the scope on the model actually exists.
| * | test hook for system merge request hookAlexis Reigel2018-01-041-0/+7
| | |
* | | Merge branch 'sh-backport-10-3-4-security-fixes' into 'master'Oswaldo Ferreira2018-01-173-8/+24
|\ \ \ | | | | | | | | | | | | | | | | Backport 10.3.4 security fixes into master See merge request gitlab-org/gitlab-ce!16509
| * | | Merge branch ↵Robert Speicher2018-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41293-fix-command-injection-vulnerability-on-system_hook_push-queue-through-web-hook' into 'security-10-3' Don't allow line breaks on HTTP headers See merge request gitlab/gitlabhq!2277 (cherry picked from commit 7fc0a6fc096768a5604d6dd24d7d952e53300c82) 073b8f9c Don't allow line breaks on HTTP headers
| * | | Merge branch '41567-projectfix' into 'security-10-3'Sean McGivern2018-01-161-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check project access on MR create See merge request gitlab/gitlabhq!2273 (cherry picked from commit 1fe2325d6ef2bced4c5e97b57691c894f38b2834) 43e85f49 check project access on MR create
| * | | Merge branch 'sh-validate-path-project-import-10-3' into 'security-10-3'Stan Hu2018-01-161-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Validate project path in Gitlab import - 10.3 port See merge request gitlab/gitlabhq!2268 (cherry picked from commit 94c82376d66fc80d46dd2d5eeb5bade408ec6a7e) 2b94a7c2 Validate project path in Gitlab import
* | | Merge branch '41727-target-branch-name' into 'master'Sean McGivern2018-01-171-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Set target_branch to the ref branch when creating MR from issue Closes #41727 See merge request gitlab-org/gitlab-ce!16422
| * | | Set target_branch to the ref branch when creating MR from issue41727-target-branch-nameJarka Kadlecová2018-01-171-0/+1
| | | |
* | | | Merge branch '37199-labels-fix' into 'master'Sean McGivern2018-01-171-1/+11
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Keep subscribers when promoting labels to group labels Closes #37199 See merge request gitlab-org/gitlab-ce!16343
| * | | Keep subscribers when promoting labels to group labels37199-labels-fixJarka Kadlecová2018-01-121-1/+11
| | | |
* | | | Merge branch 'issue-30101' into 'master'Rémy Coutable2018-01-161-15/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update 'removed assignee' note to include old assignee reference Closes #30101 See merge request gitlab-org/gitlab-ce!16301
| * | | | Update 'removed assignee' note to include old assignee referenceMaurizio De Santis2018-01-091-15/+8
| |/ / /
* | | | Log and send a system hook if a blocked user fails to loginsh-log-when-user-blockedStan Hu2018-01-141-1/+4
| | | | | | | | | | | | | | | | Closes #41633
* | | | Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-111-0/+1
| | | |
* | | | Merge branch 'remove-soft-removals' into 'master'Douwe Maan2018-01-112-3/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove soft removals related code Closes #37447 See merge request gitlab-org/gitlab-ce!15789
| * | | | Remove soft removals related codeYorick Peterse2018-01-082-3/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes all usage of soft removals except for the "pending delete" system implemented for projects. This in turn simplifies all the query plans of the models that used soft removals. Since we don't really use soft removals for anything useful there's no point in keeping it around. This _does_ mean that hard removals of issues (which only admins can do if I'm not mistaken) can influence the "iid" values, but that code is broken to begin with. More on this (and how to fix it) can be found in https://gitlab.com/gitlab-org/gitlab-ce/issues/31114. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37447
* | | | Merge branch 'Ben305/gitlab-ce-36669-default-mr-title-with-external-issues' ↵Grzegorz Bizon2018-01-111-6/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Incorrect default merge request title when Jira activated" Closes #36669 See merge request gitlab-org/gitlab-ce!16356
| * | | | Never set special MR titles for external issuesSean McGivern2018-01-101-6/+2
| | | | |
| * | | | Fix incorrect default merge request title when external issue tracker is ↵Benedikt Huss2018-01-091-1/+1
| |/ / / | | | | | | | | | | | | activated
* | | | Merge branch '4020-rebase-message' into 'master'Sean McGivern2018-01-111-3/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve 'Rebase fails with "something went wrong" and huge ugly conflict error.' Closes #41820 See merge request gitlab-org/gitlab-ce!16326
| * | | | Store only generic message if rebase fails4020-rebase-messageJan Provaznik2018-01-091-3/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of storing detailed rebase error, only a generic message is stored with MR. The reason is that this message is exposed and displayed to end user and there is no reason to expose detailed backend information. Error message is still logged so detailed information can be found in logfile by admin if needed. Related #41820
* | | | Merge branch 'gcp-fix' into 'master'Kamil Trzciński2018-01-111-1/+4
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Fix GCP redirect Closes #41867 See merge request gitlab-org/gitlab-ce!16355
| * | | Fix billing checkingKamil Trzciński2018-01-101-1/+4
| |/ /
* | | Fix bug where award emojis would be lost when moving issues between projectssh-fix-award-emoji-move-issuesStan Hu2018-01-101-5/+11
|/ / | | | | | | Closes #33423
* | Merge branch '3968-protected-branch-is-not-set-for-default-branch-on-import' ↵Douwe Maan2018-01-082-20/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Protected branch is now created for default branch on import Closes #3968 See merge request gitlab-org/gitlab-ce!16198
| * | Protected branch is now created for default branch on import3968-protected-branch-is-not-set-for-default-branch-on-importTiago Botelho2018-01-062-20/+3
| | |
View Lorry Controller Status