summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-072-0/+78
* Revert "Store SQL/view timings in milliseconds"Yorick Peterse2016-01-072-3/+3
* Merge branch 'more-opengraph' into 'master' Robert Speicher2016-01-061-46/+18
|\
| * Merge branch 'master' into more-opengraphmore-opengraphDouwe Maan2016-01-062-7/+72
| |\
| * | Don't override issue page description in project layout.Douwe Maan2016-01-061-4/+2
| * | Make `page_description` less magical :sparkles:Robert Speicher2016-01-051-25/+2
| * | Use `User#avatar_url` instead of `avatar_icon` helperRobert Speicher2016-01-051-35/+16
| * | Merge branch 'master' into more-opengraphDouwe Maan2016-01-0535-261/+1184
| |\ \
| * | | Use `assign` instead of `instance_variable_set`Robert Speicher2015-12-271-7/+7
| * | | Add specs for page_image using a Group's avatarRobert Speicher2015-12-271-0/+16
* | | | Merge branch 'fix-banzai-cache' into 'master' Robert Speicher2016-01-061-1/+14
|\ \ \ \
| * | | | Add regression test.fix-banzai-cacheDouwe Maan2016-01-061-1/+14
| | |_|/ | |/| |
* | | | Store SQL/view timings in millisecondsYorick Peterse2016-01-062-3/+3
* | | | Merge branch 'import-gh-pull-requests' into 'master' Douwe Maan2016-01-063-0/+403
|\ \ \ \ | |/ / / |/| | |
| * | | Ensure that we're only importing local pull requestsDouglas Barbosa Alexandre2016-01-051-0/+22
| * | | Generate separate comments when importing GitHub Issues into GitLabDouglas Barbosa Alexandre2016-01-053-4/+152
| * | | Refactoring GithubImport::ImporterDouglas Barbosa Alexandre2016-01-052-0/+233
* | | | Fix notification specfix-notification-specDouwe Maan2016-01-051-1/+1
|/ / /
* | | Merge branch 'mikew1/gitlab-ce-better-asana-refs' into 'master' Douwe Maan2016-01-051-6/+71
|\ \ \ | |_|/ |/| |
| * | Satisfy RubocopDouwe Maan2016-01-051-1/+1
| * | Merge remote-tracking branch 'upstream/master' into better-asana-refsMike Wyatt2015-12-3173-189/+2175
| |\ \
| * | | Use `execute` in Asana specsMike Wyatt2015-12-311-15/+18
| * | | Actually test the posted comment in Asana serviceMike Wyatt2015-12-311-4/+21
| * | | Merge remote-tracking branch 'origin/master' into better-asana-refsMike Wyatt2015-12-3023-40/+40
| |\ \ \
| * | | | Update Asana specsMike Wyatt2015-12-291-8/+32
| * | | | better support for referencing and closing issues in asana_service.rbMike Wyatt2015-12-161-0/+21
* | | | | Merge branch 'rs-abuse-reports-refactor' into 'master' Douwe Maan2016-01-053-55/+80
|\ \ \ \ \
| * | | | | Add `AbuseReport#notify`rs-abuse-reports-refactorRobert Speicher2016-01-042-55/+42
| * | | | | Make AbuseReportMailer responsible for knowing if it should deliverRobert Speicher2016-01-041-0/+38
* | | | | | Merge branch 'pr-9938' into 'master' Douwe Maan2016-01-051-0/+3
|\ \ \ \ \ \
| * | | | | | Merge pull request GH-9938 from huacnlee/hotfix/note_mail_with_notificationpr-9938Douwe Maan2016-01-041-0/+3
* | | | | | | Merge branch 'rs-relative-links-to-root' into 'master' Douwe Maan2016-01-051-0/+8
|\ \ \ \ \ \ \
| * | | | | | | Support a single directory traversal in RelativeLinkFilterrs-relative-links-to-rootRobert Speicher2015-12-301-0/+8
* | | | | | | | Merge branch 'fix-api-lookup-with-usernames-with-dots' of https://gitlab.com/...Dmitriy Zaporozhets2016-01-051-0/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix API project lookups when querying with a namespace with dotsStan Hu2016-01-031-0/+9
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'improved-leave-project' into 'master' Dmitriy Zaporozhets2016-01-051-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | rempves tests for "you have master access" textimproved-leave-projectJacob Schatz2016-01-041-1/+0
| * | | | | | | | 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-281-1/+1
| |\ \ \ \ \ \ \ \
| * | | | | | | | | fixes tests failingJacob Schatz2015-12-281-1/+4
* | | | | | | | | | Merge branch 'metrics-tuning' into 'master' Dmitriy Zaporozhets2016-01-058-136/+74
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix Rubocop styling in AR subscriber specsmetrics-tuningYorick Peterse2016-01-041-1/+1
| * | | | | | | | | | Automatically prefix transaction series namesYorick Peterse2016-01-045-8/+8
| * | | | | | | | | | Use separate series for Rails/Sidekiq sample statsYorick Peterse2016-01-041-8/+30
| * | | | | | | | | | Track total method call times per transactionYorick Peterse2016-01-041-0/+6
| * | | | | | | | | | Track total query/view timings in transactionsYorick Peterse2016-01-042-0/+38
| * | | | | | | | | | Ability to increment custom transaction valuesYorick Peterse2016-01-041-0/+12
| * | | | | | | | | | Removed tracking of hostnames for metricsYorick Peterse2015-12-312-8/+0
| * | | | | | | | | | Use separate series for Rails/Sidekiq transactionsYorick Peterse2015-12-315-6/+5
| * | | | | | | | | | Cache InfluxDB settings after the first useYorick Peterse2015-12-311-9/+3
View Lorry Controller Status