summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove InfluxDB username/passwordremove-influxdb-credentialsYorick Peterse2016-01-065-26/+16
* 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
| * | 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
| * | | | | Update Asana service documentationMike Wyatt2015-12-301-2/+2
| * | | | | Restore colon in Asana commentMike Wyatt2015-12-301-1/+1
| * | | | | Merge remote-tracking branch 'origin/master' into better-asana-refsMike Wyatt2015-12-3084-495/+546
| |\ \ \ \ \
| * | | | | | Fix error in Asana serviceMike Wyatt2015-12-291-1/+1
| * | | | | | Update Asana specsMike Wyatt2015-12-291-8/+32
| * | | | | | Update Asana service to work with Personal Access Token, lessen number of req...Mike Wyatt2015-12-291-31/+21
| * | | | | | Update Asana field descriptionsMike Wyatt2015-12-291-4/+2
| * | | | | | better support for referencing and closing issues in asana_service.rbMike Wyatt2015-12-162-8/+41
* | | | | | | Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master' Douwe Maan2016-01-056-0/+117
|\ \ \ \ \ \ \
| * | | | | | | Fix diverging commit count calculationbrunsa2/gitlab-ce-diverging-branch-graphsJeff Stubler2015-12-151-2/+5
| * | | | | | | Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-12-03582-4651/+9171
| |\ \ \ \ \ \ \
View Lorry Controller Status