deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4707 commits 6 branches 43 tags 25 MiB
Commit graph

4707 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dmitriy Zaporozhets bc15713569 Merge pull request #3173 from m4tthumphrey/patch-1 
Added system hooks link to doc index
 2013-03-08 02:08:09 -08:00
Matt Humphrey 7fb2999c60 Added system hooks link to doc index 2013-03-08 09:37:00 +00:00
Sebastian Ziebell 562de2a438 Merge branch 'master' into api/system_hooks_adjustments 2013-03-07 17:59:27 +01:00
Sebastian Ziebell 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
Dmitriy Zaporozhets a7055be1fd Merge pull request #2835 from Asquera/fixes/api 
Fix API return codes
 2013-03-07 08:33:34 -08:00
Sebastian Ziebell ecf53bb9e6 API: fixes project creation and removed redundant info 2013-03-07 15:11:33 +01:00
Sebastian Ziebell 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
Dmitriy Zaporozhets d2cec12632 block user should not be able to push 2013-03-07 14:18:30 +02:00
Sato Hiroyuki c0d312bebe Refactor: Removing a if statement, because the nil value is already removed in the view template. 2013-03-07 21:10:40 +09:00
Sato Hiroyuki b7e5f4556b Refactor: Removing the duplicated code. 2013-03-07 21:10:27 +09:00
Sato Hiroyuki 79cd1ca304 Refactor: change the map hash from a local variable to private variable. 2013-03-07 19:52:46 +09:00
Sato Hiroyuki ccc712b198 Refacor: removing the times array, because that is same with @commits array. 2013-03-07 19:16:51 +09:00
Dmitriy Zaporozhets 9c2a6e2013 Merge pull request #3047 from mikew/capistrano-deploy-example 
Capistrano deploy example
 2013-03-07 02:08:11 -08:00
Dmitriy Zaporozhets a32f85ac76 Merge pull request #3139 from rapofran/auto_focus_ldap_login 
Autofocus to username input (LDAP login).
 2013-03-07 01:55:19 -08:00
Dmitriy Zaporozhets 0d66fa89fc fix stubbed repo 2013-03-07 11:45:44 +02:00
Dmitriy Zaporozhets ca9098d898 remove last commit widget, added repo size and owner info on project home page 2013-03-07 11:14:19 +02:00
Sato Hiroyuki 8c5003cf75 Refactor: clean up models. 
* Network::Commit
** Removing unnecessary accessors.
** Removing add_refs methods.
* Network::Graph
** Removing unnecessary accessors.
** The 3 times loop of commits don't need.
 2013-03-07 17:56:01 +09:00
Dmitriy Zaporozhets e90277f9b5 show project description on public area 2013-03-07 10:08:43 +02:00
Dmitriy Zaporozhets 7c408960ce Merge pull request #3146 from amacarthur/AdminAPIs 
Additional Admin APIs
 2013-03-06 22:57:24 -08:00
Dmitriy Zaporozhets 52bf5b0e78 Merge pull request #3159 from peikk0/allow-redis-via-socket 
Allow connection to Redis via unix socket
 2013-03-06 22:43:13 -08:00
Sato Hiroyuki e03a018d28 Refactor: rename module and class names. 
* Module: Graph -> Network
* Class: JsonBuilder -> Graph
 2013-03-07 15:42:30 +09:00
Dmitriy Zaporozhets 1c2a7bc3cd Merge pull request #3161 from cabello/patch-1 
Refactor README to split production/development environments
 2013-03-06 22:31:25 -08:00
Sato Hiroyuki 784aa266bd Refactor: grouping parent and their space by including array. 2013-03-07 15:19:42 +09:00
Sato Hiroyuki 2f7f46b256 Refactor: replace "render :json = graph.to_json" to view template(show.json.erb). 
Because model shouldn't know about view logic.
 2013-03-07 15:19:32 +09:00
Danilo Cabello 3d662e5ccf Refactor README to split production/development environments 2013-03-06 20:06:56 -05:00
Sebastian Ziebell 39114d259c API: documentation contains infos to status codes in README file. 
All the info to return codes from the API functions are available in the `README.md` file as suggested.
 2013-03-07 00:15:57 +01:00
Pierre GUINOISEAU 67a61c80d1 Allow connection to Redis via unix socket 
Allow connection to Redis via unix socket, using
unix:/var/run/redis/redis.sock for example.

Default behaviour does not change, except that the full Redis URL must
be configured, with redis:// for tcp or unix: for unix socket.
 2013-03-06 22:06:12 +01:00
Dmitriy Zaporozhets 9dc46eee8e Return project description back 2013-03-06 22:56:48 +02:00
Dmitriy Zaporozhets 7b38a0de98 show highlighted code correctly inside issue body 2013-03-06 21:48:15 +02:00
Dmitriy Zaporozhets 872cf404eb fix js syntax error 2013-03-06 21:39:10 +02:00
Dmitriy Zaporozhets 19e9c736e7 add system hooks api docs to help content 2013-03-06 21:12:47 +02:00
Dmitriy Zaporozhets 08f29c322e update Gemfile.lock with https rubygems 2013-03-06 21:10:01 +02:00
Dmitriy Zaporozhets 89ce02ea5d Merge pull request #3158 from dosire/master 
Use secure protocol
 2013-03-06 10:22:45 -08:00
Sytse Sijbrandij bcaf3c2c3e Use secure protocol 2013-03-06 17:55:11 +01:00
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets 65d78253cb Merge pull request #3156 from m4tthumphrey/api-system-hooks 
Added methods to manage system hooks from API
 2013-03-06 07:42:43 -08:00
Dmitriy Zaporozhets 0384ef46b8 Merge pull request #3157 from cabello/patch-1 
Update README with references to versions.
 2013-03-06 07:37:07 -08:00
Dmitriy Zaporozhets 4c1538a946 Use redis as cache storage. cache events 2013-03-06 17:30:48 +02:00
Danilo Cabello 4db5ec281e Update README with references to versions. 2013-03-06 10:20:46 -05:00
Matt Humphrey 1dd712ddc2 System hooks API. 2013-03-06 15:15:26 +00:00
Dmitriy Zaporozhets 40f1868194 Fix loading animation while browsing tree 2013-03-06 17:12:28 +02:00
Dmitriy Zaporozhets e38e2ce29a Merge pull request #3154 from hiroponz/fix-routing-error 
Fix routing error
 2013-03-06 05:08:09 -08:00
Sato Hiroyuki 83435e3d46 Adding sleep statements to allow sufficient time for the page to settle. 2013-03-06 16:36:11 +09:00
Sato Hiroyuki e7a67a5583 Don't set format manually, bacause set in routing. 2013-03-06 16:36:10 +09:00
Sato Hiroyuki bb63459d53 Fix routing errors. 
It should fix #2598.
 2013-03-06 16:36:10 +09:00
Sato Hiroyuki 6224ac0647 Add and fix some tests for routing. 
It is linked to #2598.
 2013-03-06 16:36:01 +09:00
Dmitriy Zaporozhets d03af842c5 fix public projects identations 2013-03-06 09:12:14 +02:00
Angus MacArthur 47abdc10ca Updated documentation for added Admin APIs 2013-03-05 23:48:40 -05:00
Sebastian Ziebell b5ef6d2268 API: refactored and simplified error handling in merge requests API 2013-03-05 23:43:05 +01:00
Sebastian Ziebell cce35b6d05 Fixes api 2013-03-05 22:33:45 +01:00