Commit Graph
3460 Commits
Author SHA1 Message Date
Alfredo Sumaran 5d5df26ab1 Add documentation for "Hide whitespace changes" button 2016-04-26 14:01:40 -05:00
Rémy Coutable 7f3a8e1899 Merge branch 'patch-1' into 'master'
Add usage example for the Office 365 GetPersonaPhoto-service.



See merge request !2462
2016-04-26 16:48:26 +00:00
Rémy Coutable 6a5cced6bc Merge branch 'patch-3' into 'master'
Emphasize that GitLab must be partially running when restoring backups.

This caused me a lot of pain until I caught on.
I also enhanced the GitLab Omnibus application data backup restore procedure.  I verified the procedure by executing it with GitLab 8.6.4.

See merge request !3844
2016-04-26 15:19:43 +00:00
Rémy Coutable 110bb65130 Revert "Merge branch 'patch-2' into 'master'"
This reverts merge request !3839
2016-04-26 14:59:26 +00:00
Rémy Coutable 6d9f1e0b1c Merge branch 'patch-2' into 'master'
Document that only unicorn and sidekiq should be stopped.

And the rest of GitLab should remain running.
Also clarified the rest of the GitLab Omnibus restore procedure.

See merge request !3839
2016-04-26 14:56:28 +00:00
Achilleas Pipinellis ad46466cb9 Merge branch 'fix/ci-docker-images-documentation' into 'master'
Replace '-n' with '--name' in docker related documentation

`-n` for `docker run` is outdated. We should use `--name` instead. This MR fixes the example in documentation.

Fixes #15174

See merge request !3908
2016-04-25 19:29:02 +00:00
Achilleas Pipinellis 19fc0ea776 Merge branch 'fix/ci-php-docker-example' into 'master'
Fix php-docker example (for new docker versions)

`/.dockerinit` file doesn't exists in new Docker versions. Instead `/.dockerenv` can be used. This MR fixes the PHP example which was working only for older Docker versions.

Fixes gitlab-org/gitlab-ci-multi-runner#1241

See merge request !3907
2016-04-25 19:28:35 +00:00
Jacob Schatz d809507e05 Merge branch 'issue_14904' into 'master'
Add new shortcuts

Closes #14904

- On a project: `i` To navigate to New Issue page.
- On a issuable: `l` To open Label dropdown on a issuable.
- Global: Typing `?` multiple times now toggles the modal.

See merge request !3686
2016-04-25 19:13:25 +00:00
Yorick Peterse 35c7763c6c Merge branch 'new-list-of-influxdb-queries' into 'master'
Updated list of InfluxDB queries/config

See merge request !3840
2016-04-25 11:10:51 +00:00
Yorick Peterse 76c2594a6a Updated list of InfluxDB queries/config
This setup is quite a bit different from before. In the previous setup
raw data was kept around for 30 days and downsampled data for 7 days.
This became problematic for GitLab.com as the number of points and
series resulted in InfluxDB running out of memory when starting up
(besides taking up 30 GB of storage).

To work around this the new setup keeps raw data around for _only_ an
hour while keeping downsampled data around for 7 days. In turn all
Grafana dashboards _only_ query the downsampled data instead of also
querying raw data.

Based on rough calculations this setup needs around 2GB of storage for 1
week of data, excluding whatever is needed for storing the raw data
(this highly depends on the amount of traffic).

If users want to use this new setup they have to remove any existing
dashboards provided by GitLab.com and re-import the ones from the
Grafana dashboards repository
(https://gitlab.com/gitlab-org/grafana-dashboards/). Should users wish
to change their default retention policy the easiest way of doing so is
to simply drop the database and re-run the InfluxDB commands added by
this commit. Users who want to keep their default retention policy as-is
can simply create the "downsampled" policy and run the other commands.
2016-04-25 12:18:55 +02:00
Tomasz Maczukin 9bd0f46a85 Replace '-n' with '--name' in docker related documentation
[ci skip]
2016-04-25 12:13:50 +02:00
Tomasz Maczukin c55f517719 Fix php-docker example (for new docker versions)
[ci skip]
2016-04-25 11:35:33 +02:00
Stan Hu 06f35914da Add --tags to fetching gitlab-shell to ensure tags are downloaded
Closes #15525
2016-04-22 16:06:24 -07:00
Drew Blessing 0bb85509c9 Fix link 2016-04-22 13:24:36 -05:00
Drew Blessing 34ea1d2cfe New HA docs [ci skip] 2016-04-22 13:18:06 -05:00
Drew Blessing c38f2645ed Merge branch 'sidekiq_troubleshooting' into 'master'
Add Sidekiq troubleshooting docs

Closes #15287 

cc/ @stanhu @jacobvosmaer @dstanley

See merge request !3802
2016-04-22 18:13:03 +00:00
Drew Blessing 3e16997fd7 Add Sidekiq troubleshooting docs [ci skip] 2016-04-22 13:11:53 -05:00
Achilleas Pipinellis f063c3184b Bump gitlab-shell to 2.7.2
[ci skip]
2016-04-22 18:15:03 +03:00
Achilleas Pipinellis 15e225940b Merge branch 'doc-gh-import-additions' into 'master'
Add newest enhancements to GH importer docs

[ci skip]

See merge request !3867
2016-04-22 08:36:37 +00:00
Achilleas Pipinellis 846a9ef5ad Add newest enhancements to GH importer docs
[ci skip]
2016-04-22 11:20:37 +03:00
Achilleas Pipinellis de39959f55 Use new Note styleguide
[ci skip]
2016-04-22 10:42:30 +03:00
Yorick Peterse 0e2b644983 Merge branch 'repository-checks-default-off' into 'master'
Disable 'repository check' feature in 8.7.0

See merge request !3856
2016-04-21 22:26:34 +00:00
Achilleas Pipinellis c22c4048ce Merge branch 'doc-updating-gitlab' into 'master'
Refactor the update documentation



See merge request !3822
2016-04-21 19:51:57 +00:00
Jacob Vosmaer b80bf57d37 Disable 'repository check' feature in 8.7.0
It still causes too many false alarms.
2016-04-21 16:50:26 +02:00
Achilleas Pipinellis 67c990be65 Split into sections, port downgrade_ee_to_ce doc from EE
[ci skip]
2016-04-21 13:07:33 +03:00
John McGehee 7035122753 Emphasize that GitLab must be partially running when restoring backups.
This caused me a lot of pain until I caught on.
I also enhanced the GitLab Omnibus application data backup restore procedure.  I verified the procedure by executing it with GitLab 8.6.4.
2016-04-20 23:11:54 +00:00
John McGehee e157e97114 Document that only unicorn and sidekiq should be stopped.
And the rest of GitLab should remain running.
Also clarified the rest of the GitLab Omnibus restore procedure.
2016-04-20 17:42:49 +00:00
Alfredo Sumaran a45924348f Merge remote-tracking branch 'origin/master' into issue_14904 2016-04-20 12:24:42 -05:00
Tomasz Maczukin 4019b0d872 Fix some typos in documentation
[ci skip]
2016-04-20 11:54:06 +02:00
Tomasz Maczukin 0725c28069 Add documentation of incremental trace update API
[ci skip]
2016-04-20 11:54:05 +02:00
Robert Speicher 3d4875f86a Merge branch 'license-templates-and-api-12804' into 'master'
License templates when creating/editing a LICENSE file

Closes #12804

See merge request !3660
2016-04-20 01:38:49 +00:00
Douwe Maan 55380e69fc Merge branch 'pmq20/gitlab-ce-issue_12785' 2016-04-19 18:25:42 +02:00
Achilleas Pipinellis d7f1e041d9 Fix links in update README
[ci skip]
2016-04-19 19:12:12 +03:00
Hannes Rosenögger 9bab098455 Merge branch 'patch-1' into 'master'
"git lfs init" is deprecated, use "git lfs install" instead.

Recent releases of git-lfs warn that "init" is a deprecated command and that "install" should be used.


See merge request !3779
2016-04-19 15:35:33 +00:00
Grzegorz Bizon fd13cd189f Merge branch 'docs/notice-about-gitlab-runner' into 'master'
Add notice about GitLab Runner to requirements docs

This is related to #14589, and problems that may stem from running
GitLab Runner on same machine user installed GitLab web app on.

See merge request !3518
2016-04-19 12:17:48 +00:00
Kamil Trzciński c7bd7b6dd8 Merge branch 'make-before-after-overridable' into 'master'
Make before_script and after_script overridable

This is makes it possible to overwrite the before_script and after_script at job level.

This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3771


See merge request !3772
2016-04-19 11:12:40 +00:00
Kamil Trzciński 479f4cccf1 Merge branch 'after-script' into 'master'
Implement after_script which allows to do cleanups as part of the build process

This implements `after_script` in global context.

The `after_script` will be executed always after the job, even if the job were canceled.

This requires changes on Runner side that will be implemented in 1.2.

cc @tmaczukin @grzesiek 


See merge request !3771
2016-04-19 11:11:31 +00:00
Gabriel MazettoandDmitriy Zaporozhets 5330af3fa6 Using single builder for push and tag events 2016-04-19 11:00:30 +02:00
Gabriel MazettoandDmitriy Zaporozhets ee1090e2b2 Added System Hooks for push and tag_push
Code is based on Project Webhooks, removing deprecations and without
commits listing.
2016-04-19 11:00:30 +02:00
Alfredo Sumaran 29734516e1 Update shortcuts image 2016-04-18 15:03:36 -05:00
Felipe Artur 820c08cefd Fix documentation and improve permissions code 2016-04-18 11:12:28 -03:00
Felipe Artur 7d54e721da Insert instructions in admin page and permissions document 2016-04-18 11:12:28 -03:00
Kamil Trzcinski 2ab8d3e652 Merge branch 'after-script' into make-before-after-overridable 2016-04-18 09:47:12 -04:00
Kamil Trzcinski aca1e14bd3 Merge remote-tracking branch 'origin/master' into after-script 2016-04-18 09:46:12 -04:00
Kamil Trzcinski 39c2677e86 Merge remote-tracking branch 'origin/master' into after-script 2016-04-18 09:43:45 -04:00
Rémy Coutable 13804aba86 Continue implementation of the license template selector and /licenses API endpoint
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-18 14:47:50 +02:00
Kamil Trzcinski 42102b4344 Merge branch 'after-script' into make-before-after-overridable 2016-04-18 07:53:21 -04:00
Grzegorz Bizon 2972a991df Add minor fixes in docs for job-specific variables 2016-04-18 13:17:48 +02:00
Grzegorz Bizon a2957291b3 Update documentation on job level build variables 2016-04-18 13:17:48 +02:00
Grzegorz Bizon a264973905 Improve grammar in CI documentation for build vars 2016-04-18 13:17:48 +02:00