summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
* | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Support a single directory traversal in RelativeLinkFilterrs-relative-links-to-rootRobert Speicher2015-12-302-1/+9
* | | | | | | | | | | | Merge branch 'ssh-doc-fixes' into 'master' Hannes Rosenögger2016-01-051-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix grammarFelix Eckhofer2016-01-051-1/+1
| * | | | | | | | | | | | Clarify the key generation stepFelix Eckhofer2016-01-051-2/+3
| * | | | | | | | | | | | Remove misleading `ssh-dsa`Felix Eckhofer2016-01-051-2/+2
* | | | | | | | | | | | | Merge branch 'new-markdown' into 'master' Dmitriy Zaporozhets2016-01-052-263/+263
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |