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
71,793 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

40 Commits

Author SHA1 Message Date
Douwe Maan 52967b107b
Merge branch 'jej/mattermost-notification-confidentiality-10-6' into 'security-10-6' 
[10.6] Prevent notes on confidential issues from being sent to chat

See merge request gitlab/gitlabhq!2366
# Conflicts:
#	app/helpers/services_helper.rb
 2018-04-05 08:41:56 +02:00
Dmitriy Zaporozhets 8fe9995f11
Replace deprecated name_with_namespace with full_name in app and spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2018-03-05 16:15:26 +02:00
Robert Speicher c8b802471b Enable the RSpec/HookArgument cop and auto-correct offenses 2017-08-10 19:29:42 -04:00
Rémy Coutable cddc5cacfb Use described_class when possible 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-07-27 14:31:53 +02:00
Rémy Coutable ddccd24c13 Remove superfluous lib: true, type: redis, service: true, models: true, services: true, no_db: true, api: true 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-07-27 14:31:53 +02:00
Robert Speicher a6ec5121f0 Correct RSpec/SingleLineHook cop offenses 2017-06-14 13:18:56 -05:00
Kamil Trzciński 12dd5ac221 All CI offline migrations 2017-03-17 23:06:11 +00:00
Robert Speicher fcb37542e7 Use `:empty_project` where possible in model specs 2017-01-26 17:44:59 -05:00
Airat Shigapov 257d15a670
Return truncation for notification descriptions, fix minor bugs with rendering 2016-10-20 15:44:34 +03:00
David Eisner 32cf2e5f77
Tests for markdown HipChat notifications 2016-10-20 15:44:34 +03:00
Airat Shigapov b5d210c9d6
Render hipchat notification descriptions as HTML instead of raw markdown 2016-10-20 15:44:34 +03:00
Grzegorz Bizon 5ce5abdc1d Fix hipchat service specs after changes in pipeline 2016-10-04 14:43:58 +02:00
Valery Sizov 8b2dbe8997 Remove schema annotations completely 2016-09-16 14:37:48 +03:00
Lin Jen-Shin d5264e8804 Simplify the name for data builder, feedback: 
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13671791
 2016-08-12 16:09:29 +08:00
Kamil Trzcinski 0b0a53ee5e Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slack 
# Conflicts:
#	app/models/ci/pipeline.rb
#	app/services/ci/create_pipeline_service.rb
#	spec/models/project_services/hipchat_service_spec.rb
 2016-08-11 17:10:28 +02:00
Kamil Trzcinski 39203f1adf Pre-create all builds for Pipeline when a trigger is received 
This change simplifies a Pipeline processing by introducing a special new status: created.
This status is used for all builds that are created for a pipeline.
We are then processing next stages and queueing some of the builds (created -> pending) or skipping them (created -> skipped).
This makes it possible to simplify and solve a few ordering problems with how previously builds were scheduled.
This also allows us to visualise a full pipeline (with created builds).

This also removes an after_touch used for updating a pipeline state parameters.
Right now in various places we explicitly call a reload_status! on pipeline to force it to be updated and saved.
 2016-08-11 15:22:35 +02:00
Lin Jen-Shin 0b52517049 Merge remote-tracking branch 'upstream/master' into pipeline-hooks-without-slack 
* upstream/master: (233 commits)
  Fix awardable button mutuality loading spinners
  Update CHANGELOG for 8.10.5
  Clean up project destruction
  Small refactor of doc/development/README.md
  Avoid commit lookup on diff_helper
  Removed extra newline from redis_spec.rb
  Used cached value of project count to reduce DB load
  Remove duplicate link_to statements
  Mention add_column_with_default in downtime guide
  Add missing space to generic badge template
  Rename `run` task helper method to prevent conflict with StateMachine
  Add a method in Project to return a cached value of total count of projects
  spellcheck
  Add svg guidelines to ui guide
  Add Changelog entry for Grape upgrade [ci skip]
  Fix Grape tests.
  Retain old behavior
  Update Grape from 0.13.0 to 0.15.0.
  adds second batch of tests changed to active tense
  fixes part1 of files to start using active tense
  ...
 2016-08-11 13:35:35 +08:00
tiagonbotelho 1d268a89de adds second batch of tests changed to active tense 2016-08-09 15:11:39 +01:00
Lin Jen-Shin 984367f957 Move those builders to their own namespace, feedback: 
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13540099
 2016-08-04 23:44:27 +08:00
Rémy Coutable 255162e194 Little refactor, add specs, and a CHANGELOG entry 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-07-26 11:56:56 +02:00
Grzegorz Bizon dbba60029c Improve note factory 2016-05-29 15:03:00 -04:00
Grzegorz Bizon e558edd1ce Update specs to carry out changes in note factory 2016-05-29 15:03:00 -04:00
Robert Speicher 75739e54be Enable RSpec/NotToNot cop and auto-correct offenses 
Also removes the note from the development/testing.md guide
 2016-05-24 15:40:29 -04:00
Rémy Coutable ef340f6e77 Ensure URL in all Service subclasses are valid 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-25 15:28:24 -04:00
Ben Bodenmiller b68e3925ff format merge request references properly 2016-04-18 23:32:02 -07:00
Gabriel Mazetto b5291f9599 Fixed Rubocop offenses 2015-12-15 00:53:52 -02:00
Kamil Trzcinski 2988e1fbf5 Migrate CI::Services and CI::WebHooks to Services and WebHooks 2015-12-10 16:04:08 +01:00
Douwe Maan 1e8d703a85 Tag model specs 2015-12-09 10:50:51 +01:00
Guilherme Garnier 848d7b2a2b Fix rubocop warnings in spec/models 2015-10-03 01:48:54 -05: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 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 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
Stan Hu 0c9463174b Allow HipChat API version to be blank and default to v2 
Closes #772
 2015-05-26 21:57:24 -07: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
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