summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 'master' of gitlab.com:gitlab-org/gitlab-ce into workhorse-passt...Jacob Vosmaer2015-12-15290-5131/+3393
|\
| * Merge branch 'tests/note-polling' into 'master' Grzegorz Bizon2015-12-155-2/+34
| |\
| | * Trigger notes refresh in specs instead of waiting for ajaxtests/note-pollingGrzegorz Bizon2015-12-151-1/+1
| | * Assign notes object to a variableGrzegorz Bizon2015-12-151-1/+1
| | * Add minor fixes in note polling specsGrzegorz Bizon2015-12-151-4/+2
| | * Add spinach test for note pollingGrzegorz Bizon2015-12-153-1/+17
| | * Add feature specs for note pollingGrzegorz Bizon2015-12-151-0/+18
| |/
| * Merge branch 'rs-issue-4032' into 'master' Douwe Maan2015-12-151-1/+2
| |\
| | * Fix note pollingrs-issue-4032Robert Speicher2015-12-121-1/+2
| * | Merge branch 'preserve-trailing-new-lines-at-eof' into 'master' Robert Speicher2015-12-144-2/+21
| |\ \
| | * | Preserve trailing new lines at the end of file on the online editorDouglas Barbosa Alexandre2015-12-144-2/+21
| * | | Merge branch 'contributing_md' into 'master' Achilleas Pipinellis2015-12-141-118/+266
| |\ \ \ | | |/ / | |/| |
| | * | Fix links [ci skip]contributing_mdAchilleas Pipinellis2015-12-151-8/+10
| | * | Clean up CONTRIBUTING.md [ci skip]Achilleas Pipinellis2015-12-151-113/+254
| | * | Clarify what CE and EE means for newcomersAchilleas Pipinellis2015-12-141-1/+6
| |/ /
| * | Merge branch 'feature-proposal' into 'master' Achilleas Pipinellis2015-12-142-14/+52
| |\ \
| | * | move up text regarding where to post issuefeature-proposalJob van der Voort2015-12-141-1/+2
| | * | update guides for feature proposals on the issue trackerJob van der Voort2015-12-142-14/+51
| * | | Merge branch 'fix-typo-mailing-list' into 'master' Robert Schilling2015-12-141-2/+2
| |\ \ \
| | * | | Fix Typo [mailinglist to mailing list]Mrinal2015-12-141-2/+2
| |/ / /
| * | | Update 8.2-to-8.3 guideRobert Speicher2015-12-141-8/+5
| * | | Merge branch 'add-upgrade-guide-for-8-3' into 'master' Robert Speicher2015-12-141-0/+187
| |\ \ \
| | * | | Update gitlab-workhorse and remove mention of gitlab-git-http-serverStan Hu2015-12-141-18/+5
| | * | | Rename gitlab-git-http-server mention with gitlab-workhorseStan Hu2015-12-141-1/+1
| | * | | Add upgrade guide for 8.2 to 8.3Stan Hu2015-12-141-0/+200
| * | | | Prepare Installation doc for 8.3.0-rc1Robert Speicher2015-12-141-34/+39
| |/ / /
| * | | Merge branch 'ux/suppress-ci-yml-warning' into 'master' Grzegorz Bizon2015-12-149-39/+104
| |\ \ \
| | * | | Update CHANGELOGux/suppress-ci-yml-warningGrzegorz Bizon2015-12-141-0/+3
| | * | | Update commits spinach tests related to displaying build statusGrzegorz Bizon2015-12-142-1/+6
| | * | | Merge branch 'master' into ux/suppress-ci-yml-warningGrzegorz Bizon2015-12-14233-4628/+2053
| | |\ \ \
| | * | | | Do not display ci build status if builds enabled but no `.gitlab-ci.yml`Grzegorz Bizon2015-12-144-4/+43
| | * | | | Add matcher class to ci status linkGrzegorz Bizon2015-12-141-1/+1
| | * | | | Improve gitlab ci commits specs (refactoring)Grzegorz Bizon2015-12-142-35/+39
| | * | | | Suppress warning about missing `.gitlab-ci.yml` if builds are disabledGrzegorz Bizon2015-12-141-7/+21
| * | | | | Merge branch 'ci/persist-registration-token' into 'master' Grzegorz Bizon2015-12-1414-27/+158
| |\ \ \ \ \
| | * | | | | Use a new admin runners path when reseting runners tokenGrzegorz Bizon2015-12-142-2/+2
| | * | | | | Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-147-7/+11
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'move-ci-specs-to-admin-features' into 'master' Kamil Trzciński2015-12-142-0/+0
| |\ \ \ \ \ \
| | * | | | | | Move CI admin builds and runners specs to correct directory [ci skip]Kamil Trzcinski2015-12-142-0/+0
| |/ / / / / /
| * | | | | | Merge branch 'fix-ci-project-migration' into 'master' Kamil Trzciński2015-12-143-5/+5
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Fix 500 when viewing specific runners on runners page [ci skip]Kamil Trzcinski2015-12-142-2/+2
| | * | | | | Fix Ci::Project migration not migrating columns that cannot be NULL [ci skip]Kamil Trzcinski2015-12-141-3/+3
| |/ / / / /
| * | | | | Fix MySQL migration of CI emails [ci skip]Kamil Trzcinski2015-12-141-1/+5
| * | | | | Merge branch 'tweak-flow-merge-when-build-succeeds' into 'master' Douwe Maan2015-12-141-1/+1
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Minor fix in flow 'Merge when build succeeds'Zeger-Jan van de Weg2015-12-111-1/+1
| | | * | | Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-14284-5112/+3005
| | | |\ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'ci-project-migrate' into 'master' Kamil Trzciński2015-12-14175-2888/+1299
| |\ \ \ \ \
| | * | | | | Fix runners admin view [ci skip]Kamil Trzcinski2015-12-141-1/+1
View Lorry Controller Status