delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixes ctrl+enter not submit issue edit formissue-inline-edit-quick-submit	Phil Hughes	2017-06-24	6	-2/+58
\| \| \| \|	Closes #33758
*	Merge branch 'winh-promise-rejects-fail-tests' into 'master'	Phil Hughes	2017-06-23	8	-160/+257
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Make JavaScript tests fail for unhandled Promise rejections Closes #33845 and #33623 See merge request !12264
\| *	Make JavaScript tests fail for unhandled Promise rejections	Winnie Hellmann	2017-06-23	8	-160/+257
\|/
*	Merge branch 'hot-reload' into 'master'	Tim Zallmann	2017-06-23	1	-0/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	hot reloading for .vue files Closes #33729 See merge request !12180
\| *	hot reloading for .vue fileshot-reload	Simon Knox	2017-06-15	1	-0/+4
\| \|
* \|	Merge branch '31574-bootstrap-form-builder' into 'master'	Phil Hughes	2017-06-23	5	-74/+53
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add bootstrap_form gem See merge request !10985
\| * \|	Convert app/views/profiles/show.html.haml to bootstrap_form	Nick Thomas	2017-06-22	3	-74/+50
\| \| \|
\| * \|	Add bootstrap_form gem	Nick Thomas	2017-06-22	2	-0/+3
\| \| \|
* \| \|	Merge branch '33992-mr-target-avatar' into 'master'	Phil Hughes	2017-06-23	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add padding to target branch container Closes #33992 See merge request !12353
\| * \| \|	Add padding to target branch container33992-mr-target-avatar	Annabel Dunstone Gray	2017-06-21	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'fix-sidebar-scroll-jump' into 'master'	Phil Hughes	2017-06-23	1	-3/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove layout nav from scroll calculation Closes #33984 See merge request !12399
\| * \| \| \|	Remove layout nav from scroll calculationfix-sidebar-scroll-jump	Annabel Dunstone Gray	2017-06-22	1	-3/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch '34095-permalinks' into 'master'	Phil Hughes	2017-06-23	2	-3/+14
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix offset for fixed nav Closes #34095 See merge request !12365
\| * \| \| \| \|	Fix offset for fixed nav	Annabel Dunstone Gray	2017-06-23	2	-3/+14
\|/ / / / /
* \| \| \| \|	Merge branch 'notes-es-class-syntax' into 'master'	Tim Zallmann	2017-06-23	1	-1374/+1356
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor Notes into ES class syntax See merge request !12254
\| * \| \| \| \|	refactor Notes class to ES class syntaxnotes-es-class-syntax	Mike Greiling	2017-06-22	1	-1374/+1356
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dm-unnecessary-top-padding' into 'master'	Sean McGivern	2017-06-23	2	-2/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary top padding on group MR index See merge request !12392
\| * \| \| \| \| \|	Remove unnecessary top padding on group MR indexdm-unnecessary-top-padding	Douwe Maan	2017-06-22	2	-2/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '34120-environment-detail-bug' into 'master'	Phil Hughes	2017-06-23	3	-9/+11
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix mobile environment detail view Closes #34120 See merge request !12382
\| * \| \| \| \| \| \|	Fix mobile environment detail view	Annabel Dunstone Gray	2017-06-23	3	-9/+11
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'project-settings-container-width' into 'master'	Annabel Dunstone Gray	2017-06-23	12	-50/+52
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added limited width container to project settings See merge request !12045
\| * \| \| \| \| \| \|	Added limited width container to project settings	Phil Hughes	2017-06-20	12	-50/+52
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-dropdown-top-navbar-position-mobile' into 'master'	Annabel Dunstone Gray	2017-06-23	2	-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 navbar	Jose Ivan Vargas Lopez	2017-06-23	2	-0/+6
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'rs-revert-bootsnap' into 'master'	Stan Hu	2017-06-22	3	-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-bootsnap	Robert Speicher	2017-06-22	3	-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 Gray	2017-06-22	1	-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 Zallmann	2017-06-22	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'mk-add-datetime-with-timezone-table-definition' into 'master'	Yorick Peterse	2017-06-22	2	-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-definition	Michael Kozono	2017-06-22	1	-4/+30
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix PostgreSQL schema dump for `timestamptz`	Michael Kozono	2017-06-22	1	-5/+36
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add `datetime_with_timezone` to table definition	Michael Kozono	2017-06-22	1	-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 Speicher	2017-06-22	2	-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-query	Robert Speicher	2017-06-22	1	-1/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add the Flipper::Middleware::Memoizer middleware	Rémy Coutable	2017-06-21	2	-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 Schatz	2017-06-22	1	-379/+374
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor AwardsHandler into ES class syntax See merge request !12239
\| * \| \| \| \| \| \| \| \|	refactor AwardsHandler into es class syntaxawards-handler-class-syntax	Mike Greiling	2017-06-17	1	-379/+374
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix/properly-encode-gitaly-diffs' into 'master'	Robert Speicher	2017-06-22	3	-2/+13
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Encode Gitaly diff patches properly See merge request !12368
\| * \| \| \| \| \| \| \| \|	Encode Gitaly diff patches properlyfix/properly-encode-gitaly-diffs	Ahmad Sherif	2017-06-22	3	-2/+13
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '28717-additional-metrics-review-branch' into 'master'	Grzegorz Bizon	2017-06-22	51	-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-branch	Pawel Chojnacki	2017-06-22	1036	-5914/+10545
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	28717-additional-metrics-review-branch
\| * \| \| \| \| \| \| \| \| \|	Add Changelog message	Pawel Chojnacki	2017-06-21	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Make queries not die when underlying data cannot be found	Pawel Chojnacki	2017-06-20	5	-46/+50
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add rescue_from(ActionController::UnknownFormat) in Application Controller	Pawel Chojnacki	2017-06-20	5	-12/+50
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove unnecessary prometheus_service method, that is now handled by new ↵	Pawel Chojnacki	2017-06-20	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	automagic within Project model
\| * \| \| \| \| \| \| \| \| \|	Memoize only yaml loading method	Pawel Chojnacki	2017-06-16	2	-7/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	move additional_metrics.yaml into prometheus/ config folder	Pawel Chojnacki	2017-06-16	3	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Move Prometheus service to project model	Pawel Chojnacki	2017-06-16	8	-24/+21
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix prometheus service frontend fixture	Pawel Chojnacki	2017-06-16	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Pawel Chojnacki	2017-06-16	1189	-7088/+21912
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	28717-additional-metrics-review-branch