home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,254 Commits 48 Branches 340 Tags
d76700a87f1c643d2603d008b2c67deddfeeafa3
Commit Graph
133 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets a2e5ec7c40 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into release-candidate 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	doc/install/installation.md
 2014-07-17 18:17:32 +03:00
Dmitriy Zaporozhets 4db9c6e0a8 Version to rc1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-17 16:50:04 +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 f91f230cec 7.1.0 started 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-24 22:57:11 +03:00
Marin Jankovski 93bef4f04a Merge remote-tracking branch 'ce/master' 
Conflicts:
	VERSION
 2014-06-20 13:27:27 +02:00
Dmitriy Zaporozhets d1e424bd5c Bump version to 7.0.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-20 13:37:33 +03:00
Marin Jankovski 484819063c Merge remote-tracking branch 'ce/master' 
Conflicts:
	VERSION
	doc/install/installation.md
 2014-06-19 09:22:51 +02:00
Dmitriy Zaporozhets 70ed6ef2a6 7.0.0.rc1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-17 15:48:43 +03:00
Marin Jankovski 5782730dab Version up to 6.9.2-ee 
Conflicts:
	CHANGELOG-EE
	VERSION
 2014-05-30 12:34:26 +02:00
Dmitriy Zaporozhets babfc068ae Lets start 7.0 development 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 20:34:03 +03:00
Marin Jankovski 38d0e001ea Version to 6.9.0 2014-05-22 11:09:00 +02:00
Marin Jankovski 95ef8f9756 Merge remote-tracking branch 'ce/master' 
Conflicts:
	VERSION
	doc/install/installation.md
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	lib/gitlab/markdown.rb
	spec/lib/gitlab/ldap/ldap_access_spec.rb
 2014-05-21 13:10:37 +02:00
Marin Jankovski aacd43d72d 6.9.0 RC1 2014-05-19 12:31:20 +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 31e804f887 Merge branch '6-8-stable' of dev.gitlab.org:gitlab/gitlabhq into ce-6-8-1 
Conflicts:
	VERSION
 2014-04-24 08:36:49 +02:00
Marin Jankovski 7c5b61224a We are at 6.9.0.pre. 2014-04-23 15:50:05 +02:00
Jacob Vosmaer 319799073b Bump version to 6.8.1 2014-04-23 11:23:09 +02:00
Job van der Voort 241132b6eb version 6.8.0 2014-04-22 14:51:38 +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
Job van der Voort e6b668ab01 update VERSION to 6.8.0.rc1 2014-04-17 09:42: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 af0b59d477 Time for 6.8.0pre 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-26 09:50:18 +02:00
Dmitriy ZaporozhetsandMarin Jankovski 5245fac63b Version 6.7.2 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
 2014-03-25 18:53:09 +01:00
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 6bb474a0dc Version 6.7.0 2014-03-21 17:27:13 +01: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