summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into merge-when-build-succeeds-uncheckedmerge-when-build-succeeds-uncheckedDouwe Maan2016-01-0615-60/+251
|\
| * 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
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-11-12297-1025/+4533
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Refactor for style issuesJeff Stubler2015-11-113-21/+17
| | * | | | | | | | | Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-11-0215-112/+211
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add graphs showing commits ahead and behind default to branches pageJeff Stubler2015-11-016-2/+122
* | | | | | | | | | | | Get "Merge when build succeeds" to work when commits were pushed to MR target...Douwe Maan2016-01-055-8/+15
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'joshfng/gitlab-ce-fix-3802' into 'master' Douwe Maan2016-01-055-4/+38
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Change text back. Add additional tests.joshfng/gitlab-ce-fix-3802Josh Frye2016-01-033-3/+14
| * | | | | | | | | | | Remove feature tag from testing locallyJosh Frye2016-01-031-1/+0
| * | | | | | | | | | | Fix testsJosh Frye2016-01-032-2/+2
| * | | | | | | | | | | Show 'New Merge Request' buttons on canonical repo.Josh Frye2016-01-035-5/+29
* | | | | | | | | | | | Merge branch 'rs-abuse-reports-refactor' into 'master' Douwe Maan2016-01-056-61/+101
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add `AbuseReport#notify`rs-abuse-reports-refactorRobert Speicher2016-01-044-58/+49
| * | | | | | | | | | | | Make AbuseReportMailer responsible for knowing if it should deliverRobert Speicher2016-01-042-1/+47
| * | | | | | | | | | | | Redirect back to user profile page after abuse reportRobert Speicher2016-01-041-2/+5
* | | | | | | | | | | | | Merge branch 'pr-9938' into 'master' Douwe Maan2016-01-052-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Merge pull request GH-9938 from huacnlee/hotfix/note_mail_with_notificationpr-9938Douwe Maan2016-01-042-1/+4
* | | | | | | | | | | | | | Merge branch 'rs-relative-links-to-root' into 'master' Douwe Maan2016-01-052-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
View Lorry Controller Status