James Lopez 3e99123095 Fix merge conflicts - squashed commit ...

# Conflicts:
#	app/models/project.rb

2016-06-03 10:57:49 +02:00

..

authenticates_with_two_factor.rb

Refactor SessionsController to use a controller concern

2015-05-14 14:24:05 -04:00

continue_params.rb

Fix denting and spec

2016-03-13 13:44:31 +01:00

creates_commit.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

filter_projects.rb

Use compact syntax

2016-04-21 16:02:00 -05:00

global_milestones.rb

Use respond_to instead of a conditional to paginate milestones

2016-03-23 12:02:15 +01:00

issuable_actions.rb

Minor improvements on IssuableActions

2016-03-21 16:59:35 +01:00

issues_action.rb

Use the configured Kaminari "per page" default

2016-03-19 17:37:54 -04:00

merge_requests_action.rb

Use the configured Kaminari "per page" default

2016-03-19 17:37:54 -04:00

toggle_subscription_action.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00