BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Switch branch/tag
  1. 25 Aug, 2015 1 commit
  3. 24 Aug, 2015 4 commits
  5. 23 Aug, 2015 3 commits
    • Merge branch 'clear-and-retry-bitbucket-access-token' into 'master' · 24b282ae
      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
    • Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab · ed1d4fa4
      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
    • 7.14.0 is released · 97cc91d2
      Stan Hu authored
  7. 22 Aug, 2015 4 commits
    • Specify the branch name of the blog post to prevent the use of spaces. · cddf03f7
      Sytse Sijbrandij authored
    • Merge branch 'master' into 'master' · b85754e3
      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
    • Create cross-reference for closing references on commits pushed to non-default branches. · a9e40917
      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.
    • Merge branch 'reply-by-email' into 'master' · f0bdf7f8
      Robert Speicher authored 
      Reply by email

Fixes #1360.

It's far from done, but _it works_.

See merge request !1173
  9. 21 Aug, 2015 22 commits
  11. 20 Aug, 2015 6 commits