gitlab-org--gitlab-foss/app/controllers
Douwe Maan 51dca778ed Merge branch 'revert_revert_issuable_lock' into 'master'
Revert the revert of Optimistic Locking

## What does this MR do?

It reverts the revert of optimistic lock https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5146 (and revert MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5245)

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19871

Actually the code is already reviewed, except:
* Monkey patch `config/initializers/ar_monkey_patch.rb`
* We removed default values from migration `db/migrate/20160707104333_add_lock_to_issuables.rb`

See merge request !5623
2016-08-23 00:33:58 +00:00
..
admin Support integration with Koding (online IDE) 2016-08-19 12:10:58 -07:00
ci Enable Style/SpaceAfterColon Rubocop cops 2016-06-29 15:16:04 +02:00
concerns Handle legacy sort order values 2016-08-18 23:26:07 +01:00
dashboard Merge branch 'issue_18135' into 'master' 2016-08-19 23:06:30 +00:00
explore Replace reject_blocked with reject_blocked! in callbacks. 2016-07-27 13:56:30 -06:00
groups Add expiration date to group memberships 2016-08-18 21:09:17 +01:00
import Fix permissions check in controller, added relevant spec and updated docs 2016-08-11 16:59:37 +02:00
oauth Fix endless redirections when accessing user OAuth applications when they are disabled 2016-06-08 05:52:04 -07:00
profiles Address review comments from @smcgivern. 2016-08-18 22:12:02 +05:30
projects Revert the revert of Optimistic Locking 2016-08-22 18:43:13 +03:00
sherlock
abuse_reports_controller.rb
application_controller.rb State specific default sort order for issuables 2016-08-01 11:28:56 +02:00
autocomplete_controller.rb Move to project dropdown with infinite scroll for better performance 2016-08-17 07:33:51 +02:00
confirmations_controller.rb Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
dashboard_controller.rb Restrict starred projects to viewable ones 2016-05-10 18:13:52 +01:00
emojis_controller.rb
groups_controller.rb Fix bug where destroying a namespace would not always destroy projects 2016-08-11 15:36:35 -07:00
health_check_controller.rb Support token header for health check token, and general cleanup of the health_check feature. 2016-05-11 17:27:08 -07:00
help_controller.rb Replace reject_blocked with reject_blocked! in callbacks. 2016-07-27 13:56:30 -06:00
invites_controller.rb Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
jwt_controller.rb Improve Gitlab::Auth method names 2016-06-10 14:51:16 +02:00
koding_controller.rb Split Koding admin/user docs 2016-08-22 17:09:15 +03:00
namespaces_controller.rb
notification_settings_controller.rb merge master into issue_3359_3 2016-06-29 11:04:18 -03:00
omniauth_callbacks_controller.rb Added tests for 2FA check on OAuth request 2016-07-04 11:00:34 -05:00
passwords_controller.rb
profiles_controller.rb
projects_controller.rb Fix specs and implement fixes based on failing specs 2016-08-17 17:54:24 -05:00
registrations_controller.rb Enable Style/SpaceAroundEqualsInParameterDefault cop 2016-08-06 04:03:01 +02:00
root_controller.rb
search_controller.rb Replace reject_blocked with reject_blocked! in callbacks. 2016-07-27 13:56:30 -06:00
sent_notifications_controller.rb
sessions_controller.rb Remove provider path, replace with dynamic path. 2016-08-03 11:50:38 -06:00
snippets_controller.rb user routings refactor 2016-05-08 15:27:33 +07:00
uploads_controller.rb
users_controller.rb Group the contributing calendar by day 2016-05-16 12:22:17 +01:00