Kamil Trzcinski 0b4981e771 Merge remote-tracking branch 'origin/master' into knapsack ...

# Conflicts:
#	.gitlab-ci.yml

2016-06-07 10:29:43 +02:00

..

config

Enable the Rubocop DeprecatedClassMethods cop

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

controllers

Merge branch 'notes-are-awardables' into 'master'

2016-06-06 16:48:35 +00:00

factories

Add a U2fRegistrations table/model.

2016-06-06 12:50:31 +05:30

features

Merge branch 'jquery2' into 'master'

2016-06-06 14:25:23 +00:00

finders

Make upcoming milestone work across projects

2016-05-16 10:25:24 +01:00

fixtures

Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'

2016-05-20 16:23:04 -05:00

helpers

Merge branch 'master' into awardables

2016-05-30 18:54:08 +02:00

initializers

Add tests for setting trusted_proxies

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

javascripts

Merge branch 'notes-are-awardables' into 'master'

2016-06-06 16:48:35 +00:00

lib

Merge branch 'issue_3359' into 'master'

2016-06-06 19:14:01 +00:00

mailers

Update tests for the current_application_settings request store changes

2016-05-27 19:05:52 -07:00

models

Merge branch 'notes-are-awardables' into 'master'

2016-06-06 16:48:35 +00:00

requests

Merge branch 'master' into awardables

2016-06-03 15:20:11 +02:00

routing

Merge branch 'health-check-route'

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

services

Fix spec

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

support

Add feature specs covering U2F registration and authentication.

2016-06-06 12:50:31 +05:30

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

Enable RSpec/NotToNot cop and auto-correct offenses

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

factories_spec.rb

Enable RSpec/NotToNot cop and auto-correct offenses

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

knapsack_merger.rb

Try to use knapsack

2016-06-03 17:08:17 +02:00

rails_helper.rb

Started on the actual rspec 3 upgrade

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

spec_helper.rb

Use knapsack everywhere

2016-06-03 17:39:53 +02:00

teaspoon_env.rb

Add leading comment space cop

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