home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 12:06:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,538 Commits 48 Branches 340 Tags
ee134d09e7cedb57cd021314d5de459a4adf3d4d
Commit Graph
20538 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sytse Sijbrandij ee134d09e7 Move release cycle comments to the documentation. 2015-12-05 15:06:32 -08:00
Robert Speicher 632f60cc76 Fix CHANGELOG 
[ci skip]
 2015-11-17 13:48:45 -05:00
Robert Speicher 354f244059 Merge branch 'contributor-graph-by-email' into 'master' 
See merge request !1705
 2015-11-17 13:48:28 -05:00
Robert Speicher b1abe90aeb Merge branch 'adamliesko/gitlab-ce-notification-upon-unassignment' into 'master' 
Add notification to the former assignee upon unassignment

Replaces !1769

Fixes #3395

See merge request !1818
 2015-11-17 18:28:09 +00:00
Robert Speicher d431f3ec40 Merge branch 'james11/gitlab-ce-removable-group-owner' into 'master' 
Prevent the last owner of a group from being able to delete themselves
by 'adding' themselves as a master

Replaces !1708.

Fixes #1111.

See merge request !1815
 2015-11-17 18:23:27 +00:00
Dmitriy Zaporozhets 5098ad9d3c Merge branch 'remove-code-duplication' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-17 19:17:15 +01:00
Robert Speicher 6f6c75cb85 Bump VERSION 
[ci skip]
 2015-11-17 11:59:22 -05:00
Robert Speicher b7b49dab92 Merge branch 'param-view' into 'master' 
See merge request !1816
 2015-11-17 11:43:47 -05:00
Douwe Maan f008b2d2df Remove extra space 2015-11-17 17:19:31 +01:00
Robert Speicher 85102d094f Update CHANGELOG 
[ci skip]
 2015-11-17 11:03:02 -05:00
Robert Speicher 4597f8ef20 Update monthly release template 
[ci skip]
 2015-11-17 11:03:02 -05:00
Robert Speicher 475a5b5ab7 Merge pull request #9833 from huacnlee/fix/pr-9820-missings 
Don't render note edit forms for visitors
 2015-11-17 10:58:17 -05:00
Douwe Maan 931c56f822 Add tests for merge request update. 2015-11-17 16:53:15 +01:00
Douwe Maan 0fbf47a219 Add credits to changelog 2015-11-17 16:51:49 +01:00
Douwe Maan 80a2eb5d50 Fix spec 2015-11-17 16:51:39 +01:00
Douwe Maan 8c308e3df6 Don't fail when there was no previous assignee 2015-11-17 16:51:35 +01:00
Douwe Maan 1ca550823b Merge branch 'master' into adamliesko/gitlab-ce-notification-upon-unassignment 2015-11-17 16:41:42 +01:00
Douwe Maan e49190cad9 Don't use params[:view] directly. 2015-11-17 16:33:38 +01:00
Jason Lee 3ae1dee475 Avoid render edit_form when visitor can't edit them. 
Reverted #9820, github/task_list need a form, textarea for update.
 2015-11-17 23:21:03 +08:00
Robert Speicher df0110ba81 Merge branch 'rs-revert-gh-9820' into 'master' 
Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"

This reverts commit 63144cd062, reversing
changes made to 8ab5df9d87.

Reverts https://github.com/gitlabhq/gitlabhq/pull/9820

See merge request !1804
 2015-11-17 15:09:22 +00:00
Douwe Maan d60a23b718 Add changelog item 2015-11-17 15:53:53 +01:00
Douwe Maan e3fe3da63d Use project member abilities more extensively 2015-11-17 15:51:40 +01:00
Douwe Maan ecb83afabc Refactor ability changes 2015-11-17 15:49:37 +01:00
Douwe Maan e849b51cae Merge branch 'master' into james11/gitlab-ce-removable-group-owner 2015-11-17 15:40:54 +01:00
Douwe Maan 7b014338ca Merge branch 'master' into contributor-graph-by-email 2015-11-17 14:33:35 +01:00
Dmitriy Zaporozhets 1c040b3f0a Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-11-17 13:23:31 +01:00
Dmitriy Zaporozhets fab04fac13 Code duplication check should be enabled now 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-17 12:55:48 +01:00
Dmitriy Zaporozhets 49e32cb59f Remove small code duplication in user_reference_filter.rb 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-17 12:55:16 +01:00
Dmitriy Zaporozhets 84b5d0356a Refactor similar code for Issue and MR update service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-17 12:42:43 +01:00
Robert Schilling 6379978cdf Merge pull request #9837 from Great-Antique/master 
Fix md syntax in doc/api/commits.md
 2015-11-17 12:27:18 +01:00
Den Girnyk 4de50a866e Fix md syntax in doc/api/commits.md 2015-11-17 13:08:11 +02:00
Dmitriy Zaporozhets 9b0efdb71e Remove code duplication in notification_service.rb 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-17 12:05:35 +01:00
Dmitriy Zaporozhets 616675b4a6 Remove duplication in mailers/emails/notes.rb 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-17 11:55:43 +01:00
Dmitriy Zaporozhets 4747412a49 Set higher flay value to avoid unnecessary refactoring for now 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-17 11:18:01 +01:00
Dmitriy Zaporozhets 3cebe9e780 Refactor duplciate code for groups_controller.rb and slack_service/note_message.rb 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-17 11:03:18 +01:00
Dmitriy Zaporozhets 437d4c76ec Remove duplication in diff_helper.rb 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-17 10:49:23 +01:00
Dmitriy Zaporozhets 5f23909362 Remove code duplication in gitlab_markdown_helper.rb 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-17 10:40:29 +01:00
Douwe Maan 93262415e2 Merge branch 'issue/vars-need-eval' into 'master' 
Ensure variable in mail is evalled

I received this snippet in the mail:

```
Content-Type: text/plain;
 charset=UTF-8
Content-Transfer-Encoding: 7bit

Project #{@old_path_with_namespace} was moved to another location

The project is now located under
```

This MR fixes it.

Notes:

* I did a quick grep on other 'text.erb' files, but this was the only one with this type of error
* I made no changes to the specs. The only [spec](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/spec/mailers/notify_spec.rb#L412) I could find passes because (I assume) the correct value is in the html-part

See merge request !1706
 2015-11-17 08:55:42 +00:00
Douwe Maan c12d0b4d2a Merge branch 'rs-wiki-touches-project' into 'master' 
Make ProjectWiki touch Project#last_activity_at after wiki actions

Closes #3026

See merge request !1803
 2015-11-17 08:48:29 +00:00
Achilleas Pipinellis 03cb8edb34 Merge branch 'http-to-https' into 'master' 
Rewrite HTTP links to force TLS, where possible

I got annoyed at the fact that the links on the profile page don't force the use of TLS, so I grepped through the entire source tree, tested all the links I found, and replaced them if possible.

See merge request !1806
 2015-11-17 06:24:36 +00:00
Alex Jordan 3300db70ff Rewrite HTTP links to force TLS, where possible 2015-11-16 16:50:05 -08:00
Dmitriy Zaporozhets bfbfa3b5f0 Remove duplication in issue emails 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 23:56:16 +01:00
Dmitriy Zaporozhets 9573e06e26 Allow flay to fail for now since there is still a lot of refactoring todo 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 23:56:16 +01:00
Dmitriy Zaporozhets 79fa6c646c Remove duplication in reference filters 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 23:56:16 +01:00
Dmitriy Zaporozhets adec8c7768 Refactor select2 tags 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 23:56:16 +01:00
Dmitriy Zaporozhets da26fd3fc2 Dont allow code duplication check to fail 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 23:56:15 +01:00
Dmitriy Zaporozhets 0061143ccd Merge branch 'global-milestones' into 'master' 
Create milestones in the group

When you work with groups its quite often you want to create same milestone in multiple projects. This MR allows you to do so

For #3488 

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

See merge request !1797
 2015-11-16 20:41:27 +00:00
Dmitriy Zaporozhets b093f50986 Some code and doc improvements 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 19:55:58 +01:00
Robert Speicher 66c7605313 Merge branch 'rs-rc1-docs' into 'master' 
8.2.rc1 documentation updates

[ci skip]

See merge request !1798
 2015-11-16 18:24:16 +00:00
Robert Speicher ccb0c40c54 Make ProjectWiki touch Project#last_activity_at after wiki actions 
Closes #3026
 2015-11-16 13:08:25 -05:00