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
11,660 Commits 48 Branches 340 Tags
dfbe8fa9abb6780f8512cfa64313db60564d6535
Commit Graph
415 Commits
Author SHA1 Message Date
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
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
Dmitriy Zaporozhets 1d63464c82 Fix repository archive 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-13 21:28:22 +03:00
Dmitriy Zaporozhets 71f87ffb66 Merge pull request #6788 from CingleVue/master 
Patched `MergeRequest` to return more data.
 2014-08-13 16:47:51 +03:00
Robert Schilling cf3ba0209d Update labels via API 2014-08-13 12:29:03 +02:00
Robert Schilling 9284038dbe Add, delete labels via API 2014-08-13 12:28:19 +02:00
Dmitriy Zaporozhets f8eedb4cda Cleaner variable name 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-11 15:25:25 +03:00
Dmitriy Zaporozhets 5b52d7b979 Merge branch 'add_complete_commit_message_to_api' of https://gitlab.com/christian.taedcke/gitlab-ce into christian.taedcke/gitlab-ce-add_complete_commit_message_to_api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-08-11 12:33:04 +03:00
Dmitriy Zaporozhets d10ecacc47 Merge branch 'master' into 'master' 
Let users limit by archived/not archived projects in GitLab API GET /projects

Adds a boolean parameter, archived, to the /projects endpoint.

See merge request !158
 2014-08-11 09:27:24 +00:00
mabdullah-cinglevue d048a27771 Patched MergeRequest to return more data. 
Added milestone to merge_requests instead of milestone id.
 2014-08-01 18:41:09 +08:00
mabdullah-cinglevue 4a36d669b5 # This is a combination of 2 commits. 
# The first commit's message is:

Patched `MergeRequest` to return more data.

Patched `MergeRequest` to return the `description` & `milestone`
Conflicts:
	lib/api/entities.rb

# This is the 2nd commit message:

Update merge_requests.md

Update documentation for merge request endpoint adding support for description.
 2014-08-01 18:29:23 +08:00
Dmitriy Zaporozhets d9d8d3b799 Fix old api compatibility and tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 17:17:29 +03:00
Dmitriy Zaporozhets 70f868b737 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 16:05:43 +03:00
Dmitriy Zaporozhets 2f780af246 Git::Compare does not have limit param any more 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 14:29:59 +03:00
Sasha Joseph 37c4ba6f8d Add an option to GET /projects in the GitLab API to exclude archived projects 2014-07-28 12:48:13 -04:00
Christian TaedckeandChristian Taedcke e59674f954 Add full commit message to commit api as field message. 2014-07-25 08:25:16 +02:00
Dmitriy Zaporozhets 66098dbb59 Merge pull request #7089 from NARKOZ/api-patch 
API patch
 2014-07-23 20:26:36 +03:00
Dmitriy Zaporozhets a74b66cdee Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/group.rb
	app/models/project.rb
	features/steps/shared/project.rb
 2014-07-10 23:43:42 +03:00
Dmitriy Zaporozhets 767bd78081 Use Contributor class instead of hash 2014-07-02 15:09:06 +03:00
Dmitriy Zaporozhets 5a88873e5c Move API contributors logic to repository model 2014-07-02 14:43:23 +03:00
Dmitriy Zaporozhets 81d41c0f92 Collect contributors info via API 2014-07-02 12:40:20 +03:00
Dmitriy Zaporozhets 2e3818f14f Add contributors API endpoint 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-02 09:49:10 +03:00
Dmitriy Zaporozhets 4967c08786 Fix signup and project visibility 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-30 16:43:32 +03:00
Dmitriy Zaporozhets 8fee5a0572 Make app works with strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 23:24:17 +03:00
Dmitriy Zaporozhets e64343d6e1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/views/layouts/devise.html.haml
	features/project/project.feature
	features/steps/project/project.rb
 2014-06-26 13:02:08 +03:00
Dmitriy Zaporozhets 85333f093b Fix notes creation via API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-18 09:26:04 +03:00
Dmitriy Zaporozhets b165b097f5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb
 2014-06-17 10:53:44 +03:00
Dmitriy Zaporozhets ae564c97d4 Dont expose user email via API 
To prevent leaking of users info we reduce amount of user information
retrieved via API for normal users.

What user can get via API:

* if not admin: only id, state, name, username and avatar_url
* if admin: all user information
* about himself: all informaion

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 17:46:48 +03:00
Dmitriy Zaporozhets 1355ede49d Wipe wall notes feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 14:24:54 +03:00
Dmitriy Zaporozhets c4b02642d2 Replace milestone observer with services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 18:07:52 +03:00
Dmitriy Zaporozhets f8ea52c3a0 Remove thread vars usage from API notes and mr's 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 17:56:35 +03:00
Dmitriy Zaporozhets a7be3dfa30 Remove set of thread variables 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 17:51:49 +03:00
Nihad Abbasov dccfb374d3 fix permissions for files API 2014-06-06 06:58:20 +05:00
Nihad Abbasov 7040a42cfc API: ability to set an import url when creating project for a specified user 2014-06-06 06:31:55 +05:00
Dmitriy Zaporozhets 6fdd900827 Merge pull request #7014 from asedge/api_create_tag 
Add CreateTagService.  Use new service to allow tag creation through API.
 2014-05-29 15:37:42 +03:00
Dmitriy Zaporozhets 900d30798b Use new Projects::TransferService class 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:03:45 +03:00
Dmitriy Zaporozhets c7e00aca2d Better specs for Compare API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-27 11:27:42 +03:00
Dmitriy Zaporozhets 10ee137e9c Expose timeout and same_ref compare fields 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-27 11:16:50 +03:00
Dmitriy Zaporozhets f441436e53 Add compare branches endpoint to API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-26 16:08:22 +03:00
Sean Edge 1e6766f9ed Add CreateTagService. Use new service to allow tag creation through API. 2014-05-23 11:02:47 -04:00
Dmitriy Zaporozhets d575ee3e90 Improve branch deletion via API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-23 15:34:02 +03:00
Dmitriy Zaporozhets a9d60b3b14 Api call to remove branch 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 14:39:50 +03:00
Marin Jankovski 95ef8f9756 Merge remote-tracking branch 'ce/master' 
Conflicts:
	VERSION
	doc/install/installation.md
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	lib/gitlab/markdown.rb
	spec/lib/gitlab/ldap/ldap_access_spec.rb
 2014-05-21 13:10:37 +02:00
Jacob Vosmaer 02b85fd236 Check user access status in API for current_user 2014-05-15 10:22:59 +02:00
Dmitriy Zaporozhets 1f1c59b61d Merge pull request #6778 from dblessing/feature/mr_labels 
Merge Request Labels
 2014-05-13 14:43:46 +03:00
Drew Blessing 5f25cdfe19 Implement Merge Request Labels 2014-05-13 06:41:36 -05:00