summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* DRY up upload and download servicesapi-project-uploadDouwe Maan2016-01-085-37/+30
* Update specDouwe Maan2016-01-072-9/+12
* Satisfy RubocpDouwe Maan2016-01-071-1/+1
* Add API project upload endpointDouwe Maan2016-01-078-23/+70
* Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-070-0/+0
|\
| * Merge pull request #9889 from koreamic/file_finderDouwe Maan2016-01-0725-9/+473
| |\
| | * Add new feature to find filekoreamic2016-01-0725-9/+473
| |/
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-0725-9/+473
* | Merge branch 'revert-influxdb-milliseconds' into 'master' Yorick Peterse2016-01-074-14/+6
|\ \
| * | Revert "Store SQL/view timings in milliseconds"Yorick Peterse2016-01-074-14/+6
|/ /
* | Merge branch 'doc_enable_disable_ci' into 'master' Achilleas Pipinellis2016-01-074-0/+72
|\ \
| * | Fix hyphenation typos [ci skip]Achilleas Pipinellis2016-01-071-7/+7
| * | Add documentation on enabling/disabling GitLab CIdoc_enable_disable_ciAchilleas Pipinellis2016-01-064-0/+72
* | | Merge branch 'remove-influxdb-credentials' into 'master' Yorick Peterse2016-01-075-26/+16
|\ \ \ | |_|/ |/| |
| * | Remove InfluxDB username/passwordremove-influxdb-credentialsYorick Peterse2016-01-065-26/+16
* | | Merge branch 'more-opengraph' into 'master' Robert Speicher2016-01-067-76/+40
|\ \ \
| * \ \ Merge branch 'master' into more-opengraphmore-opengraphDouwe Maan2016-01-0615-60/+251
| |\ \ \
| * | | | Don't override issue page description in project layout.Douwe Maan2016-01-065-14/+9
| * | | | Remove now-redundant `page_description` call from Groups#showRobert Speicher2016-01-051-2/+0
| * | | | Remove now-redundant `page_description` call from Projects#showRobert Speicher2016-01-051-3/+1
| * | | | Make `page_description` less magical :sparkles:Robert Speicher2016-01-054-42/+11
| * | | | Use `User#avatar_url` instead of `avatar_icon` helperRobert Speicher2016-01-052-41/+20
| * | | | Merge branch 'master' into more-opengraphDouwe Maan2016-01-05174-1610/+3219
| |\ \ \ \
| * | | | | Use `assign` instead of `instance_variable_set`Robert Speicher2015-12-271-7/+7
| * | | | | Add specs for page_image using a Group's avatarRobert Speicher2015-12-271-0/+16
| * | | | | Add Open Graph data for group, project and commit.Douwe Maan2015-12-255-6/+14
* | | | | | Merge branch 'merge-when-build-succeeds-unchecked' into 'master' Robert Speicher2016-01-065-8/+15
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into merge-when-build-succeeds-uncheckedmerge-when-build-succeeds-uncheckedDouwe Maan2016-01-0615-60/+251
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Get "Merge when build succeeds" to work when commits were pushed to MR target...Douwe Maan2016-01-055-8/+15
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'rs-issue-1697' into 'master' Douwe Maan2016-01-061-0/+16
|\ \ \ \ \ \
| * | | | | | Define a limited set of filters for SingleLinePipeliners-issue-1697Robert Speicher2016-01-051-0/+16
* | | | | | | Merge branch 'fix-banzai-cache' into 'master' Robert Speicher2016-01-063-17/+24
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Add regression test.fix-banzai-cacheDouwe Maan2016-01-061-1/+14
| * | | | | | Fix mentionable reference extraction caching.Douwe Maan2016-01-061-2/+5
| * | | | | | Revert "Temporarily disable Markdown caching"Douwe Maan2016-01-061-3/+1
| * | | | | | Revert "Add DEBUG_BANZAI_CACHE env var to debug Banzai cache issue."Douwe Maan2016-01-061-14/+7
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'metrics-milliseconds' into 'master' Yorick Peterse2016-01-064-6/+14
|\ \ \ \ \ \
| * | | | | | Store SQL/view timings in millisecondsYorick Peterse2016-01-064-6/+14
* | | | | | | Merge branch 'azure_oauth2' into 'master' Stan Hu2016-01-067-1/+92
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Enable Microsoft Azure OAuth2 supportJanis Meybohm2016-01-067-1/+92
|/ / / / / /
* | | | | | Merge branch 'fix/project-destroy-callbacks' into 'master' Douwe Maan2016-01-061-4/+2
|\ \ \ \ \ \
| * | | | | | Fix project destroy callbackfix/project-destroy-callbacksGrzegorz Bizon2016-01-051-4/+2
* | | | | | | Merge branch 'import-gh-pull-requests' into 'master' Douwe Maan2016-01-0610-24/+681
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Update doc for importing existing GitHub projects to GitLabimport-gh-pull-requestsDouglas Barbosa Alexandre2016-01-051-2/+2
| * | | | | | Ensure that we're only importing local pull requestsDouglas Barbosa Alexandre2016-01-053-1/+31
| * | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-01-051-0/+1
| * | | | | | Generate separate comments when importing GitHub Issues into GitLabDouglas Barbosa Alexandre2016-01-058-76/+266
| * | | | | | Refactoring GithubImport::ImporterDouglas Barbosa Alexandre2016-01-055-61/+407
| * | | | | | Extract methods to import comments on a GitHub Pull RequestDouglas Barbosa Alexandre2016-01-051-24/+28
| * | | | | | Doesn't import GitHub PR where branches were no longer availableDouglas Barbosa Alexandre2016-01-051-38/+44