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
12,431 Commits 48 Branches 340 Tags
e151bbbb285c8eafe4fe8aff06d225fef71e520e
Commit Graph
47 Commits
Author SHA1 Message Date
Jacob Vosmaer be34a0c939 Merge remote-tracking branch 'subscribers/serialize_service_properties' into merge-79190fe06b-7.3.0-pre 2014-09-15 15:22:44 +02:00
Jacob Vosmaer e93523ed31 Merge commit '79190fe06b' into merge-79190fe06b-7.3.0-pre 
Conflicts:
	Gemfile
	README.md
	VERSION
	db/schema.rb
	doc/install/installation.md
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/user.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-09-15 11:24:51 +02:00
Drew Blessing 0b3d4b62a3 Complete serialization of service properties for EE 2014-09-11 05:44:00 -05:00
Drew Blessing a0dbcd2365 Serialize services properties 2014-09-10 09:56:39 -05:00
Dmitriy Zaporozhets 92deb451da Annotate models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-25 12:25:02 +03:00
Jacob Vosmaer ee8836a903 Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166 
Conflicts:
	VERSION
	app/models/user.rb
	app/services/merge_requests/build_service.rb
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/README.md
	features/project/merge_requests.feature
	features/steps/project/merge_requests.rb
 2014-08-15 10:25:23 +02:00
Jacob Vosmaer fa04782a78 Improve logging for the JIRA issue closing service 2014-08-13 17:46:34 +02:00
Dmitriy Zaporozhets 82c8c44cac Merge pull request #7312 from hiroponz/fix-404-when-clicking-link-on-hipchat-message 
Fix 404 error when clicking the branch link on hipchat message
 2014-08-13 16:42:31 +03:00
Jan-Willem van der Meer 53d5024b86 Add custom jira-issue-transition-id to request 2014-08-11 19:25:31 +02:00
Jan-Willem van der Meer d048dc26c5 Add jira issue transition id to service form 2014-08-11 19:25:08 +02:00
Stefan Kanev 1cf1e7bedb Less verbose HipChat integration 
Whenever a push with a lot of merges is made, the HipChat channel gets
overwhelmed. It is easy to loose everything else in all the GitLab
messages. It makes more sense to limit the number of commits shown.

The same problem happens with longer commit messages (like this one). It
will be useful to show only the subject of the commit message, not the
full one.
 2014-07-29 11:04:19 +03:00
Hiroyuki Sato a10f5fadb5 Fix 404 error when clicking the branch link on hipchat message 2014-07-18 20:20:18 +09:00
Dmitriy Zaporozhets 5ace25cf20 Merge branch 'ee_fix_jenkins_status_check' into 'master' 
EE - fix jenkins status check

When using Jenkins CI via the `JenkinsService` class, GitLab queries Jenkins for build status of a specific git commit shasum. This check however is done in an error prone way and fails for Jenkins jobs with multiple modules. Please note the three bubbles at the bottom of this screenshot: http://i.imgur.com/cptQdOG.png

This MR changes the checking code to make use of a HTML parser and selects the element of interest via its xpath. It was manually tested against Jenkins version 1.554 (LTS release as of today) with both maven and freestyle type jobs.
 2014-07-14 09:35:15 +00:00
Dmitriy Zaporozhets 4ff1fc35d4 Remove attr_accessible from EE only models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-11 14:38:56 +03:00
Dmitriy Zaporozhets a74b66cdee Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/group.rb
	app/models/project.rb
	features/steps/shared/project.rb
 2014-07-10 23:43:42 +03:00
Marvin Frick 9089a5d15b changes the check for Jenkins_CI status 
Instead of plaintext http response body reading, this service now checks for a value at a specified xpath in the document.
 2014-07-08 10:37:16 +02:00
Dmitriy Zaporozhets 04516027df Project services to strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 14:49:09 +03:00
Dmitriy Zaporozhets 766af5838f Merge branch 'add_aborted_status' into 'master' 
Jenkins Service - Add aborted status

Currently, Jenkins service will show "pending" build status even if the job has been aborted. This simple change allows the CI status to recognize an aborted status and mark it as a failure.
 2014-06-10 16:25:40 +00:00
Drew Blessing f6c8c6aa01 Recognize aborted job 2014-06-10 11:04:32 -05:00
Drew Blessing f1e3896334 Fix Jenkins Auth 2014-06-10 08:41:35 -05:00
Dmitriy Zaporozhets a18ae13e98 Backport CI service refactoring from EE 
It allows easier contribution of different CI services

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 11:35:43 +03:00
Dmitriy Zaporozhets 90342c9e9e Add help section for services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-15 11:28:01 +03:00
Dmitriy Zaporozhets afe1ff413d Specify project URL for Jenkins service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-15 11:20:25 +03:00
Dmitriy Zaporozhets cce27a6a00 Add parent CiService class for easy add of new services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-15 11:06:17 +03:00
Dmitriy Zaporozhets e6d2c02e67 Dirty implementastion of MR build status for Jenkins 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-15 10:34:35 +03:00
Dmitriy Zaporozhets 84b355077f Add Jenkins CI service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-14 16:57:31 +03:00
Marin Jankovski 92917d89ee Add needed spaces. 2014-05-14 09:45:40 +02:00
Marin Jankovski e2d4ee91bd Add tests and documentation for jira service. 2014-05-13 13:48:55 +02:00
Marin Jankovski e3f736d258 Add Jira service. 2014-05-13 12:12:16 +02:00
Dmitriy Zaporozhets 36f861f1b1 Re-annotate models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 15:05:03 +03:00
Federico Ravasio 6a9eb4b231 Improved Slack integration with message attachments. 2014-04-06 11:57:48 +02:00
Andrea Usuelli d21ad74146 Changed the notification sender username to GitLab in Slack Notifier 2014-03-26 10:58:51 +01:00
Dmitriy Zaporozhets 1921a934a9 Add room placeholder for Slack integration 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-19 14:42:13 +02:00
Federico Ravasio e3fc01b3ea Added Slack service integration. 2014-03-18 18:54:30 +01:00
Nick HuancaandDmitriy Zaporozhets d02e129a54 added verify false on gitlab_ci integrations 
For those of us running self-signed in gitlab-ci it generates 500s SSL_verify errors if you don't have this.
 2014-03-05 13:23:44 +02:00
Binsztock RémyandOlivier Gonzalez e7382de108 Add Gemnasium Service for Gitlab 
Conflicts:

	db/schema.rb
 2014-02-21 16:25:22 +01:00
Samuel D. Leslie a5c62585a9 Fix spelling of "GitLab" in HipChat service 
Pedantic, but it frustrates OCD people like myself :)
 2014-02-12 18:27:00 +11:00
Sytse Sijbrandij 05eb618548 Merge branch 'hipchat-remove-hash' of /mnt/ebs/repositories/Tenzer/gitlab-ce 2014-01-26 15:22:13 +00:00
Carlos Paramio b373158077 Project name was hardcoded (oops) 2014-01-24 08:42:24 +01:00
Jeppe Toustrup 6cd745c2f7 Removed hash from "<user> #pushed to branch..." Hipchat notification 2014-01-14 10:57:10 +01:00
Dmitriy Zaporozhets 6ac73f45f0 Move EmailOnPush logic to async worker 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 13:42:12 +02:00
Dmitriy Zaporozhets 5f85d6d1ce Better description to EmailsOnPush service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 16:31:12 +02:00
Dmitriy Zaporozhets 074efd8fd5 Email on push: dont send email if new branch was pushed or branch was removed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 16:20:45 +02:00
Dmitriy Zaporozhets d550933907 Add new method to mailer for deliver emails with push info 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 14:45:55 +02:00
Dmitriy Zaporozhets 2428a0b2dd Add project_services dir to autoload path 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 12:58:44 +02:00
Dmitriy Zaporozhets 86a8796b13 Create EmailsOnPushService model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 12:42:40 +02:00
Dmitriy Zaporozhets b90cbfd21e Move project services models to own subdirectory 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 12:20:36 +02:00