home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-27 21:46:16 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,559 Commits 48 Branches 340 Tags
a9d61ee054e91be5cc98f2a051e1329dc290316d
Commit Graph
149 Commits
Author SHA1 Message Date
Douwe Maan f949245a84 Merge remote-tracking branch 'gitlab-ce/master' into ce-to-ee 2015-07-31 16:12:46 +02: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
Robert Speicher cdf893bc15 Move 2FA docs from "Workflow" to "Profile Settings" 2015-06-13 17:59:12 -04:00
Dmitriy Zaporozhets 07703c22b3 Improve approve MR widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-12 16:00:25 +02:00
Dmitriy Zaporozhets f840903112 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/helpers/tab_helper.rb
	app/models/merge_request.rb
	app/views/layouts/nav/_project_settings.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	doc/api/groups.md
 2015-06-12 11:16:28 +02:00
Dmitriy Zaporozhets 148178fb98 Merge branch 'rs-issue-1758' into 'master' 
Update grids for 2FA details

Also adds a link to the documentation.

Closes #1758

See merge request !795
 2015-06-11 15:00:08 +00:00
Dmitriy Zaporozhets 491dc6506f Documentation for approval feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-11 16:06:57 +02:00
Job van der Voort 7872c7ff62 fix and minify images 2015-06-11 15:12:47 +02:00
Job van der Voort 9a4886f0a0 move and fix links importing docs 2015-06-11 14:45:48 +02:00
Robert Speicher fbdcaebcd1 Fix "Acount" typo in 2FA docs 
[ci skip]
 2015-06-10 17:11:04 -04:00
Karen Carias fd9849ebba fixed links 2015-06-10 03:19:40 +00:00
Dmitriy Zaporozhets efdf3d2905 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	doc/README.md
	doc/workflow/README.md
 2015-06-09 19:24:37 +02:00
Karen Carias b4116e76cb Removed link "importing to gitlab" because it's in "Documentation". Organized links in alphabetical order. 2015-06-08 20:55:42 +00:00
Karen Carias 44aaf40ad3 fixed numbers 2015-06-08 20:37:28 +00:00
Karen Carias 0c538cd8b5 fixed numbers 2015-06-08 20:36:28 +00:00
Karen Carias fc9d90c379 fixed numbers 2015-06-08 20:35:53 +00:00
Karen Carias e150ab9cee Added info about milestones and wiki pages not imported from Bitbucket 2015-06-08 20:31:02 +00:00
Karen Carias ce7831ae39 fixed importing link 2015-06-08 20:26:58 +00:00
Dmitriy Zaporozhets a83d0034e3 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/services/files/base_service.rb
	app/services/files/create_service.rb
	app/services/files/delete_service.rb
	app/services/files/update_service.rb
	doc/workflow/README.md
 2015-06-08 18:24:34 +02:00
Job van der Voort b368d4a1d1 fix spacing in document 2015-06-08 16:37:04 +02:00
Job van der Voort 8a32c46e6e importing documents renewed 2015-06-08 16:35:03 +02:00
Sytse Sijbrandij 509fe1159a Merge branch 'master' into 'master' 
Doc: Added FreeOTP to 2FA

I have just added a note about a free alternative to Google Authenticator to the documentation of your two factor authentication.

See merge request !777
 2015-06-06 13:11:01 +00:00
rugk 975d110688 Changed spelling 2015-06-06 12:34:40 +00:00
rugk 507ebb701a Escaped(?) 2015-06-05 13:18:05 +00:00
rugk 193f019f61 Added free alternative to Google Authenticator (FreeOTP). 2015-06-05 13:16:47 +00:00
Douwe Maan bdfd163aa1 Add info about WIP merge requests to docs. 2015-06-05 13:12:55 +02:00
Dmitriy Zaporozhets 935fc796d1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb
 2015-06-05 11:40:36 +02:00
Job van der Voort 41ee2aa2d7 fix typo and add screenshots 2015-06-03 15:35:13 +02:00
Robert Speicher 42f3626862 Add 2FA docs 
[ci skip]
 2015-06-02 18:39:30 -04:00
Stefan Schweter 8313aa6da8 Adds new section for changing time zone in GitLab configuration file. New section added for changing time zone in Omnibus installations. 2015-05-27 14:06:40 +02:00