summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove last references to job for pipeline chartszj-faster-charts-pageZ.J. van de Weg2017-06-261-3/+3
| | | | | This is not ammended to another commit as it will probably have failing tests which I'll fix and amend to this commit.
* Remove references to build in pipeline chartsZ.J. van de Weg2017-06-237-17/+17
| | | | | | | Being the good boyscouts, but mainly because of [the comment in the review](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12378#note_33302115) the words used for classes and variables are changed to not use builds anymore.
* Improve performance for pipeline chartsZ.J. van de Weg2017-06-235-19/+21
| | | | | Achieved by using another table, which both has better indexes and is smaller. Now the data provided for the user is more valueable too.
* Merge branch 'hot-reload' into 'master'Tim Zallmann2017-06-231-0/+4
|\ | | | | | | | | | | | | hot reloading for .vue files Closes #33729 See merge request !12180
| * 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
|\ \ | | | | | | | | | | | | Add bootstrap_form gem See merge request !10985
| * | 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 container Closes #33992 See merge request !12353
| * | | 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 calculation Closes #33984 See merge request !12399
| * | | | 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 nav Closes #34095 See merge request !12365
| * | | | | 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 into ES class syntax See merge request !12254
| * | | | | 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 index See merge request !12392
| * | | | | | 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 view Closes #34120 See merge request !12382
| * | | | | | | 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 settings See merge request !12045
| * | | | | | | 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 navbar Closes #34139 See merge request !12388
| * | | | | | | 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'" Closes #34134, #34106, and #34084 See merge request !12389
| * | | | | | | Revert "Merge branch 'rs-bootsnap' into 'master'"rs-revert-bootsnapRobert Speicher2017-06-223-17/+0
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 95138a9c16a2d1905354d0f46381b3822b37863d, reversing changes made to 66aad16d1aaa426237e52ef19385385566f194dc.
* | | | | | | Merge branch '33981-add-members-drop-down-doesn-t-separate-name-username' ↵Annabel Dunstone Gray2017-06-221-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve ""Add Members" drop-down doesn't separate Name/Username" Closes #33981 See merge request !12376
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `datetime_with_timezone` to table definition See merge request !12292
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So the method can be used in a `create_table` block. There is a new Rubocop style cop that requires the usage of `datetime_with_timezone`.
* | | | | | | | Merge branch '33940-cache-flipper_gate-query' into 'master'Robert Speicher2017-06-222-2/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the Flipper::Middleware::Memoizer middleware Closes #33940 See merge request !12359
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures we make maximum one call per feature per request. See https://github.com/jnunemaker/flipper/blob/v0.10.2/docs/Optimization.md#memoizing-middleware Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'awards-handler-class-syntax' into 'master'Jacob Schatz2017-06-221-379/+374
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor AwardsHandler into ES class syntax See merge request !12239
| * | | | | | | | | 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 properly See merge request !12368
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support additional prometheus metrics - review branch Closes #28717 See merge request !11712
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into ↵28717-additional-metrics-review-branchPawel Chojnacki2017-06-221036-5914/+10545
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | 28717-additional-metrics-review-branch
| * | | | | | | | | | 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 ↵Pawel Chojnacki2017-06-201-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automagic within Project model
| * | | | | | | | | | 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 ↵Pawel Chojnacki2017-06-161189-7088/+21912
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 28717-additional-metrics-review-branch
View Lorry Controller Status