summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'Douwe Maan2018-03-218-8/+191
| | | | | Server Side Request Forgery in Services and Web Hooks See merge request gitlab/gitlabhq!2337
* Merge branch 'ide-project-avatar-identicon' into 'master'Filipa Lacerda2018-03-211-0/+39
|\ | | | | | | | | | | | | Changes empty project avatar to identicon in the IDE Closes #44298 See merge request gitlab-org/gitlab-ce!17899
| * Changes empty project avatar to identicon in the IDEPhil Hughes2018-03-211-0/+39
| | | | | | | | Closes #44298
* | Merge branch 'update-licensee' into 'master'Douwe Maan2018-03-213-4/+4
|\ \ | |/ |/| | | | | | | | | Update licensee 8.7.0 -> 8.9 Closes #18077 See merge request gitlab-org/gitlab-ce!17719
| * Fix test failures with licensee 8.9Pirate Praveen2018-03-203-4/+4
| |
* | Merge branch 'make-ide-ce' into 'master'Tim Zallmann2018-03-2146-0/+4692
|\ \ | | | | | | | | | | | | | | | | | | Move IDE to CE Closes #44157 See merge request gitlab-org/gitlab-ce!17887
| * | updated file references in specsPhil Hughes2018-03-2043-428/+629
| | |
| * | Move IDE to CEPhil Hughes2018-03-2046-0/+4491
| | | | | | | | | | | | This also makes the IDE generally available
* | | Merge branch 'update-spec-import-path-for-vue-mount-component-helper' into ↵Clement Ho2018-03-2015-22/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update spec import path for vue mount component helper See merge request gitlab-org/gitlab-ce!17880
| * | | Update spec import path for vue mount component helperGeorge Tsiolis2018-03-2015-22/+22
| | | |
* | | | Resolve "Loss of input text on comments after preview"Simon Knox2018-03-201-5/+5
| | | |
* | | | Merge branch 'fix-ci-job-auto-retry' into 'master'Grzegorz Bizon2018-03-201-0/+29
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Prevent auto-retry AccessDenied error from stopping transition to failed See merge request gitlab-org/gitlab-ce!17862
| * | | Prevent auto-retry AccessDenied error from stopping transition to failedTomasz Maczukin2018-03-201-0/+29
| | | |
* | | | Merge branch 'fix/sm/erase_old_trace' into 'master'Kamil Trzciński2018-03-201-0/+22
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Use update_column than write_attribute and save Closes #44366 See merge request gitlab-org/gitlab-ce!17861
| * | | Use update_column than write_attribute and savefix/sm/erase_old_traceShinya Maeda2018-03-191-0/+22
| | | |
* | | | Merge branch '42558-add-monitoring-no-data-empty-state' into 'master'Phil Hughes2018-03-202-34/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Prometheus graphs have no empty state when no data is present" Closes #42558 See merge request gitlab-org/gitlab-ce!17759
| * | | | fix tests for dahboard.vue42558-add-monitoring-no-data-empty-stateMike Greiling2018-03-192-34/+13
| | | | |
* | | | | Merge branch '44280-fix-code-search' into 'master'Sean McGivern2018-03-201-5/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Search code blob sometimes shows filename and branch" Closes #44280 See merge request gitlab-org/gitlab-ce!17777
| * | | | | Split repository search result on \n instead of $ to prevent the items of ↵Jasper Maes2018-03-191-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | the array to start with a newline. Remove the strip from parsing the search result to keep result endlines.
* | | | | | Merge branch 'issue_25542' into 'master'Sean McGivern2018-03-202-1/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve JIRA event descriptions Closes #25542 See merge request gitlab-org/gitlab-ce!17811
| * | | | | | Improve JIRA event descriptionsissue_25542Felipe Artur2018-03-192-1/+47
| | | | | | |
* | | | | | | move render_gfm into behaviors directoryMike Greiling2018-03-197-9/+7
| | | | | | |
* | | | | | | Merge branch 'ajax-requests-in-performance-bar' into 'master'Robert Speicher2018-03-195-5/+275
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show Ajax requests in performance bar Closes #43925 See merge request gitlab-org/gitlab-ce!17742
| * | | | | | Show Ajax requests in performance barSean McGivern2018-03-195-5/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But first, rewrite the performance bar in Vue: 1. Remove the peek-host gem and replace it with existing code. This also allows us to include the host in the JSON response, rather than in the page HTML. 2. Leave the line profiler parts as here-be-dragons: nicer would be a separate endpoint for these, so we could use them on Ajax requests too. 3. The performance bar is too fiddly to rewrite right now, so apply the same logic to that. Then, add features! All requests made through Axios are able to be tracked. To keep a lid on memory usage, only the first two requests for a given URL are tracked, though. Each request that's tracked has the same data as the initial page load, with the exception of the performance bar and the line profiler, as explained above.
* | | | | | | Merge branch 'api-delimiter' into 'master'Robert Speicher2018-03-191-24/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optional '/-/' delimiter for search API See merge request gitlab-org/gitlab-ce!17750
| * | | | | | | Optional '/-/' delimiter for search APIJan Provaznik2018-03-191-24/+24
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '/-/' delimiter is used only in UI, in API we don't use it for other endpoints. To align search endpoints with the rest of API endpoints, this patch makes '/-/' optional for existing endpoints (to keep backward compatibility). Documentation is updated to prefer paths without '/-/'.
* | | | | | | Merge branch '43933-always-notify-mentions' into 'master'Sean McGivern2018-03-191-3/+18
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore unsubscribed toggle for @ mentions Closes #43933 See merge request gitlab-org/gitlab-ce!17786
| * | | | | | Always notify new mentions even if explicitly unsubscribed43933-always-notify-mentionsMario de la Ossa2018-03-191-3/+18
| | | | | | |
* | | | | | | Merge branch 'sh-admin-projects-remove-n-plus-one' into 'master'Robert Speicher2018-03-191-0/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove N+1 queries in /admin/projects page See merge request gitlab-org/gitlab-ce!17834
| * | | | | | | Remove N+1 queries in /admin/projects pageStan Hu2018-03-191-0/+10
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'refactor/move-mr-widget-sha-mismatch-vue-component' into 'master'Clement Ho2018-03-191-4/+5
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Move ShaMismatch vue component See merge request gitlab-org/gitlab-ce!17546
| * | | | | | Move ShaMismatch vue componentGeorge Tsiolis2018-03-191-4/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '31114-internal-ids-are-not-atomic' into 'master'Sean McGivern2018-03-197-3/+163
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Atomic generation of internal ids for issues. Closes #31114 See merge request gitlab-org/gitlab-ce!17580
| * | | | | | Add spec for concurrent insert situation.31114-internal-ids-are-not-atomicAndreas Brandl2018-03-181-0/+13
| | | | | | |
| * | | | | | Address review comments.Andreas Brandl2018-03-162-4/+10
| | | | | | |
| * | | | | | Add new model to import/export configuration.Andreas Brandl2018-03-161-0/+1
| | | | | | |
| * | | | | | Add shared specs for AtomicInternalId concern.Andreas Brandl2018-03-162-1/+45
| | | | | | |
| * | | | | | Backwards-compat for migration specs.Andreas Brandl2018-03-161-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The specs are based on a schema version that doesn't know about `internal_ids` table. However, the actual code being execute relies on it.
| * | | | | | Refactor, extract class and improve comments.Andreas Brandl2018-03-162-6/+5
| | | | | | |
| * | | | | | More flexible way of internal id generation.Andreas Brandl2018-03-162-20/+9
| | | | | | |
| * | | | | | Atomic generation of internal ids for issues.Andreas Brandl2018-03-162-0/+93
| | | | | | |
| * | | | | | Deprecate InternalId concern and rename.Andreas Brandl2018-03-161-1/+1
| | | | | | |
* | | | | | | Merge branch ↵Douwe Maan2018-03-191-0/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '44257-viewing-a-particular-commit-gives-500-error-error-undefined-method-binary' into 'master' Resolve "Viewing a particular commit gives 500 error ~ Error (undefined method `binary?')" Closes #44257 See merge request gitlab-org/gitlab-ce!17805
| * | | | | | | Ensure that we never assume old_blob or new_blob are nil44257-viewing-a-particular-commit-gives-500-error-error-undefined-method-binarySean McGivern2018-03-161-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These can be a `BatchLoader` which is proxying a nil, while not being concrete nils themselves.
* | | | | | | | Resolve "GitLab Community Edition 10.5.3 shows plural for 1 item"Jan2018-03-191-0/+56
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'update-kubeclient' into 'master'Grzegorz Bizon2018-03-194-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update kubeclient 2.2.0 -> 3.0 Closes #43911 See merge request gitlab-org/gitlab-ce!17739
| * \ \ \ \ \ \ Merge branch 'master' into 'update-kubeclient'Grzegorz Bizon2018-03-1749-372/+1306
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | Conflicts: Gemfile.lock
| * | | | | | | Replace KubeException with Kubeclient::HttpError (kubeclient 3.0)Pirate Praveen2018-03-154-4/+4
| | | | | | | |
* | | | | | | | Merge branch 'refactor/move-mr-widget-unresolved-discussions-vue-component' ↵Mike Greiling2018-03-191-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Move UnresolvedDiscussions vue component See merge request gitlab-org/gitlab-ce!17538
| * | | | | | | | Move UnresolvedDiscussions vue componentGeorge Tsiolis2018-03-081-4/+4
| | | | | | | | |
View Lorry Controller Status