home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 12:06:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
16,658 Commits 48 Branches 340 Tags
492249f9345fbc09a2b79cb8083bcbcdcef102b3
Commit Graph
129 Commits
Author SHA1 Message Date
Stan Hu 0c9463174b Allow HipChat API version to be blank and default to v2 
Closes #772
 2015-05-26 21:57:24 -07:00
Valery Sizov 2144cc710a fix gitlab CI links 2015-05-05 14:02:31 +03:00
Stan Hu a3157626f1 Re-annotate models 2015-05-03 13:38:27 -07:00
Dmitriy Zaporozhets 8140c68289 Merge branch 'rs-issue-2269' into 'master' 
Remove duplicate settings for default_url_options

Closes #2269

See merge request !1797
 2015-04-28 08:34:34 +00:00
Chulki Lee 57c724558d Add api version property on hipchat service 2015-04-27 21:14:04 +09:00
Dominik Sander 3c3b43b0a0 Add notify and color options to HipchatService 
When notify is set to true send messages will trigger a notification for
all room members.
Color changes the background color of the message.
 2015-04-26 22:00:51 +02:00
Robert Speicher aa9435cddb Remove duplicate settings for default_url_options 
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2269
 2015-04-25 19:46:04 -04:00
Marin Jankovski ec350f0bcf Merge pull request #9042 from skburgart/fix/jira-link 
Fix broken link in jira service
 2015-04-23 15:14:48 +02:00
Chulki Lee 681fb7def6 do not send empty message to hipchat 2015-04-22 08:05:19 +09:00
Dmitriy Zaporozhets 8d9d63b250 Merge branch 'arbitrary-local-repo-import' into 'master' 
Prevent arbitary local repos from being imported.

Fixes gitlab/gitlab-ee#263.

See merge request !1763
 2015-04-12 10:21:15 +00:00
Dmitriy Zaporozhets f244914402 Merge branch 'regex-start-of-string' into 'master' 
Fix persistent XSS vulnerability around profile website URLs.

Fixes gitlab/gitlab-ee#268

See merge request !1761
 2015-04-12 07:36:40 +00:00
Robert Speicher 307962a046 Rename last uses of Buildbox to Buildkite 2015-04-11 14:05:22 -04:00
Robert Speicher 93b1767799 Move buildbox_service files to buildkite_service 2015-04-11 14:05:22 -04:00
Douwe Maan 9e52a2dcab Don't use URI.regexp to validate since it doens't have start/end anchors. 2015-04-11 11:38:14 +02:00
Douwe Maan 0ece6bd828 Use \A and \z in regexes instead of ^ and $. 2015-04-10 18:31:07 +02:00
Valery Sizov bafec400f1 CI forking: tests 2015-04-06 19:45:16 +03:00
Valery Sizov 9c2301808b CI project forking 2015-04-06 15:20:58 +03:00
Steven Burgart 471487d2ed Fix broken link in jira service 2015-03-27 15:57:53 -04:00
Douwe Maan e08d947e77 Use relative URL for Markdown references, except in mails. 2015-03-27 10:39:05 +01:00
Douwe Maan c5de2ce742 Return full URLs from GitLabIssueTrackerService. 2015-03-27 10:39:05 +01:00
Keith Pitt 7fdc017650 Renamed Buildbox to Buildkite. 2015-03-26 11:40:43 +00:00
Dmitriy Zaporozhets 6ec8ff069c Enable more rubocop style checks 2015-03-24 18:28:10 -07:00
Dmitriy Zaporozhets 2953e0d19b Merge branch 'emailsonpush-create-delete' into 'master' 
Send EmailsOnPush email when branch or tag is created or deleted.

Addresses #1951, #1957 and #1925.

![Screen_Shot_2015-03-17_at_13.58.15](https://dev.gitlab.org/gitlab/gitlabhq/uploads/16ff25adb4b4a7e1923612e0652442b4/Screen_Shot_2015-03-17_at_13.58.15.png)

![Screen_Shot_2015-03-17_at_13.58.22](https://dev.gitlab.org/gitlab/gitlabhq/uploads/e346c1d84aba3a093b722d0a4167e289/Screen_Shot_2015-03-17_at_13.58.22.png)

![Screen_Shot_2015-03-17_at_13.58.28](https://dev.gitlab.org/gitlab/gitlabhq/uploads/720437ecc13f317c6d20eff82ac60bd7/Screen_Shot_2015-03-17_at_13.58.28.png)

![Screen_Shot_2015-03-17_at_13.58.34](https://dev.gitlab.org/gitlab/gitlabhq/uploads/2b302bb6cdbe27c96a8dff1375236602/Screen_Shot_2015-03-17_at_13.58.34.png)

See merge request !1709
 2015-03-23 16:48:27 +00:00
Douwe Maan b13bed62ea Clean up code by using keyword arguments. 2015-03-23 15:08:19 +01:00
Valery Sizov e5fe14b2fb Link to CI with ref 2015-03-20 19:19:29 +02:00
Douwe Maan bf235053ad Send EmailsOnPush email when branch or tag is created or deleted. 2015-03-18 14:07:28 +01:00
Dmitriy Zaporozhets 52acd2b45c Merge branch 'external_wiki' into 'master' 
Add support for external wikis

## What does this MR do?
This MR adds the possibility to replace the link to the internal wiki of gitlab with a custom link.
Currently this is realised as a service.

## What Use Case does this MR solve?
In my Company we already have a wiki System (Confluence).
We have a policy to use the existing wiki, so we can't switch to the internal wiki Gitlab provides.
This currently only leaves us two choices:
1. Disable the gitlab wiki. That means we completly loose the connection between wiki and code from the gitlab ui.
2. Create a simple wiki page with a link to our external wiki and hope that no one uses the internal one.

Both solutions are not really good.
So what can be done to improve the situation while making it as easy as possible for new developers to access both, wiki and gitlab?
Replacing the wiki link kinda like the JIRA integration replaces the issues link looks like a good first step to me. :)
This can probably be extended later to completly prevent access to the internal wiki (currently that's still possible if you know the link) or maybe to check if the link really points to a wiki.

## Screenshot:
![external_wiki_service](https://gitlab.com/uploads/gitlab-org/gitlab-ce/89b27cf068/external_wiki_service.png)

See merge request !291
 2015-03-18 02:00:36 +00:00
Drew Blessing 606d24ff2d Merge branch 'irker-service-use-supported-events' into 'master' 
Make Irker service check supported_events

63178a9509 added the supported_events check for services. Since f84b7eef3f was just added, we should adjust it accordingly.

See merge request !367
 2015-03-13 00:41:07 +00:00
Hannes Rosenögger 7ff9c8229d Add a service to support external wikis 2015-03-12 19:13:51 +01:00
Marin Jankovski 6d0ff0ade8 Remove placeholder methods to prevent calling methods rather than attributes. 2015-03-10 18:09:13 -07:00
Marin Jankovski 82bb3ec33d Merge branch 'issues-tracker-id' into 'master' 
Properly move over `issues_tracker_id` from old custom issue tracker URLs.

Addresses https://gitlab.com/gitlab-org/gitlab-ce/issues/1124.

cc @marin Regression in 7.8.0.

See merge request !1670
 2015-03-10 17:07:49 +00:00
Douwe Maan 76842aac75 Properly move over issues_tracker_id from old custom issue tracker URLs. 2015-03-10 14:14:49 +01:00
Douwe Maan 383c56efa1 Use Gitlab::Git helper methods and constants as much as possible. 2015-03-10 13:39:31 +01:00
Dmitriy Zaporozhets 8b551ee318 Merge branch 'emails-on-push' 
Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/project_services/emails_on_push_service.rb
 2015-03-08 16:49:11 -07:00
Stan Hu ad14ed5e49 Add tag_push event notification to HipChat and Slack services. 
Normalize output to use:
- User name instead of username
- Include first line of title in message description
- Link to "Issue #X" instead of "#X"
 2015-03-06 08:31:49 -08:00
Stan Hu 7e204cf389 Added comment notification events to HipChat and Slack services. 
Supports four different event types all bundled under the "note" event type:

- comments on a commit
- comments on an issue
- comments on a merge request
- comments on a code snippet
 2015-03-06 06:54:00 -08:00
Stan Hu f12ec5f4e8 Add merge and issue event notification for HipChat 2015-03-05 08:23:38 -08:00
Stan Hu 6ddd45948f Make Irker service use the supported events check 2015-03-04 22:31:28 +00:00
Dmitriy Zaporozhets 66c61f023b Re-annotate models 2015-03-04 14:14:00 -08:00
Douwe Maan d57e809cbd Set supported events per project service. 2015-03-03 11:14:32 +01:00
Douwe Maan 85fa334eb6 Execute GitlabCiService for both push and tag_push events. 2015-03-03 11:14:32 +01:00
Douwe Maan f13567edc4 Only execute GitlabCiService for push events. 2015-03-03 11:14:32 +01:00
Douwe Maan d86c0cda24 Fix specs. 2015-03-03 11:14:32 +01:00
Douwe Maan d9ff616fd8 Code style, directory structure. 2015-03-03 11:14:32 +01:00
Stan HuandDouwe Maan afe5d7d209 Issue #595: Support Slack notifications upon issue and merge request events 
1) Adds a DB migration for all services to toggle on push, issue, and merge events.

2) Upon an issue or merge request event, fire service hooks.

3) Slack service supports custom messages for each of these events. Other services
not supported at the moment.

4) Label merge request hooks with their corresponding actions.
 2015-03-03 11:14:31 +01:00
Dmitriy Zaporozhets 33e107127a Merge pull request #8812 from opichals/teamcity_branchName_not_to_be_whole_ref 
Fix for TeamCity buildQueue REST API build/@branchName.
 2015-03-02 15:23:15 -08:00
Dmitriy Zaporozhets f00feb14ec Merge branch 'add-irker-service' of https://github.com/Aorimn/gitlabhq into Aorimn-add-irker-service 
Conflicts:
	app/controllers/projects/services_controller.rb
 2015-03-02 15:22:31 -08:00
Aorimn f84b7eef3f Add Irker service 
Irker is a gateway which sends IRC messages on git updates. This new
service provides an interface to this gateway, integrated in Gitlab, for
each updates.
As per the guidelines, this commit adds the new feature in the
CHANGELOG, tests and documentation.

See http://www.catb.org/esr/irker/
 2015-03-01 20:51:03 +01:00
Andrès Koetsier d2c85a68bb Allow a user to specify a channel and username for the slack-webhook 2015-02-28 10:06:32 +01:00
Douwe Maan f0b78a8529 Clarify EmailsOnPushService options. 2015-02-25 16:40:48 +01:00