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
15,081 Commits 48 Branches 340 Tags
1308a8a0ef27ea241301ab0585647761a2ffeb0e
Commit Graph
165 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 2bfd4f4438 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/api/entities.rb
	lib/api/groups.rb
 2015-01-21 17:05:31 -08:00
Dmitriy Zaporozhets 84e6fe361d Welcome to 7.8 :) 2015-01-15 14:31:40 -08:00
Dmitriy Zaporozhets 3a9682a3d7 Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Conflicts:
	VERSION
	app/helpers/selects_helper.rb
	app/models/project.rb
	app/views/devise/sessions/new.html.haml
	app/views/groups/_settings_nav.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/profiles/keys/index.html.haml
	app/views/profiles/keys/show.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	config/routes.rb
	db/schema.rb
	doc/api/projects.md
	features/steps/shared/paths.rb
 2015-01-08 20:37:35 -08:00
Robert Schilling eae5f544cd Let's start 7.7.0.pre 2014-12-28 22:52:17 +01:00
Dmitriy Zaporozhets 3bd66989de Merge branch 'master' into ee-master 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/models/project.rb
	app/models/user.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.5.md
	doc/update/7.4-to-7.5.md
	lib/gitlab/git_access.rb
	spec/factories.rb
	spec/lib/gitlab/git_access_spec.rb
 2014-12-05 13:28:32 +02:00
Dmitriy Zaporozhets fe46a5c084 Start 7.6.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-18 18:44:12 +02:00
Dmitriy Zaporozhets 5136b6aec0 Revert "Version 7.6.0.rc1" 
This reverts commit 280822cd37.
 2014-11-10 16:09:41 +02:00
Dmitriy Zaporozhets 280822cd37 Version 7.6.0.rc1 2014-11-10 11:38:25 +02:00
Dmitriy Zaporozhets 67d6a79ee9 Merge branch 'ce-ee-master' into ee-master 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	config/initializers/1_settings.rb
	config/initializers/7_omniauth.rb
 2014-10-22 14:47:04 +03:00
Dmitriy Zaporozhets c0a5d04381 7.5.0 started 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-20 13:51:02 +03:00
Valery Sizov f59b692420 Merge branch 'gitlab-ee/master' into 7-4-stable_ 
Conflicts:
	VERSION
	doc/install/installation.md
 2014-10-17 20:35:51 +03:00
Valery Sizov 4da88dbb2d documents updated 2014-10-17 13:47:20 +03:00
Marin Jankovski acf4d039f5 Time for 7.4.0-pre. 2014-09-22 17:08:16 +02:00
Marin Jankovski 1638519f6b Version 7.4.0.pre-ee. 2014-09-22 16:24:58 +02:00
Marin Jankovski f24c7f5cf4 Version 7.3.0-ee. 2014-09-22 15:36:19 +02:00
Marin Jankovski 88d3da19f9 Version 7.3.0. 2014-09-22 14:35:51 +02:00
Marin Jankovski 36a9e47d70 Merge remote-tracking branch 'CE/master' into merge_ce_rc1 
Conflicts:
	Gemfile.lock
	VERSION
	doc/README.md
	doc/install/installation.md
 2014-09-17 18:36:14 +02:00
Marin Jankovski 630d042433 Version 7.3.rc1. 2014-09-17 18:28:00 +02:00
Marin Jankovski 9e7c7a6029 Update version file. 2014-08-25 11:25:42 +02:00
Robert Schilling 668c7d517a 7.3 started 2014-08-23 10:59:03 +02:00
Jacob Vosmaer 5812cfa10e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
 2014-08-20 17:14:26 +02:00
Jacob Vosmaer 87efd92d8c Bump version to 7.2.0.rc5 2014-08-20 17:13:03 +02:00
Jacob Vosmaer 779747c121 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
 2014-08-20 15:06:19 +02:00
Jacob Vosmaer f5b23bc2ca Bump version to 7.2.0.rc4 
Skipping rc3 because somebody (me) created a tag but did not bump the
version to rc3.
 2014-08-20 15:03:18 +02:00
Jacob Vosmaer f41eef1627 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
 2014-08-19 18:28:13 +02:00
Jacob Vosmaer ed9e922dd0 Bump version to 7.2.0.rc2 2014-08-19 18:25:28 +02:00
Jacob Vosmaer 7567614d3b Merge tag 'v7.2.0.rc1' 
Bump version to 7.2.0.rc1

Conflicts:
	VERSION
 2014-08-18 16:12:32 +02:00
Jacob Vosmaer 4142754c7f Bump version to 7.2.0.rc1 2014-08-18 15:51:30 +02:00
Jacob Vosmaer ee8836a903 Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166 
Conflicts:
	VERSION
	app/models/user.rb
	app/services/merge_requests/build_service.rb
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/README.md
	features/project/merge_requests.feature
	features/steps/project/merge_requests.rb
 2014-08-15 10:25:23 +02:00
Robert Schilling 2e55eac215 7.2 started 2014-07-28 10:24:49 +02:00
Dmitriy Zaporozhets 961ea22246 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1-0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/projects_controller.rb
 2014-07-22 09:54:24 +03:00
Dmitriy Zaporozhets 68a9203bce Version to 7.1.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-22 09:52:19 +03:00
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