summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed testsedit_blob-js-es6Luke Bennett2016-07-261-3/+3
* Parsed global scope to IIFELuke Bennett2016-07-261-3/+3
* Added edit_blob.js.es6Luke Bennett2016-07-261-0/+50
* Merge branch 'es6it' into 'master' Douwe Maan2016-07-253-0/+11
|\
| * Add CHANGELOGJacob Schatz2016-07-251-0/+1
| * Add es6 gemJacob Schatz2016-07-252-0/+10
* | Update CHANGELOG after 8.10.120246-devise-warning-user_omniauth_authorize_path-github-is-deprecated-please-use-user_github_omniauth_authorize_path-insteadRémy Coutable2016-07-251-9/+12
* | Merge branch 'fix-backup-restore' into 'master' Rémy Coutable2016-07-252-2/+3
|\ \ | |/ |/|
| * Fix backup restorefix-backup-restoreStan Hu2016-07-252-2/+3
* | Merge branch 'instrument-nokogiri' into 'master' Rémy Coutable2016-07-252-0/+8
|\ \ | |/ |/|
| * Instrument Nokogiri parsing methodsYorick Peterse2016-07-252-0/+8
|/
* Merge branch 'use-project-id-in-repo-cache' into 'master' Yorick Peterse2016-07-254-10/+15
|\
| * Use project ID in repository cache to prevent stale data from persisting acro...Stan Hu2016-07-254-10/+15
* | Merge branch 'api-mr-doc' into 'master' Rémy Coutable2016-07-251-0/+4
|\ \
| * | Add iid to MR API responseRobert Schilling2016-07-251-0/+4
| |/
* | Merge branch 'filter-branch-by-name' into 'master' Douwe Maan2016-07-2510-17/+207
|\ \ | |/ |/|
| * Merge branch 'master' into filter-branch-by-nametiagonbotelho2016-07-22283-2540/+4343
| |\
| | * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-cetiagonbotelho2016-07-226-21/+70
| | |\
| | * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-cetiagonbotelho2016-07-2299-1496/+1082
| | |\ \
| | * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-cetiagonbotelho2016-07-21172-983/+2779
| | |\ \ \
| | * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-cetiagonbotelho2016-07-2053-132/+470
| | |\ \ \ \
| | * | | | | updates local schematiagonbotelho2016-07-202-7/+40
| * | | | | | adds changelog itemtiagonbotelho2016-07-221-0/+1
| * | | | | | refactors the search to enable users to filter and sort branches at thetiagonbotelho2016-07-195-7/+2
| * | | | | | implements branches filter functionality and tests accordinglytiagonbotelho2016-07-191-1/+0
| * | | | | | implements the basic filter functionalitytiagonbotelho2016-07-199-11/+172
| |/ / / / /
* | | | | | Merge branch 'remove-magic-comments' into 'master' Rémy Coutable2016-07-2510-15/+1
|\ \ \ \ \ \
| * | | | | | Remove magic comments from Ruby files (!5456)winniehell2016-07-2410-15/+1
* | | | | | | Merge branch 'fork-counter-link' into 'master' Rémy Coutable2016-07-252-8/+5
|\ \ \ \ \ \ \
| * | | | | | | Make fork counter always clickable (!5463)winniehell2016-07-242-8/+5
* | | | | | | | Merge branch 'reject-invalid-trusted-proxies'Rémy Coutable2016-07-253-3/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Ignore invalid trusted proxies in X-Forwarded-For headerreject-invalid-trusted-proxiesStan Hu2016-07-233-3/+16
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'fix-wiki-error-500' into 'master' Rémy Coutable2016-07-256-15/+190
|\ \ \ \ \ \ \ \
| * | | | | | | | `WikiPage` should have a slug even when not persisted.fix-wiki-error-500Timothy Andrew2016-07-254-11/+185
| * | | | | | | | Fix CHANGELOGStan Hu2016-07-241-2/+0
| * | | | | | | | Add spec for dashes in pathsStan Hu2016-07-241-4/+4
| * | | | | | | | Fix Error 500 when creating Wiki pages with hyphens or spacesStan Hu2016-07-242-2/+5
* | | | | | | | | Merge branch 'es6ify' into 'master' Jacob Schatz2016-07-24322-13302/+14719
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | ES6ify all the things!Fatih Acet2016-07-24322-13302/+14719
|/ / / / / / / /
* | | | | | | | Merge branch 'revert-e599afac' into 'master' Stan Hu2016-07-249-29/+39
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Revert "Merge branch '17073-tagscontroller-index-is-terrible-response-time-go...Alejandro Rodríguez2016-07-249-29/+39
|/ / / / / / /
* | | | | | | Merge branch 'gfm-markdown-docs' into 'master' Achilleas Pipinellis2016-07-241-14/+51
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add links to the real markdown.md file for all GFM examplesAchilleas Pipinellis2016-07-241-14/+51
* | | | | | | Merge branch 'nullify-note-type' into 'master' Stan Hu2016-07-233-5/+21
|\ \ \ \ \ \ \
| * | | | | | | Fix bug where replies to commit notes displayed in the MR discussion tab woul...Douwe Maan2016-07-233-5/+21
| |/ / / / / /
* | | | | | | Merge branch 'add-gitlab-workhorse-version-to-admin-dashboard' into 'master' Douwe Maan2016-07-234-0/+31
|\ \ \ \ \ \ \
| * | | | | | | If version file is unavailable unknown statusKatarzyna Kobierska2016-07-232-4/+3
| * | | | | | | Add gitlab-workhorse version to admin dashboardKatarzyna Kobierska2016-07-234-0/+32
| |/ / / / / /
* | | | | | | Merge branch 'improve-rename-logging' into 'master' Robert Speicher2016-07-231-1/+10
|\ \ \ \ \ \ \
| * | | | | | | Improve project rename log messages for better debuggingimprove-rename-loggingStan Hu2016-07-231-1/+10
| |/ / / / / /