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
90d497056f
Merge pull request #4515 from amacarthur/fork-admin
...
Additon of apis for fork administration.
2013-07-10 03:54:58 -07:00
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
63e532eff0
Cache MR diffs result. Improve diff output
2013-07-08 20:12:35 +03:00
de680eb8c0
Use default system editor.
2013-07-08 18:52:10 +02:00
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
6ace422c29
Merge branch 'master' into 6-0-dev
...
Conflicts:
Gemfile
Gemfile.lock
2013-07-08 09:50:10 +03:00
6f5f5e7ee3
Add suppoort of unicorn and fog gems
2013-07-08 09:47:31 +03:00
4de11c2009
Fix broken API links, fixes #4463
2013-07-07 12:35:37 +02:00
4bba945437
Added client list to API doc
2013-07-06 10:14:06 +01:00
2643ee72a9
docs to ruby 2.0
2013-07-06 10:59:00 +03:00
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
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
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
2b4bebd9f2
Doc: set permission on config.database.yml
2013-06-29 17:31:08 +03:00
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
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
0705a7a507
Changelog updated. Added migrate docs for 6.0
2013-06-25 16:49:27 +03:00
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
8c1ac6f3c6
Fix wrong file versions in update docs
2013-06-22 13:29:51 +02:00
76f2e065ea
Merge branch 'master' into install-guide-improvements
...
Conflicts:
doc/install/installation.md
2013-06-21 21:18:20 +02:00
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
48d372725a
Update docs from 5.2 to 5.3
2013-06-20 09:52:47 +03:00
148eade9d7
Version to 5.3
2013-06-19 19:57:32 +03:00
ddc57ece6b
Create uploads dir otherwise backup fails. Fix #4304
2013-06-17 11:38:27 +03:00
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
f01d482427
Make the installation guide easier to follow for non-unix people.
2013-06-12 21:30:36 +02:00
ad0f1276db
Fix paths to the Contents Markdown pages
2013-06-11 11:36:54 -03:00
ae90107caa
mention puma cluster mode for bigger instances
2013-06-11 15:10:45 +03:00
6d6d084c39
Merge pull request #4065 from bbodenmiller/release-todos
...
add creating new release guide
2013-06-11 02:13:58 -07:00
1405d28cf7
update upgrade guide with backup, db specific commands, config changes, check, and restore
2013-06-07 17:00:40 +03:00
8df699a336
API: project events
2013-06-06 19:19:17 +03:00
543506f3c5
API: Add last_activity_at date to project entity
2013-06-06 18:40:05 +03:00
da6f4f06c7
API: implement retrieve of repository tree
2013-06-06 18:01:03 +03:00
beb0adf202
Fix api readme links
2013-06-06 15:40:26 +03:00
68d146b4a6
Improve api docs
2013-06-06 13:19:23 +03:00
963f475daf
Fix milestone api docs: invalid param for close
2013-06-06 12:32:05 +03:00
a4e671dc31
Fix wrong documentation for issue close api. Fixes #3548
2013-06-06 11:31:40 +03:00
cd5685ca8c
Merge pull request #4115 from bke-drewb/apidocs
...
Update api docs and remove old attribute from User entity.
2013-05-29 23:25:40 -07:00
8f50eb7467
adding update info regarding gitlab-shell config.yml
2013-05-29 15:03:54 -06:00
07fd95f384
Update api docs and remove old attribute from User entity.
...
The API docs incorrectly referenced a few attributes associated with users. The 'blocked' attribute has been replaced with 'state'. Also, 'dark_scheme' seems to no longer be available in the User model so it should be removed from the exposed attributes in the API User entity.
Add color scheme ID to API User entity
2013-05-29 05:40:17 -05:00
e26d149cd8
Merge branch 'double-check-after-start' of /home/git/repositories/gitlab/gitlabhq
2013-05-27 12:47:20 +00:00
c3ba0ee64b
Merge branch 'feature_teams_api' of https://github.com/former03/gitlabhq into former03-feature_teams_api
...
Conflicts:
doc/api/README.md
2013-05-27 15:05:01 +03:00
f44bd269ee
Merge pull request #4072 from ndpgroup/import_w_groups
...
Include groups in import with import repos rake task
2013-05-27 03:03:30 -07:00
b3bb558501
Merge pull request #4075 from bbodenmiller/patch-6
...
remove branch dependencies in README where not necessary
2013-05-27 02:47:16 -07:00
1194531e8e
Merge pull request #4079 from bbodenmiller/patch-8
...
details on looking for correct installation guide
2013-05-27 02:45:15 -07:00
603720e3aa
remove branch dependencies where not necessary
2013-05-27 00:32:58 -07:00
0f615d4096
add creating new release guide
2013-05-27 00:21:01 -07:00
35e0d7feaf
Merge pull request #4082 from bbodenmiller/patch-10
...
no need to download init and nginx files since they are in repo now
2013-05-26 22:51:05 -07:00
29a522cb42
no need to download init and nginx files since they are in repo now
2013-05-25 22:51:12 -06:00
Dmitriy Zaporozhets
Angus MacArthur
Sytse Sijbrandij
Robert Schilling
Matt Humphrey
Andrew Gallagher
Ariejan de Vroom
Thurston Stone
Yves Senn
Sergio Oller
Axilleas Pipinellis
Greg Barendt
Ben Bodenmiller
Trevor Strieber
Drew Blessing