home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,741 Commits 48 Branches 340 Tags
9afa80bbae3bc7ec497905321e093376e1cb1449
Commit Graph
459 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets a5972170ad Merge remote-tracking branch 'origin/master' into ee-7-4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/team_members_controller.rb
	app/finders/projects_finder.rb
	app/models/group.rb
	app/models/project_team.rb
	app/models/users_group.rb
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/ldap.md
	features/steps/group.rb
	features/steps/project/project.rb
 2014-10-02 13:24:59 +03:00
Bernhard Kaindl f030ee846e API: Initial support for forking a project via the API 
This change adds POST /projects/fork/:id to the API for forking
a project into the namespace of the authenticated user, like the
"create fork" link in the GUI does. It also calls the same code.

Failure and permission checks (except for conflict) are already
implemented and handled in ForkService and the API, so the added
code is simple and does not alter anything.
 2014-10-01 10:27:48 +02:00
jubianchi f258a59ef6 Filters issues by milestone via API 2014-09-26 22:03:37 +02:00
Dmitriy Zaporozhets eaeb4a90d4 Fix branch API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 16:22:08 +03:00
Dmitriy Zaporozhets d0e3ab5826 Merge branch 'api/improve-error-reporting' of https://github.com/jubianchi/gitlabhq into jubianchi-api/improve-error-reporting 2014-09-23 21:35:45 +03:00
Dmitriy Zaporozhets db12e2dc8d Merge pull request #7807 from cirosantilli/factor-service-error 
Factor error and success methods from services.
 2014-09-22 21:00:11 +03:00
Ciro Santilli ad47993ac4 Factor error and success methods from services. 2014-09-21 11:43:05 +02:00
Dmitriy Zaporozhets 8bff9a4098 Merge branch 'refator-members-logic' of https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre 2014-09-17 21:31:41 +03:00
Marin Jankovski 2ad6789216 Merge remote-tracking branch 'CE/master' into merge_ce_7_3_to_ee 2014-09-16 12:55:21 +02:00
Marin Jankovski 685754b088 Fix typo in comment. 2014-09-16 08:44:50 +02:00
jubianchi 998cd3cb63 Improve error reporting on users API 
* users (#6878, #3526, #4209): Validation error messages are now exposed through 400 responses, 409 response are sent in case of duplicate email or username
* MRs (#5335): 409 responses are sent in case of duplicate merge request (source/target branches), 422 responses are sent when submiting MR fo/from unrelated forks
* issues
* labels
* projects
 2014-09-16 01:25:24 +02:00
Dmitriy Zaporozhets 4f1bb91a75 Fix finder and tests for new membership models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 16:45:28 +03:00
Marin Jankovski b99b2e60d5 Ordering and sorting for MR in api. 2014-09-15 11:54:49 +02:00
Jacob Vosmaer e93523ed31 Merge commit '79190fe06b' into merge-79190fe06b-7.3.0-pre 
Conflicts:
	Gemfile
	README.md
	VERSION
	db/schema.rb
	doc/install/installation.md
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/user.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-09-15 11:24:51 +02:00
Dmitriy Zaporozhets 6558e52d90 More fixes to project members api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 12:01:45 +03:00
Dmitriy Zaporozhets ce49f035cf Fix access_level api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 11:55:36 +03:00
Dmitriy Zaporozhets 77c64a9b36 Replace project_access attribute with access_level in specs and API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 11:36:50 +03:00
Dmitriy Zaporozhets c69b8e0459 Huge replace of old users_project and users_group references 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 19:32:51 +03:00
Dmitriy Zaporozhets 3162140dfa Fix tag tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-05 09:36:11 +03:00
Dmitriy Zaporozhets 66516da3c1 Explicit issues order in API. Fixes tests for mysql. Again :) 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-04 17:15:08 +03:00
Sean Edge 468b2e8e0b Added annotated tags. Updated tag haml file and call to gitlab-shell. Updated API for annotated tags. Added tests for API. Strip leading/trailing whitespace from message, if present. Update CHANGELOG. 2014-09-04 09:47:20 -04:00
Dmitriy Zaporozhets 260fd2127c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-04 15:55:14 +03:00
Dmitriy Zaporozhets 9bb1d8fc8d Merge pull request #7382 from Razer6/git_ref_validation 
Validate branch/tag-names and references WebUI, API
 2014-09-04 15:52:42 +03:00
jubianchiandjubianchi 0ac4a933ff Filters issues by labels via API 2014-09-04 14:41:31 +02:00
Dmitriy Zaporozhets 93f15a4953 Explicit order of issues in API. Fixes specs for mysql db 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-03 22:57:32 +03:00
Robert Schilling 392113919a Validate tag-names and references in WebUI, API 2014-09-03 13:08:36 +02:00
Robert Schilling 551145bc98 Validate branch-names and references in WebUI, API 
Add specs for GitRefValidator
 2014-09-03 13:08:35 +02:00
Dmitriy Zaporozhets cf53b361b9 Make sure /api/allowed return 200 status code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-03 13:33:44 +03:00
Dmitriy Zaporozhets 0a7dea29aa /api/allowed use POST now 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-03 09:06:16 +03:00
Dmitriy Zaporozhets 20c2e90222 Refactor finders. Prevent circular dependency error 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-02 15:28:27 +03:00
Dmitriy Zaporozhets 3a3c4ea436 Merge branch 'gitlab-shell-2-0' into 'master' 
Modify GitLab to work with gitlab-shell 2.0

Related to #1516

See merge request !1057
 2014-09-02 09:20:15 +00:00
Dmitriy Zaporozhets 0306a4e2e4 Rewrite GitAccess for gitlab-shell v2 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-01 19:57:25 +03:00
jubianchiandjubianchi 4fdd21685c Filters issues by state via API 2014-09-01 13:51:40 +02:00
Jacob Vosmaer 90ce0be420 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups 
Conflicts:
	app/models/group.rb
	app/views/groups/members.html.haml
	db/schema.rb
 2014-08-29 14:43:20 +02:00
Marin Jankovski e8da7b8077 Merge remote-tracking branch 'CE/master' 
Conflicts:
	doc/workflow/README.md
 2014-08-21 10:57:39 +02:00
Robert Schilling 66f6ca0770 Fix tests after #7526 2014-08-20 20:34:55 +02:00
Jacob Vosmaer 5812cfa10e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
 2014-08-20 17:14:26 +02:00
jubianchi 7ad93ab250 Improve labels validation and expose error messages 2014-08-20 12:09:19 +02:00
Robert SchillingandJacob Vosmaer 33c8c1cc0b Fix labels return code 2014-08-19 18:20:39 +02:00
Jacob Vosmaer 6dc24e3bcf Merge pull request #7527 from Razer6/api_labels_return_code 
API: Fix labels return code
 2014-08-18 17:16:32 +02:00
Jacob Vosmaer 7567614d3b Merge tag 'v7.2.0.rc1' 
Bump version to 7.2.0.rc1

Conflicts:
	VERSION
 2014-08-18 16:12:32 +02:00
Robert Schilling 4ca3f64719 Fix labels return code 2014-08-18 00:25:49 +02:00
Jan-Willem van der Meer c982a8f050 Add backwards compatibility for creating groups with a LDAP connection 2014-08-15 18:59:58 +02:00
Jan-Willem van der Meer 27bebd5c3e Add ldap_group_links to groups api 2014-08-15 16:26:43 +02:00
Jan-Willem van der Meer 3ba7a3a5ca Remove traces from ldab_cn and ldap_access 
Also add notes about refactoring the old single-ldap API and LdapGroupResetService
 2014-08-15 12:33:05 +02:00
Dmitriy Zaporozhets 6063a1e6c1 Add labels api authorization. Update permission doc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-15 11:59:19 +03:00
Jacob Vosmaer ee8836a903 Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166 
Conflicts:
	VERSION
	app/models/user.rb
	app/services/merge_requests/build_service.rb
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/README.md
	features/project/merge_requests.feature
	features/steps/project/merge_requests.rb
 2014-08-15 10:25:23 +02:00
Dmitriy Zaporozhets 27cf081e1b Merge pull request #7479 from Razer6/feature/labels_api 
Implement complete labels API (create/delete/update)
 2014-08-15 10:25:48 +03:00
Dmitriy Zaporozhets 433dac7799 Merge pull request #7465 from Razer6/better_label_color_validation 
Better label color validation, fixes #7454
 2014-08-15 10:17:16 +03:00
Robert Schilling cbc90565b5 Do label validation for issues/merge requests API 2014-08-14 10:17:52 +02:00