home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,254 Commits 48 Branches 340 Tags
d76700a87f1c643d2603d008b2c67deddfeeafa3
Commit Graph
26 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets a74b66cdee Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/group.rb
	app/models/project.rb
	features/steps/shared/project.rb
 2014-07-10 23:43:42 +03:00
Dmitriy Zaporozhets ab29ddcfc4 Enable snippets for test project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-27 00:01:16 +03:00
Dmitriy Zaporozhets b165b097f5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb
 2014-06-17 10:53:44 +03:00
Dmitriy Zaporozhets e9de569458 Fix tests for user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 13:43:07 +03:00
Marin Jankovski 9ff69c4c4b Add tests for template mr description. 2014-05-14 15:24:14 +02:00
Robert Speicher 1897fb00b8 Make use of project factory traits 2014-03-19 05:15:24 -04:00
Ciro Santillli 439a61783d User can leave group from group page. 2014-02-12 15:52:53 +01:00
Ciro Santillli 91571c078d User pages are visible to users without login 
... if the user is authorized to at least one public project.
 2014-02-11 15:45:30 +01:00
Dmitriy Zaporozhets 28e13634dc Merge branch 'improve/mr_diff' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/project_fork.rb
	features/steps/project/project_forked_merge_requests.rb
	features/steps/project/project_issue_tracker.rb
	features/steps/project/project_markdown_render.rb
	features/steps/shared/project.rb
 2014-01-23 14:38:23 +02:00
Dmitriy Zaporozhets c227aa44f9 Make changes to tests 
* project_with_code -> project
* project -> ermpty_project

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 21:03:52 +02:00
skv a3f645ef51 Remove deprecated finders 2014-01-19 23:39:56 +04:00
Steven Thonus 37383966ef Archiving old projects; archived projects aren't shown on dashboard 
features for archive projects
abilities for archived project
other abilities for archive projects

only limit commits and merges for archived projects

ability changed to prohibited actions on archived projects

added spec and feature tests for archive projects

changed search bar not to include archived projects
 2013-12-16 14:39:14 +01:00
David Pursehouse 20ea670e67 Remove "is" from labels 2013-10-18 13:28:49 +09:00
Hiroyuki Sato 5f24bdb7d0 Render not found when failing to look for a commit 2013-08-21 17:53:51 +09:00
Dmitriy Zaporozhets 95791316f4 Lets fix tests 2013-06-22 23:57:29 +03:00
Dmitriy Zaporozhets e45179c9b4 remove useless routing tests. Added symlink creation for project with code 2013-06-22 18:57:34 +03:00
Dmitriy Zaporozhets 541d899410 Project.repository should never be nil so you can call repository.exists? or repository.empty? 
Also specify separate project factory for project with filled repo
 2013-04-01 16:56:25 +03:00
Andrew8xx8 fce22dfa2f Tests for dashboard projects fixed 2013-03-12 15:15:14 +04:00
Andrew8xx8 839957cf56 Constants in Events looks good now 2013-02-13 15:48:16 +04: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
Dmitriy Zaporozhets dccd8b6eaa Continue refactoring. Use repostory and team 2013-01-04 08:43:25 +02:00
Vincent Bonmalais 80fb38de7a Remove backward compatibility of factories. 2012-11-13 22:27:45 +11:00
randx db69836319 Move ProjectHooks from spec/requests to spinach 2012-09-27 23:52:08 +03:00
Robert Speicher 4252ea90c0 Add feature steps for a generic, non-"Shop" project 
This group is better for features that only deal with one project.
 2012-09-26 16:32:24 -04:00
Nihad Abbasov 79eb5ab396 refactor feature steps 2012-09-10 08:35:03 -07:00