summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into add_change_diff_to_file_history_viewadd_change_diff_to_file_history_viewblackst0ne2017-12-22288-2702/+5449
|\
| * Merge branch 'fix/last-push-event-widget-layout' into 'master'Clement Ho2017-12-213-14/+21
| |\
| | * Last push event widget width for fixed layoutGeorge Tsiolis2017-12-213-14/+21
| * | Merge branch '41268-bump-ruby-to-2-3-6' into 'master'Robert Speicher2017-12-213-2/+7
| |\ \
| | * | Update Ruby version to 2.3.641268-bump-ruby-to-2-3-6Rémy Coutable2017-12-213-2/+7
| * | | Merge branch 'docs/update-doc-for-ruby-2-3-6' into 'master'Robert Speicher2017-12-214-8/+368
| |\ \ \ | | |_|/ | |/| |
| | * | Update installation and upgrade guides to use Ruby 2.3.6docs/update-doc-for-ruby-2-3-6Rémy Coutable2017-12-204-8/+368
| * | | Merge branch '33609-hide-pagination' into 'master'Clement Ho2017-12-213-1/+28
| |\ \ \
| | * | | Do not show Vue pagination if only one pageMario de la Ossa2017-12-213-1/+28
| * | | | Merge branch 'patch-28' into 'master'Jacob Schatz2017-12-215-73/+218
| |\ \ \ \
| | * | | | 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 folderMarcia Ramos2017-12-215-299/+298
| |/ / / /
| * | | | Merge branch 'diff-worker-js-fix' into 'master'Jacob Schatz2017-12-211-1/+4
| |\ \ \ \
| | * | | | changed webpack configdiff-worker-js-fixPhil Hughes2017-12-162-3/+5
| | * | | | Fixed diff_worker not compiling correctlyPhil Hughes2017-12-151-1/+2
| * | | | | Merge branch 'docs-move-transfer-project-to-group' into 'master'Achilleas Pipinellis2017-12-215-84/+171
| |\ \ \ \ \
| | * | | | | 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
| |/ / / / /
| * | | | | Merge branch 'jprovazn-search' into 'master'Yorick Peterse2017-12-215-3/+34
| |\ \ \ \ \
| | * | | | | Skip projects filter on merge requests searchjprovazn-searchJan Provaznik2017-12-215-3/+34
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'fix-webpack-chunk-naming' into 'master'Jacob Schatz2017-12-213-3/+13
| |\ \ \ \ \
| | * \ \ \ \ 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
| |\ \ \ \ \ \ \
| | * | | | | | | 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 microsec...Pawel Chojnacki2017-12-126-17/+26
| | * | | | | | | 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`Bob Van Landuyt2017-12-213-3/+11
| * | | | | | | | 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"Tim Zallmann2017-12-21136-1734/+2867
| |/ / / / / / /
| * | | | | | | Merge branch 'organise-by-subject' into 'master'Marcia Ramos2017-12-211-0/+4
| |\ \ \ \ \ \ \
| | * | | | | | | 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 APIFrancisco Javier López2017-12-215-1/+72
| |/ / / / / /
| * | | | | | Merge branch '41342-add-ci-yml-example-for-browser-performance-testing-in-ce'...Marcia Ramos2017-12-211-0/+50
| |\ \ \ \ \ \
| | * | | | | | 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
| |\ \ \ \ \ \ \
| | * | | | | | | 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.jsWinnie Hellmann2017-12-211-5/+13
| |/ / / / / / / /
| * | | | | | | | Merge branch 'fix-remove-dead-spinach-steps' into 'master'Nick Thomas2017-12-211-11/+0
| |\ \ \ \ \ \ \ \
View Lorry Controller Status