root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
18,287 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

46 Commits

Author SHA1 Message Date
Dmitriy Zaporozhets 4a0fa27017
Merge branch 'master' into remove-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 11:41:53 +02:00
Boyan Tabakov 88ab815b38 Update Flowdock integration to support new Flowdock API 
Requires that users create a Git source in their flows and update the configured token to the Git source token. The old flow tokens can't be used.
 2015-08-14 16:45:23 +02:00
Stan Hu 2379057002 Provide more feedback what went wrong if HipChat service failed test 
Issue gitlab-com/support-forum#213
 2015-08-12 07:31:25 -07:00
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' " 
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
 2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets 9f10943c1a
Revert "Merge branch 'drop-satellites'" 
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 10:28:42 +02:00
Dmitriy Zaporozhets b48b07044b
Merge branch 'master' into drop-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-04 16:42:36 +02:00
Marin Jankovski 77f325a49f Do not disappoint rubocop. 2015-07-17 17:17:33 +02:00
Marin Jankovski c7daa5f17f Add specs for gitlab ci service validity. 2015-07-17 17:03:15 +02:00
Dmitriy Zaporozhets abd2bc00f9
Fix some of tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-16 17:04:49 +02:00
Stan Hu d4be82d1c9 Add Irker service configuration options 
Closes #1713
Closes #1714
Closes gitlab-com/support-forum#139
 2015-07-05 06:40:56 -07:00
Dmitriy Zaporozhets f40b99d02e
Merge branch 'master' into rubocop-for-tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/features/issues_spec.rb
	spec/models/forked_project_link_spec.rb
	spec/models/hooks/service_hook_spec.rb
	spec/models/hooks/web_hook_spec.rb
	spec/models/project_services/hipchat_service_spec.rb
	spec/requests/api/project_members_spec.rb
	spec/requests/api/projects_spec.rb
	spec/requests/api/system_hooks_spec.rb
	spec/services/archive_repository_service_spec.rb
	spec/support/matchers.rb
	spec/tasks/gitlab/backup_rake_spec.rb
 2015-06-23 10:44:03 +02:00
Robert Speicher 15a05be70d Fix Style/Blocks cop violations 2015-06-22 16:00:54 -04:00
Robert Speicher 94eff65569 Fix Style/SpaceInsideHashLiteralBraces cop violations 
These fixes were performed automatically by Rubocop's `-a` flag.
 2015-06-22 14:41:00 -04:00
Robert Speicher 5a9ede4721 Update mock and stub syntax for specs 2015-06-22 12:13:46 +02:00
Dmitriy Zaporozhets 0674bf2339
Look for .gitlab-ci.yml only if checkout_sha is present 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-15 17:54:42 +02:00
Robert Speicher 422236c71e Change `foo.should` syntax to `expect(foo).to` in specs 2015-06-13 18:37:30 -04:00
Robert Speicher 75a40ad5bc Change `foo.should_not` syntax to `expect(foo).not_to` in specs 2015-06-13 18:19:24 -04:00
Valery Sizov b931c11e1b GitLab CI service sends gitlab-ci.yml file 2015-06-02 16:46:01 +03:00
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
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 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
Valery Sizov bafec400f1 CI forking: tests 2015-04-06 19:45:16 +03:00
Marin Jankovski 96d093e59a Merge branch 'email-full-url' 2015-03-31 19:00:59 -07:00
Robert Speicher 32d6a14098 Move asana_service_spec to its correct location 2015-03-27 22:53:27 -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
Valery Sizov e5fe14b2fb Link to CI with ref 2015-03-20 19:19:29 +02:00
Douwe Maan 383c56efa1 Use Gitlab::Git helper methods and constants as much as possible. 2015-03-10 13:39:31 +01: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
Dmitriy Zaporozhets 66c61f023b Re-annotate models 2015-03-04 14:14:00 -08:00
Douwe Maan fc61608161 Fix specs. 2015-03-03 13:09:45 +01:00
Douwe Maan d86c0cda24 Fix specs. 2015-03-03 11:14:32 +01:00
Stan Hu 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 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
Marin Jankovski b0dfe434c6 Using gitlab url to build links for gitlab issue tracker and add a spec. Fix rubocop warnings in path. 2015-02-23 18:43:26 -08:00
Jeroen van Baarsen 0c4a70a306 Updated rspec to rspec 3.x syntax 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-12 19:17:35 +01:00
Dmitriy Zaporozhets c0acb28c4e Annotate models 2015-02-02 10:24:40 -08:00
Robert Speicher ab6f7164e0 Make the structure of spec/models match app/models 2015-01-30 15:51:10 -05:00