993af5d0d2 
								
							 
						 
						
							
							
								
								cattr_accessor is not threadsafe!  
							
							
							
						 
						
							2013-06-11 18:15:18 +03:00  
				
					
						
							
							
								 
						
							
								8df699a336 
								
							 
						 
						
							
							
								
								API: project events  
							
							
							
						 
						
							2013-06-06 19:19:17 +03:00  
				
					
						
							
							
								 
						
							
								543506f3c5 
								
							 
						 
						
							
							
								
								API: Add last_activity_at date to project entity  
							
							
							
						 
						
							2013-06-06 18:40:05 +03:00  
				
					
						
							
							
								 
						
							
								da6f4f06c7 
								
							 
						 
						
							
							
								
								API: implement retrieve of repository tree  
							
							
							
						 
						
							2013-06-06 18:01:03 +03:00  
				
					
						
							
							
								 
						
							
								cf9a366e22 
								
							 
						 
						
							
							
								
								API: Fix repository commits pagination  
							
							
							
						 
						
							2013-06-06 16:16:49 +03:00  
				
					
						
							
							
								 
						
							
								883f465abe 
								
							 
						 
						
							
							
								
								Fix snippet raw content being escaped  
							
							
							
						 
						
							2013-06-06 16:10:24 +03:00  
				
					
						
							
							
								 
						
							
								b05600f28b 
								
							 
						 
						
							
							
								
								Split Project api on several parts: deploy_keys, hooks, snippets etc  
							
							
							
						 
						
							2013-06-06 12:37:51 +03:00  
				
					
						
							
							
								 
						
							
								963f475daf 
								
							 
						 
						
							
							
								
								Fix milestone api docs: invalid param for close  
							
							
							
						 
						
							2013-06-06 12:32:05 +03:00  
				
					
						
							
							
								 
						
							
								a4e671dc31 
								
							 
						 
						
							
							
								
								Fix wrong documentation for issue close api.  Fixes   #3548  
							
							
							
						 
						
							2013-06-06 11:31:40 +03:00  
				
					
						
							
							
								 
						
							
								37a90d5f76 
								
							 
						 
						
							
							
								
								Selectable deploy keys contain master projects  
							
							
							
						 
						
							2013-06-05 02:59:30 +09:00  
				
					
						
							
							
								 
						
							
								bcc4e4dc7e 
								
							 
						 
						
							
							
								
								Merge branch 'gist' of  https://github.com/Andrew8xx8/gitlabhq  into Andrew8xx8-gist  
							
							... 
							
							
							
							Conflicts:
	Gemfile.lock
	app/models/ability.rb
	app/models/project.rb
	app/views/snippets/_form.html.haml
	db/schema.rb
	features/steps/shared/paths.rb
	spec/factories.rb
	spec/models/project_spec.rb 
							
						 
						
							2013-06-04 18:36:22 +03:00  
				
					
						
							
							
								 
						
							
								0611c5c612 
								
							 
						 
						
							
							
								
								Fix deploy key api 500 if key is empty  
							
							
							
						 
						
							2013-06-03 21:01:07 +03:00  
				
					
						
							
							
								 
						
							
								50e8d6c0c0 
								
							 
						 
						
							
							
								
								Add api to collect owned user projects. Api deploy_key.create: Enable deploy key if it exist in other owned project  
							
							
							
						 
						
							2013-06-03 19:49:04 +03:00  
				
					
						
							
							
								 
						
							
								cd5685ca8c 
								
							 
						 
						
							
							
								
								Merge pull request  #4115  from bke-drewb/apidocs  
							
							... 
							
							
							
							Update api docs and remove old attribute from User entity. 
							
						 
						
							2013-05-29 23:25:40 -07:00  
				
					
						
							
							
								 
						
							
								07fd95f384 
								
							 
						 
						
							
							
								
								Update api docs and remove old attribute from User entity.  
							
							... 
							
							
							
							The API docs incorrectly referenced a few attributes associated with users. The 'blocked' attribute has been replaced with 'state'. Also, 'dark_scheme' seems to no longer be available in the User model so it should be removed from the exposed attributes in the API User entity.
Add color scheme ID to API User entity 
							
						 
						
							2013-05-29 05:40:17 -05:00  
				
					
						
							
							
								 
						
							
								9351a295c1 
								
							 
						 
						
							
							
								
								Up grape version. Fix issue with raw content being escaped  
							
							
							
						 
						
							2013-05-27 17:14:47 +03:00  
				
					
						
							
							
								 
						
							
								c3ba0ee64b 
								
							 
						 
						
							
							
								
								Merge branch 'feature_teams_api' of  https://github.com/former03/gitlabhq  into former03-feature_teams_api  
							
							... 
							
							
							
							Conflicts:
	doc/api/README.md 
							
						 
						
							2013-05-27 15:05:01 +03:00  
				
					
						
							
							
								 
						
							
								068cf2f467 
								
							 
						 
						
							
							
								
								split repositories and projects api  
							
							
							
						 
						
							2013-05-23 12:23:47 +03:00  
				
					
						
							
							
								 
						
							
								0ebfa5e5a2 
								
							 
						 
						
							
							
								
								[FEATURE] Basic user_teams api  
							
							... 
							
							
							
							* Closing #3066 
 * Closing #3609  
							
						 
						
							2013-05-21 23:13:30 +02:00  
				
					
						
							
							
								 
						
							
								634cbd7138 
								
							 
						 
						
							
							
								
								Refactor API classes. So api classes like Gitlab::Issues become API::Issues  
							
							
							
						 
						
							2013-05-14 15:33:31 +03:00  
				
					
						
							
							
								 
						
							
								af5d0e9e92 
								
							 
						 
						
							
							
								
								Merge pull request  #3275  from Undev/feature/code_cleanup_remove_old_hashes  
							
							... 
							
							
							
							Code cleanup: Replace old hashes and remove trailing spaces 
							
						 
						
							2013-05-07 06:59:03 -07:00  
				
					
						
							
							
								 
						
							
								77d0e41df0 
								
							 
						 
						
							
							
								
								fix API route to delete project hook  
							
							
							
						 
						
							2013-05-07 00:09:23 +05:00  
				
					
						
							
							
								 
						
							
								4528fa9817 
								
							 
						 
						
							
							
								
								modify api to work with new deploy keys  
							
							
							
						 
						
							2013-05-06 16:24:58 +03:00  
				
					
						
							
							
								 
						
							
								b1b354b0f8 
								
							 
						 
						
							
							
								
								remove trailing spaces  
							
							
							
						 
						
							2013-05-05 18:02:02 +04:00  
				
					
						
							
							
								 
						
							
								ae2f5ecdf7 
								
							 
						 
						
							
							
								
								Add support for git-archive in gitlab internal api  
							
							
							
						 
						
							2013-04-20 15:43:48 +03:00  
				
					
						
							
							
								 
						
							
								e79ab4bdb9 
								
							 
						 
						
							
							
								
								Merge pull request  #3209  from tsl0922/master  
							
							... 
							
							
							
							Fix: API 500 error when project does not exists 
							
						 
						
							2013-04-18 03:25:03 -07:00  
				
					
						
							
							
								 
						
							
								880cb8aa48 
								
							 
						 
						
							
							
								
								Paginate users in users api  
							
							
							
						 
						
							2013-04-16 09:26:01 +03:00  
				
					
						
							
							
								 
						
							
								dfeef6c228 
								
							 
						 
						
							
							
								
								Fixed API file raw functionality, Fixed tree controller tests. Added BlobController specs  
							
							
							
						 
						
							2013-04-03 15:55:08 +03:00  
				
					
						
							
							
								 
						
							
								541d899410 
								
							 
						 
						
							
							
								
								Project.repository should never be nil so you can call repository.exists? or repository.empty?  
							
							... 
							
							
							
							Also specify separate project factory for project with filled repo 
							
						 
						
							2013-04-01 16:56:25 +03:00  
				
					
						
							
							
								 
						
							
								63e6f055f1 
								
							 
						 
						
							
							
								
								Fix notify specs. Fix merge request close via api  
							
							
							
						 
						
							2013-03-28 13:24:01 +02:00  
				
					
						
							
							
								 
						
							
								d4543eb5a7 
								
							 
						 
						
							
							
								
								Tests fixed  
							
							
							
						 
						
							2013-03-25 11:20:14 +04:00  
				
					
						
							
							
								 
						
							
								3b42c267a6 
								
							 
						 
						
							
							
								
								Dont show blocked users in autocomplete  
							
							
							
						 
						
							2013-03-19 18:07:14 +02:00  
				
					
						
							
							
								 
						
							
								124a5e270e 
								
							 
						 
						
							
							
								
								add attachemnts support for wall  
							
							
							
						 
						
							2013-03-19 13:28:29 +02:00  
				
					
						
							
							
								 
						
							
								4d378f3c9a 
								
							 
						 
						
							
							
								
								load notes for wall via api  
							
							
							
						 
						
							2013-03-19 12:35:55 +02:00  
				
					
						
							
							
								 
						
							
								a15fe61fb0 
								
							 
						 
						
							
							
								
								API docs updated  
							
							
							
						 
						
							2013-03-19 04:47:08 +00:00  
				
					
						
							
							
								 
						
							
								28e7d1a8bf 
								
							 
						 
						
							
							
								
								Abilities added to /user and /sign_in requests  
							
							
							
						 
						
							2013-03-18 20:11:28 +00:00  
				
					
						
							
							
								 
						
							
								415bade302 
								
							 
						 
						
							
							
								
								Result of misspellings run.  
							
							... 
							
							
							
							Most of these are comments but a few are strings for users.
Might be an idea to run this from time to time:
https://github.com/lyda/misspell-check 
It runs mostly clean now. 
							
						 
						
							2013-03-17 19:46:54 +00:00  
				
					
						
							
							
								 
						
							
								71ab011a17 
								
							 
						 
						
							
							
								
								Merge branch 'use_gollum_wikis' of  https://github.com/DanKnox/gitlabhq  into DanKnox-use_gollum_wikis  
							
							... 
							
							
							
							Conflicts:
	app/views/layouts/project_resource.html.haml
	app/views/wikis/edit.html.haml
	app/views/wikis/pages.html.haml
	app/views/wikis/show.html.haml
	spec/features/gitlab_flavored_markdown_spec.rb 
							
						 
						
							2013-03-15 16:55:07 +02:00  
				
					
						
							
							
								 
						
							
								1e11e45fa3 
								
							 
						 
						
							
							
								
								Fix: API 500 error when project does not exists  
							
							
							
						 
						
							2013-03-14 15:02:36 +08:00  
				
					
						
							
							
								 
						
							
								bf17d976a7 
								
							 
						 
						
							
							
								
								add api users filter and integrate users select2  
							
							
							
						 
						
							2013-03-13 23:19:09 +02:00  
				
					
						
							
							
								 
						
							
								11b57d979c 
								
							 
						 
						
							
							
								
								Reduce amount of user info provided with internal api  
							
							
							
						 
						
							2013-03-11 14:35:00 +02:00  
				
					
						
							
							
								 
						
							
								ea9b3687db 
								
							 
						 
						
							
							
								
								Replace current Wiki system with Gollum Wikis.  
							
							... 
							
							
							
							This commit replaces the old database backed Wiki system with the
excellent Gollum git based Wiki system.
The UI has been updated to allow for utilizing the extra features
that Gollum provides. Specifically:
* Edit page now allows you to choose the content format.
* Edit page allows you to provide a commit message for the change.
* History page now shows Format, Commit Message, and Commit Hash.
* A new Git Access page has been added with the Wiki Repo URL.
* The default page has been changed to Home from Index to match
the Gollum standard.
The old Wiki model has been left in tact to provide for the
development of a migration script that will move all content stored
in the old Wiki system into new Gollum Wikis. 
							
						 
						
							2013-03-09 16:39:51 -08:00  
				
					
						
							
							
								 
						
							
								562de2a438 
								
							 
						 
						
							
							
								
								Merge branch 'master' into api/system_hooks_adjustments  
							
							
							
						 
						
							2013-03-07 17:59:27 +01:00  
				
					
						
							
							
								 
						
							
								32f1eaaf0f 
								
							 
						 
						
							
							
								
								API: system hooks API functions and documentation updated  
							
							... 
							
							
							
							* updated system hooks documentation and code comments
* fixed access to system hooks if no user given resulting in a `500 Server Error`
* added tests 
							
						 
						
							2013-03-07 17:56:11 +01:00  
				
					
						
							
							
								 
						
							
								a7055be1fd 
								
							 
						 
						
							
							
								
								Merge pull request  #2835  from Asquera/fixes/api  
							
							... 
							
							
							
							Fix API return codes 
							
						 
						
							2013-03-07 08:33:34 -08:00  
				
					
						
							
							
								 
						
							
								ecf53bb9e6 
								
							 
						 
						
							
							
								
								API: fixes project creation and removed redundant info  
							
							
							
						 
						
							2013-03-07 15:11:33 +01:00  
				
					
						
							
							
								 
						
							
								3374027e3a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into fixes/api, code clean up and tests fixed  
							
							... 
							
							
							
							Conflicts:
	doc/api/projects.md
	spec/requests/api/projects_spec.rb 
							
						 
						
							2013-03-07 14:51:56 +01:00  
				
					
						
							
							
								 
						
							
								d2cec12632 
								
							 
						 
						
							
							
								
								block user should not be able to push  
							
							
							
						 
						
							2013-03-07 14:18:30 +02:00  
				
					
						
							
							
								 
						
							
								7c408960ce 
								
							 
						 
						
							
							
								
								Merge pull request  #3146  from amacarthur/AdminAPIs  
							
							... 
							
							
							
							Additional Admin APIs 
							
						 
						
							2013-03-06 22:57:24 -08:00  
				
					
						
							
							
								 
						
							
								afee5303ff 
								
							 
						 
						
							
							
								
								Merge pull request  #3149  from m4tthumphrey/api-deploy-keys  
							
							... 
							
							
							
							Added methods to manage project deploy keys via API 
							
						 
						
							2013-03-06 07:43:45 -08:00