1. 26 Aug, 2015 1 commit
  2. 24 Aug, 2015 4 commits
  3. 23 Aug, 2015 3 commits
    • Douwe Maan's avatar
      Merge branch 'clear-and-retry-bitbucket-access-token' into 'master' · b9536f0384c6
      Douwe Maan authored
      Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab and request them each session
      
      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
      
      See merge request !1112
      b9536f0384c6
    • Stan Hu's avatar
      Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab · 1f548c79b42a
      Stan Hu authored
      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
      1f548c79b42a
    • Stan Hu's avatar
      7.14.0 is released · 4ae191650a69
      Stan Hu authored
      4ae191650a69
  4. 22 Aug, 2015 4 commits
    • Sytse Sijbrandij's avatar
    • Stan Hu's avatar
      Merge branch 'master' into 'master' · 797dc78dbf24
      Stan Hu authored
      "Fixes #xxxx" now shows up in the issue log for non-default branches. #2190
      
      I don't understand why the commits containing "closing references" (like `closes #xxxx`) were not mentioned in the corresponding issues **when pushed to a non-default branch**.
      
      So I tried to discover how it works -- hence learning Ruby! I don't expect that MR to pass, this is my very first attempt of contribution.
      
      **Update:** my modifications are now done. To sum up:
      - when a commit with a reference `fixes #xxxx` is pushed to a non-default branch, a cross-reference to that issue will be created;
      - when that same commit is pushed to a default branch, no cross-reference will be created because a message `This commit closes issue` will be emitted.
      - I also refined some of the existing tests and added 2 tests on the new behavior on non-default branches.
      
      See merge request !1150
      797dc78dbf24
    • Maël Valais's avatar
      Create cross-reference for closing references on commits pushed to non-default branches. · 278c4a2d55b2
      Maël Valais authored
      I also revamped the tests on "closing reference commits" (= "Fixes #xxxx" for example).
      Now, there are two different contexts:
      - when the commits with "closing reference" are pushed to the default branch,
      - when the commits with "closing reference" are pushed to a non-default branch.
      
      Closes gitlab-org/gitlab-ce#2190.
      278c4a2d55b2
    • Robert Speicher's avatar
      Merge branch 'reply-by-email' into 'master' · 7ae992f871b5
      Robert Speicher authored
      Reply by email
      
      Fixes #1360.
      
      It's far from done, but _it works_.
      
      See merge request !1173
      7ae992f871b5
  5. 21 Aug, 2015 22 commits
  6. 20 Aug, 2015 6 commits