summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add documentation on enabling/disabling GitLab CIdoc_enable_disable_ciAchilleas Pipinellis2016-01-064-0/+72
* 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
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | markdown fixesnew-markdownAndriy Dyadyura2016-01-051-1/+1
| * | | | | | | | | markdown fixesAndriy Dyadyura2016-01-052-263/+263
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-api-lookup-with-usernames-with-dots' of https://gitlab.com/...Dmitriy Zaporozhets2016-01-053-1/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix API project lookups when querying with a namespace with dotsStan Hu2016-01-033-1/+11
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge remote-tracking branch 'origin/crosslink-env-docs'Dmitriy Zaporozhets2016-01-052-2/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix link, filename and crosslink to omnibus docs.crosslink-env-docsSytse Sijbrandij2015-12-292-2/+7
* | | | | | | | | | Merge branch 'improved-leave-project' into 'master' Dmitriy Zaporozhets2016-01-054-18/+29
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rempves tests for "you have master access" textimproved-leave-projectJacob Schatz2016-01-041-1/+0
| * | | | | | | | | | removes footer message about access to projectJacob Schatz2016-01-041-8/+1
| * | | | | | | | | | adds proper `it` for multi line. adds `find` with correct id for button.Jacob Schatz2015-12-281-3/+3
| * | | | | | | | | | Merge branch 'master' into improved-leave-projectJacob Schatz2015-12-289-37/+130
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fixes tests failingJacob Schatz2015-12-282-3/+6
| * | | | | | | | | | | adds settings menu to the top for editting and leaving projectsJacob Schatz2015-12-283-9/+25
* | | | | | | | | | | | Merge branch 'metrics-tuning' into 'master' Dmitriy Zaporozhets2016-01-0517-249/+133
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix Rubocop styling in AR subscriber specsmetrics-tuningYorick Peterse2016-01-041-1/+1
| * | | | | | | | | | | | Automatically prefix transaction series namesYorick Peterse2016-01-048-20/+19
| * | | | | | | | | | | | Use separate series for Rails/Sidekiq sample statsYorick Peterse2016-01-042-13/+44
| * | | | | | | | | | | | Track total method call times per transactionYorick Peterse2016-01-042-0/+8
| * | | | | | | | | | | | Track total query/view timings in transactionsYorick Peterse2016-01-045-0/+62
| * | | | | | | | | | | | Ability to increment custom transaction valuesYorick Peterse2016-01-042-2/+25
| * | | | | | | | | | | | Removed tracking of hostnames for metricsYorick Peterse2015-12-315-19/+2
| * | | | | | | | | | | | Use separate series for Rails/Sidekiq transactionsYorick Peterse2015-12-319-14/+15
| * | | | | | | | | | | | Cache InfluxDB settings after the first useYorick Peterse2015-12-312-23/+21
| * | | | | | | | | | | | Removed tracking of raw SQL queriesYorick Peterse2015-12-315-221/+0