Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'patch-3' into 'master' best-design-pattern | Dmitriy Zaporozhets | 2016-09-30 | 1 | -0/+1 |
|\ | |||||
| * | Added "View wiki pages" to list of actions granted to various user permission... | Dustin Miller | 2016-08-09 | 1 | -0/+1 |
* | | Merge branch 'robmv/gitlab-ce-issue21305' | Dmitriy Zaporozhets | 2016-09-30 | 3 | -2/+5 |
|\ \ | |||||
| * | | Fix "Create project" button layout with restricted visibility | Robert Marcano | 2016-09-26 | 3 | -2/+3 |
* | | | Merge branch 'patch-6' into 'master' | Dmitriy Zaporozhets | 2016-09-30 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fixed Session Cookie header | Alan Moore | 2016-09-29 | 1 | -1/+1 |
* | | | | Merge branch 'patch-6' into 'master' | Dmitriy Zaporozhets | 2016-09-30 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Smaller formatting fix | Nils Brinkmann | 2016-09-30 | 1 | -1/+1 |
* | | | | | Merge branch '22529-build-sidebar-weird-padding' into 'master' | Annabel Dunstone Gray | 2016-09-30 | 2 | -5/+12 |
|\ \ \ \ \ | |||||
| * | | | | | Removed blocks-first declaration that was added to fix coverage padding, move...22529-build-sidebar-weird-padding | Luke Bennett | 2016-09-29 | 2 | -5/+12 |
* | | | | | | Merge branch 'fix_oauth_doc' into 'master' | Achilleas Pipinellis | 2016-09-30 | 1 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into 'fix_oauth_doc' | Achilleas Pipinellis | 2016-09-30 | 145 | -530/+2861 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'initialize-redis' into 'master' | Yorick Peterse | 2016-09-30 | 2 | -18/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Initialize Redis pool in single-threaded context | Jacob Vosmaer | 2016-09-30 | 2 | -18/+9 |
* | | | | | | | | Merge branch 'update-templates-for-8-13' into 'master' | Rémy Coutable | 2016-09-30 | 10 | -1/+114 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update templates for 8.13 | Rémy Coutable | 2016-09-30 | 10 | -1/+114 |
* | | | | | | | | | Merge branch 'replace-alias_method_chain' into 'master' | Rémy Coutable | 2016-09-30 | 4 | -30/+35 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Bumped change to 8.13 release on CHANGELOG | Andre Guedes | 2016-09-30 | 1 | -1/+1 |
| * | | | | | | | | | Use `Module#prepend` instead of `alias_method_chain` | Andre Guedes | 2016-09-30 | 4 | -30/+35 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch '15356-filters-should-change-issue-counts' into 'master' | Robert Speicher | 2016-09-30 | 14 | -155/+233 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Small improvements thanks to Robert's feedback | Rémy Coutable | 2016-09-30 | 10 | -115/+79 |
| * | | | | | | | | Cache the issuable counters for 2 minutes | Rémy Coutable | 2016-09-30 | 4 | -30/+136 |
| * | | | | | | | | Take filters in account in issuable counters | Rémy Coutable | 2016-09-30 | 8 | -133/+141 |
* | | | | | | | | | Merge branch 'koding-setting-api' into 'master' | Robert Speicher | 2016-09-30 | 4 | -13/+38 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Expose the Koding application settings in the APIkoding-setting-api | DJ Mountney | 2016-09-29 | 4 | -13/+38 |
* | | | | | | | | | Merge branch '22768-revert-to-touch-file-system' into 'master' | Valery Sizov | 2016-09-30 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Revert to use Mounter method to check existence22768-revert-to-touch-file-system | Paco Guzman | 2016-09-30 | 2 | -1/+2 |
* | | | | | | | | | Merge branch '22452-milestone-title-unnecessary-escaping-fix' into 'master' | Rémy Coutable | 2016-09-30 | 4 | -3/+16 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Removing duplicate entries for !6533. | Makoto Scott-Hinkle | 2016-09-30 | 1 | -1/+0 |
| * | | | | | | | | | Merge remote-tracking branch 'origin/22452-milestone-title-unnecessary-escapi... | Makoto Scott-Hinkle | 2016-09-29 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into 22452-milestone-title-unnecessary-escaping-fix | Makoto Scott-Hinkle | 2016-09-27 | 58 | -239/+696 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Allowing ">" to be used for Milestone models's title and storing the value in... | Makoto Scott-Hinkle | 2016-09-26 | 4 | -3/+16 |
| * | | | | | | | | | | | Allowing ">" to be used for Milestone models's title and storing the value in... | Makoto Scott-Hinkle | 2016-09-29 | 4 | -3/+16 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'mr_api_todo_close' into 'master' | Rémy Coutable | 2016-09-30 | 5 | -8/+32 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Close todos when accepting a MR via the API. | Tony Gambone | 2016-09-29 | 5 | -8/+32 |
* | | | | | | | | | | | | Merge branch 'rc-new-access-requests-finder' into 'master' | Douwe Maan | 2016-09-30 | 7 | -6/+122 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Use Ability.allowed? instead of current_user.can? in AccessRequestsFinderrc-new-access-requests-finder | Rémy Coutable | 2016-09-28 | 1 | -1/+1 |
| * | | | | | | | | | | | Improve the logic in AccessRequestsFinder#execute & #execute! | Rémy Coutable | 2016-09-28 | 1 | -11/+9 |
| * | | | | | | | | | | | New AccessRequestsFinder | Rémy Coutable | 2016-09-28 | 7 | -6/+124 |
* | | | | | | | | | | | | Merge branch 'lfs-token-race-condition-fix' into 'master' | Patricio Cano | 2016-09-29 | 1 | -7/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fix race condition that can be triggered if the token expires right after we ...lfs-token-race-condition-fix | Patricio Cano | 2016-09-29 | 1 | -7/+2 |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Update CHANGELOG with 8.12.2 and 8.12.3 changes. | Ruben Davila | 2016-09-29 | 1 | -4/+10 |
* | | | | | | | | | | | | Merge branch '22632-fix-project-explore-dropdown-alignment' into 'master' | Annabel Dunstone Gray | 2016-09-29 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | right-align dropdown menus to prevent horizontal page overflow | Mike Greiling | 2016-09-29 | 1 | -2/+2 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Rémy Coutable | 2016-09-29 | 1 | -2/+13 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch '22450-restrict-origin' into 'master' | Douwe Maan | 2016-09-27 | 1 | -2/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Set a restrictive CORS policy on the API for credentialed requests | Nick Thomas | 2016-09-26 | 1 | -0/+11 |
| | * | | | | | | | | | | | Move Rack::Attack and Rack::Cors middlewares to be before Warden::Manager | Nick Thomas | 2016-09-26 | 1 | -2/+2 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Add CHANGELOG entries for 8.11.8, 8.10.11, and 8.9.11 | Rémy Coutable | 2016-09-29 | 1 | -0/+18 |
* | | | | | | | | | | | | Merge branch 'fix/rugged-repo-error' into 'master' | Rémy Coutable | 2016-09-29 | 8 | -4/+62 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | |