home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,496 Commits 48 Branches 340 Tags
f008b2d2dfd1b8030ec0634c223ca9f11d304e91
Commit Graph
20496 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Douwe Maan f008b2d2df Remove extra space 2015-11-17 17:19:31 +01: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
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
Dmitriy Zaporozhets 1c040b3f0a Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-11-17 13:23:31 +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
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 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
Robert Speicher c8e53d4467 Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list" 
This reverts commit 63144cd062, reversing
changes made to 8ab5df9d87.
 2015-11-16 13:08:08 -05:00
Dmitriy Zaporozhets 32f1a71968 Fix removing avatar for group 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 17:24:14 +01:00
Dmitriy Zaporozhets 43d5eca084 Merge branch 'add_index_uniq' into 'master' 
Add index uniq

Added unique on oid index. Removed the second index since it is unnecessary. 

See merge request !1810
 2015-11-16 16:16:36 +00:00
Dmitriy Zaporozhets 929ab909c8 Group masters should be able to create/close milestones 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 16:14:19 +01:00
Dmitriy Zaporozhets 9a3df9d5d0 Merge branch 'ci-runners-master-or-owner' into 'master' 
Show specific runners from projects where user is master or owner

This fix for permission escalation when handling specific runners.

The users were allowed to assign runners from projects where they were guests.


See merge request !1809
 2015-11-16 15:00:55 +00:00
Marin Jankovski 84c71e5d82 Add unique to oid index for lfs object. 2015-11-16 15:59:15 +01:00
Dmitriy Zaporozhets 78d542fcd8 Add milestones documentation to workflow 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 15:56:50 +01:00
Marin Jankovski f445d3d1f3 unique is for indexes. 2015-11-16 15:36:14 +01:00
Dmitriy Zaporozhets f16f315115 Few changes to Group Milestone feature: 
* Group attachments are not supported so I removed attach file link
* Added changelog item
* Add markdown hint to project milestone form

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 15:07:16 +01:00
Dmitriy Zaporozhets 8630d476e4 Add header and page title to new milestone page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 14:45:20 +01:00
Dmitriy Zaporozhets 8a03cb8744 Lets add more tests to Milestones services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 14:39:19 +01:00
Dmitriy Zaporozhets 98d6d491b5 Move global milestone specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 14:38:34 +01:00
Dmitriy Zaporozhets c79d801bf5 Fix a bug when milestone/label filter was empty for dashboard issues page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 14:07:38 +01:00
Dmitriy Zaporozhets 986695e136 Refactor global and group milestones logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 14:07:38 +01:00
Dmitriy Zaporozhets 05335a3c85 Create milestones in the group 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 14:07:38 +01:00
Dmitriy Zaporozhets 1328e4b504 Merge branch 'refactor-duplication' into 'master' 
Remove some code duplication

* remove duplicate code in uploaders
* remove duplicate code in NotificationHelper
* remove duplicate code in Repository


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

See merge request !1800
 2015-11-16 13:05:49 +00:00
Dmitriy Zaporozhets b736a7b15e Merge branch 'lfs' into 'master' 
Git LFS  support

Part of gitlab-org/gitlab-ce#2955

See merge request !1727
 2015-11-16 13:01:19 +00:00
Kamil Trzcinski 03f5ff750b Show specific runners from projects where user is master or owner 2015-11-16 13:24:56 +01:00
Dmitriy Zaporozhets c9f2f2a483 Fix wrong variable name 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 13:01:34 +01:00
Dmitriy Zaporozhets 0698c96d7d Remove duplicate code in Repository#*_names_contains 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 13:01:34 +01:00
Dmitriy Zaporozhets 433e4a80ef Fix code duplication in NotificationsHelper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 13:01:34 +01:00
Dmitriy Zaporozhets cd513034e6 Set less strict flay option for now 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 13:01:34 +01:00
Dmitriy Zaporozhets 796bb65170 Remove duplicate methods in uploaders 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 13:01:34 +01:00
Marin Jankovski 14032d8eb1 Add support for git lfs. 2015-11-16 12:39:13 +01:00
Valery Sizov 9179fcece8 Merge branch 'test_env_cache' into 'master' 
Disabling cache for test environment



See merge request !1807
 2015-11-16 11:35:05 +00:00
Valery Sizov 9e0d443f9e Disabling cache for test environment 2015-11-16 12:18:31 +02:00
Dmitriy Zaporozhets 6c8dded20b Merge branch 'fix_trailing_title_space' of https://gitlab.com/dblessing/gitlab-ce 2015-11-16 10:40:49 +01:00
Dmitriy Zaporozhets 86ce64f053 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-11-16 10:18:40 +01:00
Dmitriy Zaporozhets a43a218c98 Merge branch 'releases-feature' 2015-11-16 10:18:32 +01:00
Dmitriy Zaporozhets 743d66e4da Improve english text 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 10:11:16 +01:00
Valery Sizov 5be2191b1a Merge branch 'rs-revert-gh-9812' into 'master' 
Revert "Merge pull request #9812 from chrspeich/hide-tabs-lone-auth-provider"

This reverts commit 84999611d8, reversing
changes made to 0d9fb211f3.

See merge request !1805
 2015-11-16 07:56:56 +00:00
Robert Speicher 9337da7864 Revert "Merge pull request #9812 from chrspeich/hide-tabs-lone-auth-provider" 
This reverts commit 84999611d8, reversing
changes made to 0d9fb211f3.
 2015-11-15 21:37:13 -05:00