Fix for failing specs
Put back the travis information

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Dont show new file link on protected branch for developers

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'developers-protected-branches' into 'master'

Dont show new file link on protected branch for developers
Improve admin group page performance

Add pagination for projects and members to /admin/groups/:group page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Add members paginations to admin/project page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
add smtp_settings.rb to gitignore file
Get group members only if group not nil

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'performance-improvements' into 'master'

Performance improvements

Fixes #1135
Merge pull request #6943 from jvanbaarsen/spec-fix

Fix for failing specs
Use padding like most of other bootstrap elements

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Improve small panels

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Use big colorful pills for switch between MR tabs

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'ui-improvements' into 'master'

Ui improvements
Revert "Implements and refactors clipboard feature for markdown."

This reverts commit 2273234653924b731f9ef01432e392481ee1d4e2.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

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
Do not show a 72 times.
Merge pull request #7062 from williamherry/fix_add_smtp_settings_to_gitignore

add smtp_settings.rb to gitignore file
Bump to Rails 4.1.
Replace now forbidden keywords public and private for snippets scope
Replace snippets scopes in view and controller.