summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* refactor specfix/import-uploads-hashed-storageJames Lopez2017-11-231-3/+3
|
* use dynamic_path_segment for pathJames Lopez2017-11-231-5/+1
|
* fix specJames Lopez2017-11-231-4/+0
|
* fix specJames Lopez2017-11-231-0/+1
|
* refactor specsJames Lopez2017-11-234-16/+16
|
* add changelogJames Lopez2017-11-231-0/+5
|
* fix typoJames Lopez2017-11-231-2/+2
|
* add uploads restorer specJames Lopez2017-11-231-0/+56
|
* fix hashed storage and updated specJames Lopez2017-11-232-4/+27
|
* refactor specJames Lopez2017-11-231-3/+13
|
* add upload saver specJames Lopez2017-11-231-0/+33
|
* Merge branch '40445-upgrade-fe-babel-libraries' into 'master'Filipa Lacerda2017-11-232-315/+490
|\ | | | | | | | | | | | | Resolve "Upgrade FE Babel Libraries" Closes #40445 See merge request gitlab-org/gitlab-ce!15544
| * Upgraded babel related libraries40445-upgrade-fe-babel-librariesTim Zallmann2017-11-222-315/+490
| |
* | Merge branch 'jivl-general-icons' into 'master'Tim Zallmann2017-11-234-10/+15
|\ \ | | | | | | | | | | | | | | | | | | Change star, filter and settings icons to the their sprite based replacements Closes #33757 See merge request gitlab-org/gitlab-ce!15412
| * | Change star, filter and settings icons to the their sprite based replacementsJose Ivan Vargas Lopez2017-11-234-10/+15
|/ /
* | Update CHANGELOG.md for 10.2.1Michael Kozono2017-11-222-5/+7
| | | | | | [ci skip]
* | Merge branch '32620-speed-up-unicorn-specs' into 'master'Rémy Coutable2017-11-226-23/+19
|\ \ | | | | | | | | | | | | | | | | | | Speed up Unicorn specs by using a dummy Rack application instead of GitLab Closes #32620 See merge request gitlab-org/gitlab-ce!15548
| * | Speed up Unicorn specs by using a dummy Rack application instead of GitLabNick Thomas2017-11-226-23/+19
| | |
* | | Merge branch '28377-add-edit-button-to-mobile-file-view' into 'master'Clement Ho2017-11-224-1/+30
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Add edit button to mobile file view Closes #28377 See merge request gitlab-org/gitlab-ce!15199
| * | Add edit button to mobile file viewTravis Miller2017-11-224-1/+30
| | |
* | | Merge branch '40283-fix-missing-mr-widget-status-icons' into 'master'Tim Zallmann2017-11-221-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix missing MR widget status icons Closes #40283 See merge request gitlab-org/gitlab-ce!15533
| * | | Fix missing MR widget status icons40283-fix-missing-mr-widget-status-iconsEric Eastwood2017-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40283 Regressed in https://gitlab.com/gitlab-org/gitlab-ce/commit/d01d509bd8612f9879fa762de8ea3763bcff81cf
* | | | Merge branch '40444-upgrade-axios-from-0-16-2-to-0-17-1' into 'master'Filipa Lacerda2017-11-222-10/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Upgrade axios from 0.16.2 to 0.17.1" Closes #40444 See merge request gitlab-org/gitlab-ce!15543
| * | | | Updated axios40444-upgrade-axios-from-0-16-2-to-0-17-1Tim Zallmann2017-11-222-10/+16
| | | | |
* | | | | Merge branch 'pawel/disable_prometheus_metrics' into 'master'Stan Hu2017-11-222-3/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Temporarily force disable prometheus metrics See merge request gitlab-org/gitlab-ce!15549
| * | | | | Force disable Prometheus metricsPawel Chojnacki2017-11-222-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until https://gitlab.com/gitlab-org/prometheus-client-mmap/merge_requests/11 is ready, Prometheus metrics will not work and cause issues such as #40457.
* | | | | | Merge branch 'jivl-replace-vue-resource-prometheus-dashboard' into 'master'Filipa Lacerda2017-11-223-26/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace vue-resource for axios in the Prometheus Dashboard See merge request gitlab-org/gitlab-ce!15547
| * | | | | | Replaced vue-resource for axios in the prometheus dashboardjivl-replace-vue-resource-prometheus-dashboardJose Ivan Vargas2017-11-223-26/+14
| | | | | | |
* | | | | | | Merge branch '38877-disable-autocomplete-in-filtered-search' into 'master'Clement Ho2017-11-223-1/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disables autocomplete in filtered search Closes #38877 See merge request gitlab-org/gitlab-ce!15477
| * | | | | | | Disables autocomplete in filtered searchJacopo2017-11-203-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets `autocomplete=off` to issuable filtered serarch.
* | | | | | | | Merge branch '40295-fix-reply-quote-shortcut-on-mr' into 'master'Clement Ho2017-11-224-1/+55
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix reply quote keyboard shortcut on MRs Closes #40295 See merge request gitlab-org/gitlab-ce!15523
| * | | | | | | Fix reply quote keyboard shortcut on MRs40295-fix-reply-quote-shortcut-on-mrEric Eastwood2017-11-214-1/+55
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40295
* | | | | | | Merge branch 'qa/gb/backport-geo-integration-tests-commons' into 'master'Rémy Coutable2017-11-2211-4/+153
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport QA code that belongs to CE from EE Geo Closes #40344 See merge request gitlab-org/gitlab-ce!15536
| * | | | | | | Backport QA code that belongs to CE from EE Geoqa/gb/backport-geo-integration-tests-commonsRémy Coutable2017-11-2211-4/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'qa/gb/add-geo-integration-tests' into 'master' See merge request gitlab-org/gitlab-ee!3294
* | | | | | | | Merge branch 'improve-extra-queries-output' into 'master'Rémy Coutable2017-11-222-5/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve output for extra queries in specs See merge request gitlab-org/gitlab-ce!15537
| * | | | | | | | Improve output for extra queries in specsimprove-extra-queries-outputSean McGivern2017-11-222-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, this used `Array#-`, which would remove all queries that matches the query text in the original set. However, sometimes we have a problem with parameterised queries, where the query text is identical both times, so we'd run a query N times instead of once, and it would be hidden from the output. Replace the logic to only remove a given query N times from the actual log, where N is the number of times it appears in the expected log.
* | | | | | | | | Merge branch 'docs-install-locale-compile' into 'master'Rubén Dávila2017-11-221-2/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to using gettext:compile instead of gettext:pack in the install docs Closes #40360 See merge request gitlab-org/gitlab-ce!15501
| * | | | | | | | Switch to using gettext:compile instead of gettext:pack in the installdocs-install-locale-compileDJ Mountney2017-11-201-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs This skips the step that updates the .pot files with changes in the codebase, which can take extra time, and isn't required during install.
* | | | | | | | | Merge branch '40354-improve-ee_compat_check' into 'master'Sean McGivern2017-11-222-32/+39
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to find the merge-base against the canonical master and name the remotes See merge request gitlab-org/gitlab-ce!15495
| * | | | | | | | | Try to find the merge-base against the canonical masterRémy Coutable2017-11-222-32/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, name the remotes in Gitlab::EeCompatCheck Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'group-new-miletone-breadcrumb' into 'master'Filipa Lacerda2017-11-222-1/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed new group milestone breadcrumb Closes #40338 See merge request gitlab-org/gitlab-ce!15511
| * | | | | | | | | Fixed new group milestone breadcrumbPhil Hughes2017-11-222-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #40338
* | | | | | | | | | Merge branch '39720-group-milestone-sorting' into 'master'Sean McGivern2017-11-226-1/+133
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Group Milestone sorting Closes #39720 See merge request gitlab-org/gitlab-ce!15230
| * | | | | | | | | Add group milestone to feature spec and minor changesGeorge Andrinopoulos2017-11-074-30/+13
| | | | | | | | | |
| * | | | | | | | | Add Group Milestone sortingGeorge Andrinopoulos2017-11-077-1/+150
| | | | | | | | | |
* | | | | | | | | | Merge branch 'sh-add-query-recorder-debugging' into 'master'Sean McGivern2017-11-222-0/+53
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add QUERY_RECORDER_DEBUG environment variable to improve performance debugging See merge request gitlab-org/gitlab-ce!15499
| * | | | | | | | | | Add QUERY_RECORDER_DEBUG environment variable to improve performance debuggingsh-add-query-recorder-debuggingStan Hu2017-11-212-0/+53
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'feature_add_mermaid' into 'master'Phil Hughes2017-11-2219-41/+211
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support of Mermaid Closes #3711 See merge request gitlab-org/gitlab-ce!15107
| * | | | | | | | | Add support of MermaidVitaliy @blackst0ne Klachkov2017-11-2219-41/+211
| | | | | | | | | |
* | | | | | | | | | Merge branch 'gitaly-fetch-source-branch' into 'master'Sean McGivern2017-11-228-11/+49
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add FetchSourceBranch Gitaly call Closes gitaly#758 See merge request gitlab-org/gitlab-ce!15498