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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Added limited width to profile settingsprofile-settings-width	Phil Hughes	2017-06-23	15	-40/+56
\| \| \| \|	Closes #20918
*	Merge branch '34219-extra-symbol-notifications-modal' into 'master'	Phil Hughes	2017-06-23	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Remove extra symbol in notifications modal Closes #34219 See merge request !12417
\| *	Remove extra symbol in notifications modal34219-extra-symbol-notifications-modal	Annabel Dunstone Gray	2017-06-23	1	-1/+1
\| \|
* \|	Limit the width of commit & snippet comment sections	Phil Hughes	2017-06-23	5	-9/+14
\| \|
* \|	Limit the width of project READMEs	Phil Hughes	2017-06-23	4	-2/+9
\| \|
* \|	Make JavaScript tests fail for unhandled Promise rejections	Winnie Hellmann	2017-06-23	3	-7/+10
\| \|
* \|	Merge branch '31574-bootstrap-form-builder' into 'master'	Phil Hughes	2017-06-23	2	-74/+43
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add bootstrap_form gem See merge request !10985
\| * \|	Convert app/views/profiles/show.html.haml to bootstrap_form	Nick Thomas	2017-06-22	2	-74/+43
\| \| \|
* \| \|	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
\| \| \| \| \|
* \| \| \| \|	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	1	-2/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-2/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	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
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix dropdown position for the new button on mobile for the top navbar	Jose Ivan Vargas Lopez	2017-06-23	2	-0/+6
\| \|_\|_\|/ / / \|/\| \| \| \| \|
* \| \| \| \| \|	Resolve ""Add Members" drop-down doesn't separate Name/Username"	Tim Zallmann	2017-06-22	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	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 '28717-additional-metrics-review-branch' into 'master'	Grzegorz Bizon	2017-06-22	14	-16/+336
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	212	-1694/+1740
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \|	28717-additional-metrics-review-branch
\| * \| \| \| \| \|	Add rescue_from(ActionController::UnknownFormat) in Application Controller	Pawel Chojnacki	2017-06-20	4	-12/+20
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove unnecessary prometheus_service method, that is now handled by new ↵	Pawel Chojnacki	2017-06-20	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	automagic within Project model
\| * \| \| \| \| \|	Move Prometheus service to project model	Pawel Chojnacki	2017-06-16	5	-19/+15
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Pawel Chojnacki	2017-06-16	394	-3443/+5656
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	28717-additional-metrics-review-branch
\| * \| \| \| \| \| \|	Test Additional metrics parser and fix query checking tests	Pawel Chojnacki	2017-06-09	1	-4/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix Additional metrics filtering	Pawel Chojnacki	2017-06-08	2	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ remove test button that was leftover after a bad merge
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Pawel Chojnacki	2017-06-07	435	-2304/+6159
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	28717-additional-metrics-review-branch # Conflicts: # app/models/project_services/prometheus_service.rb # app/views/projects/services/_form.html.haml
\| * \| \| \| \| \| \| \|	Use explicit instance of prometheus service and add access methods to it	Pawel Chojnacki	2017-06-07	5	-23/+32
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	expand Namespaces:: and refactoring yaml parsing out of MetricGroup class	Pawel Chojnacki	2017-06-06	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Explicitly require format.json in prometheus_controller	Pawel Chojnacki	2017-06-06	2	-7/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ add missing prometheus_controller tests!
\| * \| \| \| \| \| \| \|	Use `.text-center` class instead of text-align prop28717-fe-prometheus-additional-metrics	kushalpandya	2017-06-02	2	-3/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update as per review feedback	kushalpandya	2017-06-01	5	-42/+53
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Handle response failure case for loadActiveMetrics	kushalpandya	2017-06-01	1	-2/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Changes based on UX review	kushalpandya	2017-06-01	2	-4/+9
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove service help, add URL field help	kushalpandya	2017-06-01	1	-12/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Lint: Fix missing new line at EOF	kushalpandya	2017-05-31	3	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Styles for banner within panel	kushalpandya	2017-05-31	1	-0/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Populate Missing env var panel	kushalpandya	2017-05-31	2	-5/+26
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add styles for Prometheus Service Metrics	kushalpandya	2017-05-31	1	-1/+37
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add Prometheus Metrics Bundle, panel for Missing environment variables	kushalpandya	2017-05-31	1	-4/+21
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Prometheus Metrics Bundle	kushalpandya	2017-05-31	2	-0/+82
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add styles for Prometheus Metrics panel	kushalpandya	2017-05-31	1	-0/+25
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Render service extras partial conditionally	kushalpandya	2017-05-31	1	-0/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Prometheus Metrics Panel View	kushalpandya	2017-05-31	1	-0/+21
\| \| \| \| \| \| \| \| \|