summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mikew1/gitlab-ce-better-asana-refs' into 'master' Douwe Maan2016-01-051-42/+40
|\
| * 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-31182-1116/+3740
| |\
| * | 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-307-34/+35
| |\ \
| * | | Fix error in Asana serviceMike Wyatt2015-12-291-1/+1
| * | | 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-161-8/+20
* | | | Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master' Douwe Maan2016-01-055-0/+115
|\ \ \ \
| * | | | Fix diverging commit count calculationbrunsa2/gitlab-ce-diverging-branch-graphsJeff Stubler2015-12-151-2/+5
| * | | | Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-12-03319-2369/+3452
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-11-12163-581/+1458
| |\ \ \ \ \
| * | | | | | Refactor for style issuesJeff Stubler2015-11-113-21/+17
| * | | | | | Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-11-022-8/+8
| |\ \ \ \ \ \
| * | | | | | | Add graphs showing commits ahead and behind default to branches pageJeff Stubler2015-11-015-2/+121
* | | | | | | | Merge branch 'joshfng/gitlab-ce-fix-3802' into 'master' Douwe Maan2016-01-052-4/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Change text back. Add additional tests.joshfng/gitlab-ce-fix-3802Josh Frye2016-01-031-1/+1
| * | | | | | | | Fix testsJosh Frye2016-01-032-2/+2
| * | | | | | | | Show 'New Merge Request' buttons on canonical repo.Josh Frye2016-01-032-5/+7
* | | | | | | | | Merge branch 'rs-abuse-reports-refactor' into 'master' Douwe Maan2016-01-053-6/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add `AbuseReport#notify`rs-abuse-reports-refactorRobert Speicher2016-01-042-3/+7
| * | | | | | | | | Make AbuseReportMailer responsible for knowing if it should deliverRobert Speicher2016-01-041-1/+9
| * | | | | | | | | Redirect back to user profile page after abuse reportRobert Speicher2016-01-041-2/+5
* | | | | | | | | | Merge branch 'pr-9938' into 'master' Douwe Maan2016-01-051-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Merge pull request GH-9938 from huacnlee/hotfix/note_mail_with_notificationpr-9938Douwe Maan2016-01-041-1/+1
* | | | | | | | | | | Merge branch 'new-markdown' into 'master' Dmitriy Zaporozhets2016-01-051-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | markdown fixesnew-markdownAndriy Dyadyura2016-01-051-1/+1
| * | | | | | | | | | | markdown fixesAndriy Dyadyura2016-01-051-3/+3
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'improved-leave-project' into 'master' Dmitriy Zaporozhets2016-01-053-16/+25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | removes footer message about access to projectJacob Schatz2016-01-041-8/+1
| * | | | | | | | | | | Merge branch 'master' into improved-leave-projectJacob Schatz2015-12-282-0/+61
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fixes tests failingJacob Schatz2015-12-281-2/+2
| * | | | | | | | | | | | adds settings menu to the top for editting and leaving projectsJacob Schatz2015-12-283-9/+25
* | | | | | | | | | | | | Merge branch 'rs-logo-animation' into 'master' Dmitriy Zaporozhets2016-01-053-8/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Restructure logo JS to use `setInterval`rs-logo-animationRobert Speicher2016-01-041-25/+21
| * | | | | | | | | | | | | Decrease the logo sweep delayRobert Speicher2016-01-041-2/+3
| * | | | | | | | | | | | | Correct the logo ID namesRobert Speicher2016-01-042-11/+11
| * | | | | | | | | | | | | Ensure the sweep always starts from the leftRobert Speicher2016-01-021-8/+9
| * | | | | | | | | | | | | Use the logo as a loading indicatorRobert Speicher2016-01-022-1/+46
| * | | | | | | | | | | | | Give the logo shapes meaningful IDsRobert Speicher2016-01-021-7/+7
* | | | | | | | | | | | | | Merge branch 'dedupe-notifications-watcher-and-subscriber' into 'master' Dmitriy Zaporozhets2016-01-051-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Don't notify users twice if they are both project watchers and subscribersStan Hu2016-01-041-0/+1
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'rs-remove-jquery-blockui' into 'master' Dmitriy Zaporozhets2016-01-052-8/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove jquery.blockUI.js pluginrs-remove-jquery-blockuiRobert Speicher2016-01-042-8/+0
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Redesign the AbuseReports indexrs-abuse-reportsRobert Speicher2016-01-042-10/+11
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'show-all-builds-by-default' into 'master' Robert Speicher2016-01-044-17/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Show 'All' tab by default in the builds pageshow-all-builds-by-defaultDouglas Barbosa Alexandre2016-01-044-17/+17
View Lorry Controller Status