Douwe Maan 6c94a44295 Merge branch 'master' into mr-builds ...

# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/views/projects/merge_requests/widget/_heading.html.haml

2015-12-08 22:26:29 +01:00

..

api

Merge branch 'master' into ui/dashboard-new-issue

2015-12-08 15:22:04 +01:00

assets

move assets from lib directory to vendor

2012-05-29 17:56:48 +05:00

backup

Backup LFS objects same as any upload.

2015-11-19 10:43:45 +01:00

ci

Expose artifacts path

2015-11-23 13:05:22 +01:00

gitlab

Merge branch 'master' into mr-builds

2015-12-08 22:26:29 +01:00

omni_auth

Fix signin with OmniAuth providers

2015-12-08 14:58:15 +01:00

rouge/formatters

Fix diff syntax highlighting

2015-08-10 08:07:26 -07:00

support

Merge pull request #9892 from stetskevych/fix_nginx_ssl_config

2015-12-07 14:03:33 +01:00

tasks

Update project repository size and commit count during import:repos task

2015-12-08 09:08:22 -08:00

award_emoji.rb

satisfy rubocop

2015-11-19 01:31:15 +02:00

disable_email_interceptor.rb

Add email interceptor to prevent mail sending if email sending is disabled.

2014-10-27 13:05:50 +01:00

event_filter.rb

Fix rubocop warnings in lib

2015-10-03 01:29:58 -05:00

extracts_path.rb

Only render 404 page from /public

2015-10-13 20:12:34 +03:00

file_size_validator.rb

Support configurable attachment size via Application Settings

2015-04-02 00:04:08 -07:00

file_streamer.rb

Implement Build Artifacts

2015-11-10 12:51:50 +01:00

gitlab.rb

Revert "Merge branch 'revert-satellites' into 'master' "

2015-08-11 14:33:31 +02:00

gt_one_coercion.rb

diff unfold

2014-08-14 15:48:14 +04:00

repository_cache.rb

Store commit count in project table

2015-07-17 15:22:56 +02:00

static_model.rb

Fixed styles, ProjectHook specs etc

2013-01-05 00:35:38 +02:00

unfold_form.rb

Gitlab Issue 707: Indent unfolded code 1 character

2015-07-22 09:58:17 -04:00

uploaded_file.rb

Implement Build Artifacts

2015-11-10 12:51:50 +01:00

version_check.rb

Replace host with real one

2015-05-11 18:21:45 +03:00