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
10,765 Commits 48 Branches 340 Tags
e677ef34b9709bf900955ee37d81ff83dc2ef2db
Commit Graph
341 Commits
Author SHA1 Message Date
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 600f4c6894 Fix snippet dev fixtures 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 12:36:31 +03:00
Dmitriy Zaporozhets 0b00b3dac3 Add sorting to merge requests on milestone page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 17:11:52 +03:00
Dmitriy Zaporozhets e6d2c02e67 Dirty implementastion of MR build status for Jenkins 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-15 10:34:35 +03:00
Marin Jankovski 7478ece8b4 Add template for merge request descriptions to projects. 2014-05-14 15:24:14 +02:00
Marin Jankovski e3f736d258 Add Jira service. 2014-05-13 12:12:16 +02:00
Dmitriy Zaporozhets 556ca35274 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ce-6-9 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/application.scss
	app/views/layouts/devise.html.haml
 2014-05-12 12:39:51 +03:00
Dmitriy Zaporozhets f5c4bda8fe Improve MR seeds 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-05 15:07:19 +03:00
Dmitriy Zaporozhets 4f670fbe9c Create seed projects with different visibility 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-05 14:30:50 +03:00
Dmitriy Zaporozhets d10b34a685 Save repository size to projects table 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-02 16:05:08 +03:00
Dmitriy Zaporozhets c51ac0484f Merge pull request #5962 from skv-headless/editing-preview 
editing preview
 2014-04-29 10:00:29 +03:00
Jacob Vosmaer c685024951 Add an index for Note#updated_at 2014-04-28 13:02:05 +02:00
Dmitriy Zaporozhets ae7bd9f7c0 Migrate invalid rows with missing iids or duplicates 2014-04-24 19:39:33 +02:00
Dmitriy Zaporozhets c46a061270 Add uniq db index on project_id+iid 2014-04-24 19:39:09 +02:00
Jacob Vosmaer cd61239540 Move the adapter check to the migration 2014-04-23 11:08:51 +02:00
Jacob Vosmaer 43e77099d8 Adjust MySQL limits for existing installations 2014-04-23 11:07:36 +02:00
Dmitriy Zaporozhets 55e46ad5f9 Update db schema 2014-04-22 12:00:51 +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
GitLab 556ddbcad4 Add schema number change. 2014-04-18 12:05:00 +02:00
GitLab cf43bf3620 Add db index for active user display. 2014-04-16 21:05:13 +02:00
skv-headless d859d08094 Editing preview 2014-04-15 19:02:02 +04:00
Dmitriy Zaporozhets 40104eead7 Appearance model for custom signin page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-14 22:14:50 +03:00
Jeroen van Baarsen 5554eb166b Fixed some hound notices 2014-04-14 15:24:37 +02:00
Jeroen van Baarsen 802087c937 Changed default in the database for the statemachine 2014-04-14 15:22:57 +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
Hiroyuki Sato 0ed2f8ded9 Fix rake db:seed_fu ENV=development 
This problem was reported on https://gitlab.com/gitlab-org/cookbook-gitlab/issues/46
 2014-04-09 11:02:45 +09:00
Job van der Voort 52cf11b9f2 add a space 2014-04-07 14:26:52 +00:00
Job van der Voort 6d19696267 Fix faulty namespaces 2014-04-07 16:03:49 +02:00
Ciro Santillli 6672d6492f Start development Key seed id from 1. 2014-03-23 23:49:22 +01:00
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