summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fl-mr-widget' into 'master'Phil Hughes2018-01-311-83/+48
|\ | | | | | | | | Move mr widget related links into a vue file See merge request gitlab-org/gitlab-ce!16825
| * Move mr widget related links into a vue fileFilipa Lacerda2018-01-301-83/+48
| |
* | Use axios instead of jquery ajax for setCiStatusFaviconClement Ho2018-01-312-28/+32
| |
* | Merge branch 'rugged-reference-cache-rescue' into 'master'Sean McGivern2018-01-312-17/+11
|\ \ | | | | | | | | | | | | Stop rescuing Rugged::Reference in Repository cache See merge request gitlab-org/gitlab-ce!16770
| * | Remove Rugged exception in cache rescuerugged-reference-cache-rescueJacob Vosmaer2018-01-302-17/+11
| | |
* | | 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 endpoints See merge request gitlab-org/gitlab-ce!16751
| * | | Remove N+1 queries with /projects/:project_id/{access_requests,members} API ↵sh-fix-project-members-api-perfStan Hu2018-01-301-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | endpoints We can simplify the code quite a bit and improve performance by using grape-entity merge fields: https://github.com/ruby-grape/grape-entity/tree/v0.6.0#merge-fields Relates to #42030
* | | | Merge branch 'zj-gitaly-server-info' into 'master'Sean McGivern2018-01-312-0/+45
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Gitaly Server info for admin panel See merge request gitlab-org/gitlab-ce!16794
| * | | | Gitaly Server info for admin panelZeger-Jan van de Weg2018-01-312-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements the client side for gitlab-org/gitaly#819. Which is a server info command. This checks the server version and git binairy version on the server. A small UI was added for administrators, so they can check the status of the Gitaly server. This is done for each storage the monolith knows. Because of this commit, gitlab-org/gitlab-ce!15580 is now closed. That MR removed the Git version too, but didn't replace it with anything.
* | | | | Merge branch 'sh-fix-events-collection' into 'master'Rémy Coutable2018-01-311-0/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix not all events being shown in group dashboard Closes #42560 See merge request gitlab-org/gitlab-ce!16819
| * | | | | Fix not all events being shown in group dashboardsh-fix-events-collectionStan Hu2018-01-301-0/+24
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The group activity feed was limited to the first 20 projects found in the group, which caused activity from some projects to be omitted. A limit of 20 is applied to the query for events, so the extra pagination does little in the way of performance. Closes #42560
* | | | | Merge branch '4635-unify-jobs-and-builds-sepc' into 'master'Rémy Coutable2018-01-312-52/+73
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Unify and split CE/EE for spec/requests/api/jobs_spec.rb See merge request gitlab-org/gitlab-ce!16804
| * | | | | 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
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Converted $.ajax calls in some JS files to axios See merge request gitlab-org/gitlab-ce!16717
| * | | | | 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 Gitaly Closes gitaly#967 See merge request gitlab-org/gitlab-ce!16723
| * | | | | | Migrate Git::Repository#delete_refs to Gitalyfeature/migrate-delete-refs-to-gitalyAhmad Sherif2018-01-302-21/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#967
* | | | | | | Merge branch '41771-reduce-cardinality-of-metrics' into 'master'Grzegorz Bizon2018-01-307-49/+167
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce the cardinality of GitLab metrics Closes #41771 See merge request gitlab-org/gitlab-ce!16443
| * | | | | | 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 ↵Pawel Chojnacki2018-01-291-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | inherited.
| * | | | | | 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 Gitaly Closes gitaly#958 See merge request gitlab-org/gitlab-ce!16716
| * | | | | | Migrate fetching wiki page formatted content to Gitalyfeature/migrate-wiki-page-formatted-data-to-gitalyAhmad Sherif2018-01-301-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#958
* | | | | | | Merge branch '21554-mark-new-user-as-external' into 'master'Douwe Maan2018-01-301-9/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Login via OAuth marked as "external" should only mark new users as "external", not existing ones Closes #21554 See merge request gitlab-org/gitlab-ce!16672
| * | | | | | | Only new users get marked as external21554-mark-new-user-as-externalTiago Botelho2018-01-301-9/+21
| | | | | | | |
* | | | | | | | Merge branch ↵Douwe Maan2018-01-301-0/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclass' into 'master' Resolve "Error 500 loading merge request: undefined method `index' for nil:NilClass" Closes #42160 See merge request gitlab-org/gitlab-ce!16795
| * | | | | | | 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
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that some legacy diff notes on GitLab.com have invalid line codes, which means truncated_diff_lines won't work. This is just a band-aid solution, as neither the diff nor the discussion will display correctly for these notes, but they won't cause a 500 error.
* | | | | | | 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 issuables See merge request gitlab-org/gitlab-ce!16774
| * | | | | | Make pagination optional for issuablesJan Provaznik2018-01-301-0/+12
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On epics roadmap page we list all epics in the given time frame without pagination (at least for the first iteration), in this case it would be nice to use the existing issuables index logic except pagination (see MR gitlab-ee!4281). For this reason this patch allows to easily disable pagination. Related gitlab-ee!4281
* | | | | | Merge branch 'osw-short-circuit-mergeable-disccusions-state' into 'master'Sean McGivern2018-01-301-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check MR state before submitting queries for discussion state Closes #42236 See merge request gitlab-org/gitlab-ce!16788
View Lorry Controller Status