Commit Graph
2231 Commits
Author SHA1 Message Date
Yves Senn 20365121e0 Merge pull request #4606 from chaixl/master
Add assets precompile step for fixing activities lost and some UI style issues
2013-07-23 02:35:13 -07:00
Jacob Vosmaer 707cea8d45 Merge pull request #4600 from lukaselmer/patch-1
Replace vim by editor
2013-07-22 01:28:50 -07:00
Axilleas Pipinellis 6d0b210ce8 Bump version of gitlab-shell to 1.7.0 2013-07-22 09:18:48 +03:00
Chai Xue Liang 7d6960104d Add assets precompile step for fixing activities lost and some UI style issues 2013-07-20 04:20:21 -07:00
Jeroen van Baarsen 2a5e05cfd8 Fixed an old reference to puma 2013-07-20 12:31:13 +02:00
Lukas Elmer 66d239f972 Replace vim by editor 2013-07-19 17:29:10 +02:00
Dmitriy Zaporozhets d3c429ed21 Doc for update from 5.3 to 5.4 2013-07-18 19:32:13 +03:00
Jacob Vosmaer d3e94eef4a Refer to recipes for nginx alternatives 2013-07-18 15:36:01 +02:00
Ariejan de Vroom afa1a20de1 Revert "Update installation.md"
This reverts commit 670e1be7a4.
2013-07-18 12:59:41 +02:00
Ariejan de Vroom 2d9bbe662e Revert "Update installation.md"
This reverts commit b5cd66d41d.
2013-07-18 12:59:18 +02:00
Ariejan de Vroom 4b47a58f2f Merge pull request #4564 from mpwoodward/patch-2
Update installation.md
2013-07-18 03:27:03 -07:00
Ariejan de Vroom 5a5d34e240 Merge pull request #4563 from mpwoodward/patch-1
Update installation.md
2013-07-18 03:26:26 -07:00
Sean Zicari 87e8c2dc3d Update README.md
Updated the relative links in ## Contents to point to the correct documents.
2013-07-17 13:51:12 -07:00
Dmitriy Zaporozhets 247e095186 Update docs 2013-07-16 11:50:00 +03:00
Matt Woodward 670e1be7a4 Update installation.md
Additional unicorn -> puma reference update
2013-07-15 15:35:14 -07:00
Matt Woodward b5cd66d41d Update installation.md
Updated incorrect/outdated references to unicorn.rb; changed to puma.rb
2013-07-15 15:32:41 -07:00
Dmitriy Zaporozhets 3c0596974a Merge pull request #4538 from amacarthur/public-project-api2
enhance project creation apis to allow setting of public attribute
2013-07-14 10:12:23 -07:00
Martin Bastien de5c8601eb Fix invalid task name migrate_global_keys 2013-07-12 21:37:05 -04:00
Angus MacArthur ace5c54ab9 enhance project creation apis to allow setting of public attribute
Change-Id: Ib71ce8cf993627eada63d7d596fb302ec702f36e
2013-07-12 12:10:42 -04:00
Dmitriy Zaporozhets 5181816970 Merge branch 'master' into 6-0-dev 2013-07-12 14:42:35 +03:00
Dmitriy Zaporozhets 8cdfa86b57 Merge pull request #3993 from bke-drewb/3599
Issue 3599: Add snippets_enabled flag to projects for API
2013-07-11 09:54:15 -07:00
Dmitriy Zaporozhets 6a9aed1e87 Merge branch 'master' into 6-0-dev
Conflicts:
	CHANGELOG
	VERSION
	app/views/admin/teams/projects/new.html.haml
	app/views/projects/teams/available.html.haml
	doc/install/installation.md
2013-07-10 14:03:00 +03:00
Dmitriy Zaporozhets 90d497056f Merge pull request #4515 from amacarthur/fork-admin
Additon of apis for fork administration.
2013-07-10 03:54:58 -07:00
Angus MacArthur ea5a006f27 Additon of apis for fork administration.
Added ability to add and remove the forked from/to relatioinship
between existing repos.
2013-07-08 17:34:00 -04:00
Dmitriy Zaporozhets 63e532eff0 Cache MR diffs result. Improve diff output 2013-07-08 20:12:35 +03:00
Sytse Sijbrandij de680eb8c0 Use default system editor. 2013-07-08 18:52:10 +02:00
Dmitriy Zaporozhets 9ee86156db Merge pull request #4508 from Razer6/fix_broken_api_links
Fix broken API links, fixes #4463
2013-07-08 03:22:12 -07:00
Dmitriy Zaporozhets 6ace422c29 Merge branch 'master' into 6-0-dev
Conflicts:
	Gemfile
	Gemfile.lock
2013-07-08 09:50:10 +03:00
Dmitriy Zaporozhets 6f5f5e7ee3 Add suppoort of unicorn and fog gems 2013-07-08 09:47:31 +03:00
Robert Schilling 4de11c2009 Fix broken API links, fixes #4463 2013-07-07 12:35:37 +02:00
Matt Humphrey 4bba945437 Added client list to API doc 2013-07-06 10:14:06 +01:00
Dmitriy Zaporozhets 2643ee72a9 docs to ruby 2.0 2013-07-06 10:59:00 +03:00
Andrew Gallagher 0c4fd05d72 move 'make config/database.yml readable to git only' instruction
I've moved the instruction in question to the the 
'Configure GitLab DB settings'. Can't change permission to a file that doesn't already exist 😉
2013-07-03 15:15:50 +10:00
Dmitriy Zaporozhets f438bd415f Merge branch 'master' into 6-0-dev
Conflicts:
	app/controllers/admin/teams/projects_controller.rb
	app/views/team_members/_team_member.html.haml
	app/views/teams/members/_member.html.haml
2013-06-30 11:35:40 +03:00
Dmitriy Zaporozhets d9c02f30e5 Merge pull request #4460 from tstone2077/feature_help_markdown
Adding detailed documentation of the markdown syntax.
2013-06-30 01:22:21 -07:00
Ariejan de Vroom 2b4bebd9f2 Doc: set permission on config.database.yml 2013-06-29 17:31:08 +03:00
Thurston StoneandThurston Stone 2a601d26f2 Adding detailed documentation of the markdown syntax.
This includes standard markdown as well as GitLab extended markdown as well as references to documents used.
2013-06-29 00:44:24 -05:00
Dmitriy Zaporozhets 7ae72e6511 Merge pull request #4323 from axilleas/update_docs
Create uploads dir otherwise backup fails. Fix #4304
2013-06-28 21:55:13 -07:00
Dmitriy Zaporozhets 0705a7a507 Changelog updated. Added migrate docs for 6.0 2013-06-25 16:49:27 +03:00
Yves Senn b8eee565a8 Merge pull request #4369 from zeehio/patch-1
[Doc] Update 5.0 to 5.1: Recompile assets
2013-06-24 00:12:12 -07:00
Robert Schilling 8c1ac6f3c6 Fix wrong file versions in update docs 2013-06-22 13:29:51 +02:00
Sytse Sijbrandij 76f2e065ea Merge branch 'master' into install-guide-improvements
Conflicts:
	doc/install/installation.md
2013-06-21 21:18:20 +02:00
Sergio Oller 98423a37b2 [Doc] Update 5.0 to 5.1: Recompile assets
Recompiling assets on the update is needed or main menu appearance may not load properly. This has been mentioned on issues #3722 and #3978.

The command has been tested several by users on those issues and by myself.

Thanks for your time and attention.
2013-06-21 11:05:21 +02:00
Dmitriy Zaporozhets 48d372725a Update docs from 5.2 to 5.3 2013-06-20 09:52:47 +03:00
Dmitriy Zaporozhets 148eade9d7 Version to 5.3 2013-06-19 19:57:32 +03:00
Axilleas Pipinellis ddc57ece6b Create uploads dir otherwise backup fails. Fix #4304 2013-06-17 11:38:27 +03:00
Sytse Sijbrandij 8ccad7c3c7 Fix spelling error and make sure you never log in as git user so you never have to logout to run sudo. 2013-06-16 22:06:33 +02:00
Sytse Sijbrandij f01d482427 Make the installation guide easier to follow for non-unix people. 2013-06-12 21:30:36 +02:00
Drew Blessing 31b06ebd01 Issue 3599: Add snippets_enabled flag to projects for API
s 3599: Add snippets_enabled flag to projects for API

Replace missing comma
2013-06-11 21:38:02 -05:00
Greg Barendt ad0f1276db Fix paths to the Contents Markdown pages 2013-06-11 11:36:54 -03:00