| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Whitelist or fix additional `Gitlab/PublicSend` cop violationsrs-more-public-send-whitelists | Robert Speicher | 2017-08-14 | 3 | -3/+5 |
| | | | | | | An upcoming update to rubocop-gitlab-security added additional violations. | ||||
| * | Rename more path_with_namespace -> full_path or disk_path | Gabriel Mazetto | 2017-08-01 | 2 | -3/+3 |
| | | |||||
| * | Rename many path_with_namespace -> full_path | Gabriel Mazetto | 2017-08-01 | 1 | -1/+1 |
| | | |||||
| * | Backport of multiple_assignees_feature [ci skip] | Valery Sizov | 2017-05-04 | 1 | -1/+1 |
| | | |||||
| * | Rename skip_metrics to imported on the importable concern | Douglas Barbosa Alexandre | 2017-04-03 | 1 | -1/+1 |
| | | |||||
| * | Skip MR metrics when importing projects from GitHub | Douglas Barbosa Alexandre | 2017-04-03 | 1 | -1/+2 |
| | | |||||
| * | Fetch GitHub project as a mirror to get all refs at once | Douglas Barbosa Alexandre | 2017-04-03 | 1 | -1/+1 |
| | | |||||
| * | Minor refactor | Gabriel Mazetto | 2017-04-03 | 2 | -12/+7 |
| | | |||||
| * | Fix BrachFormatter for removed users | Douglas Barbosa Alexandre | 2017-04-03 | 1 | -1/+1 |
| | | |||||
| * | One more change to the branch names to preserve metadata | Gabriel Mazetto | 2017-04-03 | 1 | -2/+2 |
| | | |||||
| * | Prefixes source branch name with short SHA to avoid collision | Douglas Barbosa Alexandre | 2017-04-03 | 2 | -9/+17 |
| | | |||||
| * | Fix GitHub importer for PRs of deleted forked repositories | Gabriel Mazetto | 2017-04-03 | 2 | -4/+20 |
| | | |||||
| * | Using guard clause and added more specs29046-fix-github-importer-open-prs | Gabriel Mazetto | 2017-03-10 | 2 | -9/+3 |
| | | |||||
| * | Fix GitHub Import for open PRs from a fork | Gabriel Mazetto | 2017-03-10 | 2 | -1/+13 |
| | | |||||
| * | Refactor some code29034-fix-github-importer | Gabriel Mazetto | 2017-03-08 | 1 | -2/+6 |
| | | |||||
| * | Fix name colision when importing GitHub pull requests from forked repositories | Gabriel Mazetto | 2017-03-08 | 1 | -1/+5 |
| | | |||||
| * | Fix 'Object not found - no match for id (sha)' when importing GitHub PRs | Douglas Barbosa Alexandre | 2017-03-07 | 1 | -1/+1 |
| | | |||||
| * | Revert "Enable Style/DotPosition" | Douwe Maan | 2017-02-23 | 2 | -10/+10 |
| | | | | | | | | | | | | | | | | This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9. # Conflicts: # .rubocop.yml # .rubocop_todo.yml # lib/gitlab/ci/config/entry/global.rb # lib/gitlab/ci/config/entry/jobs.rb # spec/lib/gitlab/ci/config/entry/factory_spec.rb # spec/lib/gitlab/ci/config/entry/global_spec.rb # spec/lib/gitlab/ci/config/entry/job_spec.rb # spec/lib/gitlab/ci/status/build/factory_spec.rb # spec/lib/gitlab/incoming_email_spec.rb | ||||
| * | Revert "Prefer leading style for Style/DotPosition" | Douwe Maan | 2017-02-23 | 2 | -10/+10 |
| | | | | | This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b. | ||||
| * | Enable Rails/Delegate | Douwe Maan | 2017-02-23 | 1 | -3/+1 |
| | | |||||
| * | Prefer leading style for Style/DotPosition | Douwe Maan | 2017-02-23 | 2 | -10/+10 |
| | | |||||
| * | Enable Performance/RedundantMerge | Douwe Maan | 2017-02-23 | 1 | -1/+1 |
| | | |||||
| * | Enable Style/DotPosition | Douwe Maan | 2017-02-23 | 2 | -10/+10 |
| | | |||||
| * | Reuse User#find_by_any_email on UserFormatter#find_by_email | Douglas Barbosa Alexandre | 2017-02-20 | 1 | -10/+2 |
| | | |||||
| * | Use leading periods on UserFormatter#find_by_external_uid | Douglas Barbosa Alexandre | 2017-02-20 | 1 | -2/+3 |
| | | |||||
| * | Add a simple cache for Gitlab::GithubImport::Client#user | Douglas Barbosa Alexandre | 2017-02-20 | 1 | -0/+8 |
| | | |||||
| * | GitHub Importer - Find users based on their email address | Douglas Barbosa Alexandre | 2017-02-20 | 5 | -36/+89 |
| | | | | | | | The returned email by the GitHub API is the user's publicly visible email address (or null if the user has not specified a public email address in their profile) | ||||
| * | Merge branch 'fix-github-import-MR-wrong-project' into 'security' | Robert Speicher | 2017-02-15 | 1 | -3/+7 |
| | | | | | | Fix labels being applied to wrong merge requests on GitHub import See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2064 | ||||
| * | Revert "Merge branch 'revert-9cac0317' into 'master' " | Grzegorz Bizon | 2017-01-23 | 1 | -1/+3 |
| | | | | | | This reverts commit c20934869f7dc8cfbdbafb6ecb7b1305452c9e8a, reversing changes made to 4b7ec44b91e0571d209c790d54947ba1756dac0e. | ||||
| * | Revert "Merge branch 'dont-persist-application-settings-in-test-env' into ↵ | Grzegorz Bizon | 2017-01-21 | 1 | -3/+1 |
| | | | | | | 'master'" This reverts merge request !8573 | ||||
| * | Don't persist ApplicationSetting in test envdont-persist-application-settings-in-test-env | Rémy Coutable | 2017-01-15 | 1 | -1/+3 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Add Project#gitea_import?22348-gitea-importer | Rémy Coutable | 2016-12-19 | 2 | -4/+4 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Modify GithubImport to support Gitea | Rémy Coutable | 2016-12-19 | 7 | -141/+143 |
| | | | | | | | | | The reason is that Gitea plan to be GitHub-compatible so it makes sense to just modify GitHubImport a bit for now, and hopefully we can change it to GitHubishImport once Gitea is 100%-compatible. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Gogs Importer | Kim "BKC" Carlbäcker | 2016-12-19 | 6 | -20/+31 |
| | | |||||
| * | Fix branch validation for GitHub PR where repo/fork was renamed/deleted | Douglas Barbosa Alexandre | 2016-12-01 | 1 | -1/+1 |
| | | |||||
| * | Refactor github import to reduce number of API calls | Andrew Smith | 2016-11-18 | 2 | -25/+29 |
| | | | | | Ref #24073 | ||||
| * | Cache imported GH labels no matter whatfix/gh-imported-labels-are-not-applied-correctly | Ahmad Sherif | 2016-11-04 | 1 | -6/+3 |
| | | |||||
| * | Fix applying GitHub-imported labels when importing job is interrupted | Ahmad Sherif | 2016-11-04 | 1 | -0/+10 |
| | | | | | Closes #24075 | ||||
| * | Merge branch 'adam-fix-labels-find-or-create' into 'master' | Douwe Maan | 2016-10-28 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass user instance to Labels::FindOrCreateService or skip_authorization: true ## What does this MR do? It fixes a bug described in #23694 when `project.owner` was passed to `Labels::FindOrCreateService`. `Labels::FindOrCreateService` expected a user instance and `project.owner` may return a group as well. This MR makes sure that we either pass a user instance or `skip_authorization: true`. ## Are there points in the code the reviewer needs to double check? - places where we pass `skip_authorization: true` ## Does this MR meet the acceptance criteria? - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes #23694 See merge request !7093 | ||||
| | * | Pass user instance to Labels::FindOrCreateService or skip_authorization: trueadam-fix-labels-find-or-create | Adam Niedzielski | 2016-10-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | Do not pass project.owner because it may return a group and Labels::FindOrCreateService throws an error in this case. Fixes #23694. | ||||
| * | | Fix typosfix/make-github-import-retryable | Ahmad Sherif | 2016-10-28 | 2 | -2/+2 |
| | | | |||||
| * | | Abstract the use of imported[!?] and {current,increment}_page in GitHub importer | Ahmad Sherif | 2016-10-28 | 1 | -50/+34 |
| | | | |||||
| * | | Use public_send instead of send | Ahmad Sherif | 2016-10-28 | 1 | -1/+1 |
| | | | |||||
| * | | Modify GitHub importer to be retryable | Ahmad Sherif | 2016-10-28 | 7 | -25/+130 |
| | | | |||||
| * | | Fix importing MR comments from GitHubfix/gh-import-bugs | Ahmad Sherif | 2016-10-27 | 1 | -6/+7 |
| | | | |||||
| * | | Fix applying labels for GitHub-imported MRs | Ahmad Sherif | 2016-10-27 | 2 | -7/+16 |
| |/ | |||||
| * | Rename Labels::CreateService to Labels::FindOrCreateService | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -1/+1 |
| | | |||||
| * | Fix GitHub importer spec | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -1/+4 |
| | | |||||
| * | User Labes::CreateService to create labels | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -3/+4 |
| | | |||||
| * | Fix broken handling of certain calls in GitHub importer clientfix/github-importer-client | Ahmad Sherif | 2016-10-06 | 1 | -2/+12 |
| | | | | | Closes #22998 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |