home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 01:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
2006 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets d531de0bc9 Merge branch 'popen_close_stdin' 
Conflicts:
	CHANGELOG
 2015-01-08 15:54:34 -08:00
Dmitriy Zaporozhets d0a50985ec Create ApplicationSettings if does not exist in runtime 2015-01-08 11:26:16 -08:00
Dmitriy Zaporozhets 8133e44998 Hack for migrating to new settings 2015-01-08 10:30:35 -08:00
Dmitriy Zaporozhets 57a65ede77 Improve application settings and write tests 2015-01-08 09:53:35 -08:00
Jacob Vosmaer dec168932e Merge remote-tracking branch 'dev_gitlab_org/master' into git-http-blacklist 
Conflicts:
	CHANGELOG
 2015-01-08 10:57:08 +01:00
Marin Jankovski 8dd672776e Fix failing tests due to updates on the return messages. 2015-01-07 11:39:20 +01:00
Marin Jankovski cd0aed3d54 Add a message when unable to save an object through api. 2015-01-07 10:46:00 +01:00
Jacob Vosmaer af56c1dd32 White-list requests from 127.0.0.1 
On some misconfigured GitLab servers, if you look in production.log it looks
like all requests come from 127.0.0.1. To avoid unwanted banning we
white-list 127.0.0.1 with this commit.
 2015-01-06 16:56:56 +01:00
Jacob Vosmaer 52bc4e79f8 Close standard input in Gitlab::Popen.popen 2015-01-05 11:51:21 +01:00
Marin Jankovski 7240150c89 Forward the messages in api response. 2014-12-30 15:17:46 +01:00
Marin Jankovski ed464edabe Message for api files and groups. 2014-12-30 14:29:55 +01:00
Marin Jankovski d4b613ded7 Clearer message if adding comment to commit via api fails. 2014-12-30 14:00:07 +01:00
Marin Jankovski 7fa80b5bd0 Update branch api not found messages to 'Branch not found'. 2014-12-30 13:37:14 +01:00
Dmitriy Zaporozhets 2660e83c97 Add group filtering by name for API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 11:46:47 +02:00
Dmitriy Zaporozhets a9cf84e5ac Merge pull request #7675 from yglukhov/patch_notes_api 
Implemented notes (body) patching in API.
 2014-12-29 21:06:49 +02:00
Dmitriy Zaporozhets 37ed5837a8 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-12-29 18:32:19 +02:00
Stephan van Leeuwen 180fda3d0a Updated indentation on case when statements. 2014-12-29 16:36:56 +01:00
Stephan van Leeuwen 6af34b0f71 Changed setting the sort variable 
Changed from using cases to set the sort variable, to use a one line if/else statement
 2014-12-29 16:36:56 +01:00
Stephan van Leeuwen 6b50721946 Updated projects api to allow ordering 
Added support for order_by and sort parameters, to sort the projects by the specified values.
Updated projects api documentation including the order_by and sort parameters
 2014-12-29 16:36:56 +01:00
Marin Jankovski 42fb42aed4 Merge branch 'master' into developer_can_push_to_protected_branches_option 
Conflicts:
	db/schema.rb
 2014-12-29 09:30:55 +01:00
Ciro Santilli cd688a6011 Replace regex methods by string ones since faster 
and more readable.
 2014-12-28 23:53:27 +01:00
Marin Jankovski 92eb3974ac Add option to disable/enable developers push to already protected branches. 2014-12-26 11:39:12 +01:00
Marin Jankovski 770b2a5cfb Move protected branch actions into a method. 2014-12-26 09:52:39 +01:00
Marin Jankovski 61b4214e94 Allow regular code push for developers if the protected branch allows it. 2014-12-26 09:35:49 +01:00
uranandyglukhov 1fbc010241 Implemented notes (body) patching in API. 2014-12-25 14:28:40 +02:00
Valery Sizov e41dadcb33 Doorkeeper integration 2014-12-24 15:38:07 +02:00
Marin Jankovski 18d9172edc Use a different name of the method to check if sanitize is enabled in check task. 2014-12-22 10:03:52 +01:00
Robert Schilling f7f56e4a0b Merge pull request #8256 from cirosantilli/rm-unused-has_gitlab_shell3 
Remove unused has_gitlab_shell3? method
 2014-12-21 10:15:34 +01:00
Jacob Vosmaer c8b2def2be Add more comments explaining how we block IPs 2014-12-18 11:08:11 +01:00
Drew Blessing f06f69b9da Add theme type css class 2014-12-15 13:21:26 -06:00
Jacob Vosmaer 62ea02740d Block Git HTTP Basic Auth after 10 failed attempts 2014-12-15 18:57:42 +01:00
Marin Jankovski e5951cf4ae Don't forget to splat. 2014-12-12 10:42:55 +01:00
Marin Jankovski bd43cf0653 Use system where only return result is needed. 2014-12-12 10:17:07 +01:00
Marin Jankovski cd4c65c159 Use shell invocation according to the shell commands guidelines. 2014-12-11 13:17:43 +01:00
Dmitriy Zaporozhets 7d662114b3 Merge branch 'sidekiq_memory_killer_grace_time' into 'master' 
Add 'grace time' behavior to Sidekiq MemoryKiller

The previous iteration of the memory killer did not give 'large'
jobs much of a chance to finish. This caused them to come back after
each restart, leading to another memory-induced shutdown. By adding
some 'grace time' between the moment we detect a memory peak and
the moment we start shutting down, we hope to give Sidekiq a chance
to get whatever causes its memory to grow 'out of its system'.

See merge request !1313
 2014-12-08 13:17:10 +00:00
Jacob Vosmaer 2fcef3278c Fix typo 2014-12-08 13:39:18 +01:00
Jacob Vosmaer 3dd86b83ba Use constants instead of getters 2014-12-08 13:19:31 +01:00
Jacob Vosmaer 4f9a14061b Wait 15 minutes before Sidekiq MemoryKiller action 2014-12-05 17:29:34 +01:00
Dmitriy Zaporozhets 4491a3d12b Decline push if repository does not exist 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 18:17:51 +02:00
Dmitriy Zaporozhets e6c5a8b161 Merge branch 'rake_task_for_google_email_schema_verfication' into 'master' 
Rake task for google email schema verfication

#1607

See merge request !1300
 2014-12-05 10:19:10 +00:00
Marin Jankovski cdc62cffcb Add rake task for google schema whitelisting. 2014-12-04 15:22:10 +01:00
Valery Sizov 3a5ed5260b Supporting for multiple omniauth provider for the same user 2014-12-04 13:03:55 +02:00
Valery Sizov 1a80d13a39 Multi-provider auth. LDAP is not reworked 2014-12-04 13:01:50 +02:00
Dmitriy Zaporozhets 835cbc06d8 Reload mr code on force push too 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-02 17:42:56 +02:00
Dmitriy Zaporozhets 612b8806dd Fix internal API for missing project or key 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-01 16:55:33 +02:00
Dmitriy Zaporozhets 06b7907c2a Fix deploy keys permission check in internal api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-01 16:25:10 +02:00
Achilleas Pipinellis 191aa9712e Properly fix wiki restore. 
ProjectWiki.new() creates a new wiki git repository, so any tries
to bare clone a bundle fail. With this patch we remove the newly
created wiki.git before restoring from the backup bundle.
 2014-11-30 18:24:05 +02:00
Achilleas Pipinellis 880478b21e Proper wiki restore. Fixes #845 2014-11-29 22:01:52 +02:00
Jacob Vosmaer d336127a20 Add comments to the MemoryKiller middleware 2014-11-28 15:19:03 +01:00
Jacob Vosmaer 64ab6c9ed5 Add 'MemoryKiller' Sidekiq middleware 
When enabled, this middleware allows Sidekiq to detect that its RSS has
exceeded a maximum value, triggering a graceful shutdown. This
middleware should be combined with external process supervision that
will restart Sidekiq after the graceful shutdown, such as Runit.
 2014-11-28 15:01:41 +01:00