home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 18:46:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,845 Commits 48 Branches 340 Tags
3e71e568569998516afffcb336d397cd4f4a4e90
Commit Graph
177 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 1ba393de81 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 2015-09-16 10:26:10 +02:00
Jared Szechy e156f42079 FogBugz project import 2015-09-08 20:23:01 -04:00
Dmitriy Zaporozhets b6e061244b Add documentation for ff-merge and rebase 2015-09-07 10:31:32 +02:00
Achilleas Pipinellis e334ec0683 Ordering of GitHub issues import is now fixed 
See https://gitlab.com/gitlab-org/gitlab-ce/commit/4a203aab57c69ea402939cf8fc423a0e5aaa1cab
 2015-08-31 08:24:50 +03:00
Dmitriy Zaporozhets 243bf65124 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-26 17:15:12 +02:00
Job van der Voort 7bcce28df6 Merge branch 'fix' into 'master' 
Fixed text about HTTP

Fixed for text to be more clear. Because of tweet https://twitter.com/mystygage/status/630798770012323840

See merge request !1921
 2015-08-26 11:16:13 +00:00
Dmitriy Zaporozhets 067673fbe7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into master-ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-19 11:13:30 +02:00
karen Carias 10491b5438 deleted line 2015-08-17 14:42:34 -07:00
Dmitriy Zaporozhets 680b087764 Merge master from CE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 14:01:32 +02:00
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' " 
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
 2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets c0bf026ed8 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-11 14:29:43 +02:00
Dmitriy Zaporozhets 84727fba96 Revert "Merge branch 'improve-merge-requests' into 'master' " 
This reverts commit 4773f38e28, reversing
changes made to 0d5d80b735.
 2015-08-11 10:26:19 +02:00
karen Carias 5ba2d53cfa fixed text 2015-08-10 16:56:02 -07:00
karen Carias e0642b2743 fixed conflict 2015-08-10 16:14:03 -07:00
karen Carias 37b4cfea3a fixed conflict and comment 2015-08-10 16:05:59 -07:00
karen Carias 8344c79508 fixed conflict and comment 2015-08-10 16:03:10 -07:00
Dmitriy Zaporozhets 0fd7d3ebe0 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-10 16:01:53 +02:00
Robert Speicher a71bed53e0 Merge branch 'merge-notifs' into 'master' 
See merge request !1077
 2015-08-07 18:47:02 -04:00
karen Carias 082467e8e6 Info about not receiving emails 2015-08-07 13:07:04 -07:00
Dmitriy Zaporozhets 3c5ef17975 Link merge request doc to README 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-07 13:07:03 +02:00
Dmitriy Zaporozhets 86bccb71a1 Create ref for every merge request. Add documentation for fetch merge requests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-07 12:54:58 +02:00
Douwe Maan 4f24eb2aa6 Merge branch 'master' into merge-notifs 2015-08-06 12:16:36 +02:00
Douwe Maan c6799b0e1e Update notification docs 2015-08-06 12:16:05 +02:00
Job van der Voort e9ba1185f2 Merge branch 'add-user' into 'master' 
Added new doc about adding users and members

Added new doc in workflow about how to add users and members and I also linked it to "permissions".

See merge request !1916
 2015-08-04 08:46:47 +00:00
karen Carias c5a6c16dba typo 2015-08-03 15:55:02 -07:00
karen Carias 28cc6d9b98 text fixed 2015-08-03 15:51:09 -07:00
Douwe Maan f949245a84 Merge remote-tracking branch 'gitlab-ce/master' into ce-to-ee 2015-07-31 16:12:46 +02:00
karen Carias e70901abe7 typo 2015-07-30 13:26:10 -07:00
karen Carias 168f10feba added new doc about adding users and members 2015-07-30 13:20:10 -07:00
Stan Hu 6b5551d994 Merge branch 'typo-corrections' into 'master' 
Minor styling fixes

- Link to rendered html instead of markdown source.
- Removed typos

See merge request !1044
 2015-07-30 06:39:12 +00:00
Job van der Voort 2f5359233d Merge branch 'doc-size' into 'master' 
Added info about repo size

Because of tweet https://twitter.com/s_hulard/status/624160758335672320

See merge request !1912
 2015-07-28 13:40:19 +00:00
Valery Sizov 73a8780285 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee 2015-07-28 14:24:57 +03:00
karen Carias 6b243dd138 fixed text 2015-07-27 21:53:55 -07:00
Arno Fleming 779318398c Minor styling fixes. 
- Link to rendered html instead of markdown source.
- Removed typos
 2015-07-25 18:43:58 +02:00
karen Carias a1ca9b5220 added info about repo size 2015-07-23 16:38:22 -07:00
karen Carias 9a7645c8a4 added note about labels in MR 2015-07-23 12:30:05 -07:00
Douwe Maan f032b15dcf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee 
# Conflicts:
#	README.md
#	app/controllers/projects_controller.rb
#	db/schema.rb
#	doc/workflow/README.md
#	lib/gitlab/satellite/merge_action.rb
 2015-07-23 13:40:31 +02:00
Stan Hu 59f3d5cdf5 Fix typos 2015-07-20 09:06:47 -07:00
Job van der Voort 17207b98be fix typo 2015-07-17 15:50:21 +00:00
Job van der Voort 114465c3b2 new documentation on merge request approvals 2015-07-17 16:47:54 +02:00
karen Carias 3d6e67e44e fixed notifications title 2015-07-13 10:36:29 -07:00
Dmitriy Zaporozhets dd32818441 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/assets/javascripts/project_new.js.coffee
	app/helpers/appearances_helper.rb
	app/helpers/application_helper.rb
	app/helpers/groups_helper.rb
	app/helpers/oauth_helper.rb
	app/models/user.rb
	app/views/admin/application_settings/_form.html.haml
	app/views/layouts/nav/_group.html.haml
	app/views/layouts/nav/_project_settings.html.haml
	app/views/profiles/accounts/show.html.haml
	doc/integration/README.md
	features/steps/project/merge_requests.rb
	features/support/env.rb
	spec/controllers/import/github_controller_spec.rb
	spec/helpers/oauth_helper_spec.rb
	spec/lib/gitlab/ldap/access_spec.rb
	spec/lib/gitlab/upgrader_spec.rb
	spec/models/project_team_spec.rb
	spec/routing/admin_routing_spec.rb
	spec/services/git_push_service_spec.rb
	spec/services/test_hook_service_spec.rb
 2015-07-02 17:07:02 +02:00
karen Carias c7f89e9ceb fixed phrase 2015-06-25 16:29:49 -07:00
karen Carias 770ba45581 fixed word 2015-06-25 16:20:42 -07:00
karen Carias b7930718a3 added info about EE 2015-06-25 11:43:41 -07:00
karen Carias 6ae5b8d704 added info about GitHub EE 2015-06-25 11:29:11 -07:00
karen Carias 8045d67376 added info about GitHub importing 2015-06-24 14:57:46 -07:00
karen Carias 7c5e9e98b9 added info to groups doc 2015-06-22 10:02:59 -07:00
Dmitriy Zaporozhets ae713ae8fc Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
	doc/README.md
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.12.md
	doc/workflow/README.md
 2015-06-17 11:25:59 +02:00
Karen Carias bdab1c6c46 added info about migrating to gitlab.com 2015-06-17 01:02:01 +00:00