Marin Jankovski 3e875b05b4 Merge remote-tracking branch 'ce/master' into merge_ce ...

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/project_new.js.coffee
	app/controllers/projects_controller.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/project_team.rb
	app/models/user.rb
	app/services/files/create_service.rb
	app/views/layouts/nav/_admin.html.haml
	config/routes.rb
	db/schema.rb
	spec/models/jira_service_spec.rb
	spec/requests/api/projects_spec.rb

2015-01-29 11:34:43 -08:00

..

commits

Fix tests

2014-12-25 15:55:12 +02:00

issues

Merge branch 'upstream-master' into markdown-preview

2014-12-07 20:25:58 -07:00

source

Add tests for initializing bare repo and creating new file in it

2015-01-27 12:19:32 -08:00

active_tab.rb

UI improvements mostly for mobile screens

2014-12-02 11:31:57 +02:00

archived.rb

Merge branch 'spinach-step' of https://github.com/cirosantilli/gitlabhq into cirosantilli-spinach-step

2014-09-22 20:56:12 +03:00

create.rb

Allow Group path to be changed at the same time as name

2014-12-22 15:02:47 +02:00

deploy_keys.rb

Fix MR spinach tests

2014-01-23 12:55:43 +02:00

fork.rb

Improve fork to namespaces feature

2014-11-14 16:06:39 +02:00

forked_merge_requests.rb

Remove def project from tests that inherit it.

2014-09-28 13:44:04 +02:00

git_hooks.rb

Git hooks for checking email

2014-10-29 11:42:51 +02:00

graph.rb

Add tests for commits graph

2014-09-29 12:11:53 +03:00

hooks.rb

Remove unnecessary page. from tests.

2014-09-26 09:51:17 +02:00

merge_requests.rb

Merge remote-tracking branch 'ce/master' into merge_ce

2015-01-29 11:34:43 -08:00

network_graph.rb

Remove unnecessary page. from tests.

2014-09-26 09:51:17 +02:00

project_group_links.rb

Fix tests for share project with group

2014-12-30 12:48:29 +02:00

project_shortcuts.rb

Prefix Spinach features with Spinach::Features::.

2014-09-22 16:30:25 +02:00

project.rb

Merge remote-tracking branch 'ce/master' into merge_ce

2015-01-29 11:34:43 -08:00

redirects.rb

Remove unnecessary page. from tests.

2014-09-26 09:51:17 +02:00

services.rb

Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2015-01-08 20:37:35 -08:00

snippets.rb

Remove def project from tests that inherit it.

2014-09-28 13:44:04 +02:00

star.rb

Remove unnecessary page. from tests.

2014-09-26 09:51:17 +02:00

team_management.rb

Merge remote-tracking branch 'origin/master' into ee-7-4

2014-10-02 13:24:59 +03:00

wiki.rb

Factor current_url + URI.path into current_path.

2014-09-23 21:56:38 +02:00