Jeroen van Baarsen
8044b4d278
Merge branch 'master' into 'master'
...
ADD: Note on how to setup dns hostname resolution to installation manual
Hi,
I'm suggesting to add the following note to the installation instructions. It took me some time to figure out why the test failed and why I wasn't able to push. The error messages did not point into the right direction so this might help other people with the same problems.
I hope my english is good enough, if not, please feel free to rephrase anything.
Thank you in advance,
Holger Segnitz
See merge request !236
2015-05-27 07:11:44 +00:00
Dmitriy Zaporozhets
ebe0aef269
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-05-26 16:41:15 +03:00
Job van der Voort
109a3684f0
Merge branch 'backup_gitlab.com' into 'master'
...
Added note about backups for gitlab.com
Added note about backups for Gitlab.com based on question on Twitter
https://twitter.com/MarcelloLins/status/598544357294272513
See merge request !1828
2015-05-26 07:22:38 +00:00
Karen Carias
2b4eb7869e
Explained info better
2015-05-26 01:18:24 +00:00
Robert Speicher
fdde284c97
Document expanded autolinking in doc/markdown/markdown.md
2015-05-25 16:22:46 -04:00
Karen Carias
01c4683473
small fix
2015-05-25 19:56:11 +00:00
Douwe Maan
2d0a9c4cc2
Merge branch 'add-webhook-note-events' into 'master'
...
Add support for Webhook note events
This MR adds support for note events (comments) for WebHooks.
Perhaps the only potential source of confusion is that the settings indicates "Note Events" instead of "Comments". What do you think?
Screenshot after:

Closes https://github.com/gitlabhq/gitlabhq/issues/6745
See merge request !673
2015-05-25 07:57:52 +00:00
Karen Carias
0c14044203
fixed link
2015-05-22 23:12:12 +00:00
Karen Carias
43a11f4b53
Added link to keyboard shortcuts
2015-05-22 23:11:36 +00:00
Karen Carias
dffc313bb5
test1 image
2015-05-22 23:08:50 +00:00
Karen Carias
920b547d63
keyboard shortcuts in GitLab
2015-05-22 23:08:12 +00:00
karen Carias
fdc9ae7ca2
picture for shortcuts
2015-05-22 15:57:29 -07:00
Job van der Voort
33dbb30fb4
notify the core team and devs
2015-05-22 15:19:06 +02:00
Stan Hu
deeff56967
Add support for Webhook note events
...
Closes https://github.com/gitlabhq/gitlabhq/issues/6745
2015-05-21 23:48:16 -04:00
Karen Carias
9622348bed
Added note about backups for gitlab.com
2015-05-21 21:39:00 +00:00
Karen Carias
1132b3e8dc
Link to change your time zone in Gitlab CE
2015-05-21 20:05:39 +00:00
Karen Carias
871c90c3d1
Added instructions to change time zone in GitLab CE
2015-05-21 20:03:25 +00:00
Jacob Vosmaer
5483c2b0a9
How to dump a production DB to staging
2015-05-18 13:37:43 +02:00
Douwe Maan
fab9cbf98d
Update installation/update guides for 7.11.
2015-05-15 13:12:54 +02:00
Valery Sizov
7471047104
update API doc
2015-05-14 16:30:27 +03:00
Sytse Sijbrandij
cc0a4b7ee8
Merge requests are welcome in spite of the deprecation.
2015-05-13 12:16:05 +00:00
Dmitriy Zaporozhets
5dcbe6f4ba
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-05-13 14:27:02 +03:00
Sytse Sijbrandij
82dec4b49b
remove strange code branchets
2015-05-13 10:08:48 +00:00
Sytse Sijbrandij
cfef2a11d9
Deprecate the upgrader script since we forget to update it.
2015-05-13 10:08:04 +00:00
Jeroen van Baarsen
892158f136
Merge pull request #8872 from baloo/feature/execute_mr_webhooks_upon_commit
...
Call merge request web hook for each commits
2015-05-13 11:57:33 +02:00
Marin Jankovski
700e5117cd
Merge branch 'code-defreeze' into 'master'
...
defreeze code
Fixes #2166 .
See merge request !1820
2015-05-13 09:10:47 +00:00
Arthur Gautier
a927bf56b1
Call merge request web hook for each commits
...
Call merge request web hook every times a new commit hits the
source branch
Signed-off-by: Arthur Gautier <baloo@gandi.net >
2015-05-13 09:33:20 +02:00
Dmitriy Zaporozhets
0bac9d0135
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-05-12 16:26:21 +03:00
Douwe Maan
8acd705c8a
Update docs in line with mysql-postgresql-converter changes.
2015-05-12 13:36:20 +02:00
Valery Sizov
34a9aa2e8a
update migration style guide
2015-05-12 14:34:43 +03:00
Dmitriy Zaporozhets
9694c8164d
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-05-11 22:45:13 +03:00
Dmitriy Zaporozhets
f1ba3769bd
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-05-11 22:44:21 +03:00
Sytse Sijbrandij
881e11df1b
Small improvements to style guide.
2015-05-11 14:48:39 +00:00
Job van der Voort
6a6047f80c
create migration style guide. Fixes #2305
2015-05-11 15:09:36 +02:00
Job van der Voort
65b9ca9c08
defreeze code
2015-05-11 14:34:54 +02:00
Jakub Jirutka
f676bbf918
Update installation instructions, make kerberos optional
2015-05-11 13:37:56 +02:00
Robert Speicher
70bbf093aa
Remove class and id attributes from SanitizationFilter whitelist
2015-05-08 12:31:34 -04:00
Marin Jankovski
d9b6b9201e
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-05-08 17:07:37 +02:00
Job van der Voort
1c911b430c
Merge branch 'How_to_Reset_your_root_password' into 'master'
...
How to reset your root password
Added link and file correctly on Security doc.
Please review to make sure it's correct.
See merge request !1811
2015-05-08 14:36:50 +00:00
Job van der Voort
c74a0be9f8
make it more obvious what happens in the code
2015-05-08 14:36:24 +00:00
Job van der Voort
83c5aa6888
remove redundant colon
2015-05-08 14:35:05 +00:00
Valeriy Sizov
f682a6adb9
Merge pull request #9214 from Bugagazavr/hook-events
...
Added X-GitLab-Event header for web hooks
2015-05-08 17:17:01 +03:00
bugagazavr
acac788902
Added X-GitLab-Event header for web hooks
2015-05-08 16:49:03 +03:00
Valery Sizov
3a18eb8d3a
Fix link to the CI documentation
2015-05-08 15:22:19 +03:00
Sytse Sijbrandij
8a413174a5
Merge branch 'backup_doc' into 'master'
...
Improved the backup documentation
See merge request !621
2015-05-08 12:16:08 +00:00
Valery Sizov
b031a26376
improved backup doc
2015-05-08 15:10:04 +03:00
Dmitriy Zaporozhets
6c32abc5f7
Merge branch 'rs-task_list' into 'master'
...
Use task_list gem for task lists
Task Lists can now be used in comments, and they'll render in previews. 👏
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271
See merge request !599
2015-05-08 09:39:48 +00:00
Job van der Voort
0384d2929f
Merge branch 'sidekiq-memory-killer-shutdown-signal' into 'master'
...
Add SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL env var
It looks like SIGTERM may not be enough to shut down a Sidekiq process
when its RSS has gotten too big. This change will allow us to experiment
with sending SIGKILL instead of SIGTERM to Sidekiq processes on
gitlab.com.
See merge request !1812
2015-05-08 09:01:10 +00:00
Marin Jankovski
0fc6f0b5d4
Merge branch 'new-issue-after-release' into 'master'
...
new issue after release
See merge request !1810
2015-05-08 07:10:54 +00:00
Marin Jankovski
5dc84fa5ca
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-05-08 09:08:56 +02:00