home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,254 Commits 48 Branches 340 Tags
d76700a87f1c643d2603d008b2c67deddfeeafa3
Commit Graph
390 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets cc193d7068 Fix 404 for invited projects 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-16 14:25:56 +03:00
Dmitriy Zaporozhets f5285d3103 Remove mass-assigment tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-11 16:07:20 +03: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 13f017f01b Fix user model specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-30 14:22:09 +03:00
Dmitriy Zaporozhets 0f550aa386 Remove mass assgnment specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 23:57:55 +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 d12b910d20 Merge branch 'remove-observers' into 'master' 
Remove observers from application

Part of #1133
 2014-06-23 06:36:08 +00:00
Marin Jankovski 93bef4f04a Merge remote-tracking branch 'ce/master' 
Conflicts:
	VERSION
 2014-06-20 13:27:27 +02:00
Dmitriy Zaporozhets 0771109bb8 Fix permission issue with highest access level for group 
If user was a member of both group and project and group access level
was higher it was not respected and user got lowest project access
level. Now it is fixed and user get highest access level

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-20 12:54:03 +03:00
Dmitriy Zaporozhets 73f91da8b1 Fix project deletion and tests 2014-06-17 23:49:17 +03:00
Dmitriy Zaporozhets 2d87556847 Remove rails observers from application 2014-06-17 22:51:43 +03:00
Dmitriy Zaporozhets 9e3094b232 Remove UsersGroup observer 2014-06-17 21:36:40 +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
Jacob Vosmaer 834b23a750 Fix JIRA issue reference bug 2014-06-13 18:24:30 +02:00
Jacob Vosmaer 3f1ece2690 Detect closing issues in Merge Request description 2014-06-13 17:25:44 +02:00
Jacob Vosmaer 2ab1363c75 Test if JiraIssues make it through #issues_for 2014-06-13 15:40:33 +02:00
Jacob Vosmaer 68048e3009 Feed a JiraIssue to JiraService in its spec 2014-06-13 15:40:32 +02:00
Jacob Vosmaer d4ae3e4d82 Add a JiraIssue class 2014-06-13 15:40:09 +02:00
Marin Jankovski f43e41973f Test for the apostrophe in the email 2014-06-11 13:36:30 +02:00
Jeroen van Baarsen a705d194fa Fixed the project team specs 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-08 23:36:09 +02:00
Dmitriy Zaporozhets c283fba3b7 Improve performance of application for large teams 
This commit fixes a lot of sql queries to db for for groups and projects
with big amount of members.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-04 11:52:17 +03:00
Marin Jankovski 209726917b Fix the system_hook test. 2014-06-03 11:37:23 +02:00
Dmitriy Zaporozhets cea0fc1de8 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:33:49 +03:00
Dmitriy Zaporozhets 8a3807c838 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 12:40:22 +03:00
Marin Jankovski e2d4ee91bd Add tests and documentation for jira service. 2014-05-13 13:48:55 +02:00
Dmitriy Zaporozhets c4e713a5b6 Merge remote-tracking branch 'origin/master' into 6-8-ce-to-ee 
Conflicts:
	VERSION
	db/schema.rb
	doc/install/installation.md
 2014-04-22 11:58:11 +02:00
Dmitriy Zaporozhets cfa7e24b33 Use last appearance settings. Show last edit date 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-14 22:14:51 +03:00
Dmitriy Zaporozhets 352bb97266 Merge pull request #6731 from hiroponz/better-title-format-for-wiki-page 
Better title format for wiki page
 2014-04-13 20:13:02 +03:00
Jeroen van Baarsen 25eadf0c5b Proposal for split testing 2014-04-11 13:37:33 +02:00
Dmitriy Zaporozhets fae2e540b6 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce-6-8 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	Gemfile.lock
	README.md
	VERSION
	app/assets/javascripts/application.js
	db/schema.rb
	doc/install/installation.md
	doc/update/4.2-to-5.0.md
	doc/update/5.0-to-5.1.md
	doc/update/5.1-to-5.2.md
	doc/update/5.2-to-5.3.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.0-to-6.7.md
	lib/gitlab/git_access.rb
 2014-04-10 13:34:56 +03:00
Dmitriy Zaporozhets 89ecb19126 Merge branch 'ensure_default_fields' into 'master' 
Add values to default fields to prevent 500 error when migrate from MySQL to Postgres
 2014-04-10 07:20:45 +00:00
Hiroyuki Sato bca528a57c Better title format for wiki page 
The title format for wiki page may be unintelligible.
For example 'GitLab' is converted to 'Git Lab', 'MySQL' is converted to
'My Sql', etc.
 2014-04-10 15:14:02 +09:00
Dmitriy Zaporozhets 36f861f1b1 Re-annotate models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 15:05:03 +03:00
Dmitriy Zaporozhets 1bd28994cc Use ProjectWiki instead of GollumWiki in code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 14:35:58 +03:00
Dmitriy Zaporozhets 684877acc4 Fix test broken by 89c942908c 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-08 15:58:28 +03:00
Federico Ravasio 6a9eb4b231 Improved Slack integration with message attachments. 2014-04-06 11:57:48 +02:00
Dmitriy Zaporozhets c31b703110 Fix tests that dont respect project-fork relation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-03 11:47:56 +03:00
Dmitriy Zaporozhets 6ae2529041 Remove KeysObserver 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 21:13:05 +03:00
Marin Jankovski 466203eb0c Additional check in the test. 2014-03-26 12:56:25 +01:00
Marin Jankovski 961d87937b Add the tests for user search. 2014-03-26 12:44:00 +01:00
Dmitriy Zaporozhets cce80d04fe Remove author_id_of_changes from spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 14:02:55 +02:00
Dmitriy Zaporozhets 3fa2dd1107 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-6-7-rc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile.lock
	VERSION
	lib/gitlab/git_access.rb
 2014-03-21 12:22:43 +02:00
Dmitriy Zaporozhets f034e6f3b7 GitHook model specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 14:08:15 +02:00
Federico Ravasio e3fc01b3ea Added Slack service integration. 2014-03-18 18:54:30 +01:00
Dmitriy Zaporozhets e502d785f9 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/controllers/application_controller.rb
	app/models/user.rb
	app/views/groups/members.html.haml
	app/views/groups/show.html.haml
	config/gitlab.yml.example
	db/schema.rb
	features/steps/project/project_browse_branches.rb
	lib/api/projects.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/adapter.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/upgrader.rb
 2014-03-18 11:15:01 +02:00
Jeroen van Baarsen 9a676ccc0a Added tag_push_events to the web_hooks 
* Added a scope to the web_hooks model
* Added extra checkbooks in de hooks overview window
 2014-03-05 20:44:01 +01:00
Jacob Vosmaer dd703b3e2a Remove duplicate code 2014-03-03 08:40:29 +01:00
Binsztock RémyandOlivier Gonzalez e7382de108 Add Gemnasium Service for Gitlab 
Conflicts:

	db/schema.rb
 2014-02-21 16:25:22 +01:00
Dmitriy Zaporozhets cf413ffb75 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce_6_6 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	VERSION
	db/schema.rb
	features/steps/group/group.rb
	lib/api/internal.rb
 2014-02-19 14:55:07 +02:00
Dmitriy Zaporozhets aef782888f Merge pull request #5261 from devaroop/retrieve_ssh_keys_by_ssh 
ssh keys publically available for sysadmins via http, the github way
 2014-02-11 18:41:10 +02:00