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
5d4531db25
Gogs Importer
2016-12-19 17:35:51 +01:00
b5f9541778
Skip wiki creation when GitHub project has wiki enabled
...
If the GitHub project repository has wiki, we should not create
the default wiki. Otherwise the GitHub importer will fail because
the wiki repository already exist.
This bug was introduced here
https://gitlab.com/gitlab-org/gitlab-ce/commit/892dea67717c0efbd6a28f763
9f34535ec0a8747
2016-10-04 13:06:45 -03:00
0c65112da7
modify github import JS and controller so we can now specify a namespace and/or name for a project.
...
- Fixed and added specs.
- Added different namespace options depending on user privilages
- Updated docs.
2016-09-20 10:14:39 +02:00
d308a3f433
Merge branch 'issue_19734' into 'master'
...
Project tools visibility level
## part of #19734
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG ) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md )
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [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 you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits )
See merge request !5606
2016-09-01 15:28:14 +00:00
892dea6771
Project tools visibility level
2016-09-01 11:47:59 -03:00
9b376e772e
GitHub importer use default project visibility for non-private projects
2016-08-31 18:27:42 -03:00
383cc84047
some refactoring based on feedback
2016-03-21 13:15:51 +01:00
735563329d
refactored a bunch of stuff based on MR feedback
2016-03-07 12:50:35 +01:00
c2b33d3b71
added import url exposer to construct URL withunencrypted credentials
2016-03-04 16:23:19 +01:00
06b36c00d5
some refactoring in the migration. Also fixed github import issue and updated spec
2016-03-04 12:21:53 +01:00
78f5eb94fb
Import GitHub wiki into GitLab
2016-01-14 12:09:31 -02:00
ed1d4fa477
Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab
...
and request them each session. Pass these tokens to the project import data.
This prevents the need to encrypt these tokens and clear them in case they
expire or get revoked.
For example, if you deleted and re-created OAuth2 keys for Bitbucket, you would get
an Error 500 with no way to recover:
```
Started GET "/import/bitbucket/status" for x.x.x.x at 2015-08-07 05:24:10 +0000
Processing by Import::BitbucketController#status as HTML
Completed 500 Internal Server Error in 607ms (ActiveRecord: 2.3ms)
NameError (uninitialized constant Import::BitbucketController::Unauthorized):
app/controllers/import/bitbucket_controller.rb:77:in `rescue in go_to_bitbucket_for_permissions'
app/controllers/import/bitbucket_controller.rb:74:in `go_to_bitbucket_for_permissions'
app/controllers/import/bitbucket_controller.rb:86:in `bitbucket_unauthorized'
```
Closes #1871
2015-08-23 09:23:44 -07:00
99abbe7dbe
Use Projects::CreateService to create imported projects so hooks are executed.
2015-04-06 14:51:09 +02:00
18231b0bb3
GitLab.com integration: refactoring
2015-02-05 12:50:34 -08:00
Grzegorz Bizon