home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 02:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,585 Commits 48 Branches 340 Tags
ec56ebb4cd3d413095a98e0ceae4f6d062e22521
Commit Graph
1017 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 1eba936681 New API: share project with group 
Share project with group using API.
You must be a master or owner of project in order to do it.

POST /projects/:id/share

Parameters:
  id (required) - The ID of a project
  group_id (required) - The ID of a group
  group_access (required) - Level of permissions for sharing
 2013-10-03 10:15:50 +03:00
Dmitriy Zaporozhets db93bec3fe Add group_access validation to ProjectGroupLink 2013-10-03 10:04:07 +03:00
Dmitriy Zaporozhets 8744b88d53 LDAP groups api 2013-10-01 10:58:20 +03:00
Dmitriy Zaporozhets 0c5a9f20b5 Merge branch '6-1-stable' of https://dev.gitlab.org/gitlab/gitlabhq into 6-1-stable-ee 
Conflicts:
	VERSION
	app/controllers/application_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/models/merge_request.rb
	app/models/user.rb
	app/views/groups/_projects.html.haml
	config/routes.rb
	db/schema.rb
	doc/install/installation.md
 2013-09-27 15:24:54 +03:00
Hiroyuki Sato b099951c55 Fix API::MergeRequest 
Refs #5145
 2013-09-22 18:46:42 +09:00
Dmitriy Zaporozhets 8672203baf Merge pull request #5112 from hiroponz/drop-support-of-root-namespace 
Drop support of root namespace in model
 2013-09-17 23:57:17 -07:00
Izaak Alpert ca1b67ce38 Don't show users password change page if ldap users 2013-09-17 22:38:08 -04:00
Hiroyuki Sato a3ef683108 Drop support of root namespace in model 2013-09-17 23:05:42 +09:00
Dmitriy Zaporozhets e0e88cddd8 Fix tests 2013-09-14 22:01:31 +03:00
Dmitriy Zaporozhets 2898d92397 Merge pull request #4996 from hiroponz/drop-support-of-root-namespace 
[WIP]Drop support of root namespace in routing
 2013-09-14 07:47:41 -07:00
Jakub Zienkiewicz 996d146cbd test if commit author receives new note notifications 2013-09-13 15:38:30 +02:00
Hiroyuki Sato df9cbbc924 Drop support of root namespace in routing 2013-09-13 07:00:24 +09:00
Dmitriy Zaporozhets 839c3b198e Merge branch 'feature/email_when_added_to_group' of /home/git/repositories/gitlab/gitlabhq 2013-09-12 18:40:41 +00:00
Dmitriy Zaporozhets c1dd31cf8b Enable UsersGroup observer, Add group_member methods to NotificationService 2013-09-12 19:00:32 +03:00
Dmitriy Zaporozhets 8589824f00 Add UsersGroup observer 
Trigger notification service when new user-group relation was created
 2013-09-12 18:59:31 +03:00
Dmitriy Zaporozhets 7bf8d22f17 Remove commented tests since nobody is going to fix them 2013-09-11 22:50:08 +03:00
Izaak Alpert 5dae40f579 Update to only provide one way to get a default user 
-calling build_user will now apply defaults and only override them if as: :admin is set

Change-Id: Id1d938c0967752ecc14370af54f2d88128d18c44
 2013-09-11 14:04:15 -04:00
Izaak Alpert d4d4a78f83 Update User api to respect default settings 
-API now respects default_projects_limit, default_can_create_group, and default_can_create_team

Change-Id: I059d060d576df1050e5371e707381c5e8c608a7a
 2013-09-11 14:04:15 -04:00
Stephen Holdaway e19526c2ac Fix several_namespaces? to work with multiple ownership of groups 2013-09-12 00:10:45 +12:00
Dmitriy Zaporozhets c7cb7599e2 Merge pull request #5022 from amacarthur/config-public-project 
make public/private setting for project creation configurable
 2013-09-10 08:21:37 -07:00
Angus MacArthur cc1eb9657e style fixes 2013-09-10 10:49:23 -04:00
Angus MacArthur f87e2d2801 make public/private setting for project creation configurable 2013-09-09 14:10:58 -04:00
Izaak Alpert fdc23a93e7 Style guide fixes (spacing) 
Change-Id: I966bfd0ccc4b05925384ecab8c6cbe3c6ba3b667
 2013-09-09 13:18:10 -04:00
Izaak Alpert 7a56075efa Some of the requested updates, rebase on master 
Change-Id: I305266fe9acbbb5136adeeb52e7e4e1d6629a30a
 2013-09-09 12:04:38 -04:00
Izaak AlpertandIzaak Alpert e86e881832 API: admin users can sudo commands as other users 
-Specifying a header of SUDO or adding a :sudo with either user id, or username of the user will set the current_user to be that user if your identifying private_token/PRIVATE_TOKEN is an administrator token
 2013-09-09 12:04:38 -04:00
Boyan Tabakov 01ff084a4d Improved large commit handling. 
Previously, only number of changed files mattered. Now, number of lines to render in the diff are also taken into account.

A hard limit is set, above which diffs are not rendered and users are not allowed to override that. This prevents high server
resource usage with huge commits.

Related to #1745, #2259

In addition, handle large commits for MergeRequests and Compare controllers.

Also fixes a bug where diffs are loaded twice, if user goes directly to merge_requests/:id/diffs URL.
 2013-09-07 14:44:03 +03:00
Izaak Alpert fadcc25189 Fixes for @randx 
Change-Id: I3b15ae34c0957a0f4026e1886c92a9770e9d170e
 2013-09-05 10:41:57 -04:00
Izaak Alpert 8248e1f2b8 Add group membership api 
Change-Id: I5b174bba02856ede788dcb51ec9b0d598ea7d0df
 2013-09-04 13:17:17 -04:00
Dmitriy Zaporozhets 8e238f4273 Fix user remove tests. Remove user even if he has projects 2013-09-04 16:20:40 +03:00
Dmitriy Zaporozhets 7b8bd93e67 Rewrite OAuth specs 2013-09-04 00:53:13 +03:00
Dmitriy Zaporozhets 079d3a5dc1 Merge pull request #4906 from alexvh/standardize_diff_api_url 
Standardize recently added commit diff api url
 2013-08-29 10:02:32 -07:00
Alex Van't Hof 59f428dca2 Standardize commit diff api url, change blob api url, add get single commit 
Use "/commits/:sha/diff" as opposed to "/commit/:sha", keeping in line
with existing api urls (e.g. "/projects/:id", etc.)

Fix 500 error resulting from a diff api call with an invalid commit hash

Move "/commits/:sha/blob" to "/blobs/:sha", leaving the old path for
backwards compatibility.

Add ability to get a single commit via "/commits/:sha"
 2013-08-27 21:22:42 -04:00
Dmitriy Zaporozhets 777456b29c fix tests 2013-08-28 00:04:04 +03:00
Dmitriy Zaporozhets eb4272e2f5 Remove old specs 2013-08-27 22:00:41 +03:00
Dmitriy Zaporozhets a7bd18f9f2 Fix mailer tests 2013-08-26 20:58:34 +03:00
Dmitriy Zaporozhets 0093554ad6 Add test and docs for markdown tables 2013-08-26 15:07:07 +03:00
Dmitriy Zaporozhets c8e3d31925 Merge pull request #4892 from Aigeruth/feature/api-add-diff 
Feature: get the diff of a commit via API.
 2013-08-26 04:02:09 -07:00
ash wilson c8a115c0e3 Link issues from comments and automatically close them 
Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown
references in descriptions, titles, or attached Notes creates a back-reference
Note that links to the original referencer. Furthermore, pushing commits with
commit messages that match a (configurable) regexp to a project's default
branch will close any issues mentioned by GFM in the matched closing phrase.
If accepting a merge request would close any Issues in this way, a banner is
appended to the merge request's main panel to indicate this.
 2013-08-25 18:58:41 -04:00
Gabor Nagy d139cc6b32 Adds feature: get a diff via API. 2013-08-25 23:48:11 +02:00
Dmitriy Zaporozhets 0fcd89e3ac Show iids for issues/mr in email subject 2013-08-22 15:40:48 +03:00
Dmitriy Zaporozhets 668358439e Fix tests after can_create_team was removed 2013-08-21 15:07:09 +03:00
Dmitriy Zaporozhets 8dd37afe34 Reannotate 2013-08-21 12:34:02 +03:00
Dmitriy Zaporozhets 606701ada4 Look for milestone by iid in milestone controller 2013-08-21 12:22:18 +03:00
Dmitriy Zaporozhets 395f3a1d20 Merge branch 'feature/internal_ids' of /home/git/repositories/gitlab/gitlabhq 2013-08-20 19:30:38 +00:00
Dmitriy Zaporozhets e9f1c39e7e Fix tests 2013-08-20 21:41:14 +03:00
Dmitriy Zaporozhets a73e068c06 Fixing tests after adding iid for issues/mr 2013-08-20 16:56:05 +03:00
Dmitriy Zaporozhets 7a26a4b69d Refactor access roles methods 2013-08-20 15:59:45 +03:00
Dmitriy Zaporozhets 860a80ea57 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	app/assets/stylesheets/common.scss
	db/schema.rb
 2013-08-16 14:37:51 +03:00
Dmitriy Zaporozhets 7d1b3d4e27 Fix passign full user object instead of id to Event.create 2013-08-14 16:02:21 +03:00
Dmitriy Zaporozhets 7825830ca5 Allow project name, path etc start with number. Fixed specs 2013-08-13 12:24:10 +03:00