home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,755 Commits 48 Branches 340 Tags
b583bb5fcbb0ea609c0895f95ebdb45bb4f2eea0
Commit Graph
2252 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 680b087764 Merge master from CE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 14:01:32 +02:00
Dmitriy Zaporozhets 0fd7d3ebe0 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-10 16:01:53 +02:00
Robert Speicher 1f9487f7f4 Merge branch 'ldap-sync-group-members' into 'master' 
Disable adding, updating and removing members from a group that is
synced with LDAP.

Addresses #290.

See merge request !465
 2015-08-09 01:44:28 +00:00
Dmitriy Zaporozhets 4773f38e28 Merge branch 'improve-merge-requests' into 'master' 
Improve merge requests

- [x] Fetch merge request refs by IID
- [x] Ability to fetch any merge request
- [x] Link commits and diffs in merge request to target project
- [x] Improve merge request UI and command line instructions
- [x] Check merge request widget loading test coverage double

See merge request !1115
 2015-08-07 14:44:54 +00:00
Douwe Maan 0d5d80b735 Merge branch 'comment-updated-by' into 'master' 
Show who last edited a comment if it wasn't the original author

Fixes #1796.

The `updated_by` user is also tracked for issues and merge requests, but it isn't currently shown, because "edited by Person" would give the idea that Person edited the description, while most updates to those are assignee/milestone/labels, in which case who made that change is already visible in the comments.

See merge request !1075
 2015-08-07 14:44:28 +00:00
Douwe Maan ad55f0d6f9 Merge branch 'master' into comment-updated-by 2015-08-07 15:05:17 +02:00
Dmitriy Zaporozhets 86bccb71a1 Create ref for every merge request. Add documentation for fetch merge requests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-07 12:54:58 +02:00
Dmitriy Zaporozhets 8dce66234f Fetch to mr code from fork to iid 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-07 12:35:04 +02:00
Robert Speicher fb6dc1f07d Add Group#add_* convenience methods 
Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
 2015-08-07 00:20:02 -04:00
Dmitriy Zaporozhets 2c46cf084b Merge branch 'fix-namespace-move-dir' into 'master' 
Ensure old namespace directory exists before moving it

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

Fixes #983 

See merge request !1101
 2015-08-06 16:09:11 +00:00
Dmitriy Zaporozhets dcb0bf0df5 Merge branch 'report-spam' 2015-08-06 18:07:36 +02:00
Dmitriy Zaporozhets cba7f20dc8 Allow users to send abuse reports 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 14:03:27 +02:00
Douwe Maan 8b6ae0104d Merge branch 'master' into comment-updated-by 2015-08-06 12:52:26 +02:00
Douwe Maan d6222d2273 Minor code tweak 2015-08-06 12:37:16 +02:00
Dmitriy Zaporozhets d044c14290 Ensure old namespace directory exists before moving it 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 12:31:24 +02:00
Douwe Maan c6cbee846c Merge branch 'remove-email-from-published-keys' into 'master' 
Only publish ssh key-type and key

Now when requesting my keys; my emailadres is exposed. [My keys](https://gitlab.com/zj.keys)

To prevent harvesting only key-type and the key itself are displayed instead of all data supplied when uploaded.

See merge request !850
 2015-08-06 09:05:15 +00:00
Dmitriy Zaporozhets 957e849f41 Merge branch 'drop-satellites' 2015-08-05 15:40:14 +02:00
Kamil Trzciński caf4c0dd87 Merge branch 'ci-skipped-status' into 'master' 
Added support for CI skipped status

This is required to support: https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/216


See merge request !1073
 2015-08-05 10:09:07 +00:00
Valery Sizov 6353ca9ae8 Revert "Update noteable after a new note is added" 
This reverts commit fbdaf0e2a5.
 2015-08-05 12:00:12 +03:00
Kamil Trzcinski 427b5df260 Added support for CI skipped status 2015-08-04 16:47:19 +02:00
Dmitriy Zaporozhets b48b07044b Merge branch 'master' into drop-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-04 16:42:36 +02:00
Zeger-Jan van de Weg 4ccd767abf Only publish ssh key-type and key 2015-08-04 14:33:18 +02:00
Valery Sizov 91f733c52b Merge branch 'auto_suggestion' into 'master' 
Automatic approver suggestions



See merge request !466
 2015-08-03 08:45:10 +00:00
Valery Sizov 37ae86231d Refactoring 2015-08-03 10:54:30 +03:00
Atsushi Ishida f33898ecfb Re-annotate models 2015-08-03 01:52:54 +09:00
Douwe Maan e2f93d2ea1 Merge branch 'master' into ldap-sync-group-members 2015-07-31 23:55:42 +02:00
Douwe Maan f949245a84 Merge remote-tracking branch 'gitlab-ce/master' into ce-to-ee 2015-07-31 16:12:46 +02:00
Douwe Maan 2472147fe0 Merge branch 'master' into ldap-sync-group-members 2015-07-31 16:04:24 +02:00
Douwe Maan 3307008499 Merge branch 'admin-group-member' into 'master' 
Add specific ability for managing group members

To be used for https://dev.gitlab.org/gitlab/gitlab-ee/issues/290 (Internal issue)

See merge request !1059
 2015-07-31 13:25:53 +00:00
Douwe Maan 04f2da3c37 Merge branch 'master' into comment-updated-by 2015-07-31 14:29:23 +02:00
Valery Sizov 858737a1db auto suggestion 2015-07-31 12:25:17 +03:00
Robert Speicher a876db48d9 Merge branch 'api-new-attributes' into 'master' 
Add project star and fork count, group avatar URL and user/group web URL attributes to API

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

See merge request !1058
 2015-07-30 21:38:48 +00:00
Douwe Maan 36bd6c8494 Show who last edited a comment if it wasn't the original author 2015-07-30 14:45:54 +02:00
Douwe Maan 2a60b8006b Fix Project 2015-07-30 12:35:09 +02:00
Douwe Maan b8066e2cd0 No more web url 2015-07-30 11:56:15 +02:00
Stan Hu 3e9b612306 Check that project was actually created rather than just validated in import:repos task 
Add gitlab-shell to error message to give user a clue that something may be wrong there.

Ran into this in #2082. User was told that repositories were created when they were
not due to hooks symlink being wrong.
 2015-07-29 10:49:13 -07:00
Douwe Maan 72c552c2d4 Fix specs 2015-07-29 13:23:28 +02:00
Douwe Maan 05cca9342b Use URL helpers 2015-07-29 12:03:53 +02:00
Douwe Maan db00bd0088 Disable adding, updating and removing members from a group that is synced with LDAP 2015-07-28 16:40:51 +02:00
Douwe Maan f9bcb9632c Add specific ability for managing group members 2015-07-28 16:32:15 +02:00
Douwe Maan 4461cded15 Don't send "Added to group" notifications when group is LDAP synched 2015-07-28 16:08:24 +02:00
Douwe Maan a784b996b3 Add project star and fork count, group avatar URL and user/group web URL attributes to API 2015-07-28 15:49:44 +02:00
Robert Speicher 37bc7bac19 Add Issuable#to_ability_name 2015-07-24 15:50:12 -04:00
Robert Speicher 31dc5e7034 Add admin_merge_request ability to Developer level and up 
This was necessary because this permission is checked dynamically by
`app/views/shared/issuable/_context` when on a Merge Request.

Closes #2058
 2015-07-24 14:57:38 -04:00
Valery Sizov 2d1d6fc05e Group web_hook fix 2015-07-24 16:30:47 +03:00
Douwe Maan 0c1d912559 Merge branch 'rs-issue-2012' into 'master' 
Make username parameter for Users#show case-insensitive

Closes #2012

See merge request !996
 2015-07-24 09:29:58 +00:00
Robert Speicher 5ce6d18681 Add User.find_by_username! 2015-07-23 17:16:39 -04:00
Douwe Maan f032b15dcf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee 
# Conflicts:
#	README.md
#	app/controllers/projects_controller.rb
#	db/schema.rb
#	doc/workflow/README.md
#	lib/gitlab/satellite/merge_action.rb
 2015-07-23 13:40:31 +02:00
Douwe Maan 276ca427ea Fix Remove source-branch for MRs from same project 2015-07-22 14:07:41 +02:00
Stan Hu 996ad35bed Merge branch 'fix-disabled-feature-access' into 'master' 
Fix (i.e. prevent) access to disabled features for unauthenticated users

Unauthenticated users had access to disabled features of public
projects. The code has been slightly refactored so that feature checks
are done in a separate method and can also be applied for public access.

See merge request !1006
 2015-07-20 16:42:07 +00:00