Douwe MaanandRobert Speicher 78328eee43 Merge branch 'issuable-todo-improvements' ...

# Conflicts:
#	app/controllers/projects/todos_controller.rb

2016-06-17 22:17:06 -04:00

..

config

Enable the Rubocop DeprecatedClassMethods cop

2016-05-08 15:33:34 -06:00

controllers

Merge branch 'issuable-todo-improvements'

2016-06-17 22:17:06 -04:00

factories

Merge branch '2979-personal-access-tokens' into 'master'

2016-06-17 14:18:40 -04:00

features

Merge branch 'issuable-todo-improvements'

2016-06-17 22:17:06 -04:00

finders

Fix notes on confidential issues through JSON to users without access

2016-06-14 17:51:17 -03:00

fixtures

Add support for Docker Registry manifest v1

2016-06-15 12:53:23 +02:00

helpers

Merge branch 'fix-18717' into 'master'

2016-06-17 22:15:54 -04:00

initializers

Add tests for setting trusted_proxies

2016-05-04 15:49:39 -07:00

javascripts

Merge branch 'category-search-dropdown' into 'master'

2016-06-15 20:56:15 -04:00

lib

Merge branch 'track-total-method-call-time' into 'master'

2016-06-17 14:23:05 -04:00

mailers

Merge branch 'rs-devise-emails' into 'master'

2016-06-17 14:19:29 -04:00

models

Merge branch 'issue_12758' into 'master'

2016-06-17 22:09:34 -04:00

requests

Merge branch 'api-endpoints-award-emoji' into 'master'

2016-06-17 22:09:54 -04:00

routing

Merge branch 'health-check-route'

2016-05-12 16:39:03 -05:00

services

Merge branch 'issue_12758' into 'master'

2016-06-17 22:09:34 -04:00

support

Merge branch 'feature/project-export' into 'master'

2016-06-17 14:18:15 -04:00

tasks/gitlab

Switch the gitlab:db:configure task to use tables.any? instead of looking specifically for the schema_migrations table

2016-05-25 10:47:09 -07:00

views

Move "I should see Crowd login form" feature to a view spec

2016-02-24 17:38:13 -05:00

workers

Merge branch 'repo-check-require-push-events' into 'master'

2016-06-17 16:03:28 -04:00

factories_spec.rb

Enable RSpec/NotToNot cop and auto-correct offenses

2016-05-24 15:40:29 -04:00

rails_helper.rb

Started on the actual rspec 3 upgrade

2015-06-22 12:12:49 +02:00

spec_helper.rb

Enable Knapsack only in CI environment

2016-06-08 11:43:13 +02:00

teaspoon_env.rb

Add leading comment space cop

2016-05-31 19:33:46 -03:00