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,489 Commits 48 Branches 340 Tags
9b0efdb71ea6e4f3a33db9959c63125cd50afebe
Commit Graph
20489 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Robert Speicher 3777b233a3 Merge branch 'relative_links_default_branch' into 'master' 
Relative links in project README should point to default branch, not master

Relative links in the README shown on a project's main page currently always point to the "master" branch.  This is a particularly obvious problem for projects that have no "master" branch, since the link points to a non-existent file.

This patch changes the relative links to instead point to the default branch.

Resolves #2707, #1134, #1852

See merge request !1801
 2015-11-15 18:25:20 +00:00
Alec Cooper 4bb99677b1 Relative links in the README file shown on the repository homepage should point 
to the default branch, not to master
 2015-11-14 15:00:55 -05:00
Dmitriy Zaporozhets aec9f211e5 Merge branch 'impersonate' into 'master' 
refactor login as to be impersonation with better login/logout

Modifies the existing "login as" feature to be called impersonation.

This also adds:

* Application keep track of who is impersonating the user so they can revert back to the original user without having to log out.
* Stores the user profile via `HTTP_REFERER` so you get redirected back to the person you have impersonated once you stop.

## Screenshots:

![](http://sindacio.us/i/2015-10-28_17-52-41.png)
![](http://sindacio.us/i/2015-10-28_17-53-08.png)

See merge request !1702
 2015-11-14 09:04:10 +00:00
Dmitriy Zaporozhets da8ca8b217 Merge branch 'annotate-models' into 'master' 
Annotate models

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

See merge request !1799
 2015-11-14 08:27:12 +00:00
Dmitriy Zaporozhets a237999f00 Annotate models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-13 19:22:46 +01:00