home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,431 Commits 48 Branches 340 Tags
30920cc466ae90f4e44a4437869e02dc1948580d
Commit Graph
2143 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 3a9682a3d7 Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Conflicts:
	VERSION
	app/helpers/selects_helper.rb
	app/models/project.rb
	app/views/devise/sessions/new.html.haml
	app/views/groups/_settings_nav.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/profiles/keys/index.html.haml
	app/views/profiles/keys/show.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	config/routes.rb
	db/schema.rb
	doc/api/projects.md
	features/steps/shared/paths.rb
 2015-01-08 20:37:35 -08:00
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
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 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 bbcb70a9dc Add group filtering by name for API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 11:30:56 +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
Dmitriy Zaporozhets fd1f54b8ab Merge branch 'master' into ee-from-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/views/admin/groups/_form.html.haml
	app/views/groups/edit.html.haml
	app/views/groups/show.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/projects/_settings_nav.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.6.md
 2014-12-26 15:05:43 +02: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
Marin Jankovski 6ab5127bfa Merge branch 'master' into group_membership_lock 
Conflicts:
	db/schema.rb
 2014-12-16 14:34:32 +01:00
Dmitriy Zaporozhets dc0e6d06c5 Merge branch 'master' into ce-7-6 2014-12-16 13:21:18 +02:00
Drew Blessing f06f69b9da Add theme type css class 2014-12-15 13:21:26 -06:00
Valery Sizov 73c0dfd265 Kerberos: username as identifier 2014-12-15 18:07:03 +02:00
Valery Sizov 8a7993194e Kerberos support 2014-12-15 18:06:17 +02:00
Marin Jankovski 3257f8fcce Do not allow adding users via api if member lock is enabled. 2014-12-15 13:25:31 +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
Dmitriy Zaporozhets 1c93d0df7a Merge branch 'master' into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
 2014-12-11 18:12:45 +02:00
Marin Jankovski cd4c65c159 Use shell invocation according to the shell commands guidelines. 2014-12-11 13:17:43 +01:00
Dmitriy Zaporozhets 633fb8ab6b Prevent 500 error on ldap group links page 
If group has links to ldap servers that are disabled or removed from
gitlab config.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-08 15:58:01 +02: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
Valery Sizov 2f006f89a5 fix specs after merge CE -> EE 2014-12-08 13:11:33 +02: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 3bd66989de Merge branch 'master' into ee-master 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/models/project.rb
	app/models/user.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.5.md
	doc/update/7.4-to-7.5.md
	lib/gitlab/git_access.rb
	spec/factories.rb
	spec/lib/gitlab/git_access_spec.rb
 2014-12-05 13:28:32 +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