Commit graph

18 commits

Author SHA1 Message Date
GitLab Bot
e5e0589e09 Add latest changes from gitlab-org/gitlab@master 2021-04-26 12:09:44 +00:00
GitLab Bot
d8995bd33f Add latest changes from gitlab-org/gitlab@master 2020-12-10 00:09:50 +00:00
GitLab Bot
effda22b3e Add latest changes from gitlab-org/gitlab@master 2020-09-28 12:10:02 +00:00
GitLab Bot
d5cf5cf4f7 Add latest changes from gitlab-org/gitlab@master 2020-07-17 00:09:37 +00:00
GitLab Bot
4774fa00b7 Add latest changes from gitlab-org/gitlab@master 2020-06-15 15:08:20 +00:00
GitLab Bot
dc003cd08b Add latest changes from gitlab-org/gitlab@master 2020-03-26 18:08:03 +00:00
Stan Hu
1a4d1b0501 Fix Fogbugz Importer not working
This stopped working in GitLab 11.11 when we upgraded to Rails 5.1.
Rails 5 changed ActionController::Parameters to return an Object instead
of a Hash. The old behavior was deprecated in Rails 5 but finally
removed in Rails 5.1

Since the controller wasn't updated properly, the callback endpoint
quietly failed with the message, "Could not connect to FogBugz, check
your url".

To fix this, we need to call `to_h` on the `import_params` to access the
Hash. We also need to do this for the user map and permit specific keys.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/33530
2019-06-09 23:53:49 -07: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
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
Douwe Maan
f40716f48a No more and/or 2017-02-21 16:31:14 -06:00
Grzegorz Bizon
9e211091a8 Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
Valery Sizov
8346dde052 Only render 404 page from /public 2015-10-13 20:12:34 +03:00
Jared Szechy
93bb8f14ef Use fixed version of fogbugz gem
This allows us to properly handle authentication errors.
2015-09-15 15:23:30 -04:00
Jared Szechy
e156f42079 FogBugz project import 2015-09-08 20:23:01 -04:00