home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 01:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,747 Commits 48 Branches 340 Tags
300b7c19ea7634e67ec5cb5dd58dac90db9e9ce7
Commit Graph
1183 Commits
Author SHA1 Message Date
Marin Jankovski 300b7c19ea Move the branded login page documentation to customization directory. 2014-06-18 11:51:44 +02:00
Marin Jankovski 0c51f13a84 Add branded login page documentation. 2014-06-18 11:33:16 +02:00
Dmitriy Zaporozhets b165b097f5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb
 2014-06-17 10:53:44 +03:00
Marin Jankovski d4a1b4c5bf Packages for 6.9.4-ee 2014-06-16 11:54:27 +02:00
Dmitriy Zaporozhets 87fd342a23 Merge branch 'more-secure-api' into 'master' 
More secure api

Dont expose user email via API. Fixes #1314
 2014-06-14 09:39:01 +00:00
Dmitriy Zaporozhets 342b7b62c4 Merge branch 'git-2-docs' into 'master' 
Git 2 docs

Related to #1318
 2014-06-13 15:09:32 +00:00
Dmitriy Zaporozhets a7345e368a Fix gravatar size and update docs for new users API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 18:02:42 +03:00
Dmitriy Zaporozhets 76e2564018 Recommend setup git 2.0 for installation docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 15:10:58 +03:00
Dmitriy Zaporozhets 1355ede49d Wipe wall notes feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 14:24:54 +03:00
Sytse Sijbrandij d2d99521b6 Clarify the master branch release instructions. 2014-06-11 10:37:48 +02:00
Jacob Vosmaer 84cdd53358 Add 6.9-ce-to-ee.md update doc 2014-06-11 10:33:06 +02:00
Sytse Sijbrandij 5d95fc6726 Link in code sections do not work. 2014-06-10 14:45:03 +02:00
Sytse Sijbrandij 95af7123bb Reformulate some of the https instructions. 2014-06-10 14:43:11 +02:00
Sytse Sijbrandij 772f2f1ac8 Merge branch 'https_documentation' into 'master' 
Https in installation document
 2014-06-10 12:32:25 +00:00
Marin Jankovski fa9c39591c Extract gitlab-shell configuration note to gitlab-shell section. 2014-06-10 12:57:50 +02:00
Marin Jankovski b980ab407e Update installation doc to mention using https. 2014-06-10 11:58:11 +02:00
Dmitriy Zaporozhets 1687095db6 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-06-10 12:40:28 +03:00
Dmitriy Zaporozhets d205292552 Merge branch 'gitlab_shell_version_file' into 'master' 
Gitlab shell version file
 2014-06-10 09:35:34 +00:00
Marin Jankovski dca6c490cc Update check task and add to monthly release doc lines about gitlab_shell_version file. 2014-06-10 11:16:47 +02:00
Marin Jankovski 3affaa9b98 Add python-docutils to dependency list. 2014-06-10 10:40:28 +02:00
Dmitriy Zaporozhets a93ae9dc61 Merge pull request #7043 from jvanbaarsen/update-installation-dox 
We need to change config in step 5
 2014-06-09 22:12:45 +03:00
Jacob Vosmaer 95cfe76818 Update 6.9.3 omnibus packages with OpenSSL 1.0.1h 2014-06-06 13:46:10 +02:00
Jacob Vosmaer 1a87fb754e Protect stable branches 2014-06-06 09:36:19 +02:00
Dmitriy Zaporozhets 77b6bd9b49 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-06-05 21:41:04 +03:00
Achilleas Pipinellis 7be6b8ca73 Move gitlab-ssl nginx config from gitlab-recipes 2014-06-05 16:54:50 +03:00
Ciro Santilli 27f32ac648 Remove conflict artifact. 2014-06-05 14:47:51 +02:00
Sytse Sijbrandij 4ed39a77ef Support Ruby 2.1 and better explain the memory requirements. 2014-06-05 08:45:12 +02:00
Jeroen van Baarsen 793955cdfc We need to change config in step 5 2014-06-04 23:04:44 +02:00
Marin Jankovski 8361faec57 Packages for 6.9.3-ee 2014-06-04 10:46:29 +02:00
Sytse Sijbrandij 6e18d5e9be Merge branch 'master' into 'master' 
Fixing typo in help for public access

Fixing a typo in the help page
 2014-06-04 08:16:34 +00:00
Kaizer Sogiawala 0d861c9935 Fixing typo 2014-06-04 00:57:14 -07:00
Marin Jankovski 4147fc7eb6 Update patch release document. 2014-06-04 09:27:23 +02:00
Ciro Santilli fd348de76d Update docs to markdown style guide. 2014-06-03 23:16:31 +02:00
Marin Jankovski c8460c4731 Update the one-liner. 2014-06-02 09:48:55 +02:00
Marin Jankovski 379299ad18 Add bash one liner in updater doc due to change of updater location. 2014-06-02 09:39:43 +02:00
Dmitriy Zaporozhets 94b0f1b2bb Bump gitlab-shell version 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-31 15:57:22 +03:00
Dmitriy Zaporozhets d54d3324b1 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-05-30 18:05:14 +03:00
Dmitriy Zaporozhets bd7c3955b1 Merge pull request #6882 from Tandrial/master 
Satellites access fix
 2014-05-30 16:59:02 +03:00
Dmitriy Zaporozhets d8c7efa626 Dont allow git tag rewrite/removal unless you are master 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-30 16:26:45 +03:00
Marin Jankovski 5fa80fa9b0 Packages for 6.9.2-ee 2014-05-30 13:05:46 +02:00
Sytse Sijbrandij 5e20b0a73c Merge branch 'new_index_converter' into 'master' 
New index converter
 2014-05-29 16:58:48 +00:00
Jacob Vosmaer bc62c283c6 Download schema.rb.bundled if necessary 2014-05-29 15:42:20 +02:00
Jacob Vosmaer 4f049c8845 Release new EE 6.8.1 packages 
The old packages were having issues with gitlab-shell.
 2014-05-29 14:53:15 +02:00
Dmitriy Zaporozhets 6fdd900827 Merge pull request #7014 from asedge/api_create_tag 
Add CreateTagService.  Use new service to allow tag creation through API.
 2014-05-29 15:37:42 +03:00
Dmitriy Zaporozhets ec837932d0 Merge pull request #7036 from willkara/patch-1 
Too many zeros in CPU req listing
 2014-05-29 15:19:27 +03:00
Dmitriy Zaporozhets 0e4bc4e6de Merge branch 'link-doc-help' into 'master' 
Readme on the help page

Adds the readme from the docs to the help page instead of the current links.

Fixes #1117
 2014-05-29 11:33:54 +00:00
Marin Jankovski 2dbf1a00a9 Ruby 2.0+ is a requirement. 2014-05-29 10:15:14 +02:00
Marin Jankovski 59797b2f2e Remove list items styling in show render. 2014-05-29 08:44:25 +02:00
William Karavites e52c4a62f2 Too many zeros in CPU req listing 
There were too many zeros in the listing of users for CPU's.
 2014-05-28 13:08:00 -04:00
Dmitriy Zaporozhets 1932f902d5 Allow masters to create projects in groups 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:04:42 +03:00