home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 20:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,140 Commits 48 Branches 340 Tags
2bfa02bb3ccb2b176fa936ce7a70b75eeedce9ef
Commit Graph
312 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 8d2755a26b Create git_hooks db table 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 14:07:48 +02:00
Dmitriy Zaporozhets 896159caac Update db schema 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-18 11:18:34 +02: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
Dmitriy Zaporozhets 39f80884db Improve developer seeds 
Return execution of observers in seeds.
Mute email sending to letter opening in you browser.
Added `rake dev` task to reset db and add seeds.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-15 11:39:35 +02:00
Dmitriy Zaporozhets 6e73b208a9 Add comments fixtures for development 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-15 10:23:48 +02:00
Dmitriy Zaporozhets 0d7986a8c7 Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	db/schema.rb
 2014-03-14 12:00:21 +02:00
Dmitriy Zaporozhets 10c0cb8ca7 Add migration for already imported projects 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-13 11:28:41 +02:00
Dmitriy Zaporozhets e603da7360 Add Project#import_status field 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-12 17:14:28 +02:00
Dmitriy Zaporozhets 75c9c68c18 Rebuild schame from migrations 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-12 09:55:08 +02:00
Dmitriy Zaporozhets 56318a24b1 Merge pull request #6474 from jvanbaarsen/post-tag-hook 
Add web hooks on tag
 2014-03-12 09:52:34 +02:00
Dmitriy Zaporozhets cf890b227a Add User#last_credential_check_at 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-11 10:07:22 +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
gussan 93bc67ab11 Add index_merge_request_diffs_on_merge_request_id 2014-03-04 10:38:09 +09:00
Dmitriy Zaporozhets 4710897c0d Add testme repo for dev seeds 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-28 10:06:17 +02:00
Dmitriy Zaporozhets 136316a92d Fix group ownership for dev seeds 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-25 10:44:29 +02: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 7d8453d82a db schema 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-19 14:56:39 +02: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
Jason Hollingsworth 29cfd33d94 Add email aliases for users 
Emails are used to associate commits with users. The emails
are not verified and don't have to be valid email addresses. They
are assigned on a first come, first serve basis.

Notifications are sent when an email is added.
 2014-02-13 22:59:39 -06:00
Dmitriy Zaporozhets 903726c846 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	Gemfile
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
 2014-02-11 10:15:13 +02:00
Dmitriy Zaporozhets e8f8abddb0 Squash migrations for years 2011 and 2012 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-04 17:11:30 +02:00
Dmitriy Zaporozhets a184fcf368 Merge pull request #6178 from Popl7/add_group_avatars 
added group avatars
 2014-01-28 00:26:18 -08:00
Steven Thonus 251df827a5 added group avatars 2014-01-28 08:38:00 +01:00
skv-headless 4125de5ef1 Fix merge_request_diffs migrations for postgresql 2014-01-27 18:50:53 +04:00
Dmitriy Zaporozhets 9bb9267482 Merge branch 'development_seed_fix' into 'master' 
Development  Project Seed Data Fix

After this commit https://dev.gitlab.org/gitlab/gitlabhq/commit/1d2bdb4d5880bb1ad39b62c81ff2971aa0cb3798 Contexts were replaced with Services. One context remained in the seed data which means development seeding will fail.

@dzaporozhets Do we want to backport this to 6.5 too?

/cc @jacobvosmaer @sytse
 2014-01-24 11:27:05 +00: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
Marin Jankovski 5e08f8134e Replace context with service in development seed data. 2014-01-23 10:09:19 +01:00
Dmitriy Zaporozhets 4d56c359d3 Merge pull request #6075 from skv-headless/remove_deprecated_finders 
Remove deprecated finders
 2014-01-22 11:04:56 -08:00
Dmitriy Zaporozhets de724a7a34 Improve db schema for merge request diffs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 15:17:41 +02:00
Dmitriy Zaporozhets c983e8eb3d Create separate table to store Merge request commits/diffs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 14:22:47 +02:00
Dmitriy Zaporozhets 2df9a76042 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 6_5_ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/generic/common.scss
	app/views/projects/edit.html.haml
	config.ru
	db/schema.rb
	doc/install/installation.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/gitlab/upgrader.rb
 2014-01-21 18:15:49 +02:00
skv a3f645ef51 Remove deprecated finders 2014-01-19 23:39:56 +04:00
Jerome Dalbert 2e3f250d45 Add website url to user 2014-01-18 19:15:10 +00:00
Dmitriy Zaporozhets 34f994b7c5 Improve dev fixtures 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-25 09:56:39 +02:00
Dmitriy Zaporozhets 3eba8d7433 Update db schema 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-23 13:50:57 +02:00
Dmitriy Zaporozhets 1f43fa20d3 Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/controllers/application_controller.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.2-to-6.3.md
 2013-12-23 12:57:22 +02:00
Andrew Tomaka 0760ba3efb Customization and previewing of broadcast messages 2013-12-18 17:43:45 -05:00
Dmitriy Zaporozhets 0b59af49cb Fix db schema 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 14:50:19 +02:00
Dmitriy Zaporozhets 86a8796b13 Create EmailsOnPushService model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 12:42:40 +02: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
Dmitriy Zaporozhets 7060668e09 Fixed db schema 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-16 14:52:04 +02:00
Drew Blessing d9b5777db1 Allow user to hide the message to add an ssh key permanently 
Favor links instead of buttons

Remove unnecessary class

Remove extra space
 2013-12-14 20:21:12 -06:00
Dmitriy Zaporozhets 169b4ce0ca Add new fields to web_hooks table. 
Next fields were added:
* push_events
* issues_events
* merge_requests_events

Main goal is to create web hooks that can be triggered only for certain
event types. For example you can have separate web hook for push events
and another one for issues.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-04 13:37:17 +02:00
Dmitriy Zaporozhets 4e77b0b52d Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3 
Conflicts:
	Gemfile.lock
	VERSION
	app/assets/javascripts/api.js.coffee
	app/models/user.rb
	app/views/help/index.html.haml
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/api/api.rb
	lib/api/entities.rb
	lib/gitlab/ldap/user.rb
	lib/tasks/gitlab/check.rake

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-29 10:01:43 +02:00
Jason Hollingsworth d9bb4230cc Adding authenticated public mode (internal). 
Added visibility_level icons to project view (rather than just text).
Added public projects to search results.
Added ability to restrict visibility levels standard users can set.
 2013-11-26 22:22:07 -06:00
Dmitriy Zaporozhets f1ecf53c1e Broadcast message model + migrations 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 13:47:28 +02:00
Dmitriy Zaporozhets 9d14c5137a Project#default_branch use repo HEAD instead of DB value now 
Drop default_branch field from projects table
Use repository.root_ref as value for defautl_branch method
Fixes issue with default_branch and HEAD getting out of sync

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-06 18:45:39 +02:00
Dmitriy Zaporozhets 44f1fec05a Fix db schema 2013-10-31 14:34:09 +02:00
Dmitriy Zaporozhets c9a2765515 Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq into upstream/6-2-stable 
Conflicts:
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/api/groups.md
	doc/api/projects.md
	doc/install/installation.md
	lib/api/projects.rb
	spec/requests/api/groups_spec.rb
	spec/requests/api/projects_spec.rb
 2013-10-31 14:29:48 +02:00
Dmitriy Zaporozhets 60e2a6563d Add description to issues, projects in development fixtures 2013-10-17 12:27:09 +03:00