Fatih Acet fe125f8dc9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search-dropdown ...

# Conflicts:
#	app/assets/javascripts/lib/common_utils.js.coffee

2016-06-16 02:04:09 +03:00

..

config

Enable the Rubocop DeprecatedClassMethods cop

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

controllers

Merge branch 'stanhu/gitlab-ce-fix-error-500-false-binary-negative'

2016-06-15 15:56:02 +02:00

factories

Improve validations

2016-06-15 12:03:49 +02:00

features

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search-dropdown

2016-06-16 02:04:09 +03: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

UI and copywriting improvements

2016-06-14 13:18:14 +02:00

initializers

Add tests for setting trusted_proxies

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

javascripts

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search-dropdown

2016-06-16 02:04:09 +03:00

lib

Merge branch 'docker-registry-manifest-v1' into 'master'

2016-06-15 15:07:39 +00:00

mailers

UI and copywriting improvements

2016-06-14 13:18:14 +02:00

models

Merge branch 'environments-and-deployments' into 'master'

2016-06-15 13:48:09 +00:00

requests

Merge branch '18451-track-new-redis-connections' into 'master'

2016-06-15 09:56:42 +00:00

routing

Merge branch 'health-check-route'

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

services

Merge branch 'fair-usage-of-shared-runners' into 'master'

2016-06-15 19:00:32 +00:00

support

Fix Error 500 when viewing a blob with binary characters after the 1024-byte mark

2016-06-12 07:36:25 -07: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 'dont-drop-stuck-builds' into 'master'

2016-06-15 02:54:19 +00: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