summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Move the images over to dev.gitlab.orguse-custom-ruby-imagesZ.J. van de Weg2016-09-302-3/+3
* Update CI yaml and update CHANGELOG entryZ.J. van de Weg2016-09-302-3/+3
* Set CHANGELOG item to right releaseZ.J. van de Weg2016-09-301-1/+1
* remove unused cache from .gitlab-ci.ymlZ.J. van de Weg2016-09-301-2/+0
* Use custom Ruby images to test buildsKamil Trzcinski2016-09-303-17/+3
* Merge branch '15356-filters-should-change-issue-counts' into 'master' Robert Speicher2016-09-3014-155/+233
|\
| * Small improvements thanks to Robert's feedbackRémy Coutable2016-09-3010-115/+79
| * Cache the issuable counters for 2 minutesRémy Coutable2016-09-304-30/+136
| * Take filters in account in issuable countersRémy Coutable2016-09-308-133/+141
* | Merge branch 'koding-setting-api' into 'master' Robert Speicher2016-09-304-13/+38
|\ \
| * | Expose the Koding application settings in the APIkoding-setting-apiDJ Mountney2016-09-294-13/+38
* | | Merge branch '22768-revert-to-touch-file-system' into 'master' Valery Sizov2016-09-302-1/+2
|\ \ \ | |_|/ |/| |
| * | Revert to use Mounter method to check existence22768-revert-to-touch-file-systemPaco Guzman2016-09-302-1/+2
* | | Merge branch '22452-milestone-title-unnecessary-escaping-fix' into 'master' Rémy Coutable2016-09-304-3/+16
|\ \ \
| * | | Removing duplicate entries for !6533.Makoto Scott-Hinkle2016-09-301-1/+0
| * | | Merge remote-tracking branch 'origin/22452-milestone-title-unnecessary-escapi...Makoto Scott-Hinkle2016-09-291-0/+1
| |\ \ \
| | * \ \ Merge branch 'master' into 22452-milestone-title-unnecessary-escaping-fixMakoto Scott-Hinkle2016-09-2758-239/+696
| | |\ \ \
| | * | | | Allowing ">" to be used for Milestone models's title and storing the value in...Makoto Scott-Hinkle2016-09-264-3/+16
| * | | | | Allowing ">" to be used for Milestone models's title and storing the value in...Makoto Scott-Hinkle2016-09-294-3/+16
| | |_|/ / | |/| | |
* | | | | Merge branch 'mr_api_todo_close' into 'master' Rémy Coutable2016-09-305-8/+32
|\ \ \ \ \
| * | | | | Close todos when accepting a MR via the API.Tony Gambone2016-09-295-8/+32
* | | | | | Merge branch 'rc-new-access-requests-finder' into 'master' Douwe Maan2016-09-307-6/+122
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Use Ability.allowed? instead of current_user.can? in AccessRequestsFinderrc-new-access-requests-finderRémy Coutable2016-09-281-1/+1
| * | | | | Improve the logic in AccessRequestsFinder#execute & #execute!Rémy Coutable2016-09-281-11/+9
| * | | | | New AccessRequestsFinderRémy Coutable2016-09-287-6/+124
* | | | | | Merge branch 'lfs-token-race-condition-fix' into 'master' Patricio Cano2016-09-291-7/+2
|\ \ \ \ \ \
| * | | | | | Fix race condition that can be triggered if the token expires right after we ...lfs-token-race-condition-fixPatricio Cano2016-09-291-7/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Update CHANGELOG with 8.12.2 and 8.12.3 changes.Ruben Davila2016-09-291-4/+10
* | | | | | Merge branch '22632-fix-project-explore-dropdown-alignment' into 'master' Annabel Dunstone Gray2016-09-291-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | right-align dropdown menus to prevent horizontal page overflowMike Greiling2016-09-291-2/+2
|/ / / / /
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRémy Coutable2016-09-291-2/+13
|\ \ \ \ \
| * \ \ \ \ Merge branch '22450-restrict-origin' into 'master' Douwe Maan2016-09-271-2/+13
| |\ \ \ \ \
| | * | | | | Set a restrictive CORS policy on the API for credentialed requestsNick Thomas2016-09-261-0/+11
| | * | | | | Move Rack::Attack and Rack::Cors middlewares to be before Warden::ManagerNick Thomas2016-09-261-2/+2
| |/ / / / /
* | | | | | Add CHANGELOG entries for 8.11.8, 8.10.11, and 8.9.11Rémy Coutable2016-09-291-0/+18
* | | | | | Merge branch 'fix/rugged-repo-error' into 'master' Rémy Coutable2016-09-298-4/+62
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | fix broken repo 500 errors in UI and added relevant specsJames Lopez2016-09-298-4/+62
* | | | | | Merge branch 'axil/gitlab-ce-typos_runners_pages' into 'master' Achilleas Pipinellis2016-09-298-40/+44
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix grammar and typos in Runners pagesaxil/gitlab-ce-typos_runners_pagesAchilleas Pipinellis2016-09-288-40/+44
* | | | | | Merge branch '22544-long-commit-message' into 'master' Fatih Acet2016-09-292-1/+7
|\ \ \ \ \ \
| * | | | | | Fixes long commit messages overflow viewport in file treeFilipa Lacerda2016-09-292-1/+7
|/ / / / / /
* | | | | | Merge branch 'fix-double-changelog-header-for-8-13' into 'master' Robert Speicher2016-09-291-2/+1
|\ \ \ \ \ \
| * | | | | | Update CHANGELOGfix-double-changelog-header-for-8-13Luke "Jared" Bennett2016-09-291-2/+1
|/ / / / / /
* | | | | | Merge branch 'issue_22382' into 'master' Rémy Coutable2016-09-295-9/+16
|\ \ \ \ \ \
| * | | | | | Expose project share expiration_date field on APIissue_22382Felipe Artur2016-09-285-9/+16
* | | | | | | Merge branch 'fix-html5-color-inputs' into 'master' Annabel Dunstone Gray2016-09-293-4/+4
|\ \ \ \ \ \ \
| * | | | | | | remove instances of <input type="color" /> due to inconsistent browser supportMike Greiling2016-09-293-4/+4
* | | | | | | | Merge branch 'cs-upgrade-devise' into 'master' Robert Speicher2016-09-2913-15/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix test failure by accessing Content-Type header directly.cs-upgrade-deviseConnor Shea2016-09-271-1/+1
| * | | | | | | | Upgrade Devise from 4.1.1 to 4.2.0.Connor Shea2016-09-2712-14/+14
| | |_|_|_|_|_|/ | |/| | | | | |