• Shinya Maeda's avatar
    Squashed commit of the following: · 060c5687
    Shinya Maeda authored
    commit 5aa6032526c7270b8793f62b9a5e66c0ce79c3b9
    Merge: cfb05ed27a3 1cf4aa02
    Author: Shinya Maeda <shinya@gitlab.com>
    Date:   Tue Nov 6 22:07:12 2018 +0900
    
        Merge branch 'master-ce' into fix-environment-status-in-merge-request-widget
    
    commit cfb05ed27a37f815721372731882af8c6a6efd54
    Author: Shinya Maeda <shinya@gitlab.com>
    Date:   Tue Nov 6 20:59:15 2018 +0900
    
        Add proxy status for frontend
    
    commit e6b3d65c53d97285b4f1575146b44a540e3fc4bf
    Author: Shinya Maeda <shinya@gitlab.com>
    Date:   Tue Nov 6 20:47:23 2018 +0900
    
        Prevent nil exception in environment status
    
    commit 23d4e37ebd83615326e749cce43178208e5ff76c
    Author: Shinya Maeda <shinya@gitlab.com>
    Date:   Tue Nov 6 18:36:06 2018 +0900
    
        Fix typo in spec
    
    commit 963b0fcedeaf22b949d9f3cef4b662146c9c003d
    Author: Shinya Maeda <shinya@gitlab.com>
    Date:   Tue Nov 6 18:22:20 2018 +0900
    
        Add feature spec
    
    commit 9cff0225cc8da1b787207b06858ef6a63ad7513f
    Author: Shinya Maeda <shinya@gitlab.com>
    Date:   Tue Nov ...
    060c5687