faa9bd402d
Create a Gitlab::Git submodule for conlict-related files
...
Rename classes to (hopefully) clearer names while we're doing that.
2017-10-12 22:03:15 -03:00
f72598b659
Move Gitlab::Diff::LineCode to module Gitlab::Git
2017-10-12 21:45:16 -03:00
41ef94e777
Migrate creating/deleting a branch to Gitaly
2017-09-06 17:25:17 +02:00
260c8da060
Whitelist or fix additional `Gitlab/PublicSend` cop violations
...
An upcoming update to rubocop-gitlab-security added additional
violations.
2017-08-14 12:14:11 -04:00
fb06a4d8fe
Rename more path_with_namespace -> full_path or disk_path
2017-08-01 07:28:13 +02:00
abb878326c
Rename many path_with_namespace -> full_path
2017-08-01 07:26:58 +02:00
387c4b2c21
Backport of multiple_assignees_feature [ci skip]
2017-05-04 17:11:53 +03:00
a6affc66dc
Rename skip_metrics to imported on the importable concern
2017-04-03 15:50:22 -03:00
20486593bd
Skip MR metrics when importing projects from GitHub
2017-04-03 15:50:22 -03:00
336ba94a7b
Fetch GitHub project as a mirror to get all refs at once
2017-04-03 15:50:22 -03:00
3c75ee2823
Minor refactor
2017-04-03 12:45:31 +02:00
c8273ba858
Fix BrachFormatter for removed users
2017-04-03 12:45:31 +02:00
291bd873d3
One more change to the branch names to preserve metadata
2017-04-03 12:45:31 +02:00
59588ebac0
Prefixes source branch name with short SHA to avoid collision
2017-04-03 12:45:31 +02:00
a3e65ef021
Fix GitHub importer for PRs of deleted forked repositories
2017-04-03 12:45:31 +02:00
a996880bf7
Using guard clause and added more specs
2017-03-10 21:13:45 +01:00
9b53cb6c88
Fix GitHub Import for open PRs from a fork
2017-03-10 21:08:21 +01:00
ce35dcbc81
Refactor some code
2017-03-08 19:42:21 +01:00
26fa716dd2
Fix name colision when importing GitHub pull requests from forked repositories
2017-03-08 19:42:21 +01:00
ec4b03a4c6
Fix 'Object not found - no match for id (sha)' when importing GitHub PRs
2017-03-07 15:59:07 -03:00
56de781a2c
Revert "Enable Style/DotPosition"
...
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
2017-02-23 09:33:19 -06:00
1fe7501b49
Revert "Prefer leading style for Style/DotPosition"
...
This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.
2017-02-23 09:33:05 -06:00
75f5fa997d
Enable Rails/Delegate
2017-02-23 09:32:42 -06:00
206953a430
Prefer leading style for Style/DotPosition
2017-02-23 09:32:22 -06:00
030baf70d2
Enable Performance/RedundantMerge
2017-02-23 09:31:57 -06:00
3dadf306dd
Enable Style/DotPosition
2017-02-23 09:31:56 -06:00
43b1f5e40d
Reuse User#find_by_any_email on UserFormatter#find_by_email
2017-02-20 14:48:12 -03:00
20128693eb
Use leading periods on UserFormatter#find_by_external_uid
2017-02-20 14:48:12 -03:00
7da13fee84
Add a simple cache for Gitlab::GithubImport::Client#user
2017-02-20 14:48:12 -03:00
2d1e0a0811
GitHub Importer - Find users based on their email address
...
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)
2017-02-20 14:48:12 -03:00
414d695db7
Merge branch 'fix-github-import-MR-wrong-project' into 'security'
...
Fix labels being applied to wrong merge requests on GitHub import
See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2064
2017-02-15 10:42:56 -05:00
632c2939bb
Revert "Merge branch 'revert-9cac0317' into 'master'
"
...
This reverts commit c20934869f4b7ec44b91
2017-01-23 16:35:24 +01:00
baeaa97ef4
Revert "Merge branch 'dont-persist-application-settings-in-test-env' into 'master'"
...
This reverts merge request !8573
2017-01-21 22:55:35 +00:00
f6cc29ed83
Don't persist ApplicationSetting in test env
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-15 01:07:29 -05:00
ab06313c36
Add Project#gitea_import?
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-12-19 17:35:51 +01:00
99ddd1dcbe
Modify GithubImport to support Gitea
...
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>
2016-12-19 17:35:51 +01:00
5d4531db25
Gogs Importer
2016-12-19 17:35:51 +01:00
8ca040d8ae
Fix branch validation for GitHub PR where repo/fork was renamed/deleted
2016-12-01 00:03:12 -02:00
3228798b37
Refactor github import to reduce number of API calls
...
Ref #24073
2016-11-18 07:47:00 +10:00
eaa0303b3d
Cache imported GH labels no matter what
2016-11-04 15:59:53 +02:00
6a9fb20fe1
Fix applying GitHub-imported labels when importing job is interrupted
...
Closes #24075
2016-11-04 15:59:53 +02:00
44cbfeaba8
Merge branch 'adam-fix-labels-find-or-create' into 'master'
...
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
2016-10-28 15:01:59 +00:00
e2c603696a
Pass user instance to Labels::FindOrCreateService or skip_authorization: true
...
Do not pass project.owner because it may return a group and Labels::FindOrCreateService
throws an error in this case.
Fixes #23694 .
2016-10-28 11:31:45 +02:00
f68d9261b0
Fix typos
2016-10-28 11:30:20 +02:00
07275dd79c
Abstract the use of imported[!?] and {current,increment}_page in GitHub importer
2016-10-28 11:30:20 +02:00
bc6302b942
Use public_send instead of send
2016-10-28 11:30:20 +02:00
14fbd25d06
Modify GitHub importer to be retryable
2016-10-28 11:30:20 +02:00
ce38ae8ca1
Fix importing MR comments from GitHub
2016-10-27 15:42:29 +02:00
4259334fb6
Fix applying labels for GitHub-imported MRs
2016-10-27 15:42:28 +02:00
4f6d1c1d70
Rename Labels::CreateService to Labels::FindOrCreateService
2016-10-19 14:58:28 -02:00
Alejandro Rodríguez
Ahmad Sherif
Robert Speicher
Gabriel Mazetto
Valery Sizov
Douglas Barbosa Alexandre
Douwe Maan
Robert Speicher
Grzegorz Bizon
Rémy Coutable
Kim "BKC" Carlbäcker
Andrew Smith
Douwe Maan
Adam Niedzielski