summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Split pipelines by origin on usage datazj-usage-ping-only-gl-pipelinesZ.J. van de Weg2017-06-275-2/+19
* Merge branch 'hot-reload' into 'master'Tim Zallmann2017-06-231-0/+4
|\
| * hot reloading for .vue fileshot-reloadSimon Knox2017-06-151-0/+4
* | Merge branch '31574-bootstrap-form-builder' into 'master'Phil Hughes2017-06-235-74/+53
|\ \
| * | Convert app/views/profiles/show.html.haml to bootstrap_formNick Thomas2017-06-223-74/+50
| * | Add bootstrap_form gemNick Thomas2017-06-222-0/+3
* | | Merge branch '33992-mr-target-avatar' into 'master'Phil Hughes2017-06-231-1/+1
|\ \ \
| * | | Add padding to target branch container33992-mr-target-avatarAnnabel Dunstone Gray2017-06-211-1/+1
* | | | Merge branch 'fix-sidebar-scroll-jump' into 'master'Phil Hughes2017-06-231-3/+1
|\ \ \ \
| * | | | Remove layout nav from scroll calculationfix-sidebar-scroll-jumpAnnabel Dunstone Gray2017-06-221-3/+1
* | | | | Merge branch '34095-permalinks' into 'master'Phil Hughes2017-06-232-3/+14
|\ \ \ \ \
| * | | | | Fix offset for fixed navAnnabel Dunstone Gray2017-06-232-3/+14
|/ / / / /
* | | | | Merge branch 'notes-es-class-syntax' into 'master'Tim Zallmann2017-06-231-1374/+1356
|\ \ \ \ \
| * | | | | refactor Notes class to ES class syntaxnotes-es-class-syntaxMike Greiling2017-06-221-1374/+1356
* | | | | | Merge branch 'dm-unnecessary-top-padding' into 'master'Sean McGivern2017-06-232-2/+5
|\ \ \ \ \ \
| * | | | | | Remove unnecessary top padding on group MR indexdm-unnecessary-top-paddingDouwe Maan2017-06-222-2/+5
* | | | | | | Merge branch '34120-environment-detail-bug' into 'master'Phil Hughes2017-06-233-9/+11
|\ \ \ \ \ \ \
| * | | | | | | Fix mobile environment detail viewAnnabel Dunstone Gray2017-06-233-9/+11
|/ / / / / / /
* | | | | | | Merge branch 'project-settings-container-width' into 'master'Annabel Dunstone Gray2017-06-2312-50/+52
|\ \ \ \ \ \ \
| * | | | | | | Added limited width container to project settingsPhil Hughes2017-06-2012-50/+52
* | | | | | | | Merge branch 'fix-dropdown-top-navbar-position-mobile' into 'master'Annabel Dunstone Gray2017-06-232-0/+6
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix dropdown position for the new button on mobile for the top navbarJose Ivan Vargas Lopez2017-06-232-0/+6
|/ / / / / / /
* | | | | | | Merge branch 'rs-revert-bootsnap' into 'master'Stan Hu2017-06-223-17/+0
|\ \ \ \ \ \ \
| * | | | | | | Revert "Merge branch 'rs-bootsnap' into 'master'"rs-revert-bootsnapRobert Speicher2017-06-223-17/+0
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '33981-add-members-drop-down-doesn-t-separate-name-username' int...Annabel Dunstone Gray2017-06-221-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Resolve ""Add Members" drop-down doesn't separate Name/Username"Tim Zallmann2017-06-221-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'mk-add-datetime-with-timezone-table-definition' into 'master'Yorick Peterse2017-06-222-14/+81
|\ \ \ \ \ \ \
| * | | | | | | Fix MySQL schema dump for `timestamp`mk-add-datetime-with-timezone-table-definitionMichael Kozono2017-06-221-4/+30
| * | | | | | | Fix PostgreSQL schema dump for `timestamptz`Michael Kozono2017-06-221-5/+36
| * | | | | | | Add `datetime_with_timezone` to table definitionMichael Kozono2017-06-221-6/+16
* | | | | | | | Merge branch '33940-cache-flipper_gate-query' into 'master'Robert Speicher2017-06-222-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix Style/EmptyLines violation in lib/feature.rb33940-cache-flipper_gate-queryRobert Speicher2017-06-221-1/+0
| * | | | | | | | Add the Flipper::Middleware::Memoizer middlewareRémy Coutable2017-06-212-1/+4
* | | | | | | | | Merge branch 'awards-handler-class-syntax' into 'master'Jacob Schatz2017-06-221-379/+374
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | refactor AwardsHandler into es class syntaxawards-handler-class-syntaxMike Greiling2017-06-171-379/+374
* | | | | | | | | | Merge branch 'fix/properly-encode-gitaly-diffs' into 'master'Robert Speicher2017-06-223-2/+13
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Encode Gitaly diff patches properlyfix/properly-encode-gitaly-diffsAhmad Sherif2017-06-223-2/+13
* | | | | | | | | | Merge branch '28717-additional-metrics-review-branch' into 'master'Grzegorz Bizon2017-06-2251-57/+1969
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...28717-additional-metrics-review-branchPawel Chojnacki2017-06-221036-5914/+10545
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | Add Changelog messagePawel Chojnacki2017-06-211-0/+4
| * | | | | | | | | | Make queries not die when underlying data cannot be foundPawel Chojnacki2017-06-205-46/+50
| * | | | | | | | | | Add rescue_from(ActionController::UnknownFormat) in Application ControllerPawel Chojnacki2017-06-205-12/+50
| * | | | | | | | | | Remove unnecessary prometheus_service method, that is now handled by new auto...Pawel Chojnacki2017-06-201-4/+0
| * | | | | | | | | | Memoize only yaml loading methodPawel Chojnacki2017-06-162-7/+2
| * | | | | | | | | | move additional_metrics.yaml into prometheus/ config folderPawel Chojnacki2017-06-163-2/+2
| * | | | | | | | | | Move Prometheus service to project modelPawel Chojnacki2017-06-168-24/+21
| * | | | | | | | | | Fix prometheus service frontend fixturePawel Chojnacki2017-06-162-3/+3
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...Pawel Chojnacki2017-06-161189-7088/+21912
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cleanup wipPawel Chojnacki2017-06-163-6/+9
| * | | | | | | | | | | Use include ActiveModel::Model to hold metrics data parsed from yaml.Pawel Chojnacki2017-06-165-43/+32