summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'patch-3' into 'master' best-design-patternDmitriy Zaporozhets2016-09-301-0/+1
|\
| * Added "View wiki pages" to list of actions granted to various user permission...Dustin Miller2016-08-091-0/+1
* | Merge branch 'robmv/gitlab-ce-issue21305'Dmitriy Zaporozhets2016-09-303-2/+5
|\ \
| * | Fix "Create project" button layout with restricted visibilityRobert Marcano2016-09-263-2/+3
* | | Merge branch 'patch-6' into 'master' Dmitriy Zaporozhets2016-09-301-1/+1
|\ \ \
| * | | Fixed Session Cookie headerAlan Moore2016-09-291-1/+1
* | | | Merge branch 'patch-6' into 'master' Dmitriy Zaporozhets2016-09-301-1/+1
|\ \ \ \
| * | | | Smaller formatting fixNils Brinkmann2016-09-301-1/+1
* | | | | Merge branch '22529-build-sidebar-weird-padding' into 'master' Annabel Dunstone Gray2016-09-302-5/+12
|\ \ \ \ \
| * | | | | Removed blocks-first declaration that was added to fix coverage padding, move...22529-build-sidebar-weird-paddingLuke Bennett2016-09-292-5/+12
* | | | | | Merge branch 'fix_oauth_doc' into 'master' Achilleas Pipinellis2016-09-301-4/+4
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into 'fix_oauth_doc'Achilleas Pipinellis2016-09-30145-530/+2861
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'initialize-redis' into 'master' Yorick Peterse2016-09-302-18/+9
|\ \ \ \ \ \ \
| * | | | | | | Initialize Redis pool in single-threaded contextJacob Vosmaer2016-09-302-18/+9
* | | | | | | | Merge branch 'update-templates-for-8-13' into 'master' Rémy Coutable2016-09-3010-1/+114
|\ \ \ \ \ \ \ \
| * | | | | | | | Update templates for 8.13Rémy Coutable2016-09-3010-1/+114
* | | | | | | | | Merge branch 'replace-alias_method_chain' into 'master' Rémy Coutable2016-09-304-30/+35
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bumped change to 8.13 release on CHANGELOGAndre Guedes2016-09-301-1/+1
| * | | | | | | | | Use `Module#prepend` instead of `alias_method_chain`Andre Guedes2016-09-304-30/+35
| |/ / / / / / / /
* | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |