home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 16:46:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,779 Commits 48 Branches 340 Tags
bb57ee0260989be29213e8c514b56d4075ff0f0f
Commit Graph
22 Commits
Author SHA1 Message Date
Vinnie Okada 7710931fd7 Fix Spinach test 
Remove an unnecessary step in the project audit event test.
 2015-02-28 07:34:16 -07:00
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
Steven ThonusandHannes Rosenögger 42bac7f9f2 adding avatar to project settings page added avatar removal show project avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix 2015-01-24 18:51:16 +01:00
Marin Jankovski 4eaeb3b6d5 Factor audit events tests. 2014-11-24 09:01:01 +01:00
Marin Jankovski f90db27e2a Add audit events feature spec for project. 2014-11-20 11:54:05 +01:00
Dmitriy Zaporozhets f4d43ed3b1 Merge branch 'master' into ce-upstream 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/user.rb
	app/views/admin/users/index.html.haml
	app/views/projects/services/_form.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-10-14 18:23:51 +03:00
Ciro Santilli fa34901237 Make Spinach test names consistent 
- do not add Feature to feature titles
- titleize feature titles
- put steps on the same path as .feature files
- make feature titles match their path
 2014-10-05 18:21:11 +02:00
Dmitriy Zaporozhets a5972170ad Merge remote-tracking branch 'origin/master' into ee-7-4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/team_members_controller.rb
	app/finders/projects_finder.rb
	app/models/group.rb
	app/models/project_team.rb
	app/models/users_group.rb
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/ldap.md
	features/steps/group.rb
	features/steps/project/project.rb
 2014-10-02 13:24:59 +03:00
Marin Jankovski 65cb51af31 Add a feature for readme on project show page. 2014-09-30 14:59:30 +02:00
Dmitriy Zaporozhets 961ea22246 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1-0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/projects_controller.rb
 2014-07-22 09:54:24 +03:00
Dmitriy Zaporozhets af2a6ec150 Add useless test. Uncomment when we improve testing 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-21 22:52:01 +03:00
Dmitriy Zaporozhets e64343d6e1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/views/layouts/devise.html.haml
	features/project/project.feature
	features/steps/project/project.rb
 2014-06-26 13:02:08 +03:00
Dmitriy Zaporozhets af7e77984c Show VERSION information on project sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-25 12:07:06 +03:00
Marin Jankovski 9ff69c4c4b Add tests for template mr description. 2014-05-14 15:24:14 +02:00
Dmitriy Zaporozhets cc51931d1f Fix 500 error when rename repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-23 14:21:02 +02:00
Dmitriy Zaporozhets b8b8a34b52 Fix 500 error when rename repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-23 13:19:13 +02:00
Dmitriy Zaporozhets f375adcb96 Fix project.show spinach test 2013-06-04 17:01:41 +03:00
Dmitriy Zaporozhets fb1c85061e remove unused spec 2013-03-19 08:40:32 +02:00
GitLab 232d61d598 Refactor project creation. Added logout link to profile page 2013-01-17 17:35:57 +02:00
Dmitriy Zaporozhets 2f6603e581 A bit of spinach tests 2013-01-09 08:14:05 +03:00
Nihad Abbasov b58155113b add spinach steps for remaining features 2012-09-10 06:35:23 -07:00
Nihad Abbasov 080bd12e16 rewrite project commits features using spinach 2012-09-10 04:27:11 -07:00