Robert Speicher dc2d0051dc Merge branch 'fix/build-retry-button-in-view' into 'master' ...

Do not show build retry link when build is active

Closes #19244

See merge request !4967

2016-06-30 18:23:34 +00:00

..

config

Revert "Fix merge conflicts - squashed commit"

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

controllers

Import from Github using Personal Access Tokens.

2016-06-30 18:48:17 +02:00

factories

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

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

features

Merge branch 'issue-18886' into 'master'

2016-06-30 12:56:59 +00: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

Merge branch 'rack-request-trusted-proxies' into 'master'

2016-06-30 15:37:16 +00:00

javascripts

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

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

lib

Merge branch 'fix-external-issue-rendering' into 'master'

2016-06-30 17:46:20 +00:00

mailers

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

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

models

Merge branch 'fix/build-retry-button-in-view' into 'master'

2016-06-30 18:23:34 +00: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

Merge branch 'fix-external-issue-rendering' into 'master'

2016-06-30 17:46:20 +00:00

support

Remove hardcoded gitlab-shell version in test env now that the required tag is published

2016-06-30 11:52:38 -04:00

tasks/gitlab

Refactor repository paths handling to allow multiple git mount points

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

views

Do not show build retry link when build is active

2016-06-30 11:06:19 +02: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