Douwe Maan 0283fff591 Merge branch 'master' into extend_markdown_upload ...

# Conflicts:
#	app/views/projects/issues/_form.html.haml
#	app/views/projects/merge_requests/_form.html.haml
#	app/views/projects/merge_requests/_new_submit.html.haml
#	app/views/projects/milestones/_form.html.haml
#	app/views/projects/notes/_form.html.haml
#	app/views/projects/wikis/_form.html.haml
#	config/routes.rb
#	spec/controllers/projects_controller_spec.rb

2015-02-24 14:54:39 +01:00

..

admin

Merge branch 'master' into rails-4.1.9

2015-02-19 20:53:05 -07:00

dashboard

Fix dashboard for projects > 30

2015-02-22 22:06:43 -08:00

devise

Update bootstrap-sass gem

2015-02-19 15:02:49 -08:00

doorkeeper

Rework oauth2 feature

2014-12-25 18:35:04 +02:00

errors

Improve error page layout

2014-06-24 15:57:38 +03:00

events

Merge branch 'master' into extend_markdown_upload

2015-02-24 14:54:39 +01:00

explore

Merge branch 'master' into rails-4.1.9

2015-02-19 20:53:05 -07:00

groups

Merge branch 'master' into rails-4.1.9

2015-02-22 07:55:30 -07:00

help

Subscription should be a link on its own.

2015-02-15 21:51:23 -08:00

import

Add gitorious.org importer

2015-02-20 17:42:58 +00:00

kaminari/gitlab

Migrate forms and inputs pt1

2013-12-31 02:50:36 +02:00

layouts

Merge branch 'profile_tooltip_addition' into 'master'

2015-02-24 08:06:22 +00:00

notify

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

profiles

Avoid duplicate application rows

2015-02-14 19:46:39 -07:00

projects

Merge branch 'master' into extend_markdown_upload

2015-02-24 14:54:39 +01:00

search

Update path helper references

2015-02-19 21:25:28 -07:00

shared

LDAP users don't need to set a password to Git over HTTP.

2015-02-23 20:04:18 -08:00

snippets

Update path helper references

2015-02-19 21:25:28 -07:00

users

Get contributed projects only if push event exists

2015-02-18 14:20:26 -08:00

votes

Fix votes block. twbs3 progress bars

2014-01-01 22:59:06 +02:00