summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'api-priority-labels' into 'master' Rémy Coutable2016-11-071-10/+34
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exposes the label priority to the API. Furthermore, it allows the user to modify the priority via the API. Closes #21269 See merge request !7286
| * | | | | | | | Update label's API documentationRobert Schilling2016-11-071-10/+34
| | | | | | | | |
* | | | | | | | | Fix broken link to observatory cli on Frontend Dev GuideSam Rose2016-11-061-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'correct-spelling-andreesen' into 'master' Robert Speicher2016-11-051-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct spelling of Andreesen's name [ci skip] See merge request !7293
| * | | | | | | | Correct spelling of Andreesen's namecorrect-spelling-andreesenVictor Wu2016-11-041-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'gitlab-workhorse-1.0.0' into 'master' Rémy Coutable2016-11-042-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Workhorse to v1.0.0, improving error handling This is an update to v1.0.0 - which does not signify any breaking changes, but is merely in accordance with http://semver.org/#how-do-i-know-when-to-release-100 See merge request !7289
| * | | | | | | Update GitLab Workhorse to v1.0.0Nick Thomas2016-11-042-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Add documentation for the "Only allow merge requests to be merged if all ↵Rémy Coutable2016-11-044-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | discussions are resolved" feature Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Add setting to only allow merge requests to be merged when all discussions ↵Rodolfo Santos2016-11-041-0/+10
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are resolved Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'rs-update-rdoc' into 'master' Robert Speicher2016-11-041-8/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rdoc to `~> 4.2` Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2814 See merge request !7261
| * | | | | | Remove unused `gitlab:generate_docs` Rake taskrs-remove-sdocRobert Speicher2016-11-031-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was the only thing using the `sdoc` gem, which was blocking another gem from updating.
* | | | | | | Merge branch 'backport-ee-js-groups-api' into 'master' Robert Speicher2016-11-041-2/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport Group API code that was added in EE only Group API code that was added in EE only. /cc @vsizov See merge request !7205
| * | | | | | Backport Group API code that was added in EE onlybackport-ee-js-groups-apiRémy Coutable2016-10-311-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch '24059-round-robin-repository-storage' into 'master' Douwe Maan2016-11-043-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Introduce round-robin project creation to spread load over multiple shards" ## What does this MR do? Allow multiple shards to be enabled in the admin settings page, balancing project creation across all enabled shards. ## Are there points in the code the reviewer needs to double check? * `f.select ..., multiple: true` isn't the most beautiful UI in the world, but switching to `collection_check_boxes` (or a facsimile thereof) isn't trivial * Should `pick_repository_storage` be a method of `ApplicationSetting`, or `Project`? It's going to accrete logic over time so perhaps it should be its own class already? * This is written to avoid the need for a database migration, so it is`serialize :repository_storage` without `, Array`. This is tested, but alternatives include: * Add a database migration * Write a custom Coder that will accept a String or Array in `load` and always `dump an Array. ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-11-03_at_14.42.41](/uploads/7de15d6c1b3fa60bb7a34d6a7d9f00ce/Screen_Shot_2016-11-03_at_14.42.41.png) ## Does this MR meet the acceptance criteria? - [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [X] Added for this feature/bug - [ ] All builds are passing - [X] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [X] Branch has no merge conflicts with `master` (if it does - rebase it please) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24059 See merge request !7273
| * | | | | | | Document multiple repository storage pathsNick Thomas2016-11-043-1/+6
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'clarify-nginx-installation' into 'master' Achilleas Pipinellis2016-11-041-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify NGINX config setup These changes are to clarify that the paths may need to be changed in the NGINX config file depending on where GitLab is installed. See merge request !6834
| * | | | | | | add reminder to check paths in nginx configTim Hogg2016-10-121-1/+5
| | | | | | | |
* | | | | | | | Merge branch 'fix-docs-links' into 'master' Achilleas Pipinellis2016-11-045-31/+32
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Docs links This fixes some links in the docs to either be relative or to use HTTPS and docs.gitlab.com. See merge request !7280
| * | | | | | | | Change a bunch of doc links to either relative or https://docs.gitlab.com.fix-docs-linksConnor Shea2016-11-035-31/+32
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '23979-show-environment-log' into 'master' Sean McGivern2016-11-041-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show log corresponding to env in admin/logs Closes #23979 See merge request !7191
| * | | | | | | | Show log corresponding to env in admin/logsLukas Erlacher2016-11-031-1/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No matter which environment Gitlab was running as, the admin/logs view always showed production.log. This commit selects the logfile based on Rails.env. - Rename ProductionLogger to EnvironmentLogger - Make EnvironmentLogger logfile depend on env - Update spinach test for log tabs
* | | | | | | | Add tip for using Chrome to run and debug teaspoon tests.Bryce Johnson2016-11-031-0/+6
|/ / / / / / /
* | | | | | | Clarify the author field for the changelog documentationRobert Speicher2016-11-031-0/+3
| |_|/ / / / |/| | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'zj-expose-system-hooks' into 'master' Rémy Coutable2016-11-031-10/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose more info for SystemHooks See merge request !6964
| * | | | | | Update docs and test descriptionzj-expose-system-hooksZ.J. van de Weg2016-11-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Update docs and unexpose tokenZeger-Jan van de Weg2016-11-021-10/+20
| | | | | | |
* | | | | | | Update "Installation from source" guide for 8.14.0Alejandro Rodríguez2016-11-032-2/+207
| |_|_|_|/ / |/| | | | |
* | | | | | Add a `--force` option to bin/changelogrs-changelog-forceRobert Speicher2016-11-021-1/+19
| | | | | |
* | | | | | Update examples in changelog docs to use single quotes around titleRobert Speicher2016-11-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'rs-bin-changelog' into 'master' Rémy Coutable2016-11-022-0/+165
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a bin/changelog script and changelog documentation See merge request !7098
| * | | | | | Add changelog documentationRobert Speicher2016-10-312-0/+165
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'mrchrisw/gitlab-version-fix' into 'master' Achilleas Pipinellis2016-11-021-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab 8.13 not 13 cc// @felipe_artur See merge request !7234
| * | | | | | GitLab 8.13 not 13mrchrisw/gitlab-version-fixChris Wilson2016-11-021-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'fix/backtrace-command' into 'master' Sean McGivern2016-11-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix gdb backtrace command See merge request !7227
| * | | | | | Fix gdb backtrace command Daniel Axelrod2016-11-011-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct the command to get a gdb backtrace from all threads. `apply` is not a valid gdb command. See https://sourceware.org/gdb/onlinedocs/gdb/Threads.html#Threads .
* | | | | | Merge branch 'gpocentek/gitlab-ce-api-webhook-token' into 'master' Rémy Coutable2016-11-021-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR adds support for the `token` attribute in the project hook API. Feature requested on a dependant project: https://github.com/gpocentek/python-gitlab/issues/170 See merge request !7220
| * | | | | | Ensure hook tokens are write-only in the APIgpocentek/gitlab-ce-api-webhook-tokenSean McGivern2016-11-011-2/+2
| | | | | | |
| * | | | | | Add support for token attr in project hooks APIGauvain Pocentek2016-11-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The UI allows to define a token to validate payload on the target URL, this patch adds the feature to the API.
* | | | | | | Merge branch 'slony-upgrade-guide' into 'master' Achilleas Pipinellis2016-11-022-0/+484
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added guide for upgrading Postgres using Slony ## What does this MR do? This adds a guide for upgrading PostgreSQL using Slony. ## Are there points in the code the reviewer needs to double check? Spelling, grammar, etc ## Why was this MR needed? This process is not documented and we'll need to provide steps on how to do this before we start shipping PostgreSQL 9.6 with omnibus-gitlab. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) cc @pcarranza @marin @axil See merge request !6711
| * | | | | | | Added guide for upgrading Postgres using Slonyslony-upgrade-guideYorick Peterse2016-11-012-0/+484
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'create_hooks_rake' into 'master' Rémy Coutable2016-11-023-187/+258
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Rake task to create/repair GitLab Shell hooks symlinks ## What does this MR do? Adds a Rake task wrapper around `gitlab-shell` `bin/create_hooks` script. This makes it easier for an administrator to repair hooks symlinks without worrying about where repository data is located, etc. Just run this task and it takes care of everything based on current configuration. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? `bin/create_hooks` was not well-documented. It requires parameters specifying where repository data is located. It also needs to be run by the `git` user. Wrapping it in a Rake task allows us to take current configuration in to account and makes it easier on the administrator. See merge request !5634
| * | | | | | | Add Rake task to create/repair GitLab Shell hooks symlinksDrew Blessing2016-11-013-187/+258
| | | | | | | |
* | | | | | | | Merge branch 'background-migrations' into 'master'Robert Speicher2016-11-012-0/+76
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for post deployment migrations Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22133 See merge request !6572
| * | | | | | | Support for post deployment migrationsbackground-migrationsYorick Peterse2016-10-312-0/+76
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are regular Rails migrations that are executed by default. A user can opt-out of these migrations by setting an environment variable during the deployment process. Fixes gitlab-org/gitlab-ce#22133
* | | | | | | Merge branch 'patch-7' into 'master' Patricio Cano2016-11-011-7/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix how to get SAML error details ## What does this MR do? Update to better document how to get SAML error details. Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/1929 and https://gitlab.com/gitlab-org/gitlab-ce/issues/3223. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/12705. See merge request !7199
| * | | | | | | fix how to get SAML error detailsBen Bodenmiller2016-10-311-7/+14
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'decaffeinate-the-docs' into 'master' Fatih Acet2016-11-012-6/+4
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove leftover references to coffeescript from comments and docs. I was looking at the front-end helper spec and noticed some outdated coffeescript refs in it. So I figured it wouldn't hurt to take a few minutes and remove all the coffeescript references in CE that we don't need anymore. I didn't touch any coffeescript references that could potentially break anything. Just docs and code comments. - [x] All builds are passing See merge request !7151
| * | | | | | Remove leftover references to coffeescript from comments and docs.decaffeinate-the-docsBryce Johnson2016-10-312-6/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'add-link-to-issue-boards-in-api-readme' into 'master' Achilleas Pipinellis2016-11-011-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a link to the Issue Boards API in main README See merge request !7221
| * | | | | | Add a link to the Issue Boards API in main READMEAchilleas Pipinellis2016-11-011-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | [ci skip]