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,146 Commits 48 Branches 340 Tags
da255da8d6f348347382d04db220ea65a6cd6dff
Commit Graph
109 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 3a293fa966 Merge branch '6-7-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-7-2-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	doc/install/installation.md
	lib/gitlab/backend/grack_auth.rb
 2014-03-25 10:12:59 +02:00
Dmitriy Zaporozhets dbbf4ea24c Version 6.7.2 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 23:11:01 +02:00
Dmitriy Zaporozhets ba0d8842f5 Version 6.7.1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 23:06:30 +02:00
Marin Jankovski 80236d6c6c Version 6.7.0 2014-03-21 17:22:12 +01: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 189f88de5b rc1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:03:02 +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 0e45bf5431 Merge branch '6-6-stable' of dev.gitlab.org:gitlab/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	doc/install/installation.md
 2014-02-24 12:46:25 +02:00
Dmitriy Zaporozhets e868de687d Its start for 6.7.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-21 19:45:28 +02:00
Dmitriy Zaporozhets 1a3527f6e7 Version to 6.6.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-21 17:02:38 +02:00
Dmitriy Zaporozhets 499a118590 Time for rc1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-20 10:24:31 +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
Dmitriy Zaporozhets 4f4a1b961d Version to beta 2014-02-16 17:22:16 +00: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 5cc830d3db Version to 6.6.0.pre 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-25 11:48:36 +02:00
Dmitriy Zaporozhets 68590fddd8 Version 6.5.1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 10:13:23 +02:00
Dmitriy Zaporozhets 51f06bad0b Version 6.5.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 11:10:01 +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
Dmitriy Zaporozhets 416c25871d More entries to CHANGELOG. Version to rc1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-21 12:36:50 +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
Dmitriy Zaporozhets 68118b5446 Version to 6.5.0.pre 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-21 23:23:13 +02:00
Dmitriy Zaporozhets 0e4a8e231c Version 6.4.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-20 16:03:05 +02:00
Dmitriy Zaporozhets 4db2e97bf4 6.4 in beta now 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 17:10:12 +02:00
Jacob Vosmaer c728b7b18f Bump version to 6.3.1-ee 2013-12-04 18:18:21 +01: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
Dmitriy Zaporozhets 9c4ed864d5 Starting 6.4.0.pre 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-24 22:06:17 +02:00
Dmitriy Zaporozhets f285da48b1 Version to 6.3.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-22 12:58:37 +02:00
Dmitriy Zaporozhets 4525fc8405 Time for release candidate 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-21 10:03:00 +02:00
Dmitriy Zaporozhets 6cc3cc5152 Changelog entries and version up to beta1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-19 17:27:23 +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 9c3e95f6d9 Version to 6.2.2 2013-10-31 11:28:25 +02:00
Dmitriy Zaporozhets ff7073ac23 master is on 6.3.0.pre now 2013-10-28 13:29:37 +02:00
Dmitriy Zaporozhets f2a77a82b8 Version 6.2.1 2013-10-28 13:14:29 +02:00
Dmitriy Zaporozhets 7210a34bc7 Version up to 6.2.0 2013-10-21 10:05:13 +03:00
Dmitriy Zaporozhets 13c192d44c Version up to beta 2013-10-17 12:32:00 +03:00
Dmitriy Zaporozhets 0c5a9f20b5 Merge branch '6-1-stable' of https://dev.gitlab.org/gitlab/gitlabhq into 6-1-stable-ee 
Conflicts:
	VERSION
	app/controllers/application_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/models/merge_request.rb
	app/models/user.rb
	app/views/groups/_projects.html.haml
	config/routes.rb
	db/schema.rb
	doc/install/installation.md
 2013-09-27 15:24:54 +03:00
Dmitriy Zaporozhets bae15dc5f7 Version up to 6.2.0.pre 2013-09-25 14:04:32 +03:00
Marin Jankovski dcf9abc1b1 Version 6.1.0 2013-09-22 10:45:19 +02:00
Dmitriy Zaporozhets 3fe2558a5c Let it be 6.1.0.rc1 2013-09-14 18:25:42 +03:00
Dmitriy Zaporozhets 3811e43481 Version up to beta1 2013-09-10 13:43:06 +03:00
Dmitriy Zaporozhets e04f375638 Merge branch '6-0-stable' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
 2013-08-21 11:57:43 +03:00
Dmitriy Zaporozhets 97b58d1484 6.1.0pre 2013-08-20 22:30:45 +03:00
Dmitriy Zaporozhets 27e532b426 Time for 6.0.0 2013-08-20 22:05:58 +03:00
Dmitriy Zaporozhets 6141516174 Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq 
Conflicts:
	VERSION
 2013-08-20 14:02:00 +03:00
Dmitriy Zaporozhets 7daf394732 Its time for 6.0.0rc1 2013-08-20 12:41:56 +03:00
Dmitriy Zaporozhets fd7c8c71e5 its time for beta 2013-08-19 18:52:19 +03:00
Dmitriy Zaporozhets 2a42030a8c Version to 6.0.0-ee.beta 2013-08-12 13:37:17 +03:00
Dmitriy Zaporozhets 670aaaeb9d Version to 6.0.0.pre 2013-06-18 21:05:43 +03:00
Dmitriy Zaporozhets 1f26c46a94 5.3.0 in beta now 2013-06-10 18:27:35 +03:00
Dmitriy Zaporozhets e5e3e0d9e6 Version up to 5.3.0 2013-05-28 17:24:23 +03:00