Commit Graph

76 Commits

Author SHA1 Message Date
GitLab Bot 4aa6fba6d8 Add latest changes from gitlab-org/gitlab@master 2023-12-21 00:13:46 +00:00
GitLab Bot 5fcd4e5fbc Add latest changes from gitlab-org/gitlab@master 2023-10-16 18:10:30 +00:00
GitLab Bot 58af7e4529 Add latest changes from gitlab-org/gitlab@master 2023-07-20 15:07:13 +00:00
GitLab Bot 1bbd0179d7 Add latest changes from gitlab-org/gitlab@master 2023-06-29 18:10:36 +00:00
GitLab Bot fa69a57b46 Add latest changes from gitlab-org/gitlab@master 2023-04-26 18:19:16 +00:00
GitLab Bot 190734a48c Add latest changes from gitlab-org/gitlab@master 2023-04-25 21:16:20 +00:00
GitLab Bot 2ea6383914 Add latest changes from gitlab-org/gitlab@master 2023-04-19 03:08:33 +00:00
GitLab Bot 21cf3e773d Add latest changes from gitlab-org/gitlab@master 2023-04-03 21:08:25 +00:00
GitLab Bot f6b58d1490 Add latest changes from gitlab-org/gitlab@master 2023-03-15 18:11:11 +00:00
GitLab Bot b50c9d31e3 Add latest changes from gitlab-org/gitlab@master 2023-03-15 12:13:34 +00:00
GitLab Bot e22c3819ad Add latest changes from gitlab-org/gitlab@master 2023-03-06 18:08:12 +00:00
GitLab Bot 919e3e3cd8 Add latest changes from gitlab-org/gitlab@master 2023-02-07 21:09:58 +00:00
GitLab Bot 6cae2159b8 Add latest changes from gitlab-org/gitlab@master 2023-02-07 18:07:51 +00:00
GitLab Bot 5db6a7a014 Add latest changes from gitlab-org/gitlab@master 2023-01-05 15:08:39 +00:00
GitLab Bot 17c478bc80 Add latest changes from gitlab-org/gitlab@master 2022-12-15 00:08:38 +00:00
GitLab Bot db2275b561 Add latest changes from gitlab-org/gitlab@master 2022-10-14 21:09:20 +00:00
GitLab Bot dcd075c981 Add latest changes from gitlab-org/gitlab@master 2022-10-14 00:10:41 +00:00
GitLab Bot 0cd52ae4af Add latest changes from gitlab-org/gitlab@master 2022-10-13 00:08:53 +00:00
GitLab Bot 99aa31992d Add latest changes from gitlab-org/gitlab@master 2022-09-15 18:10:36 +00:00
GitLab Bot 57b795ee00 Add latest changes from gitlab-org/gitlab@master 2022-06-22 06:08:52 +00:00
GitLab Bot ae192a2f14 Add latest changes from gitlab-org/gitlab@master 2022-06-08 06:08:10 +00:00
GitLab Bot 1843215ebb Add latest changes from gitlab-org/gitlab@master 2022-04-15 09:08:25 +00:00
GitLab Bot 82f12c2090 Add latest changes from gitlab-org/gitlab@master 2022-03-23 18:08:47 +00:00
GitLab Bot d237ada361 Add latest changes from gitlab-org/gitlab@master 2022-01-12 00:16:35 +00:00
GitLab Bot c70a70ea42 Add latest changes from gitlab-org/gitlab@master 2021-08-20 15:10:24 +00:00
GitLab Bot 0ae8428c8e Add latest changes from gitlab-org/gitlab@master 2021-05-11 21:10:21 +00:00
GitLab Bot 1361891b0a Add latest changes from gitlab-org/gitlab@master 2020-12-09 12:09:42 +00:00
GitLab Bot c19dce027b Add latest changes from gitlab-org/gitlab@master 2020-11-13 21:09:31 +00:00
GitLab Bot 9ebfef6a3c Add latest changes from gitlab-org/gitlab@master 2020-11-04 15:08:41 +00:00
GitLab Bot effda22b3e Add latest changes from gitlab-org/gitlab@master 2020-09-28 12:10:02 +00:00
GitLab Bot bd27a42f54 Add latest changes from gitlab-org/gitlab@master 2020-08-11 12:09:55 +00:00
GitLab Bot 0790cf032c Add latest changes from gitlab-org/gitlab@master 2020-08-06 21:10:15 +00:00
GitLab Bot 58320d8e03 Add latest changes from gitlab-org/gitlab@master 2020-07-29 15:09:39 +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 57d1bb8254 Add latest changes from gitlab-org/gitlab@master 2020-05-19 09:08:12 +00:00
GitLab Bot f697dc5e76 Add latest changes from gitlab-org/gitlab@master 2020-04-14 18:09:54 +00:00
GitLab Bot 4584eb0e07 Add latest changes from gitlab-org/gitlab@master 2019-09-18 15:06:03 +00:00
GitLab Bot 80f61b4035 Add latest changes from gitlab-org/gitlab@master 2019-09-18 14:02:45 +00:00
GitLab Bot b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
Matija Čupić 1f40372029
Do not authorize with OAuth for CICD only projects 2019-07-23 11:48:23 +02:00
Luke Bennett 534a61179e
Improve the GitHub and Gitea import feature table interface
These are backend changes.
Use Vue for the import feature UI for "githubish"
providers (GitHub and Gitea).
Add "Go to project" button after a successful import.
Use CI-style status icons and improve spacing of the
table and its component.
Adds ETag polling to the github and gitea import
jobs endpoint.
2019-02-13 00:15:57 +00:00
Stan Hu 88f2e9615c
Alias GitHub and BitBucket OAuth2 callback URLs
To prevent an OAuth2 covert redirect vulnerability, this commit adds and
uses an alias for the GitHub and BitBucket OAuth2 callback URLs to the
following paths:

GitHub: /users/auth/-/import/github
Bitbucket: /users/auth/-/import/bitbucket

This allows admins to put a more restrictive callback URL in the OAuth2
configuration settings. Instead of https://example.com, admins can now use:

https://example.com/users/auth

It's possible but not trivial to change Devise and OmniAuth to use a
different prefix for callback URLs instead of /users/auth. For now,
aliasing the import URLs under the /users/auth namespace should suffice.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56663
2019-01-31 16:52:48 +01:00
Dmitriy Zaporozhets 1a93b2312f
Backport github import fix from EE
For codebase consistency

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2019-01-17 15:21:37 +02:00
Ben 1e2bd85333 API for importing external repos 2019-01-17 10:37:08 +00:00
Stan Hu b4e2679437 Allow GitHub imports via token even if OAuth2 provider not configured
Previously, the GitHub importer would only work if the site configured
an OAuth2 provider were configured. Users attempting to import via a
GitHub personal access token would see an Error 500 due to a failed
redirection. We fix this by only doing the redirection if the provider
has been configured and allowing users to see the new import page.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/38524
2018-12-10 11:56:14 -08:00
George Tsiolis 733ae94921 Fix typos in comments and specs 2018-11-01 08:59:20 +02:00
Stan Hu 3d82f20d1b Strip whitespace around GitHub personal access tokens
Some browsers insert a trailing whitespace after pasting the
token into the field. This should help reduce confusion.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/46588
2018-10-17 13:16:31 -07: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