Merge branch 'github_importer' into 'master'

Github importer See merge request !51

Merge branch 'github_importer' into 'master'
Github importer See merge request !51
f1825156 · Dmitriy Zaporozhets · 87feb100 · 1e85c7e7 · f1825156 · f1825156
Commit f1825156 authored Jan 13, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

CHANGELOG CHANGELOG +3 -0

VERSION VERSION +1 -1

lib/gitlab_projects.rb lib/gitlab_projects.rb +1 -0

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
+v2.4.1
+  - Access token masking in url before loging
+
 v2.4.0
  - Show error message when git push is rejected


--- a/VERSION
+++ b/VERSION
-2.4.0
+2.4.1
--- 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