home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 18:16:45 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,169 Commits 48 Branches 340 Tags
aae4e3f8a43fb64ebd8dd1ae1479651c8951dec0
Commit Graph
143 Commits
Author SHA1 Message Date
Valery Sizov 91402ac0eb Merge branch '7-4-stable' into ee_stable 2014-10-21 13:48:16 +03:00
Ciro SantilliandDmitriy Zaporozhets db5ea013f4 Use :message key, not :error for File::Service. 2014-10-21 11:37:15 +03: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
Valery Sizov 47f539f5a6 Snippets: public/internal/private 2014-10-09 17:09:53 +03:00
Vinnie Okada 40263a06c1 Refactor task list tests and coffeescript 2014-10-06 19:19:12 -05:00
Vinnie Okada 31bc42de57 Add Spinach tests for task lists 2014-10-06 02:07:03 -05:00
Dmitriy Zaporozhets eafac5932f Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ee-7-4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/helpers/merge_requests_helper.rb
	doc/update/README.md
	lib/gitlab/reference_extractor.rb
 2014-10-03 16:18:40 +03:00
Ciro Santilli 3960a5a25a Remove assignment without effect. 2014-10-03 12:19:31 +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
Ciro Santilli 89f7345f3f Remove unnecessary page. from tests. 2014-09-26 09:51:17 +02:00
Ciro Santilli 778afb699f Replace javascript:; links with buttons. 2014-09-22 21:01:19 +02:00
Ciro Santilli ef6e94e37e Replace old spinach step definitions with step. 2014-09-22 10:01:50 +02:00
Jacob Vosmaer e93523ed31 Merge commit '79190fe06b' into merge-79190fe06b-7.3.0-pre 
Conflicts:
	Gemfile
	README.md
	VERSION
	db/schema.rb
	doc/install/installation.md
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/user.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-09-15 11:24:51 +02:00
Dmitriy Zaporozhets 9e4a40982e Merge pull request #7646 from bushong1/snippet-search3 
Adding in snippet search functionality
 2014-09-09 10:31:21 +03:00
Charles Bushong 4561a09c69 Cleaning for the hound 2014-09-05 13:51:23 -04:00
Charles Bushong 858dbd0842 Updating to persist a params snippets variable 2014-09-05 13:30:55 -04:00
Dmitriy Zaporozhets 18e4e99764 Merge branch 'sha-link' of https://github.com/cirosantilli/gitlabhq into cirosantilli-sha-link 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-09-04 15:47:54 +03:00
Dmitriy Zaporozhets 36c3e2cc62 Explicitly require active teab for tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-04 10:00:04 +03:00
Dmitriy Zaporozhets a2b6c1e65f Rename activity to project tab 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-02 11:47:25 +03:00
Robert Schilling 0cbc19f944 Awesome shortcuts for GitLab 2014-09-01 11:49:17 +02:00
Ciro Santilli 81336bd2b5 Add permalink to fixed SHA URL on blob view. 2014-09-01 10:26:47 +02:00
Jacob Vosmaer 90ce0be420 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups 
Conflicts:
	app/models/group.rb
	app/views/groups/members.html.haml
	db/schema.rb
 2014-08-29 14:43:20 +02:00
Jan-Willem van der Meer 469bc36896 Add integration test for new LDAP sync 2014-08-15 10:32:30 +02:00
Jacob Vosmaer ee8836a903 Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166 
Conflicts:
	VERSION
	app/models/user.rb
	app/services/merge_requests/build_service.rb
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/README.md
	features/project/merge_requests.feature
	features/steps/project/merge_requests.rb
 2014-08-15 10:25:23 +02:00
Robert Schilling b9519c8314 Validate label titel in project scope 2014-08-13 15:48:26 +02:00
Robert Schilling da7e14c864 fix searching on empty project, prevent 500 
Fix hound
 2014-08-11 11:31:37 +02:00
Jan-Willem van der Meer cd45fd7011 Test basic email flow 2014-08-11 09:54:12 +02:00
Jan-Willem van der Meer 2be5aab425 Use singular route 
Even simpler
 2014-08-08 15:24:14 +02:00
Jan-Willem van der Meer a955975cbb Initial steps in feature 2014-08-08 14:25:50 +02:00
Dmitriy Zaporozhets bd72c74dab Fix dashboard tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 23:33:13 +03:00
Dmitriy Zaporozhets 5a68c20fba Fix MR factory and some MR tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 18:07:24 +03:00
Dmitriy Zaporozhets c2c7d14ec5 Move all test repos data to ReposHelpers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 17:23:40 +03:00
Dmitriy Zaporozhets bb2f4d665e Fix browse code spinach tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 16:20:47 +03:00
Dmitriy Zaporozhets 0f4748873d Project labels tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 14:06:14 +03:00
Dmitriy Zaporozhets 70f868b737 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 16:05:43 +03:00
Dmitriy Zaporozhets d3ea53877d Tests for trending/starred pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-26 10:33:42 +03:00
Dmitriy Zaporozhets e21ca9f8b1 Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosantilli-star 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-07-24 10:54:42 +03:00
Dmitriy Zaporozhets f0bfeb6e33 Refactor explore area tests. Replaced old links 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-23 12:18:51 +03:00
Ciro Santilli e1d307bf4b Move destroy user feature to spec. 2014-07-17 23:22:40 +02:00
Ciro Santilli 714f7201d3 Add project stars. 2014-07-17 22:47:16 +02:00
dreis 1da2262efd Added public groups area to enhance searching and exploring of projects 
fixed whitespaces and quotes

fixed whitespaces

fixed devise.html.haml

fixed method parenthesis in app/models/group.rb

removed links from header

removed links from devise.html

added tests
 2014-07-15 08:19:27 +02:00
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 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 ba7b4630a2 Replace home icon with tab names 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 10:39:35 +03:00
Dmitriy Zaporozhets 69baa3afb2 Dont render difscussion for commit diffs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-24 20:22:33 +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 d593c98fcb Delete wall notes tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 14:29:26 +03:00
Dmitriy Zaporozhets 11728851bf Fix blob highlight tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-12 21:36:38 +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