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
Karen Carias
c406bce4b5
Deleted > and commented "or" out
2015-05-07 16:48:25 +00:00
Jacob Vosmaer
1c1f18b416
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.
2015-05-07 18:47:03 +02:00
Karen Carias
94a426d2e6
Added link to root password doc correctly
2015-05-07 16:11:18 +00:00
Job van der Voort
4164f6155a
new issue after release
2015-05-07 14:26:21 +00:00
Marin Jankovski
e7dc9ca2d0
Add yanking pkg example to the release documentation.
2015-05-07 16:15:58 +02:00
Job van der Voort
415648e255
revert to 7.10.1
2015-05-07 13:39:10 +00:00
Job van der Voort
895bc33fef
Update upgrader doc to point to 7.10.2
2015-05-07 12:24:18 +00:00
Sytse Sijbrandij
deddad6025
Document sidekiq restarting functionality.
2015-05-07 14:22:14 +02:00
Valery Sizov
bc45469b6a
Link to CI backup documentation
2015-05-07 13:34:59 +03:00
Robert Speicher
cca28c7920
Update Markdown help docs for latest changes
2015-05-06 21:04:33 -04:00
Patricio Cano
69f3b40031
Fixed broken permissions link.
2015-05-05 16:14:54 +00:00
Marin Jankovski
595931580d
Merge branch 'improve-external-issue-tracker-config-doc' into 'master'
...
Improve documentation of configuring external issue trackers
There was some confusion over the deprecated `:issues_tracker_id` field. Added documentation.
Closes #1514
See merge request !580
2015-05-04 16:02:05 +00:00
Dmitriy Zaporozhets
c874422bb0
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-05-04 18:07:03 +03:00
Stan Hu
07dc517017
Improve documentation of configuring external issue trackers
...
Closes #1514
2015-05-04 07:33:25 -07:00
Job van der Voort
2587334a79
Merge branch 'Add_doc_block_new_users_by_default' into 'master'
...
Added " How to maintain tight control over the number of active users..."
Added " How to maintain tight control over the number of active users on your GitLab installation" to documentation.
Please check that documentation is OK before accepting Merge. I took if from https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example#L149
cc/ @sytse
See merge request !1792
2015-05-04 09:13:53 +00:00
Job van der Voort
2530141ace
update doc by removing unnecessary parts
2015-05-04 11:13:07 +02:00
Sven Selberg
361284fec2
Add current_sign_in_at to api User
2015-05-04 09:42:11 +02:00
Achilleas Pipinellis
be05a9b938
Merge branch 'fix/log-path' into 'master'
...
Fix file paths for installations from the source
See merge request !583
2015-05-03 14:07:03 +00:00