Commit Graph

88 Commits

Author SHA1 Message Date
Vokhmin Alexey V 621b74fef2 #472: Update activeadmin gem, some fixes 2015-06-01 22:57:00 +03:00
Vokhmin Alexey V 0a6c487995 #472: Updated the Projects::IssuesController and Api::V1::IssuesController 2015-06-01 22:56:57 +03:00
Vokhmin Alexey V 4dfdd3b10d #472: Remove protected_attributes gem, use strong_parameters for Api::V1::AdvisoriesController 2015-06-01 22:56:56 +03:00
Alexander Machehin d7727fe6a5 improve activity feed 2015-05-05 17:25:29 +05:00
Vokhmin Alexey V 6a7d6cb982 #465: updated views 2015-04-07 23:05:12 +03:00
Vokhmin Alexey V 4fec2213c8 #465: added pundit gem, wip... 2015-04-07 23:01:25 +03:00
Alexander Machehin cad69483d0 [#369] show issue page: in progress 2014-11-28 23:36:24 +05:00
Alexander Machehin d304c27698 [#247] add string/text maximum length validations 2014-11-28 21:19:06 +05:00
Alexander Machehin 5a2c4896ad [#369] new issue page: labels; small fixes 2014-11-27 23:55:03 +05:00
Alexander Machehin 0124b9bb10 [#247] update validations 2014-11-25 21:42:02 +05:00
Vokhmin Alexey V 90f6bca72d Merge branch 'master' into 369-bootstrap
Conflicts:
	Gemfile.lock
	app/models/concerns/feed/git.rb
	app/models/issue.rb
2014-11-08 01:09:32 +03:00
Vokhmin Alexey V 1184659c19 #435: rollback some changes 2014-10-22 23:15:08 +04:00
Vokhmin Alexey V 6b6e73b925 #435: added reopen status for issues 2014-10-22 23:10:52 +04:00
Vokhmin Alexey V acd57203c7 #435: display statistics by issues and pull-requests 2014-10-20 23:18:34 +04:00
Vokhmin Alexey V b2fa15cf47 rollback changes 2014-10-18 00:15:52 +04:00
Vokhmin Alexey V fdf5a05cbd Fixed: RecordNotUnique in Issue#set_serial_id 2014-10-18 00:05:08 +04:00
Alexander Machehin 2ef938a389 [#369] refactoring; add pagination 2014-05-06 15:51:04 +06:00
Alexander Machehin 46c3b8cabe [#345] remove deprecation warning with eager loading table that are referenced in a string SQL snippet 2014-04-29 13:18:12 +06:00
Vokhmin Alexey V be6bd727a6 Fixed: Assign container 2014-04-10 01:20:39 +04:00
Alexander Machehin eb8326bf30 [#345] fix SystemStackError: stack level too deep 2014-03-21 15:38:40 +06:00
Alexander Machehin f99211da9a [#345] remove deprecations with association conditions 2014-03-11 18:40:02 +06:00
Alexander Machehin ef63ddcaac [#345] fix mistypes 2014-03-11 17:47:03 +06:00
Alexander Machehin a5f56bb835 [#345] remove observers; use new labmda syntax 2014-03-11 14:28:17 +06:00
Alexander Machehin 0e39aae1bf [#343] use new ruby hash syntax 2014-01-21 10:51:49 +06:00
Alexander Machehin 0cb585ef71 Merge branch 'master' into 29-migrate-to-ruby-2.1
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/activity_feeds_controller.rb
	app/models/activity_feed_observer.rb
	config/environments/development.rb
	config/initializers/a_app_config.rb
	config/initializers/airbrake.rb
	lib/modules/models/git.rb
	spec/controllers/activity_feeds_controller_spec.rb
	spec/helpers/activity_feeds_helper_spec.rb
2014-01-10 08:31:31 +06:00
Vokhmin Alexey V eeed2a49b7 #200: moved observer of Issue to lib 2013-06-27 17:06:42 +04:00
Alexander Machehin 94d7865f14 [#19] remove unneeded code 2013-04-10 02:21:02 +06:00
Vokhmin Alexey V 9e7eb7af94 #29: merge master into branch 2013-04-03 16:10:22 +04:00
Alexander Machehin 1812857d1e [#19] fix issue & pull request links' 2013-03-30 00:06:48 +06:00
Vokhmin Alexey V f8fb48a85b #26: remove unnecessary stiles, JS, update PullRequests controller 2013-03-19 16:11:02 +04:00
Vokhmin Alexey V e055d0080b #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
Vokhmin Alexey V b8b238e876 #977: add "table_name" into all scopes 2013-02-28 19:27:50 +04:00
Alexander Machehin 519886fecd [refs #777] fix for group owned project 2012-12-14 00:18:22 +06:00
Vokhmin Alexey V 5f0e683711 #90: moved code 2012-09-26 19:41:00 +04:00
Vokhmin Alexey V efe8b1ffdb #90: small refactoring 2012-09-26 18:20:46 +04:00
Vokhmin Alexey V 07b27b934f #90: updated #index page for pull-requests 2012-09-26 15:46:23 +04:00
Alexander Machehin a7f926bbdf [refs #90] forgot dependent destroy 2012-08-08 00:07:26 +06:00
Alexander Machehin ae4c8a6a5e [refs #90] fixed lost data after merge 2012-06-28 16:44:55 +06:00
Alexander Machehin 682f33a9bf [refs #90] view merged status 2012-06-13 23:52:11 +06:00
Alexander Machehin 4b8def5bd0 [refs #90] add pulls to tracker 2012-06-04 23:00:19 +06:00
Alexander Machehin 60aba754ae [refs #90] pull title/body update 2012-05-31 22:57:52 +06:00
Alexander Machehin 11c67fb07d Revert "[refs #90] issue status -> state" & changed state -> status
This reverts commit 7470ee76e4783a0fbbd98607406d7b770a2980d1.

Conflicts:

	app/controllers/projects/issues_controller.rb
	db/migrate/20120412173938_create_pull_requests.rb
	db/schema.rb
2012-05-29 16:50:25 +06:00
Alexander Machehin 36b4ce2d99 Merge branch 'master' into 90-pull
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/projects/issues_controller.rb
	app/models/project.rb
	config/locales/menu.en.yml
	config/routes.rb
	db/schema.rb
2012-05-03 23:19:43 +06:00
Alexander Machehin 9e5db741d3 Merge branch 'master' into 90-pull
Conflicts:
	app/models/project.rb
	db/schema.rb
2012-05-02 23:08:24 +06:00
Pavel Chipiga b957600eda Merge branch 'master' into 263-refactoring
Conflicts:
	app/models/project.rb
	app/views/projects/_repo_block.html.haml
	db/schema.rb
	spec/controllers/issues_controller_spec.rb
	spec/controllers/projects_controller_spec.rb
2012-05-01 15:54:13 +03:00
George Vinogradov de093d7065 [issue #425] Changed object to actor in Relation and to eventable in
EventLog
2012-04-26 05:38:33 +04:00
Alexander Machehin 628fed40ea [refs #90] issue status -> state 2012-04-23 23:34:11 +06:00
Alexander Machehin 58776a6e9e [refs #90] fixing pull methods 2012-04-23 23:34:10 +06:00
Pavel Chipiga 701da7e1f9 Disable bluepill. Update gems. Github project style URLs. Fix project load. Fix abilities. Fic urls generation. Fix some specs. Refs #263 2012-04-19 22:45:50 +03:00
Alexander Machehin 2dedbd92d0 [refs #194] assignee & user 2012-04-14 01:44:04 +06:00