diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-13 20:50:35 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-13 20:50:35 +0000 |
| commit | f18251564855d6ca4b57e1f1a4603c1ccac31f09 (patch) | |
| tree | 8b304cb378697c799c8241ff6ae64074501ea73a | |
| parent | 87feb100fea39ecc8a10f2e6724fa150574d6715 (diff) | |
| parent | 1e85c7e7d888c38015e2547c7b4d8a4b1a261ed7 (diff) | |
| download | gitlab-shell-f18251564855d6ca4b57e1f1a4603c1ccac31f09.tar.gz | |
Merge branch 'github_importer' into 'master'
Github importer
See merge request !51
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | lib/gitlab_projects.rb | 1 |
3 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,6 @@ +v2.4.1 + - Access token masking in url before loging + v2.4.0 - Show error message when git push is rejected @@ -1 +1 @@ -2.4.0 +2.4.1 diff --git a/lib/gitlab_projects.rb b/lib/gitlab_projects.rb index 0744317..e9c9203 100644 --- a/lib/gitlab_projects.rb +++ b/lib/gitlab_projects.rb @@ -109,6 +109,7 @@ class GitlabProjects def mask_password_in_url(url) result = URI(url) result.password = "*****" unless result.password.nil? + result.user = "*****" unless result.user.nil? #it's needed for oauth access_token result rescue url |