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
8,423 Commits 48 Branches 340 Tags
245d68eef8d53acabbb39751e23cbfdc3209a4f4
Commit Graph
189 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 2df9a76042 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 6_5_ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/generic/common.scss
	app/views/projects/edit.html.haml
	config.ru
	db/schema.rb
	doc/install/installation.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/gitlab/upgrader.rb
 2014-01-21 18:15:49 +02:00
Dmitriy Zaporozhets f8aae4b7d8 Merge branch 'add_website_url_to_user' of https://github.com/jeromedalbert/gitlabhq into jeromedalbert-add_website_url_to_user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-01-19 20:23:29 +02:00
Jerome Dalbert 2e3f250d45 Add website url to user 2014-01-18 19:15:10 +00:00
Dmitriy Zaporozhets 1d497a127b Mention base64 encoding for files API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-16 18:09:58 +02:00
Jeroen van Baarsen ef404d8ea6 Dropped expiration date from the snippet API 2014-01-11 18:40:17 +01:00
Dmitriy Zaporozhets 6579de0727 Merge pull request #5799 from criteo/import_url_api 
Add import_url param in API projects create
 2014-01-06 06:18:26 -08:00
Dmitriy Zaporozhets 1c0929f5ac Merge pull request #5823 from bobot/feature/api_parent_ids 
[API] add parent_ids to specific commit informations
 2014-01-06 06:15:48 -08:00
Maxime Brugidou cd8a90eee5 Add import_url in API docs 2013-12-30 11:39:26 +01:00
Thom Gerdes 27912f9c21 Add api support for raw blob search 
See issue
http://feedback.gitlab.com/forums/176466-general/suggestions/4566001-expose-raw-object-search-via-the-gitlab-api
 2013-12-26 08:54:13 -05:00
Dmitriy Zaporozhets 1f43fa20d3 Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/controllers/application_controller.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.2-to-6.3.md
 2013-12-23 12:57:22 +02:00
François Bobot 7b3b63d4d4 [API] add parent_ids to specific commit informations 2013-12-11 14:41:07 +01:00
Dmitriy Zaporozhets 21f4e5d3ac ProjectHook API supports new event fields 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-04 13:37:39 +02:00
Sytse Sijbrandij 71e92681f2 We welcome everyone to contribute. 2013-12-01 11:53:00 +01:00
Dmitriy Zaporozhets 4e77b0b52d Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3 
Conflicts:
	Gemfile.lock
	VERSION
	app/assets/javascripts/api.js.coffee
	app/models/user.rb
	app/views/help/index.html.haml
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/api/api.rb
	lib/api/entities.rb
	lib/gitlab/ldap/user.rb
	lib/tasks/gitlab/check.rake

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-29 10:01:43 +02:00
Jason Hollingsworth d9bb4230cc Adding authenticated public mode (internal). 
Added visibility_level icons to project view (rather than just text).
Added public projects to search results.
Added ability to restrict visibility levels standard users can set.
 2013-11-26 22:22:07 -06:00
Dmitriy Zaporozhets 3bab1bd4c1 Improve consistency: use file_path for API create/update/delete files 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 10:03:50 +02:00
Dmitriy Zaporozhets 32d7332d2c API: delete file from repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-19 16:33:38 +02:00
Dmitriy Zaporozhets 434d276dba better wording for api doc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-18 19:53:10 +02:00
Dmitriy Zaporozhets 11931bfb9c update projects api docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-18 16:49:29 +02:00
Dmitriy Zaporozhets c77d957b36 API: Edit file in repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-11 14:58:06 +02:00
Dmitriy Zaporozhets 79afb001ad Fix type in API doc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-10 10:43:04 +02:00
Dmitriy Zaporozhets f64dd1b492 Add docs for create file API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-09 11:40:17 +02:00
Dmitriy Zaporozhets cfa15d0846 Remove default_branch support from API project creation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-06 19:14:11 +02:00
Dmitriy Zaporozhets c9a2765515 Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq into upstream/6-2-stable 
Conflicts:
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/api/groups.md
	doc/api/projects.md
	doc/install/installation.md
	lib/api/projects.rb
	spec/requests/api/groups_spec.rb
	spec/requests/api/projects_spec.rb
 2013-10-31 14:29:48 +02:00
Dmitriy Zaporozhets a430680ad5 Allow set ldap_cn and ldap_access for new group via API 2013-10-30 17:45:18 +02:00
Dmitriy Zaporozhets e0723f41b8 Docs for ldap_cn and ldap_access group attributes in API 2013-10-30 15:08:40 +02:00
Marin Jankovski 1712406f8a Add an example. 2013-10-18 09:11:37 +02:00
Marin Jankovski 7c3fd6941f Update project api doc. 2013-10-17 12:16:57 +02:00
Dmitriy Zaporozhets 02693b72a4 Explain iid in API 2013-10-14 16:40:16 +03:00
Sytse Sijbrandij 3888d94adc System hooks docs links to admin area. 2013-10-14 09:24:38 +02:00
Izaak Alpert a00c534c4c Fix a bug where the tgz returned got encoded utf8 
Conflicts:
	doc/api/repositories.md

Change-Id: I7ebc39b47ff860813d9622ba6776583536e6e384
 2013-10-10 09:19:28 -04:00
Izaak Alpert ce21d8688d feature API call to download repo archive 
defaults to HEAD

Conflicts:
	spec/requests/api/repositories_spec.rb

Change-Id: Id114aca6c59d75f18e49bf9f33809a04e010bfb6
 2013-10-10 09:19:28 -04:00
Dmitriy Zaporozhets 51825e434e API: docs for remove project 2013-10-09 14:43:18 +03:00
Islam AmerandJacob Vosmaer 29c807ced3 Expose votes in merge request api 
Signed-off-by: Islam Amer <islam.amer@jollamobile.com>
 2013-10-08 09:32:00 +02:00
Dmitriy Zaporozhets f141711cfd API: new feature - remove group 2013-10-07 13:10:01 +03:00
Dmitriy Zaporozhets 073c8a2966 Merge pull request #5230 from cmckni3/patch-1 
Fix invalid json in API docs
 2013-10-06 22:44:03 -07:00
Dmitriy Zaporozhets 5bd0025790 API doc: Share project with group 2013-10-03 11:18:29 +03:00
Marin Jankovski da54a1e644 Update group access levels in docs. 2013-10-02 16:41:01 +02:00
Marin Jankovski d7ec7c794a Removed user teams api docs. 2013-10-02 12:51:43 +02:00
Marin Jankovski 55880751aa Update deploy keys, groups and system hooks api docs. 2013-10-02 12:50:01 +02:00
Marin Jankovski f1253fa710 Update issues, milestones, notes api docs. 2013-10-02 12:08:07 +02:00
Marin Jankovski 5e96d07021 Update snippets and merge request api documentation 2013-10-02 11:04:51 +02:00
Marin Jankovski f22e6c917d Update project api docs. 2013-10-01 23:13:09 +02:00
Marin Jankovski 1b205cbc39 Update user api documentation 2013-10-01 13:52:57 +02:00
Chris McKnight 4ee7834266 Fix json keys in groups API documentation 2013-09-30 21:45:15 -05:00
Chris McKnight 979dd2603c Fix invalid json in issues API doc 2013-09-30 17:39:33 -05:00
Tobias Bieniek 4692612b84 Fixed typo in groups.md 2013-09-30 11:01:57 +02:00
Boyan Tabakov 479631aafc Extended User API to expose admin and can_create_group for user creation/updating. 
Also, is_admin and can_create_group are exposed in the user information.
Fixed attributes_for_keys to process properly keys with boolean values (since false.present? is false).
 2013-09-29 11:47:29 +03:00
Izaak Alpert 04c7c262a7 Used pagnation function from api helpers 
Change-Id: I1bdd3608d3b46924b5da3ae282c99f85ee4e0dab
 2013-09-24 09:22:46 -04:00
Izaak Alpert 9d06921ffb Added missing API documentation 
Change-Id: I1337ee7ff51d018d6f62d447345032597e84269f
 2013-09-23 19:36:39 -04:00