Commit Graph
3478 Commits
Author SHA1 Message Date
Achilleas Pipinellis 15a2c55802 Merge branch 'fix-github-oauth-instructions' into 'master'
Fix the GitHub Omniauth instructions

Technically the screenshot is also out of date, but I honestly don't care enough to go through the effort of making a sample application, taking a screenshot, etc.

See merge request !3976
2016-05-01 17:40:41 +00:00
Connor Shea f49d86cd5c Fix some broken links in the documentation [ci skip] 2016-04-29 13:11:23 -06:00
Alex Jordan c50ce3ba29 Fix the GitHub Omniauth instructions 2016-04-28 21:13:21 -07:00
Jacob Vosmaer (GitLab) 872e854840 Merge branch 'prepend-letter-v-to-workhorse-version-numbers' into 'master'
Prepend letter v to GitLab Workhorse version numbers

This helps to address gitlab-org/gitlab-ce#12684 so as to maintain consistency in all GitLab projects.

It also addresses: https://gitlab.com/gitlab-org/gitlab-workhorse/issues/4

Next Steps

- create a set of duplicate tags in workhorse to prevent errors when updating from the patch guide


See merge request !3088
2016-04-28 14:12:47 +00:00
Achilleas Pipinellis 45f4cc6e9b Merge branch 'fix/docker-in-docker-ci-documentation' into 'master'
Update using_docker_build.md, clarify the 'privileged' mode requirement

Related to #15428

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

See merge request !3909
2016-04-28 10:59:20 +00:00
Achilleas Pipinellis 8b09dafb16 Copyedit using_docker_build.md and fix links 2016-04-28 13:04:53 +03:00
Rémy Coutable 7aff855bc7 Merge branch 'fix-github-enterprise-imports' into 'master'
Backport GitHub Enterprise import support from EE

These changes were pulled from GitLab EE to support configuring
an alternative API URL than the default https://api.github.com.
In addition, the `verify_ssl` flag allows users to disable SSL cert
checking.

One modification: add a default `args` option if it does not exist
to avoid breaking existing configurations.

See merge request !3892
2016-04-28 09:37:13 +00:00
Achilleas Pipinellis 2ec58d4a74 Merge branch 'trigger-query-string' into 'master'
Add API doc example with query string for triggering build

Make this explicit to prevent confusion as we saw in gitlab-org/gitlab-ci#413.

See merge request !3947
2016-04-27 19:24:18 +00:00
Achilleas Pipinellis 0863644a90 Merge branch 'fix-operations-doc' into 'master'
Sidekiq MemoryKiller sends a `SIGKILL` signal, not `SIGTERM`

As documented in https://gitlab.com/gitlab-org/gitlab-ce/blob/f127edd012bd8b6f76ac67d69aadbd7d4837258f/lib/gitlab/sidekiq_middleware/memory_killer.rb#L10 (this was changed by c291ff9c6f).

See merge request !3927
2016-04-27 18:05:30 +00:00
David de Boer 7c9233856e Add API doc example with query string for triggering build 2016-04-27 16:41:37 +02:00
Dmitriy Zaporozhets 6c0ed63990 Merge branch 'ie-browser-update' into 'master'
Changes support from IE 10+ to IE 11+

IE 11 was released 17 October 2013; 2 years ago. Generally what I have experienced is that support for browsers (when newer ones are available) continues for up to 2 years. Based on that info we would drop support for IE 10 and the latest IE we would support would be IE 11. 

I also think this is more realistic since no one is really testing anything on IE 10 at the moment.  We should start testing on all the browser that we currently support. 

Also we can then have real support for flexbox and not need things like `-ms-flexbox` and other IE specific hacks. 

cc @iamphill @annabeldunstone @elvongray @alfredo1 @rspeicher 

See merge request !3913
2016-04-27 13:25:02 +00:00
Stan Hu c47183d787 Fixes for review of GitHub Enterprise backport changes 2016-04-26 21:02:45 -07:00
Stan Hu eede032345 Backport GitHub Enterprise import support from EE
These changes were pulled from GitLab EE to support configuring
an alternative API URL than the default https://api.github.com.
In addition, the `verify_ssl` flag allows users to disable SSL cert
checking.

One modification: add a default `args` option if it does not exist
to avoid breaking existing configurations.
2016-04-26 21:00:55 -07:00
Alfredo Sumaran 0392dffdb6 Update wording 2016-04-26 14:01:40 -05:00
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
Rémy Coutable cdf91da3eb Sidekiq MemoryKiller sends a SIGKILL signal, not SIGTERM
[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-26 15:46:54 +02: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
Jacob Schatz 9eac51376f Changes support from IE 10+ to IE 11+ 2016-04-25 14:15:02 -04:00
Tomasz Maczukin 5fc6a7dc14 Update using_docker_build.md, clarify the 'privileged' mode requirement
[ci skip]
2016-04-25 13:51:17 +02: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