home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 01:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,377 Commits 48 Branches 340 Tags
a9e409179bb6be53e1fb45e930739fc73dbb77ea
Commit Graph
18377 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 15fc7bd613 No HTML-only email please 2015-08-21 16:09:55 -07: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
Douwe Maan 3abb356dd2 Add development documentation for real. 2015-08-21 15:13:22 -07:00
Douwe Maan 0366655311 Fix check task for development. 2015-08-21 15:06:04 -07:00
Douwe Maan 50baa1fdd1 Add development section to doc. 2015-08-21 15:03:16 -07: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
Douwe Maan 1cfc4af31e Merge branch 'rs-dev-issue-2550' into 'master' 
Remove trailing HTML entities from non-Rinku autolinks as well.

Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2550

See merge request !1179
 2015-08-21 18:48:18 +00: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
Robert Speicher f5b3bf84ad Merge branch 'fix-backup-restore' into 'master' 
Do not delete the SQL dump too early

The change in baa157926d 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
 2015-08-21 16:10:12 +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 7e51ec4f04 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-21 16:55:41 +02: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
Jacob Vosmaer 4cd06867c7 Do not delete the SQL dump too early 
The change in baa157926d 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 .
 2015-08-21 16:12:46 +02:00
Jacob Vosmaer bd78e1a2e9 Merge pull request #9535 from bbodenmiller/patch-3 
check upload dir permissions
 2015-08-21 14:30:58 +02: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
Robert Speicher 747fe7520b Remove trailing HTML entities from non-Rinku autolinks as well. 2015-08-20 18:25:16 -07:00
Douwe Maan 35224d5e7f Memoize address_regex locally. 2015-08-20 16:44:44 -07:00
Douwe Maan 3d141d1512 Fix spec by removing global state. 2015-08-20 16:21:31 -07:00
Douwe Maan afb765ad9e Fix markdown specs again. Apparently development and test behave differently. 2015-08-20 15:41:34 -07:00
Douwe Maan 99ef8c8159 Fix markdown specs. 2015-08-20 15:37:43 -07:00
Douwe Maan f26c2905d1 Fix indentation 2015-08-20 14:25:56 -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 41ed60c21a Fix MailRoom running check. 2015-08-20 14:09:37 -07:00
Douwe Maan 02b7be4a68 Remove weirdness. 2015-08-20 14:03:09 -07:00
Douwe Maan 123af78561 Add gitlab:reply_by_email:check rake task. 2015-08-20 14:03:04 -07:00
Douwe Maan 48e25a019a Add stub_reply_by_email_setting helper. 2015-08-20 13:21:22 -07:00
Douwe Maan 6110e175dc Use heredocs. 2015-08-20 13:10:55 -07:00
Douwe Maan 54b04f1c5b Add fixture_file helper. 2015-08-20 12:41:47 -07:00
Douwe Maan ac268674ed Update spec. 2015-08-20 12:34:45 -07:00
Douwe Maan e1eb09dd0e Remove more unused fixtures. 2015-08-20 12:33:33 -07:00
Douwe Maan 2b5a2b8f39 Removed unused fixtures. 2015-08-20 12:29:03 -07:00
Douwe Maan 3d51a6d435 Merge branch 'master' into reply-by-email 2015-08-20 12:19:19 -07:00
Douwe Maan 8ec5fb138d Test Gitlab::Email::Receiver. 2015-08-20 12:17:59 -07:00
Douwe Maan e44936f3ed Test EmailReceiverWorker. 2015-08-20 11:47:09 -07:00
Douwe Maan 991c9f6fda Test Email::AttachmentUploader. 2015-08-20 11:33:35 -07:00
Douwe Maan 2f78b5e8af Make error class names more consistent. 2015-08-20 11:33:18 -07:00
Douwe Maan 0b401f2e94 Fix a couple of whoopsy daisies. 2015-08-20 11:17:14 -07:00
Douwe Maan e9972efc2f Extract ReplyParser and AttachmentUploader from Receiver. 2015-08-20 11:05:06 -07:00
Douwe Maan 3ff9d5c64c Use canonical version of mail_room. 2015-08-20 10:58:04 -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 90071a08d7 Merge branch 'top-menu-improvements' into 'master' 
Navigation improvements

- [x] make explore area as part of dashboard
- [x] move navigation links from top right corner to sidebar
- [x] group navigation items on dashboard
- [x] cleanup UI after such changes
- [ ] fix tests

cc @sytses @JobV

See merge request !1177
 2015-08-20 12:18:41 +00:00