summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge branch 'workhorse-passthrough' into 'master' Kamil Trzciński2015-12-162-2/+20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass all requests from NGINX to gitlab-workhorse See merge request !2073
| | * | | | Update workhorse version in doc/install/installation.mdworkhorse-passthroughRobert Speicher2015-12-151-1/+1
| | | | | |
| | * | | | Gitlab-workhorse related 8.3 update changesJacob Vosmaer2015-12-151-1/+19
| | |/ / /
* | | | | Merge branch 'add-open-issues-count-to-api' of ↵Dmitriy Zaporozhets2015-12-161-0/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | https://gitlab.com/stanhu/gitlab-ce Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add open_issues_count to project APIStan Hu2015-12-111-0/+3
| | | | | | | | | | | | | | | | | | | | This is needed to support Huboard and a generally useful value.
* | | | | [ci skip] Add SVN to Git migration documentationDrew Blessing2015-12-154-17/+84
| | | | |
* | | | | Merge branch 'add_user_repo_integrity_rake_task' into 'master' Robert Speicher2015-12-153-1/+65
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add user repository integrity check rake task Corrupt repositories and stuck lock files can cause weird issues in GitLab. Often we know which user is having these problems and then we have to go hunt down which repository is causing it. Several times recently that involved me running queries in the rails console to get an array of projects and then writing a quick Ruby script to loop through and run `git fsck`. This last time I also had to check for the existence of `config.lock` and ref lock files. This rake task will eliminate all of those steps and allow an admin to simply specify a username. I also added the lock file checks to the existing `gitlab:repo:check` task which goes through all projects. See merge request !2080
| * | | | [ci skip] Add user repository integrity check rake taskDrew Blessing2015-12-143-1/+65
| | | | |
* | | | | Update 8.2-to-8.3 guideRobert Speicher2015-12-141-8/+5
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'add-upgrade-guide-for-8-3' into 'master' Robert Speicher2015-12-141-0/+187
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add upgrade guide for 8.2 to 8.3 Making sure we don't forget mentioning the need to upgrade Redis from !1888. Added this in preparation for 8.3. [ci skip] See merge request !2085
| * | | | | Update gitlab-workhorse and remove mention of gitlab-git-http-serverStan Hu2015-12-141-18/+5
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Rename gitlab-git-http-server mention with gitlab-workhorseStan Hu2015-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Add upgrade guide for 8.2 to 8.3Stan Hu2015-12-141-0/+200
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Prepare Installation doc for 8.3.0-rc1Robert Speicher2015-12-141-34/+39
|/ / / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'ci-project-migrate' into 'master' Kamil Trzciński2015-12-141-3/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci Project migrate - This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`. - This requires offline migrations. - It simplifies database models making all CI objects to be attached to: Project. - It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers). - We should add default `timeout` to Application Settings. - It misses specs. - It is based on ci-services-migrate for now. - It removes CI events. - It removes administrator CI projects overview. - It removes CI application settings. In 8.4 or 8.5 we can remove redundant tables and columns. See merge request !1987
| * | | | | Migrate CI::Project to ProjectKamil Trzcinski2015-12-111-3/+0
| | | | | |
* | | | | | Rename mention of gitlab-git-http-server to gitlab-workhorseStan Hu2015-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Closes https://github.com/gitlabhq/gitlabhq/issues/9904
* | | | | | Bump Redis requirement to 2.8 for Sidekiq 4 requirementsStan Hu2015-12-121-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #3649 [ci skip]
* | | | | | add details on how to change saml button labelBen Bodenmiller2015-12-111-2/+3
| |/ / / / |/| | | |
* | | | | Clarify cache behaviorDrew Blessing2015-12-111-0/+3
| |/ / / |/| | |
* | | | Merge pull request #9850 from davydovanton/doc-fix-typosStan Hu2015-12-105-7/+7
|\ \ \ \ | | | | | | | | | | Fix typos in all docs
| * | | | Fix typos in all docs [skip ci]Anton Davydov2015-11-245-7/+7
| | | | |
* | | | | Document file upload random uuid securityDrew Blessing2015-12-102-1/+13
| |/ / / |/| | |
* | | | Merge branch 'fix-typos' into 'master' Robert Speicher2015-12-097-7/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typos in integration docs [ci skip] See merge request !1999
| * | | | Fix typos in integration docsTobias Stöckler2015-12-077-7/+7
| | | | |
* | | | | Merge branch 'master' into 'master' Robert Speicher2015-12-091-2/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update init script only once The init script is already being updated in section 6. See merge request !2038 [ci skip]
| * | | | | Update init script only onceFelix Eckhofer2015-12-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | The init script is already being updated in section 6.
* | | | | | Merge branch 'remove-default-branch-option-from-doc' into 'master' Dmitriy Zaporozhets2015-12-091-1/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove default_branch from project API creation documentation The docs erroneously included `default_branch` as an option in project creation, but this field does not make sense because a new project has an empty repo with no branches. Closes #3937 See merge request !2034
| * | | | | Remove default_branch from project API creation since an empty repositoryStan Hu2015-12-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | has no branches to start. Closes #3937
* | | | | | Merge branch 'fix-workhorse-upgrade-info' into 'master' Jacob Vosmaer2015-12-091-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the prepended v on GitLab Workhorse upgrade doc Fix for https://gitlab.com/gitlab-org/gitlab-workhorse/issues/4 See merge request !2020
| * | | | | | Remove the prepended v on GitLab Workhorse upgrade docfix-workhorse-upgrade-infoKelvin2015-12-081-1/+1
| | | | | | |
* | | | | | | Merge branch 'merge-if-green' into 'master' Douwe Maan2015-12-095-3/+67
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge when build succeeds ### What does this MR do? Adds a button to a MR when the build/ci is running so it can be merged when/if the build is successfull. ### Are there points in the code the reviewer needs to double check? English spelling and whether or not the grammer is correct. ### Why was this MR needed? When you expect its all good, and don't want to revisit the current MR it can be accepted allready. ### What are the relevant issue numbers / Feature requests? Fixes #2640 -- although `Merge if green` is replaced with `Merge when the build succeeds` the general idea is the same. ### Screenshots (if relevant) ![Screenshot_from_2015-12-07_10-34-39](/uploads/b90b558b6ad6c8266bc9c96120d86f96/Screenshot_from_2015-12-07_10-34-39.png) ![Screenshot_from_2015-11-02_17-26-56](/uploads/9f52f56e3c5e9ec63cb8f42978c92a52/Screenshot_from_2015-11-02_17-26-56.png) ![Screenshot_from_2015-11-02_17-27-03](/uploads/119fc18c9b15ff73dc38010ac5b6244a/Screenshot_from_2015-11-02_17-27-03.png) ![Screenshot_from_2015-12-03_10-08-14](/uploads/bad7b35c7d129981d43631877c958be0/Screenshot_from_2015-12-03_10-08-14.png) ![Screenshot_from_2015-11-02_17-27-16](/uploads/b616d750a16cc11ba72f2ca84213515e/Screenshot_from_2015-11-02_17-27-16.png) ### Further considerations What if there are minor things needed solving, e.g. Rubocop, the current implementation will reset the approved status of the MR. It might be a consideration keep the approval for team member, or even guests. This would require an extra option in the Admin screen, though might add extra value. #### TODO - [x] Docs - [x] Specs /cc @DouweM @rspeicher See merge request !1729
| * \ \ \ \ \ \ Merge branch 'master' into merge-if-greenDouwe Maan2015-12-091-13/+14
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # config/routes.rb
| * | | | | | | Tweak text of documentationDouwe Maan2015-12-081-3/+3
| | | | | | | |
| * | | | | | | Merge branch 'master' into merge-if-greenDouwe Maan2015-12-084-4/+284
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/merge_requests/widget/_heading.html.haml # app/views/projects/merge_requests/widget/open/_accept.html.haml
| * | | | | | | | Rewrite docsDouwe Maan2015-12-086-12/+8
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-083-7/+15
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-0737-241/+544
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Doc feature Merge When Build SucceedsZeger-Jan van de Weg2015-12-023-0/+20
| | | | | | | | |
| * | | | | | | | Refactor MergeWhenBuildSucceedsService and incorporate feedbackZeger-Jan van de Weg2015-11-231-5/+3
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-11-1859-262/+921
| |\ \ \ \ \ \ \ \
| * | | | | | | | | API support, incorporated feedbackZeger-Jan van de Weg2015-11-181-5/+55
| | | | | | | | | |
* | | | | | | | | | Merge branch 'ci-services-docs' into 'master' Achilleas Pipinellis2015-12-0911-114/+910
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce CI documentation for services and languages This introduces guide for PHP, a bunch of services (databases) and cleans up some docker references. With this there are bunch of example projects in https://gitlab.com/groups/gitlab-examples. /cc @JobV @axil See merge request !1917
| * | | | | | | | | Use the name of the linked containers instead of localhostci-services-docsAchilleas Pipinellis2015-12-082-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1917#note_2833978
| * | | | | | | | | More clean up to the CI example on how to use docker images [ci skip]Achilleas Pipinellis2015-12-081-64/+36
| | | | | | | | | |
| * | | | | | | | | Use the latest docker image in mysql CI example [ci skip]Achilleas Pipinellis2015-12-081-1/+1
| | | | | | | | | |
| * | | | | | | | | More postgres CI service example cleanupAchilleas Pipinellis2015-12-081-20/+35
| | | | | | | | | |
| * | | | | | | | | More redis CI example clean upAchilleas Pipinellis2015-12-081-6/+7
| | | | | | | | | |
| * | | | | | | | | Fix wrong naming of services keyword [ci skip]Achilleas Pipinellis2015-12-081-1/+1
| | | | | | | | | |
| * | | | | | | | | Add note about the various phpenv toolsAchilleas Pipinellis2015-12-081-0/+8
| | | | | | | | | |