Commit Graph
945 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 1e3f09b21f Fix tests 2013-08-05 18:29:44 +03:00
Dmitriy Zaporozhets b6d0dd871c Merge pull request #4618 from jacargentina/notification-on-commits
Fix notifications to handle participants and mentions on commits too
2013-08-02 03:02:05 -07:00
Javier CastroandJavier Castro 669ada924b Fix test case for notification_service 2013-07-30 08:52:46 -03:00
Jakub Zienkiewicz 5e35f21605 allow all git-upload-* commands for deploy keys 2013-07-30 10:15:36 +02:00
Johannes Schleifenbaum cd19f82e51 Fix typos 2013-07-29 12:47:06 +02:00
Javier Castro cb877b7e6f Fix notifications to handle participants and mentions on commits too 2013-07-24 17:04:51 -03:00
Jacob Vosmaer aa0473d0eb Validate fingerprint uniqueness 2013-07-17 15:17:18 +02:00
Jacob Vosmaer 3ada8f45c7 Remove unnecessary user from test 2013-07-17 15:17:17 +02:00
Dmitriy Zaporozhets d2284b4112 Fix routing specs 2013-07-17 08:43:56 +03:00
Dmitriy Zaporozhets c4301ce049 update tests with new routing 2013-07-16 23:14:22 +03:00
Dmitriy Zaporozhets d207a31fc9 Fix tests and tab highlight 2013-07-16 22:25:59 +03:00
Angus MacArthur ace5c54ab9 enhance project creation apis to allow setting of public attribute
Change-Id: Ib71ce8cf993627eada63d7d596fb302ec702f36e
2013-07-12 12:10:42 -04:00
Dmitriy Zaporozhets 7ab2130cab Remove randomly failing test 2013-07-10 19:09:48 +03:00
Dmitriy Zaporozhets 6a9aed1e87 Merge branch 'master' into 6-0-dev
Conflicts:
	CHANGELOG
	VERSION
	app/views/admin/teams/projects/new.html.haml
	app/views/projects/teams/available.html.haml
	doc/install/installation.md
2013-07-10 14:03:00 +03:00
Angus MacArthur ea5a006f27 Additon of apis for fork administration.
Added ability to add and remove the forked from/to relatioinship
between existing repos.
2013-07-08 17:34:00 -04:00
Dmitriy Zaporozhets ee890f2b2a Merge branch 'master' into 6-0-dev
Conflicts:
	app/views/dashboard/projects.html.haml
	app/views/layouts/_head_panel.html.haml
	config/routes.rb
2013-07-02 11:47:09 +03:00
Jack Weeden 20b2a0b235 Ability to edit comments 2013-07-01 10:48:02 +01:00
Jack Weeden b62c9e5991 Prevent 'toplevel constant SnippetsController referenced by Project::SnippetsController' warning 2013-07-01 10:48:01 +01:00
Dmitriy Zaporozhets f438bd415f Merge branch 'master' into 6-0-dev
Conflicts:
	app/controllers/admin/teams/projects_controller.rb
	app/views/team_members/_team_member.html.haml
	app/views/teams/members/_member.html.haml
2013-06-30 11:35:40 +03:00
Dmitriy Zaporozhets 6642709faa Fix route specs 2013-06-26 20:17:07 +03:00
Dmitriy Zaporozhets 01cf474fa1 Fix spinach test 2013-06-26 19:13:29 +03:00
Dmitriy Zaporozhets 21f7c99c25 group add_users spec 2013-06-26 15:32:09 +03:00
Dmitriy Zaporozhets 743c232b16 Merge pull request #4412 from senny/fix_bad_constant_reference
fix bad constant reference in `project_routing_spec.rb`.
2013-06-25 22:57:33 -07:00
Dmitriy Zaporozhets 11c9b06f7c Fix key observer spec 2013-06-25 14:12:38 +03:00
Dmitriy Zaporozhets d41940d36e Merge branch 'master' into 6-0-dev
Conflicts:
	app/views/projects/issues/show.html.haml
	db/fixtures/development/09_issues.rb
	db/fixtures/development/10_merge_requests.rb
2013-06-24 22:13:00 +03:00
Yves Senn 3b9e3021ee fix bad constant reference in project_routing_spec.rb. 2013-06-24 18:57:49 +02:00
Dmitriy Zaporozhets 15f62fcc27 Fix profile emails with new key route 2013-06-24 19:24:27 +03:00
Dmitriy Zaporozhets 3e09e6f7b8 Move Profile related controllers under Profiles:: module 2013-06-24 18:24:14 +03:00
Javier Castro cf35d19c2e Show participants on issues, including mentions, and notify email to all participants 2013-06-24 11:55:44 -03:00
Dmitriy Zaporozhets 40bca5246b Fix routing/controller specs for refactored controllers 2013-06-23 20:25:06 +03:00
Dmitriy Zaporozhets e45179c9b4 remove useless routing tests. Added symlink creation for project with code 2013-06-22 18:57:34 +03:00
Dmitriy Zaporozhets 7b87fcbad4 Fix broken factory 2013-06-22 16:46:57 +03:00
Dmitriy Zaporozhets 0bc714c271 Remove form for adding user to several projects from admin area.
Remove unnecessary projects order on User#show
2013-06-22 13:41:08 +03:00
Dmitriy Zaporozhets 1dd6606161 Send project transfer email to all members. Added specs for project move email 2013-06-22 10:56:51 +03:00
Dmitriy Zaporozhets 8c918e583a Remove tests for missing method 2013-06-21 21:50:34 +03:00
Dmitriy Zaporozhets 6e35aceff2 Annotated 2013-06-19 15:40:33 +03:00
Dmitriy Zaporozhets 1b3b90dbfd Remove teams specs 2013-06-18 22:06:20 +03:00
Dmitriy Zaporozhets 2a63f64f24 Remove team factories and few links 2013-06-18 21:44:04 +03:00
Dmitriy Zaporozhets 439f399bec Remove all team resources except models. Move models to deprecated directory 2013-06-18 21:22:34 +03:00
Dmitriy Zaporozhets b4fe5a76a7 Fix UsersGroup specs 2013-06-18 17:47:52 +03:00
Dmitriy Zaporozhets fa877b6312 UsersGroup specs. Fixed db/schema 2013-06-18 17:47:52 +03:00
Dmitriy Zaporozhets 81697850eb create UsersGroup entity. Modify ability to check group owners instead one owner 2013-06-18 17:47:52 +03:00
Dmitriy Zaporozhets a8bcb9a5d5 Fix mailer test 2013-06-14 12:58:12 +03:00
Dmitriy Zaporozhets 6838304a85 Force user password change for users created by admin 2013-06-13 21:06:27 +03:00
Dmitriy Zaporozhets 993af5d0d2 cattr_accessor is not threadsafe! 2013-06-11 18:15:18 +03:00
Dmitriy Zaporozhets 9ae26cd128 Merge pull request #4257 from jojosch/fix/routing-commit-with-#
Routing fix Commit-List: branch with # and + in name
2013-06-11 01:03:03 -07:00
Dmitriy Zaporozhets 038d40f0f5 Solve inconsistency between network graph & stat graphs 2013-06-11 09:54:01 +03:00
Johannes Schleifenbaum c830bab79a Commit List and Tree allow also + in branch name 2013-06-09 23:47:55 +02:00
Johannes Schleifenbaum 37ff9d88ec Routing fix Commit-List: switch to branch with # in name 2013-06-09 16:28:55 +02:00
Dmitriy Zaporozhets 8df699a336 API: project events 2013-06-06 19:19:17 +03:00