- 26 8月, 2015 6 次提交
-
-
由 Josef Kufner 提交于
-
由 Josef Kufner 提交于
-
由 Dmitriy Zaporozhets 提交于
Re-use project partial for rendering explore projects from dashboard For consistency with projects on dashboard after !1198 Before: ![Screenshot_2015-08-25_18.21.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/53bcf6909fe55b2e331ea6a720cb12ce/Screenshot_2015-08-25_18.21.48.png) After: ![Screenshot_2015-08-25_18.20.22](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fbda93828ec28ef1ac874d65b4a04c2b/Screenshot_2015-08-25_18.20.22.png) Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1200
-
由 Douwe Maan 提交于
Re-enable the "links with adjacent text" UserReferenceFilter spec See merge request !1194
-
由 Dmitriy Zaporozhets 提交于
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
由 Dmitriy Zaporozhets 提交于
Separate activity page Move activity to separate page. Part of #2225 ![Screenshot_2015-08-25_15.07.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2126b22ed7b98a2f748c96ad60bc8b2e/Screenshot_2015-08-25_15.07.23.png) See merge request !1198
-
- 25 8月, 2015 18 次提交
-
-
由 Dmitriy Zaporozhets 提交于
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
由 Dmitriy Zaporozhets 提交于
Fix "Reload with full diff" URL button in compare branch view This button worked when viewing merge requests because the JavaScript stripped the .html in the Ajax request. However, it left the .html suffix in the compare branch view. See merge request !1195
-
由 Dmitriy Zaporozhets 提交于
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
由 Dmitriy Zaporozhets 提交于
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
由 Dmitriy Zaporozhets 提交于
Improve abuse reports management * Link to user profile instead of user admin page * One button for remove user and report * Remove user and report without page reloading Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1196
-
由 Dmitriy Zaporozhets 提交于
Gracefully handle SMTP user input errors (e.g. incorrect email addresses) to prevent Sidekiq retries ### What does this MR do? This MR gracefully handles SMTP input errors (e.g. incorrect or invalid e-mail addresses) to prevent these types of exceptions from causing Sidekiq to retry the task. If these specific exceptions occur, they will be logged, and the e-mail will be dropped from the queue. ### Why was this MR needed? If you include an author that has a misspelled e-mail address, Sidekiq will keep sending e-mail to all the recipients even if they have already received the e-mail. The only way to recover is to clear the Sidekiq queue. Note that other exceptions can still be thrown (e.g. `IOError`, `Net::SMTPAuthenticationError`, `Net::SMTPServerBusy`, `Net::SMTPUnknownError`, and `TimeoutError`). If the worker encounters these, Sidekiq should retry the task. ### What are the relevant issue numbers? Closes https://github.com/gitlabhq/gitlabhq/issues/9560 See merge request !1163
-
由 Dmitriy Zaporozhets 提交于
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
由 Dmitriy Zaporozhets 提交于
* Link to user profile instead of user admin page * One button for remove user and report * Remove user and report with page reloading Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
由 Dmitriy Zaporozhets 提交于
Upgrade browser gem to 1.0.0 to avoid warning in IE11 compatibilty mode GitLab currently displays the "outdated browser" message if users run Internet Explorer 11 in Compatibility Mode. @fnando [updated the browser gem](https://github.com/fnando/browser/pull/168) to use IE's Trident version to determine the "true" version of IE11. Closes #2271 See merge request !1188
-
由 Stan Hu 提交于
This button worked when viewing merge requests because the JavaScript stripped the .html in the Ajax request. However, it left the .html suffix in the compare branch view.
-
由 Robert Speicher 提交于
-
由 Robert Speicher 提交于
Ignore empty incoming messages (Reply by email) We should also update mail_room when https://github.com/tpitale/mail_room/pull/35 goes in, but that can wait a bit. See merge request !1190
-
由 Robert Speicher 提交于
Move changelog entry to 7.14.1 [ci skip] See merge request !1192
-
由 Robert Speicher 提交于
[ci skip]
-
由 Douwe Maan 提交于
Move full_host fix changelog entry to 7.14.1 [ci skip] See merge request !1191
-
由 Robert Speicher 提交于
[ci skip]
-
由 Robert Speicher 提交于
Only include base URL in OmniAuth full_host parameter Closes #2335 See merge request !1187
-
由 Douwe Maan 提交于
-
- 24 8月, 2015 8 次提交
-
-
由 Douwe Maan 提交于
Fix Error 500 in API when accessing a group that has an avatar Closes #2340 See merge request !1189
-
由 Stan Hu 提交于
Closes #2340
-
由 Dmitriy Zaporozhets 提交于
Ability to search milestones https://dev.gitlab.org/gitlab/gitlabhq/issues/2473 See merge request !1158
-
由 Valery Sizov 提交于
-
由 Stan Hu 提交于
Closes #2271
-
由 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
-
由 Stan Hu 提交于
Closes #2335
-
由 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
-
- 23 8月, 2015 2 次提交
-
-
由 Stan Hu 提交于
-
由 Sytse Sijbrandij 提交于
-
- 22 8月, 2015 6 次提交
-
-
由 Stan Hu 提交于
"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 提交于
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 提交于
Reply by email Fixes #1360. It's far from done, but _it works_. See merge request !1173
-
由 Douwe Maan 提交于
-
由 Douwe Maan 提交于
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 提交于
-