summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Execute project hooks and services after commit when moving an issuedm-issue-move-transaction-errorDouwe Maan2017-12-225-9/+42
* 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
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * | | | | 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 factoriesGrzegorz Bizon2017-12-2113-50/+327
|/ / / / / /
* | | | | | Merge branch 'rs-remove-useless-definition' into 'master'Douwe Maan2017-12-211-5/+0
|\ \ \ \ \ \
| * | | | | | Remove a redundant `InvalidPathError` definitionrs-remove-useless-definitionRobert Speicher2017-12-201-5/+0
* | | | | | | Merge branch '38356-add-last_commit_sha-to-the-commit-api' into 'master'Douwe Maan2017-12-219-20/+253
|\ \ \ \ \ \ \
| * | | | | | | Updates from last code review:38356-add-last_commit_sha-to-the-commit-apiRubén Dávila2017-12-208-33/+153
| * | | | | | | Check if file has been modified for each action provided.Rubén Dávila2017-12-204-2/+61
| * | | | | | | Add some initial specs for Files::MultiService classRubén Dávila2017-12-201-0/+54
* | | | | | | | Merge branch '36958-enable-ordering-projects-subgroups-by-name' into 'master'Rémy Coutable2017-12-215-21/+52
|\ \ \ \ \ \ \ \
| * | | | | | | | Enable sorting by name in the Groups dropdownMark Fletcher2017-12-203-0/+42
| * | | | | | | | Employ Groups dropdown in admin viewMark Fletcher2017-12-202-19/+7
| * | | | | | | | Accept options hash for Groups dropdownMark Fletcher2017-12-201-2/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'winh-fix-transient-loadDiff-failure' into 'master'Phil Hughes2017-12-211-5/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fix racing condition in Ajax call of merge_request_tabs_spec.jswinh-fix-transient-loadDiff-failureWinnie Hellmann2017-12-201-5/+9
* | | | | | | | Merge branch '41291-spec-failure-on-spec-features-merge_requests-image_diff_n...Robert Speicher2017-12-211-1/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Stub old image diff urlClement Ho2017-12-201-1/+2
| * | | | | | | Fix a failure because we stub DiffHelper#diff_file_blob_raw_path instead of #...41291-spec-failure-on-spec-features-merge_requests-image_diff_notes_spec-rbRémy Coutable2017-12-201-2/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jivl-replace-d3-v3-v4' into 'master'Mike Greiling2017-12-2012-76/+226
|\ \ \ \ \ \ \
| * | | | | | | added minChunks to the common_d3 bundlejivl-replace-d3-v3-v4Jose Ivan Vargas2017-12-183-8/+4
| * | | | | | | Removed fills from stat_contributors_graphJose Ivan Vargas2017-12-181-3/+0
View Lorry Controller Status