Commit Graph
395 Commits
Author SHA1 Message Date
Marin Jankovski 9f33898f7a All services can have templates. 2015-02-12 09:19:55 -08:00
Marin Jankovski 6b4ddf2cc1 Add admin services templates. 2015-02-11 17:55:33 -08:00
Marin Jankovski 00c7d533a0 Default issue tracker fix for creating default issue service. 2015-02-09 14:33:47 -08:00
Dmitriy Zaporozhets 0a34f2dcb5 Merge pull request #8580 from j0k3r/asana
Add Asana service
2015-02-08 01:12:41 -08:00
Dmitriy Zaporozhets c5be267e40 Refactor issuable sorting a bit 2015-02-05 20:21:21 -08:00
Dmitriy Zaporozhets bbca6a0abd Refactor sorting in project 2015-02-05 19:15:05 -08:00
Dmitriy Zaporozhets 62ed1c537e Explicitly define ordering in models using default_scope 2015-02-05 14:20:55 -08:00
Dmitriy Zaporozhets 0e2fcb68d7 Disable project path blacklist
Because since project always belongs to namespace it dont need such
strict restrictions any more
2015-02-04 15:23:38 -08:00
Dmitriy Zaporozhets cc39bca3fa Rubocop: Style/AlignHash enabled 2015-02-02 21:15:44 -08:00
Dmitriy Zaporozhets 4f1d1fc51b Convert hashes to ruby 1.9 style 2015-02-02 19:30:09 -08:00
Dmitriy Zaporozhets c0acb28c4e Annotate models 2015-02-02 10:24:40 -08:00
Jeremy b4d9ceb26f Add Asana service
Also add ability to render "service.help" in markdown
2015-02-02 09:59:42 +01:00
Marin Jankovski 68f7302474 Add a scope for visible services, code styling changes for easier readability. 2015-01-28 14:25:55 -08:00
Marin Jankovski 537cd66d7e Add gitlab internal issue tracker service. 2015-01-28 09:28:17 -08:00
Marin Jankovski 0da59cb55b Merge branch 'master' into move_external_issue_tracker_away_from_yml_config
Conflicts:
	app/models/project.rb
	spec/models/project_spec.rb
2015-01-26 22:12:53 -08:00
Marin Jankovski 33913f9b8f Make issue tracker service fields required. 2015-01-26 22:08:27 -08:00
Marin Jankovski 65e700472b Update the issue tracker attribute on issue tracker change. 2015-01-26 11:39:32 -08:00
Hannes Rosenögger 70c44a0da2 Fix tests, merge conflicts, some minor issues and make the project avatar feature mergable 2015-01-24 18:51:16 +01:00
Steven ThonusandHannes Rosenögger 42bac7f9f2 adding avatar to project settings page added avatar removal show project avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix 2015-01-24 18:51:16 +01:00
Marin Jankovski c70dcd2907 Merge branch 'master' into move_external_issue_tracker_away_from_yml_config 2015-01-23 12:38:46 -08:00
Marin Jankovski a720dde67c Remove configuration option from project settings page for external issue trackers. 2015-01-23 11:55:41 -08:00
Marin Jankovski 7c701acf57 Do a check which issue tracker is used inside the project. 2015-01-23 11:01:09 -08:00
Marin Jankovski 103a1bb06d Use service settings instead of config file settings to present issues. 2015-01-23 10:28:38 -08:00
Dmitriy Zaporozhets 98ee4a1fa7 Annotate models 2015-01-22 09:40:03 -08:00
Dmitriy Zaporozhets 2b10520b30 Merge pull request #7999 from cirosantilli/append-inplace
Append in place for strings and arrays [failure unrelated]
2015-01-21 23:07:15 -08:00
Marin Jankovski e9d6d1e51a Custom issue tracker service. 2015-01-20 16:55:35 -08:00
Marin Jankovski 62c00661c4 Allow creation of the jira and redmine services. 2015-01-20 16:47:29 -08:00
Dmitriy Zaporozhets 77adf81e87 Fix tests 2015-01-18 19:13:41 -08:00
Hannes Rosenögger 1e9e3fc73d Make the project search case insensitive 2015-01-18 12:28:29 +01:00
Ciro Santilli 33c9f05c6b Append in place for strings and arrays 2015-01-01 21:12:00 +01: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
Marin Jankovski 61b4214e94 Allow regular code push for developers if the protected branch allows it. 2014-12-26 09:35:49 +01:00
Jason Lippert 1fa19401e9 Teamcity interaction using 8.1 rest api 2014-12-23 12:38:25 -05: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 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
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
Drew Blessing 776bca07cd Add Atlassian Bamboo service 2014-10-28 05:20:36 -05:00
Dmitriy Zaporozhets 5ed7c20150 Prevent 500 error when filter projects with push in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-20 17:22:39 +03:00
Keith Pitt 4c7da578f2 Merge branch 'master' into buildbox-service
Conflicts:
	app/models/project.rb
2014-10-08 16:33:53 +08:00
Keith Pitt 76594d474c Added support for Buildbox 2014-10-08 16:30:04 +08:00
Ciro Santilli d927499894 Remove unused Project#code function. 2014-10-04 10:54:00 +02:00
Sullivan SENECHAL d1fa3b336d Add Pushover service integration
That introduce select field type for services options.
2014-10-03 13:54:37 +02:00
Dmitriy Zaporozhets 03b44916ba Merge pull request #7754 from Bugagazavr/hooks
More information in merge request hook
2014-10-03 13:37:19 +03:00
Ciro Santilli 2e9f5de868 Add parenthesis to function def with arguments. 2014-10-03 09:18:46 +02:00
Kirill Zaitsev 1c9d2e39c1 Hook attributes 2014-10-02 12:58:02 +04:00
Dmitriy Zaporozhets 16d530b7b0 Sort projects in search autocomplete by amount of stars. Most popular go first
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-25 19:41:49 +03:00