- 24 Aug, 2015 1 commit
-
-
Stan Hu authored
Closes #2340
-
- 23 Aug, 2015 3 commits
-
-
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
-
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
-
Stan Hu authored
-
- 22 Aug, 2015 4 commits
-
-
Sytse Sijbrandij authored
-
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
-
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.
-
Robert Speicher authored
Reply by email Fixes #1360. It's far from done, but _it works_. See merge request !1173
-
- 21 Aug, 2015 22 commits
-
-
Douwe Maan authored
-
Douwe Maan authored
Fix bug preventing invite by e-mail This was broken in 70f52918 as a result of introducing the ability to filter by current user. Closes #2320 See merge request !1181
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Stan Hu authored
-
Douwe Maan authored
Remove trailing HTML entities from non-Rinku autolinks as well. Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2550 See merge request !1179
-
Robert Speicher authored
Check permissions on target project in merge request create service. See merge request !1183
-
Douwe Maan authored
-
Douwe Maan authored
-
Robert Speicher authored
Fix bug where non-project members of the target project could set labels on new merge requests. Fixes #2292. See merge request !1180
-
Robert Speicher authored
Do not delete the SQL dump too early The change in baa15792 broke backup restore fucnctionality. This would not lead to data loss, but it prevented the restore script from working. This bug exists only in 7.14.0 release candidate versions, not in 7.13. Reported in https://github.com/gitlabhq/gitlabhq/issues/9571 . See merge request !1182
-
Dmitriy Zaporozhets authored
Fixed JS issue with diff image loading Fixes #1323 Whilst I couldn't reproduce the error locally, I did manage to get the same JS error message that was in the live env. See merge request !463
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Only show recent push event if the branch still exists or a recent merge request has not been created Closes #2277 See merge request !1167
-
Dmitriy Zaporozhets authored
Case-insensitive search for comments Signed-off-by:
Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1174
-
Jacob Vosmaer authored
The change in baa15792 broke backup restore fucnctionality. This would not lead to data loss, but it prevented the restore script from working. This bug exists only in 7.14.0 release candidate versions, not in 7.13. Reported in https://github.com/gitlabhq/gitlabhq/issues/9571 .
-
Jacob Vosmaer authored
check upload dir permissions
-
Dmitriy Zaporozhets authored
Add size information back to project summary screen. ![gitlab-with-size](https://gitlab.com/nneul/gitlab-ce/uploads/84d15169aa7ee4e966465a71ca383f24/gitlab-with-size.png) See merge request !1178
-
Douwe Maan authored
-
Robert Speicher authored
-
- 20 Aug, 2015 10 commits
-
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
Fix blame view line groupings Before: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b84f75183244e58683b9172c772591d6/image.png) After: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/12ef635deefd3616142e65f064252020/image.png) Closes #2305 See merge request !1176
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-