summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* revert locale things30162-retire-koding-integrationMike Bartlett2017-09-0115-239/+166
* added changelogMike Bartlett2017-09-011-0/+4
* Hide Koding setting in admin panel if not enabledMike Bartlett2017-09-0116-184/+260
* Merge branch 'gitaly-0.36.0' into 'master'Sean McGivern2017-09-011-1/+1
|\
| * Use gitaly 0.36.0gitaly-0.36.0Jacob Vosmaer2017-09-011-1/+1
* | Merge branch 'feature/sm/2783-rename-codeclimate-to-codequality-ce' into 'mas...Kamil TrzciƄski2017-09-012-4/+7
|\ \
| * | fix docfeature/sm/2783-rename-codeclimate-to-codequality-ceShinya Maeda2017-08-311-3/+1
| * | Squashed commit of the following:Shinya Maeda2017-08-312-4/+9
* | | Merge branch 'sm-cherry-pick-list-commits-in-message' into 'master'Sean McGivern2017-09-017-4/+95
|\ \ \
| * | | Improve description of a Commit#cherry_pick_message UTSaverio Miroddi2017-08-221-2/+2
| * | | Add changelog entrySaverio Miroddi2017-08-221-0/+5
| * | | Fix rubocop errors in spec/models/commit_spec.rbSaverio Miroddi2017-08-211-2/+0
| * | | Add UT for cherry-pick of an existing merge that is not foundSaverio Miroddi2017-08-211-19/+30
| * | | Change a variable name in Commit#cherry_pick_descriptionSaverio Miroddi2017-08-211-4/+4
| * | | Reverse order of commits in MR cherry-pick messageSaverio Miroddi2017-08-212-3/+4
| * | | Remove redundant statement part in a test suiteSaverio Miroddi2017-08-181-1/+1
| * | | Correct the cherry-pick message for merge commitsSaverio Miroddi2017-08-175-23/+45
| * | | Extended UTs for the new cherry-pick message formatSaverio Miroddi2017-08-162-1/+28
| * | | Fix build failures related to cherry-pick message changesSaverio Miroddi2017-08-162-2/+2
| * | | Add support for start project to commit cherry-pick descriptionSaverio Miroddi2017-08-152-5/+5
| * | | Made commit cherry-pick message more standardSaverio Miroddi2017-08-151-11/+8
| * | | Extracted cherry-pick description in ::CommitSaverio Miroddi2017-08-151-6/+10
| * | | Merge branch 'master' into sm-cherry-pick-list-commits-in-messageSaverio Miroddi2017-08-15461-2658/+6715
| |\ \ \
| * | | | Add 'from commit' information to cherry-picked commitsSaverio Miroddi2017-08-102-1/+27
* | | | | Merge branch '35686-unescape-wiki-title' into 'master'Sean McGivern2017-09-013-1/+12
|\ \ \ \ \
| * | | | | Unescape HTML characters in Wiki titleJacopo2017-08-303-1/+12
* | | | | | Merge branch 'issue_36820' into 'master'Sean McGivern2017-09-013-0/+9
|\ \ \ \ \ \
| * | | | | | Remove closing external issues by reference errorissue_36820Felipe Artur2017-08-313-0/+9
* | | | | | | Merge branch '36061-mr-ref-instrument' into 'master'Sean McGivern2017-09-012-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Instrument MergeRequest#fetch_ref36061-mr-ref-instrumentJarka Kadlecova2017-09-012-0/+6
* | | | | | | | Merge branch 'rs-api-use-project-requirements' into 'master'Sean McGivern2017-09-0132-35/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | API: Use defined project requirementsrs-api-use-project-requirementsRobert Schilling2017-08-3132-35/+35
* | | | | | | | | Merge branch 'rouge-2.2.1' into 'master'Sean McGivern2017-09-012-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bump rouge to 2.2.1pbr2017-08-292-1/+6
* | | | | | | | | | Merge branch 'gitaly-post-upload-pack-mandatory' into 'master'Douwe Maan2017-09-013-18/+9
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Make Gitaly PostUploadPack mandatoryJacob Vosmaer (GitLab)2017-09-013-18/+9
|/ / / / / / / / /
* | | | | | | | | Merge branch 'enable-new-navigaton-by-default' into 'master'Tim Zallmann2017-09-0143-172/+133
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into enable-new-navigaton-by-defaultenable-new-navigaton-by-defaultPhil Hughes2017-08-30215-2768/+5720
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | more navigation spec fixesPhil Hughes2017-08-303-7/+7
| * | | | | | | | | | more spinach fixesPhil Hughes2017-08-303-4/+4
| * | | | | | | | | | spinach test updatesPhil Hughes2017-08-3011-17/+23
| * | | | | | | | | | spec updatesPhil Hughes2017-08-293-0/+6
| * | | | | | | | | | fixed boards specsPhil Hughes2017-08-291-0/+2
| * | | | | | | | | | more spec fixesPhil Hughes2017-08-2910-26/+27
| * | | | | | | | | | spec updatesPhil Hughes2017-08-299-81/+41
| * | | | | | | | | | layout-nav test check fixPhil Hughes2017-08-291-4/+4
| * | | | | | | | | | fixed up a bunch of specsPhil Hughes2017-08-297-12/+19
| * | | | | | | | | | added logo ID to top barPhil Hughes2017-08-292-1/+4
| * | | | | | | | | | Enable the new navigation by defaultPhil Hughes2017-08-294-25/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '37194-fix-mr-widget-merge-button-dropdown-caret' into 'master'Phil Hughes2017-09-012-0/+6
|\ \ \ \ \ \ \ \ \ \