17944 Commits (5220a0087e5097999ead31e453eaf9a1bc32cae8)

 

All Branches   

Search

Author	SHA1	Message	Date
Alex Coles	5220a0087e	Fix for rake ci:travis:prepare task (2nd try) ... See 8633e82b. Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	f75392f8be	Fully qualify ::Type class constant ... See 0b941955. Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	e8c1d940e0	[hack] Alias Journal constants at top-level ... This is a quick work-around for apparently broken class reification in the journaling system. Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	0f553a93cd	Change journals schema to allow nullable user_id ... This is a quick fix for the following test failures (not seen in Rails 3): PG::NotNullViolation: ERROR: null value in column "user_id" violates not-null constraint Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	c739e5922d	Fix external stylesheet file name ... This file should have been renamed in b6d5c298. Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	f35e741387	Merge branch 'dev' into feature/rails4 ... Signed-off-by: Alex Coles <alex@alexbcoles.com> Conflicts: app/controllers/api/v2/authentication_controller.rb app/controllers/api/v2/planning_element_journals_controller.rb app/controllers/api/v2/planning_element_type_colors_controller.rb app/controllers/api/v2/project_associations_controller.rb app/controllers/api/v2/project_types_controller.rb app/controllers/api/v2/projects_controller.rb app/controllers/api/v2/reported_project_statuses_controller.rb app/controllers/api/v2/reportings_controller.rb app/controllers/api/v2/timelines_controller.rb app/controllers/api/v2/users_controller.rb app/controllers/copy_projects_controller.rb app/controllers/custom_fields_controller.rb app/controllers/projects_controller.rb app/controllers/time_entries/reports_controller.rb app/controllers/types_controller.rb app/controllers/versions_controller.rb app/controllers/workflows_controller.rb app/helpers/types_helper.rb app/models/project.rb app/models/query.rb app/models/timeline.rb app/models/type.rb app/models/work_package.rb app/models/workflow.rb app/services/planning_comparison_service.rb config/initializers/10-patches.rb config/routes.rb db/seeds/production.rb features/step_definitions/general_steps.rb features/step_definitions/issue_steps.rb features/step_definitions/timelines_given_steps.rb features/step_definitions/type_steps.rb features/step_definitions/work_package_steps.rb lib/redmine/default_data/loader.rb lib/tasks/ci.rake lib/tasks/documentation.rake spec/controllers/api/v2/planning_elements_controller_spec.rb spec/factories/type_factory.rb spec/views/api/v2/custom_fields/index_api_rabl_spec.rb spec/views/api/v2/planning_elements/show_api_json_spec.rb spec/views/api/v2/projects/show_api_json_spec.rb	10 years ago
Markus Kahl	43d388f01d	Merge branch 'feature/consistent-ruby-style' into dev	10 years ago
Alex Coles	992e98cdab	Merge branch 'dev' into feature/consistent-ruby-style ... Signed-off-by: Alex Coles <alex@alexbcoles.com> Conflicts: spec/controllers/work_packages_controller_spec.rb	10 years ago
ulferts	7e0180ba43	Merge pull request #2099 from opf/feature/16975_grouped_attributes_on_overview_tab ... 16975 grouped attributes on overview tab	10 years ago
Alex Coles	0532e87a40	Minor spacing fixes in AccountController ... [ci skip] Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	96e187b888	Merge pull request #2142 from marutosi/finn/rails4.0.11 ... update Rails 4.0.11	10 years ago
Toshi MARUYAMA	12b7de1e55	update Rails 4.0.11	10 years ago
Martin Linkhorst	7306c441af	Merge pull request #2129 from opf/feature/disable_setting_password_15247 ... disable password choice config	10 years ago
Alex Coles	5158e698bf	Fix syntax (w/Rubocop) in db migrations, seeds ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	a747820eee	Use 1.9+ Hash syntax in db seeds, migrations ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	77a7d6a40e	Prefer #map over #collect in cuke steps ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	f95c9d15f3	Prefer #map over #collect in specs ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	8b7bcf4b61	Prefer #map over #collect in Rails config files ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	5b066ba8bb	Prefer #map over #collect in migrations ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	ca2a1a5afc	Prefer #map over #collect in lib code ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	3637aa7e9b	Prefer #map over #collect in services ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	1d1ec0ef37	Prefer #map over #collect in (Rails) models ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	b257d7bc61	Prefer #map over #collect in (Rails) helpers ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	8a28b1a730	Prefer #map over #collect in (Rails) controllers ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	25ede2df34	Re-run Rubocup auto-correct on pagination_spec_helper.rb ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
MayaBerd	e7db3798c8	Update README.md ... Updating feature and help links	10 years ago
Alex Coles	86f319a927	Fix bad rubocop auto-correct in pagination_spec_helper.rb ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	5afc11f19e	Fix syntax (w/Rubocop) in specs ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	d1a2ae7805	Re-run Rubocup auto-correct on redmine.rb ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	2f75bf4aff	Fix an indent in acts_as_customizable.rb ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	79f0cb88ea	Fix syntax (w/Rubocop) in Rails config files ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	f10023674e	Use 1.9+ Hash syntax in Rails config files ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	86677983a8	Fix syntax (w/Rubocop) in Rails routes ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	be3c0c7871	Use 1.9+ Hash syntax in Rails routes ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	194d0e381c	Fix bad rubocop auto-correct in extended_http.rb ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	ae1a92dac8	Fix whitespace in redmine.rb ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	5264df3c48	Fix syntax (w/Rubocop) in cuke steps, support ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	dabd7ba88a	Fix bad rubocop auto-correct affecting procs ... Switch to stabby lambdas, where consistent. Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	f98fdd7a86	Fix bad rubocop auto-correct in redmine.rb ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	ee1678c030	Fix bad rubocop auto-correct in redcloth.rb ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	548f68b693	Use 1.9+ Hash syntax in cuke steps, support files ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	03978767be	Use 1.9+ Hash syntax in specs ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	45297523c2	Fix syntax (w/Rubocop) in lib code ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	e7400af52a	Use 1.9+ Hash syntax in lib code ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	b8b26cfcf0	Fix syntax (w/Rubocop) in tasks ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	4c6623e0ae	Fix syntax (w/Rubocop) in policies ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	10f578d00b	Fix syntax (w/Rubocop) in services ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	a2b4e97eea	Use 1.9+ Hash syntax in services ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	05b01a094c	Fix syntax (w/Rubocop) in mailers ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	32d7aebaff	Use 1.9+ Hash syntax in mailers ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago