Commit graph

22 commits

Author SHA1 Message Date
GitLab Bot
4774fa00b7 Add latest changes from gitlab-org/gitlab@master 2020-06-15 15:08:20 +00:00
Martin Wortschack
5660690787 Externalize strings in projects controllers
- concerns
- dashboard
- groups
- import
2019-03-27 16:52:52 +00:00
gfyoung
be42c05054 Enable more frozen string in app/controllers/
Enables frozen string for the following:

* app/controllers/dashboard/**/*.rb
* app/controllers/explore/**/*.rb
* app/controllers/google_api/**/*.rb
* app/controllers/groups/**/*.rb
* app/controllers/import/**/*.rb
* app/controllers/instance_statistics/**/*.rb
* app/controllers/ldap/**/*.rb
* app/controllers/oauth/**/*.rb
* app/controllers/profiles/**/*.rb

Partially addresses #47424.
2018-09-23 12:48:02 -07:00
Yorick Peterse
2039c8280d
Disable existing offenses for the CodeReuse cops
This whitelists all existing offenses for the various CodeReuse cops, of
which most are triggered by the CodeReuse/ActiveRecord cop.
2018-09-11 17:32:00 +02:00
Francisco Javier López
c52ab9141c Fix gitlab import project load 2018-07-23 07:52:15 +00:00
Stan Hu
3a722ff53f Show a more helpful error for import status
Importing a project from GitHub for a project namespace that already exists
would show an unhelpful error, "An error occurred while importing project."
We now add the base message from Projects::CreateService when this fails.

Closes #47365
2018-06-06 01:40:55 -07:00
Tiago Botelho
bddbcaefc2 Backports every CE related change from ee-44542 to CE 2018-05-04 17:33:26 +02:00
Clement Ho
71c948d637 Replace $.post in importer status with axios 2018-02-09 11:14:48 +00:00
Rémy Coutable
c946ee1282
Enable the Layout/SpaceBeforeBlockBraces cop
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-09 11:52:22 +02:00
Douglas Barbosa Alexandre
e293ffd48f Refactoring Import::BaseController#find_or_create_namespace 2016-08-31 16:54:15 -03:00
Douglas Barbosa Alexandre
325de662ce Don't create groups for unallowed users when importing projects 2016-08-31 12:55:45 -03:00
Grzegorz Bizon
c0ebfea6ba Fix some useless access modifiers in the code 2016-07-19 14:16:54 +02:00
Valery Sizov
8346dde052 Only render 404 page from /public 2015-10-13 20:12:34 +03:00
Stan Hu
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
Jeroen van Baarsen
5a4ebfb47a Fixed the Rails/ActionFilter cop
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-04-20 15:39:37 +02:00
Douwe Maan
737f322e41 Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user into current namespace. 2015-03-31 16:34:13 +02:00
Dmitriy Zaporozhets
f980827ba6 Merge branch 'fix_gitlab_importer' into 'master'
Fix GitLab && Gitorious importers. Hide already imported projects

Fixes #2060

See merge request !1594
2015-02-26 16:57:26 +00:00
Valery Sizov
9c6f048795 Fix GitLab importer. Hide already imported projects 2015-02-25 12:18:15 +02:00
Douwe Maan
448817c4de Load public key in initializer. 2015-02-24 15:07:24 +01:00
Valery Sizov
1ac20698a5 gitlab.com importer: refactorig 2015-02-05 17:03:43 -08:00
Valery Sizov
592ed8738c Gitlab.com integration: code folding 2015-02-05 12:50:34 -08:00
Valery Sizov
33349dd549 GitLab.com integration: refactoring 2015-02-05 12:50:34 -08:00
Renamed from app/controllers/importers/gitlabs_controller.rb (Browse further)