summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use relative URLs when linking to uploaded files38893-banzai-upload-filter-relative-urlsNick Thomas2017-12-215-82/+122
|
* Merge branch 'patch-28' into 'master'Jacob Schatz2017-12-215-73/+218
|\ | | | | | | | | Added 'admin' persona See merge request gitlab-org/gitlab-ce!15470
| * Added 'admin' personaSarah O'Donnell2017-12-215-73/+218
| |
* | Merge branch 'docs-move-article-artifactory' into 'master'Achilleas Pipinellis2017-12-215-299/+298
|\ \ | |/ |/| | | | | Docs: move article Artifactory + GL to subject-related folder See merge request gitlab-org/gitlab-ce!16081
| * Docs: move article Artifactory + GL to subject-related folderMarcia Ramos2017-12-215-299/+298
|/
* Merge branch 'diff-worker-js-fix' into 'master'Jacob Schatz2017-12-211-1/+4
|\ | | | | | | | | | | | | Fixed diff_worker not compiling correctly Closes #41182 See merge request gitlab-org/gitlab-ce!15966
| * changed webpack configdiff-worker-js-fixPhil Hughes2017-12-162-3/+5
| |
| * Fixed diff_worker not compiling correctlyPhil Hughes2017-12-151-1/+2
| | | | | | | | Closes #41182
* | Merge branch 'docs-move-transfer-project-to-group' into 'master'Achilleas Pipinellis2017-12-215-84/+171
|\ \ | | | | | | | | | | | | Refactor user, project and group docs when changing namespace See merge request gitlab-org/gitlab-ce!16019
| * | Mention GitLab Pages when changing usernameJohn Doe2017-12-211-1/+3
| | |
| * | Consolidate the docs when changing a repo pathJohn Doe2017-12-214-115/+164
| | |
| * | Add docs for automatic redirects when renaming namespacesAchilleas Pipinellis2017-12-212-6/+42
| | |
| * | move "Transfer an existing project into a group" to project docsMarcia Ramos2017-12-213-16/+16
|/ / | | | | | | | | | | - move the section - replace identifiers with inline links - update settings (General settings > Advanced settings)
* | Merge branch 'jprovazn-search' into 'master'Yorick Peterse2017-12-215-3/+34
|\ \ | | | | | | | | | | | | Skip projects filter on merge requests search See merge request gitlab-org/gitlab-ce!15955
| * | Skip projects filter on merge requests searchjprovazn-searchJan Provaznik2017-12-215-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When searching for merge requests, an additional subquery is added which by default filters only merge requests which belong to source or target project user has permission for. This filter is not needed because more restrictive filter which checks if user has permission for target project is used in the query. So unless a custom projects filter is used by user, it's possible to skip the default projects filter and speed up the final query. Related to #40540
* | | Merge branch 'fix-webpack-chunk-naming' into 'master'Jacob Schatz2017-12-213-3/+13
|\ \ \ | | | | | | | | | | | | | | | | Properly name webpack chunks for dynamic imports See merge request gitlab-org/gitlab-ce!16066
| * \ \ Merge branch 'master' into fix-webpack-chunk-namingClement Ho2017-12-21299-2357/+4831
| |\ \ \
| * | | | update dispatcher to allow for dynamic imports until webpack plugin is updatedfix-webpack-chunk-namingMike Greiling2017-12-202-1/+6
| | | | |
| * | | | properly handle naming for dispatcher route chunksMike Greiling2017-12-201-2/+7
| | | | |
* | | | | Merge branch 'pawel/reduce_cardinality_of_prometheus_metrics' into 'master'Douwe Maan2017-12-219-26/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce cardinality of some of GitLab's Prometheus metrics and fix observed duration reporting. Closes #41045 See merge request gitlab-org/gitlab-ce!15881
| * | | | | add missing word to pawel-reduce_cardinality_of_prometheus_metrics.ymlpawel/reduce_cardinality_of_prometheus_metricsPaweł Chojnacki2017-12-201-1/+1
| | | | | |
| * | | | | Use seconds where possible, and convert to milliseconds for Influxdb consumptionPawel Chojnacki2017-12-215-28/+31
| | | | | |
| * | | | | use in_milliseconds rails helperPawel Chojnacki2017-12-202-3/+3
| | | | | |
| * | | | | Fix tests and formattingPawel Chojnacki2017-12-194-7/+8
| | | | | |
| * | | | | Make `System.monotonic_time` retun seconds represented by float with ↵Pawel Chojnacki2017-12-126-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | microsecond precision
| * | | | | Fix gitaly_call_histogram to observe times in seconds correctlyPawel Chojnacki2017-12-121-1/+1
| | | | | |
| * | | | | Reduce cardinality of gitlab_cache_operation_duration_seconds histogramPawel Chojnacki2017-12-121-1/+1
| | | | | |
* | | | | | Merge branch 'bvl-patch-mr-serializer' into 'master'Douwe Maan2017-12-213-3/+11
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fall back to the `MergeRequestWidgetEntity` Closes #41296 See merge request gitlab-org/gitlab-ce!16074
| * | | | | Fall back to the `MergeRequestWidgetEntity`Bob Van Landuyt2017-12-213-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | When no serializer was passed.
* | | | | | Merge branch '40040-decouple-multi-file-editor-from-file-list' into 'master'Phil Hughes2017-12-21136-1734/+2867
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Decouple multi-file editor from file list" Closes #40040 and #40032 See merge request gitlab-org/gitlab-ce!15430
| * | | | | Resolve "Decouple multi-file editor from file list"Tim Zallmann2017-12-21136-1734/+2867
|/ / / / /
* | | | | Merge branch 'organise-by-subject' into 'master'Marcia Ramos2017-12-211-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | organise content by subject See merge request gitlab-org/gitlab-ce!16080
| * | | | | organise content by subjectorganise-by-subjectJob van der Voort2017-12-211-0/+4
| |/ / / /
* | | | | Merge branch 'fj-40279-normalize-ldap-dn-api' into 'master'Douwe Maan2017-12-215-1/+72
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | LDAP extern_uids are not normalized when updated via API Closes #40279 See merge request gitlab-org/gitlab-ce!16004
| * | | | LDAP extern_uids are not normalized when updated via APIFrancisco Javier López2017-12-215-1/+72
|/ / / /
* | | | Merge branch ↵Marcia Ramos2017-12-211-0/+50
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41342-add-ci-yml-example-for-browser-performance-testing-in-ce' into 'master' Add CI YML example for Browser Performance Testing in CE See merge request gitlab-org/gitlab-ce!16058
| * | | | Add CI YML example for CE41342-add-ci-yml-example-for-browser-performance-testing-in-ceJoshua Lambert2017-12-201-0/+50
| | | | |
* | | | | Merge branch '41227-document-volume-mounts-with-docker-dind' into 'master'Achilleas Pipinellis2017-12-211-0/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Docker volumes not mounted when using docker:dind" See merge request gitlab-org/gitlab-ce!16070
| * | | | | Document mounting volumes with Docker-in-DockerTeresa e Junior2017-12-211-0/+15
| | | | | |
* | | | | | Merge branch 'winh-fix-datetime_utility' into 'master'Filipa Lacerda2017-12-211-5/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore missing language code in datetime_utility.js Closes #41248 See merge request gitlab-org/gitlab-ce!16009
| * | | | | | Restore missing language code in datetime_utility.jsWinnie Hellmann2017-12-211-5/+13
|/ / / / / /
* | | | | | Merge branch 'fix-remove-dead-spinach-steps' into 'master'Nick Thomas2017-12-211-11/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove two unused step definitions from spinach See merge request gitlab-org/gitlab-ce!16047
| * | | | | | Remove two unused step definitions from spinachNick Thomas2017-12-201-11/+0
| | | | | | |
* | | | | | | Merge branch '40063-markdown-editor-improvements' into 'master'Filipa Lacerda2017-12-216-17/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide toolbar in markdown preview mode Closes #40063 See merge request gitlab-org/gitlab-ce!15994
| * | | | | | | Add spec for previewing a note40063-markdown-editor-improvementsAnnabel Dunstone Gray2017-12-203-2/+17
| | | | | | | |
| * | | | | | | Hide & show toolbar on MR pageAnnabel Dunstone Gray2017-12-182-4/+4
| | | | | | | |
| * | | | | | | Fix formattingAnnabel Dunstone Gray2017-12-182-12/+12
| | | | | | | |
| * | | | | | | Hide toolbar in markdown preview modeAnnabel Dunstone Gray2017-12-184-11/+25
| | | | | | | |
* | | | | | | | Merge branch 'qa/gb/add-dependencies-support-to-factories' into 'master'Rémy Coutable2017-12-2113-50/+327
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for defining explicit dependencies to QA factories Closes gitlab-qa#122 See merge request gitlab-org/gitlab-ce!15979
| * | | | | | | | Add support for defining explicit dependencies to QA factoriesGrzegorz Bizon2017-12-2113-50/+327
|/ / / / / / / /
View Lorry Controller Status