James Lopez 3929972d90 Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental ... # Conflicts: # app/controllers/import/gitlab_project_controller.rb		2016-05-03 13:14:31 +02:00
..
api	Merge remote-tracking branch 'dev/master' into 'master'	2016-05-02 19:58:54 -04:00
assets	…
backup	…
banzai	Merge branch 'dev_issue_15331' into 'master'	2016-04-21 20:49:41 +00:00
ci	Fix some typos	2016-04-22 22:08:38 +02:00
gitlab	Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental	2016-05-03 13:14:31 +02:00
omni_auth	…
rouge/formatters	…
support	Replace gitlab-workhorse with GitLab Workhorse where appropriate	2016-04-28 17:36:50 +03:00
tasks	…
award_emoji.rb	Removed usage of normilizeEmojiName method	2016-04-22 21:53:26 +01:00
banzai.rb	…
disable_email_interceptor.rb	…
event_filter.rb	…
extracts_path.rb	…
file_size_validator.rb	Get rid of more requires, which causes warnings when code is reloaded	2016-04-19 11:48:10 +02:00
file_streamer.rb	…
gitlab.rb	…
gt_one_coercion.rb	…
repository_cache.rb	…
static_model.rb	…
unfold_form.rb	…
uploaded_file.rb	…
version_check.rb	…