Commit Graph
1658 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets ef9f8677e6 Expose author username in project events API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-31 12:08:45 +02:00
Dmitriy Zaporozhets aa75a755ee Merge branch 'api-delete-branch-json' into 'master'
Api delete branch json

Fixes gitlab/gitlabhq#1478

See merge request !1233
2014-10-31 09:38:24 +00:00
Sytse Sijbrandij 5a699090cd Merge branch 'improve_rake_import_doc' into 'master'
Improve import Documentation

Improved the documentation steps for importing bare git repositories to GitLab.

@dzaporozhets I added a step to create gitlab-satellites. Is this step really necessary, or do the satellites get created as needed?

See merge request !1234
2014-10-30 22:51:41 +00:00
Patricio Cano 2022754d93 Modified according to suggestions by @sytse 2014-10-30 17:36:25 -05:00
Sytse Sijbrandij a1dda564b1 Revert "Change update recommendation" since it should be fixed with
c3104abfd4

This reverts commit 8101640c33.
2014-10-30 14:59:05 -07:00
Patricio Cano 5c645b76b3 Fixed typo 2014-10-30 13:14:31 -05:00
Patricio Cano 792f7e09e2 Corrected layout, to be more friendly. 2014-10-30 13:10:07 -05:00
Patricio Cano 493d3e8240 Corrected the wording of the documentation and the layout. 2014-10-30 13:08:10 -05:00
Patricio Cano 19caccf773 Added the satellites:create step, that might be necessary after the import.
Corrected syntax.
2014-10-30 12:38:09 -05:00
Dmitriy Zaporozhets 20e04d9f39 Delete branch via API: doc updated
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-30 17:30:09 +02:00
Dmitriy Zaporozhets 8431db3326 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-10-30 16:17:48 +02:00
Dmitriy Zaporozhets f0dd16d53e Merge branch 'master' of github.com:gitlabhq/gitlabhq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-10-30 16:17:36 +02:00
Sean Edge 822d9aa6ba Create RepoTag Grape entity and present it when doing stuff with tags via API. Update API doc for repositories. Add tag message to tag list page in UI. Update Changelog. Update spec to set .gitconfig identity, required for annotated tags. 2014-10-30 09:48:23 -04:00
Robert Schilling f99b876837 Merge pull request #8185 from bbodenmiller/patch-3
fix markdown formatting
2014-10-30 08:53:37 +01:00
Robert Schilling b8d85bc230 Merge pull request #8194 from bbodenmiller/patch-9
ruby -> Ruby
2014-10-30 08:51:39 +01:00
Ben Bodenmiller 12e751a892 Quit the database session at end of database setup 2014-10-30 00:01:19 -07:00
Ben Bodenmiller 9c6106c4f6 clarify that 'template1=#' is part of prompt
Similar to https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/database_mysql.md clarify that `template1=#` is part of the prompt.
2014-10-29 23:58:34 -07:00
Ben Bodenmiller 87fa3f0d2e ruby -> Ruby 2014-10-29 21:18:57 -07:00
Ben Bodenmiller 1f62cb3ee7 fix git installation 2014-10-29 19:09:24 -07:00
Sytse Sijbrandij bd0d679b23 Update patch manual to link to blog post. 2014-10-29 16:24:07 -07:00
Patricio Cano e712583a5e Improved rake documentation for importing existing repositories with a rake task. 2014-10-29 17:21:55 -05:00
Dmitriy Zaporozhets f01e311ed1 Merge branch 'update-gitlab-shell-to-corresponding-version' into 'master'
Update gitlab shell to corresponding version

This prevents people upgrading to a to recent version of GitLab Shell as happend in https://gitlab.com/gitlab-org/gitlab-ce/issues/700

See merge request !227
2014-10-29 17:10:36 +00:00
Dmitriy Zaporozhets a565c51b86 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-10-29 13:41:29 +02:00
Dmitriy Zaporozhets 93bed4435e Merge pull request #8060 from dblessing/feature/bamboo_service
Add Atlassian Bamboo service
2014-10-29 13:41:13 +02:00
Jacob Vosmaer 527bbd44de Merge branch 'master' into 'master'
Close #717

This closes #717:

Add documentation changes to:

 * Set the permissions of the unix socket properly
 * Create the directory for the socket
 * Make sure tmpfiles.d persists said directory

The first change makes sure gitlabl can connect to the socket. The latter two avoid redis from failing to start on systemd-based systems, including recent versions of Debian.

You may probably want to cherry-pick this into the documentation for the latest stable release.

See merge request !224
2014-10-29 11:01:18 +00:00
Sytse Sijbrandij 1d0f638248 Don't update GitLab Shell to the latest version but to the corresponding version. 2014-10-28 10:57:30 -07:00
Ben Bodenmiller dc4caa26bf minor requirements.md cleanup
* "Non Unix"->"Non-Unix"
* Fix poor wording
2014-10-28 09:47:57 -07:00
Dmitriy Zaporozhets ec4a079099 Merge pull request #7976 from bbodenmiller/patch-9
support latest firefox esr release
2014-10-28 14:07:42 +02:00
Drew Blessing 776bca07cd Add Atlassian Bamboo service 2014-10-28 05:20:36 -05:00
Ben Bodenmiller 6093d4fd83 fix markdown formatting
fix markdown formatting issue
2014-10-27 23:28:02 -07:00
Sytse Sijbrandij 45d9446978 Merge pull request #8178 from dblessing/backport/update-doc
Change update recommendation
2014-10-27 11:27:05 -07:00
Dmitriy Zaporozhets 08d361e8b3 Merge branch 'improve_release_doc' into 'master'
Improvements for release documentation

See merge request !1203
2014-10-27 16:56:22 +00:00
Valery Sizov fd44d0b6c2 update release doc 2014-10-27 16:02:21 +02:00
Drew Blessing 8101640c33 Change update recommendation 2014-10-27 08:30:57 -05:00
Valery Sizov f9885c0c3c Merge branch '7-4-stable-non-conflict' into 'master'
7-4-stable to master.  With resolved conflicts

See merge request !1221
2014-10-27 11:48:24 +00:00
Valery Sizov 21e8f43af3 Merge branch 'master' into 7-4-stable
Conflicts:
	CHANGELOG
	VERSION
2014-10-27 12:08:44 +02:00
Dmitriy Zaporozhets 2f6856f713 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-27 12:00:19 +02:00
Valery Sizov 250d582bdd update patch document 2014-10-24 22:28:02 +03:00
Sytse Sijbrandij f6bed511cd Merge pull request #8126 from bbodenmiller/cleanup-release
cleanup monthly release details
2014-10-24 20:41:44 +02:00
Steven Sloan 7b339e61e8 update slack-notifier to 1.0.0, use raw webhook_url per slack recommendation
per changes with slack, they’re now using “static” web hook urls that describe the team & service with IDs that don’t change if the team or service name change. their recommendation is to use the raw webhook_url instead of building it out of components to allow more flexibility

this should also prevent issues cropping up with mistakes in how the urls are parsed
2014-10-23 14:47:28 -04:00
Hugo Osvaldo Barrera add5d43b6e Close #717
Add documentation changes to:

 * Set the permissions of the unix socket properly
 * Create the directory for the socket
 * Make sure tmpfiles.d persists said directory

The first change makes sure gitlabl can connect to the socket. The latter two
avoid redis from failing to start on systemd-based systems, including recent
versions of Debian.
2014-10-23 14:01:44 -03:00
Marin Jankovski 1c1d9f78a4 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-10-23 16:41:39 +02:00
Sytse Sijbrandij 6e9fb7facc Added relative dates, removed packages for GitLab.com. 2014-10-23 16:24:44 +02:00
Job van der Voort 6704792933 link third applications to website 2014-10-23 11:11:53 +02:00
Ciro Santilli 5d5b3b8273 Fix doc raketasts import md style [ci skip] 2014-10-22 22:56:42 +02:00
Ben Bodenmiller aa923847b2 cleanup monthly release details 2014-10-21 14:23:58 -07:00
Valery Sizov be80837a69 Update Guide: Change path to nginx config 2014-10-21 19:12:52 +03:00
Jacob Vosmaer 5661451c36 Merge branch 'doc-ldap_user_filter' into 'master'
Update LDAP documentation

See merge request !1199
2014-10-21 11:25:46 +00:00
Sytse Sijbrandij 2e4a33b287 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-10-21 13:22:07 +02:00
Sytse Sijbrandij e6631c8786 Merge request for blog post on gitlab.com next time. 2014-10-21 13:21:58 +02:00