summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-0125-45/+45
* Merge branch 'sh-fix-project-members-api-perf' into 'master'Rémy Coutable2018-01-311-0/+15
|\
| * Remove N+1 queries with /projects/:project_id/{access_requests,members} API e...sh-fix-project-members-api-perfStan Hu2018-01-301-0/+15
* | Merge branch 'zj-gitaly-server-info' into 'master'Sean McGivern2018-01-312-0/+45
|\ \
| * | Gitaly Server info for admin panelZeger-Jan van de Weg2018-01-312-0/+45
* | | Merge branch 'sh-fix-events-collection' into 'master'Rémy Coutable2018-01-311-0/+24
|\ \ \
| * | | Fix not all events being shown in group dashboardsh-fix-events-collectionStan Hu2018-01-301-0/+24
| | |/ | |/|
* | | Merge branch '4635-unify-jobs-and-builds-sepc' into 'master'Rémy Coutable2018-01-312-52/+73
|\ \ \
| * | | Make those files as close as EE to reduce conflicts4635-unify-jobs-and-builds-sepcLin Jen-Shin2018-01-312-52/+73
* | | | Merge branch 'ph-ajax-to-axios' into 'master'Filipa Lacerda2018-01-319-166/+142
|\ \ \ \ | |_|/ / |/| | |
| * | | fixed failing specsph-ajax-to-axiosPhil Hughes2018-01-302-2/+2
| * | | fixed more unhandled promise rejectionsPhil Hughes2018-01-302-5/+13
| * | | fixed unhandled promise rejectionPhil Hughes2018-01-301-2/+4
| * | | changed commits.js to axiosPhil Hughes2018-01-301-12/+31
| * | | converted blob viewer to axiosPhil Hughes2018-01-301-19/+17
| * | | spec fixes after API axios changePhil Hughes2018-01-303-11/+19
| * | | Converted API.js to axiosPhil Hughes2018-01-301-115/+56
* | | | Merge branch 'feature/migrate-delete-refs-to-gitaly' into 'master'Robert Speicher2018-01-302-21/+25
|\ \ \ \
| * | | | Migrate Git::Repository#delete_refs to Gitalyfeature/migrate-delete-refs-to-gitalyAhmad Sherif2018-01-302-21/+25
* | | | | Merge branch '41771-reduce-cardinality-of-metrics' into 'master'Grzegorz Bizon2018-01-307-49/+167
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Rename Concern -> Methods41771-reduce-cardinality-of-metricsPawel Chojnacki2018-01-291-2/+2
| * | | | use public_send where appropriatePawel Chojnacki2018-01-291-3/+3
| * | | | before -> afterPawel Chojnacki2018-01-292-2/+2
| * | | | use define_method to define devine_metric_method. (couldn't resist)Pawel Chojnacki2018-01-291-15/+12
| * | | | Fix ruby sampler specPawel Chojnacki2018-01-291-12/+10
| * | | | Convert InfluxDB to concern. Fix uninitialized metrics when metrics code is i...Pawel Chojnacki2018-01-291-2/+5
| * | | | Cleanup rspecPawel Chojnacki2018-01-291-14/+20
| * | | | NullMetric as a singletonPawel Chojnacki2018-01-291-1/+3
| * | | | Avoid cascading lockingPawel Chojnacki2018-01-291-1/+1
| * | | | Test if feature is respectedPawel Chojnacki2018-01-291-19/+52
| * | | | Small Concern_spec cleanupPawel Chojnacki2018-01-291-3/+1
| * | | | Add Tests for Metrics::ConcernPawel Chojnacki2018-01-291-0/+101
| * | | | Fix testsPawel Chojnacki2018-01-291-1/+1
| * | | | Convert active recordPawel Chojnacki2018-01-291-1/+1
| * | | | Fix code after refactoringPawel Chojnacki2018-01-291-1/+1
| * | | | cleanup method callPawel Chojnacki2018-01-291-32/+12
* | | | | Merge branch 'feature/migrate-wiki-page-formatted-data-to-gitaly' into 'master'Robert Speicher2018-01-301-5/+15
|\ \ \ \ \
| * | | | | Migrate fetching wiki page formatted content to Gitalyfeature/migrate-wiki-page-formatted-data-to-gitalyAhmad Sherif2018-01-301-5/+15
* | | | | | Merge branch '21554-mark-new-user-as-external' into 'master'Douwe Maan2018-01-301-9/+21
|\ \ \ \ \ \
| * | | | | | Only new users get marked as external21554-mark-new-user-as-externalTiago Botelho2018-01-301-9/+21
* | | | | | | Merge branch '42160-error-500-loading-merge-request-undefined-method-index-fo...Douwe Maan2018-01-301-0/+10
|\ \ \ \ \ \ \
| * | | | | | | Fix truncated_diff_lines for legacy notes without a line42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclassSean McGivern2018-01-301-0/+10
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Decouple more of Repository from RuggedJacob Vosmaer (GitLab)2018-01-301-0/+25
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'jprovazn-pagination' into 'master'Sean McGivern2018-01-301-0/+12
|\ \ \ \ \ \
| * | | | | | Make pagination optional for issuablesJan Provaznik2018-01-301-0/+12
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'osw-short-circuit-mergeable-disccusions-state' into 'master'Sean McGivern2018-01-301-0/+4
|\ \ \ \ \ \
| * | | | | | Check MR state before submitting queries for discussion stateosw-short-circuit-mergeable-disccusions-stateOswaldo Ferreira2018-01-291-0/+4
* | | | | | | Merge branch 'ph-ajax-into-axios' into 'master'Filipa Lacerda2018-01-302-54/+100
|\ \ \ \ \ \ \
| * | | | | | | fixed issuable_spec.jsPhil Hughes2018-01-291-4/+22
| * | | | | | | Converted integration_settings_form to axiosPhil Hughes2018-01-291-50/+78