home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,235 Commits 48 Branches 340 Tags
884352294deab0c11845547ce2ab96b60f468458
Commit Graph
1423 Commits
Author SHA1 Message Date
Drew Blessing 9f9f1b3b87 Fix HipChat Server 2014-12-29 18:51:39 -06:00
Dmitriy Zaporozhets e0459da2a6 Merge branch 'fix-services' into 'master' 
Fix async services execution broken in 7.6

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/920

See merge request !1360
 2014-12-29 16:31:49 +00:00
Dmitriy Zaporozhets ed4e682eb8 Fix async services execution broken in 7.6 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 17:48:43 +02:00
Dmitriy Zaporozhets b07802ab68 Rescue Net::OpenTimeout exception in web hook 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 16:41:10 +02:00
Marin Jankovski e005d4191a Merge branch 'master' into developer_can_push_to_protected_branches_option 2014-12-29 15:39:03 +01:00
Dmitriy Zaporozhets cf95736865 New feature: add 'Mention' notification level 
It does disable all emails expect system one or when you was @mentioned

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 15:55:21 +02: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
Marin Jankovski 1c089a8561 Use shorter search for protected branch status. 2014-12-29 09:04:31 +01:00
Dmitriy Zaporozhets 803ca9e8cc Merge pull request #7957 from cirosantilli/rm-unused-project-code 
Remove unused Project#code function [failure unrelated]
 2014-12-28 22:15:43 +02:00
Dmitriy Zaporozhets 25a42a56cf Merge pull request #8439 from glasspelican/Teamcity 
Teamcity integration using 8.1 rest api
 2014-12-28 22:11:29 +02:00
Marin Jankovski 61b4214e94 Allow regular code push for developers if the protected branch allows it. 2014-12-26 09:35:49 +01:00
Dmitriy Zaporozhets 592e396869 Rework oauth2 feature 
* improve UI
* add authorization
* add separate page for oauth applications

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 18:35:04 +02:00
Valery Sizov e41dadcb33 Doorkeeper integration 2014-12-24 15:38:07 +02:00
Jason Lippert 1fa19401e9 Teamcity interaction using 8.1 rest api 2014-12-23 12:38:25 -05:00
Dmitriy Zaporozhets 4ab728bfe8 Fix random Argument error when update note 
In some strange cases Ruby thinks `system` is not AR field but
Kernel.system call and raises exception during save. It should prevent
this random wierd behaviour

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-15 16:31:23 +02:00
Jeroen van Baarsen 4eb3c47d4e Fixed a lot of already defined notices 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-12-14 15:13:09 +01:00
Dmitriy Zaporozhets 118bd7178b Sanitize snippet file name in raw headers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 13:28:48 +02:00
Dmitriy Zaporozhets f28a12a559 Add strict validation to snippet file names 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 13:15:42 +02:00
Dmitriy Zaporozhets 0d5265bbec Execute project services asynchronously 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-07 12:29:37 +02:00
Dmitriy Zaporozhets 6487419364 Automatically close merge requests that were locker for 1 day 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 16:02:08 +02:00
Dmitriy Zaporozhets b23f71ec4d Set/unset merge request locked_at timestamp after transition 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 15:49:25 +02:00
Dmitriy Zaporozhets d7fa9952ef Merge branch 'prevent-500-test-webhook' into 'master' 
Prevent 500 test webhook

Fixes #1803

See merge request !1299
 2014-12-04 16:03:42 +00:00
Dmitriy Zaporozhets db2edff937 Handle web hook exception 
Write to log if web hook cant be executed. This prevents 500 error when
test web hook with invalid URL and prevent exceptions and retries in
sidekiq

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-04 15:07:01 +02: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 bf39347970 Merge branch 'larger-avatar' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-12-02 12:44:18 +02:00
Sytse Sijbrandij 8f60144782 Change avatar file size to 200kb. 2014-12-02 10:32:24 +01:00
Dmitriy Zaporozhets d7568727b9 Merge pull request #8283 from cardoe/hipchat-private-server 
HipChat custom server support
 2014-12-01 18:25:28 +02:00
Dmitriy Zaporozhets 9d93729313 Move projects import to separate resource. Add bare repo creation to repository controller 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-30 00:50:25 +02:00
Dmitriy Zaporozhets 674cbe939c Dont allow project creation without repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-29 21:34:18 +02:00
Daniel AquinoandDoug Goldstein 1353f9aa64 HipChat service: support custom servers 
HipChat allows users to run their own private servers and to be able to
support those we must connect to the correct URL when using one of these
custom servers.
 2014-11-19 21:27:24 -06:00
Doug Goldstein 2f3df4cb56 HipChat service: correct service name & use v2 API 
HipChat refers to their own product camel cased so we should do the
same. HipChat no longer recommends people use the deprecated v1 API so
switch to using the v2 API by default. hipchat-rb does not yet default
to v2 in any version so it must be specified.
 2014-11-19 21:26:58 -06:00
Dmitriy Zaporozhets 2388fdd7c6 Improve fork to namespaces feature 
* Show namespace thumbnail differently if project was already forked
* Show loading spinner when click on fork
* Fork link navigates to personal namespace only if no manageable groups exists

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-14 16:06:39 +02:00
Dmitriy Zaporozhets e08e405ac4 Select namespace where to fork project 
Now you can fork project into group or personal namespace.
Also I moved fork logic from ProjectsController to own fork resource

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-13 22:06:19 +02:00
Dmitriy Zaporozhets 940ed58e76 Merge branch 'commit-comments' of https://gitlab.com/jeroenj/gitlab-ce into jeroenj/gitlab-ce-commit-comments 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-11-12 13:19:35 +02:00
Dmitriy Zaporozhets 95e8f9797a Merge pull request #7617 from pkill/issue-280-commit-note-notifications 
Issue-280 Send notifications when a note is added to a commit and author...
 2014-11-12 12:17:27 +02:00
Dmitriy Zaporozhets 2139e3519b Refactor merge request refresh logic on push 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-11 16:49:26 +02:00
Dmitriy Zaporozhets ccd842c3a7 Prevent post-receive error when push to project with dead forks 
If project has open merge request from fork and this fork was removed
before merge request was closed it cause exception during push

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-11 14:52:30 +02:00
Dmitriy Zaporozhets 150fc0cc68 Merge branch 'master' into mentioned_inside_mr 2014-11-06 15:38:09 +02:00
Dmitriy Zaporozhets 0ce1826b44 Merge pull request #8258 from cirosantilli/factor-repo-path 
Factor using Repository#path_to_repo
 2014-11-06 10:57:05 +02:00
Dmitriy Zaporozhets 6d60762793 Merge branch 'gitlab-ci-parallel' into 'master' 
Update GitLab CI service to work with new GitLab CI

See merge request !1239
 2014-11-05 17:42:52 +00:00
Ciro Santilli e4a38e4471 Factor using Repository#path_to_repo 2014-11-05 17:51:49 +01:00
Alex Elman 383ac10ca5 Issue-280 Send notifications when a note is added to a commit and author is a group member 
This fixes a bug where commit authors weren't receiving email notifications for notes added to their commits and their membership was in the group but not the project. The fix is to look up membership via the team object which accounts for both project and group members.
 2014-11-05 10:28:59 -06:00
Valeriy Sizov 5715df2067 Merge pull request #8233 from cirosantilli/rm-new-branch-dead 
Remove dead Event#new_branch? method
 2014-11-05 16:25:35 +02:00
Marin Jankovski 2ee1ec4300 Do not allow cross reference note in a mr if a mr contains mentioned commit. 2014-11-05 12:53:10 +01:00
Valeriy Sizov 5c6b21f1c2 Merge pull request #7967 from Bugagazavr/issue-actor 
Add issueable actor to hooks
 2014-11-05 12:10:50 +02:00
Dmitriy Zaporozhets 3246ed514f Update GitLab CI service to work with new GitLab CI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-05 11:44:40 +02:00
Ciro Santilli c49cb40f65 Remove dead Event#new_branch? method 2014-11-03 20:17:02 +01:00
Dmitriy Zaporozhets e1c48f1431 Merge branch 'master' into jastkand/gitlab-ce-fix-api-auth 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-11-03 14:10:53 +02:00
Marin Jankovski fe610ff576 Merge pull request #8156 from stevenosloan/update_slack_and_use_raw_webhook_url 
update slack-notifier for new webhook_url format
 2014-11-03 09:57:05 +01:00