James Lopez 67f59ebd50 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-validator ...

# Conflicts:
#	spec/models/project_spec.rb

2016-06-30 14:37:48 +02:00

..

config

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

controllers

Merge branch 'master' into issue_3359_3

2016-06-29 11:32:38 -03:00

factories

Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-project

2016-06-20 14:04:14 +00:00

features

Enable Style/SpaceAfterComma Rubocop cop

2016-06-29 15:23:44 +02:00

finders

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

fixtures

optimize png images losslessly using zopflipng

2016-06-29 19:22:15 +08:00

helpers

Refactor repository paths handling to allow multiple git mount points

2016-06-29 22:30:31 -04:00

initializers

Refactor repository paths handling to allow multiple git mount points

2016-06-29 22:30:31 -04:00

javascripts

Merge branch 'emoji-menu-stick-search' into 'master'

2016-06-27 18:03:08 +00:00

lib

Create (if necessary) and link the gitlab-shell secret file on the rake install task

2016-06-29 22:30:33 -04:00

mailers

Fallback to group's owners/masters when a project has none

2016-06-20 12:10:37 +02:00

models

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-validator

2016-06-30 14:37:48 +02:00

requests

Add Application Setting to configure default Repository Path for new projects

2016-06-29 23:35:00 -04:00

routing

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

services

Refactor repository paths handling to allow multiple git mount points

2016-06-29 22:30:31 -04:00

support

Refactor repository paths handling to allow multiple git mount points

2016-06-29 22:30:31 -04:00

tasks/gitlab

Refactor repository paths handling to allow multiple git mount points

2016-06-29 22:30:31 -04:00

views

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

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

workers

Refactor repository paths handling to allow multiple git mount points

2016-06-29 22:30:31 -04:00

factories_spec.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02: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

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00