1. 27 8月, 2015 1 次提交
  2. 26 8月, 2015 1 次提交
  3. 24 8月, 2015 6 次提交
    • D
      Merge branch 'fix-error-500-groups-with-avatar' into 'master' · e449426a
      Douwe Maan 提交于
      Fix Error 500 in API when accessing a group that has an avatar
      
      Closes #2340
      
      See merge request !1189
      e449426a
    • S
      Fix Error 500 in API when accessing a group that has an avatar · 19f478e0
      Stan Hu 提交于
      Closes #2340
      19f478e0
    • D
      Merge branch 'milestone_search' into 'master' · add099b0
      Dmitriy Zaporozhets 提交于
      Ability to search milestones
      
      https://dev.gitlab.org/gitlab/gitlabhq/issues/2473
      
      See merge request !1158
      add099b0
    • V
      Ability to search milestones · 56527b63
      Valery Sizov 提交于
      56527b63
    • D
      Merge branch 'clear-and-retry-bitbucket-access-token' into 'master' · 24b282ae
      Douwe Maan 提交于
      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
      24b282ae
    • S
      Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab · ed1d4fa4
      Stan Hu 提交于
      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
      ed1d4fa4
  4. 23 8月, 2015 2 次提交
  5. 22 8月, 2015 16 次提交
  6. 21 8月, 2015 14 次提交