summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | 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
|/ / / / / / / / / / / / / /
| | | | | | | | | | | | * | Added CHANGELOG for housekeeping and changed GITLAB_SHELL_VERSION to 2.6.10Jeroen Nijhof2016-01-062-1/+2
| | | | | | | | | | | | * | Use panel-default and .form-actionsJeroen Nijhof2016-01-061-11/+13
| | | | | | | | | | | | * | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-061577-17600/+50296
| | | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | Import comments on the diff of a GitHub Pull Request into GitLabDouglas Barbosa Alexandre2016-01-051-0/+16
| * | | | | | | | | | | | | | Import comments on GitHub Pull Request into GitLabDouglas Barbosa Alexandre2016-01-051-0/+14
| * | | | | | | | | | | | | | Import GitHub Pull Requests into GitLabDouglas Barbosa Alexandre2016-01-051-7/+57
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'fix-notification-spec' into 'master' Douwe Maan2016-01-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix notification specfix-notification-specDouwe Maan2016-01-051-1/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'rs-fix-abuse-report-url' into 'master' Dmitriy Zaporozhets2016-01-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix the abuse report detail URL in the HTML email templaters-fix-abuse-report-urlRobert Speicher2016-01-051-1/+1
* | | | | | | | | | | | | | Merge branch 'feature/detailed-user-endpoint' of https://gitlab.com/Michi302/...Dmitriy Zaporozhets2016-01-063-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add missing changelog entryMichi302/gitlab-ce-feature/detailed-user-endpointMichi3022016-01-051-0/+1
| * | | | | | | | | | | | | | Make single user API endpoint return Entities::User instead of Entities::User...Michi3022015-12-282-1/+8
* | | | | | | | | | | | | | | Merge pull request #9912 from pmq20/psvr/dec15Stan Hu2016-01-051-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Ignore config/sidekiq.yml [ci skip]The rugged tests are fragile2015-12-151-0/+1
* | | | | | | | | | | | | | | Merge branch 'validate-readme-format' into 'master'Robert Speicher2016-01-052-8/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | [ci skip] Update CHANGELOGvalidate-readme-formatDouglas Barbosa Alexandre2016-01-051-0/+1
| * | | | | | | | | | | | | | | Validate README format before displayingDouglas Barbosa Alexandre2016-01-051-8/+6
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'rs-version-check-svg' into 'master' Robert Speicher2016-01-052-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Update version check images to use SVGRobert Speicher2016-01-052-1/+2
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'mikew1/gitlab-ce-better-asana-refs' into 'master' Douwe Maan2016-01-052-48/+111
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Satisfy RubocopDouwe Maan2016-01-051-1/+1
| * | | | | | | | | | | | | Don't log backtrace in Asana servicemikew1/gitlab-ce-better-asana-refsMike Wyatt2016-01-041-1/+0
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into better-asana-refsMike Wyatt2015-12-31403-2136/+22333
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Use `execute` in Asana specsMike Wyatt2015-12-311-15/+18
| * | | | | | | | | | | | | Actually test the posted comment in Asana serviceMike Wyatt2015-12-311-4/+21
| * | | | | | | | | | | | | Better handling of errors in Asana serviceMike Wyatt2015-12-301-9/+8