home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,387 Commits 48 Branches 340 Tags
a2f170b35a67bda4841db0fb5326ce675f4cd5d5
Commit Graph
9006 Commits
Author SHA1 Message Date
Douwe Maan e449426a4e Merge branch 'fix-error-500-groups-with-avatar' into 'master' 
Fix Error 500 in API when accessing a group that has an avatar

Closes #2340

See merge request !1189
 2015-08-24 15:23:10 +00:00
Stan Hu 19f478e00d Fix Error 500 in API when accessing a group that has an avatar 
Closes #2340
 2015-08-24 07:46:06 -07:00
Valery Sizov 56527b63e8 Ability to search milestones 2015-08-24 13:59:01 +03:00
Stan Hu ed1d4fa477 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
 2015-08-23 09:23:44 -07:00
Maël Valais a9e409179b Create cross-reference for closing references on commits pushed to non-default branches. 
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.
 2015-08-22 16:49:09 +02:00
Robert Speicher f0bdf7f810 Merge branch 'reply-by-email' into 'master' 
Reply by email

Fixes #1360.

It's far from done, but _it works_.

See merge request !1173
 2015-08-22 00:00:08 +00:00
Douwe Maan 0daa21ed8c Merge branch 'fix-email-autocomplete' into 'master' 
Fix bug preventing invite by e-mail

This was broken in 70f5291808 as a result of introducing the ability to filter by current user.

Closes #2320

See merge request !1181
 2015-08-21 22:25:59 +00:00
Stan Hu 577df6b8ca List the current user first in issuable dropdowns 2015-08-21 14:27:21 -07:00
Stan Hu 3715a0f29b Fix bug preventing invite by e-mail 
This was broken in 70f5291808 as a result of introducing the ability to filter by current user.

Closes #2320
 2015-08-21 13:47:56 -07:00
Robert Speicher d0d435a22e Merge branch 'fix-mr-create-permissions' into 'master' 
Check permissions on target project in merge request create service.

See merge request !1183
 2015-08-21 18:02:16 +00:00
Douwe Maan 69708dab9f Block blocked users from replying to threads by email. 2015-08-21 10:14:45 -07:00
Douwe Maan 414533ca48 Check permissions on target project in merge request create service. 2015-08-21 09:47:39 -07:00
Robert Speicher 1346756f74 Merge branch 'fix-fork-mr-labels' into 'master' 
Fix bug where non-project members of the target project could set labels on new merge requests.

Fixes #2292.

See merge request !1180
 2015-08-21 16:37:09 +00:00
Dmitriy Zaporozhets 9bd6c41a02 Merge branch 'commit-image-branch' into 'master' 
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
 2015-08-21 15:11:09 +00:00
Dmitriy Zaporozhets d43d7ffd6f Merge branch 'hide-recent-push' into 'master' 
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
 2015-08-21 14:54:53 +00:00
Dmitriy Zaporozhets 59525d6b28 Merge branch 'comment-case-insensetive-search' into 'master' 
Case-insensitive search for comments

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1174
 2015-08-21 14:53:36 +00:00
Dmitriy Zaporozhets 677bf6615f Merge branch 'issue-2306-repo-size-display' into 'master' 
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
 2015-08-21 10:21:48 +00:00
Douwe Maan 77e508d8fd Fix bug where non-project members of the target project could set labels on new merge requests. 2015-08-20 18:32:32 -07:00
Douwe Maan 2de0935e27 Merge branch 'fix-blame-lines-grouping' into 'master' 
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
 2015-08-20 21:24:48 +00:00
Douwe Maan 02b7be4a68 Remove weirdness. 2015-08-20 14:03:09 -07:00
Douwe Maan 3d51a6d435 Merge branch 'master' into reply-by-email 2015-08-20 12:19:19 -07:00
Douwe Maan 2f78b5e8af Make error class names more consistent. 2015-08-20 11:33:18 -07:00
Douwe Maan e9972efc2f Extract ReplyParser and AttachmentUploader from Receiver. 2015-08-20 11:05:06 -07:00
Nathan Neulinger 3930ec4490 Add size information back to project summary screen. 2015-08-20 12:47:55 +00:00
Dmitriy Zaporozhets 8819007c83 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-20 14:19:32 +02:00
Dmitriy Zaporozhets 6a91e32af9 Cleanup groups pages UI a bit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-20 13:05:14 +02:00
Dmitriy Zaporozhets 8129e2f33f Small ui improvements to snippet page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-20 12:56:15 +02:00
Dmitriy Zaporozhets 0d8ad2dd63 Cleanup snippets index pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-20 12:48:11 +02:00
Artem Sidorenko e238a8dad5 Import sources: show only enabled sources 2015-08-20 12:13:22 +02:00
Dmitriy Zaporozhets f82c14259b Rebuild navigation for dashboard 
* projects from explore page are available from dashboard
* use dashboard sidebar for both logged in and not users
* move explroe projects under projects tab
* move explore groups under groups tab
* move public snippets under snippets tab

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-20 11:59:21 +02:00
Artem Sidorenko 55dca86b98 Import sources: settings in the admin interface 2015-08-20 11:28:27 +02:00
Dmitriy Zaporozhets b1c1a3d3cc Refactor sidebar navigation for dashboard 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-20 10:59:05 +02:00
Stan Hu 98eb89be5d Only show recent push event if the branch still exists or a recent merge request has not been created 
Closes #2277
 2015-08-20 01:38:15 -07:00
Stan Hu 0a5b005da1 Fix blame view line groupings 
Closes #2305
 2015-08-20 01:27:29 -07:00
Sytse Sijbrandij 55fc58bda4 Merge branch '2fa-message-improvement' into 'master' 
Improved 2FA warning message about lost codes

Fixes internal issue: https://dev.gitlab.org/gitlab/gitlabhq/issues/2472

The warning message now clearly states that access will be lost of the 2FA recovery codes are not saved.

/cc @sytses @JobV

See merge request !1175
 2015-08-19 23:21:02 +00:00
Patricio Cano 475bb00bde Improved 2FA warning message about lost codes 2015-08-19 18:13:01 -05:00
Douwe Maan eacdd5080a Fix Basemailer#can? 2015-08-19 14:58:41 -07:00
Douwe Maan 089aa2de2b Add Reply by email feature to admin dashboard. 2015-08-19 13:57:27 -07:00
Douwe Maan 0bc94198fc Fix BaseMailer. 2015-08-19 12:51:42 -07:00
Douwe Maan 4e33127b3a We'll get the <p> for free. 2015-08-19 12:38:08 -07:00
Douwe Maan ed6122d7ea Markdown, not GFM. 2015-08-19 12:37:34 -07:00
Douwe Maan 992dbbd9fe Move sent_notification! out of Notify. 2015-08-19 12:35:23 -07:00
Douwe Maan a8a861ae2a Add BaseMailer to house shared mailer functionality. 2015-08-19 12:35:08 -07:00
Douwe Maan 03b54f1f03 Fix responding to commit notes 2015-08-19 11:35:13 -07:00
Douwe Maan 76dbafba86 Send a rejection email when the incoming email couldn't be processed. 2015-08-19 11:10:21 -07:00
Douwe Maan ee1eb2948d Turn reply-by-email attachments into uploads. 2015-08-19 10:18:05 -07:00
Douwe Maan 01c5ecedd4 Add "Reply to this email directly" to notification footer. 2015-08-19 10:17:51 -07:00
Douwe Maan 6b31827a41 Include display name with reply to address. 2015-08-19 10:17:32 -07:00
Douwe Maan 4f34d363a5 Correctly set Message-ID for comment notifications. 2015-08-19 10:17:20 -07:00
Douwe Maan 73eef57d5e Make MR notification email subject more standard. 2015-08-19 10:16:30 -07:00