1. 14 Jan, 2016 16 commits
    • Tomasz Maczukin's avatar
      Merge branch 'master' into ci/api-triggers · 8eed1876
      Tomasz Maczukin authored
      * master: (32 commits)
        Fix specs and rubocop warnings
        fixed LDAP activation on login to use new ldap_blocked state
        Fix Admin/Users view to position buttons without spacing magic
        Update to Go 1.5.3
        Fix the undefinded variable error in Project's safe_import_url method
        Fix misaligned edit button in milestone collection partial
        Update button styles for Milestones#show
        Ensure the API doesn't return notes that the current user shouldn't see
        Add spec for Note#cross_reference_not_visible_for?
        Remove (invalid) timestamp formatting
        Move `BroadcastMessage#status` to a helper since it's presentational
        Update CHANGELOG
        Broadcast Messages can now be edited
        Update Broadcast Message features
        Update BroadcastMessage model
        Update broadcast_message helper
        Simplify BroadcastMessage factory
        Simplify broadcast message JS
        Remove alert_type attribute from BroadcastMessage
        Move broadcast message form to a partial
        ...
      8eed1876
    • Douwe Maan's avatar
      Merge branch 'feature/ldap-sync-edgecases' into 'master' · 4d64a32c
      Douwe Maan authored
      LDAP Sync blocked user edgecases
      
      Allow GitLab admins to block otherwise valid GitLab LDAP users
      (https://gitlab.com/gitlab-org/gitlab-ce/issues/3462)
      
      Based on the discussion on the original issue, we are going to differentiate "normal" block operations to the ldap automatic ones in order to make some decisions when its one or the other.
      
      Expected behavior:
      
      - [x] "ldap_blocked" users respond to both `blocked?` and `ldap_blocked?`
      - [x] "ldap_blocked" users can't be unblocked by the Admin UI
      - [x] "ldap_blocked" users can't be unblocked by the API
      - [x] Block operations that are originated from LDAP synchronization will flag user as "ldap_blocked"
      - [x] Only "ldap_blocked" users will be automatically unblocked by LDAP synchronization
      - [x] When LDAP identity is removed, we should convert `ldap_blocked` into `blocked`
       
      Mockup for the Admin UI with both "ldap_blocked" and normal "blocked" users:
      ![image](/uploads/4f56fc17b73cb2c9e2a154a22e7ad291/image.png)
      
      There will be another MR for the EE version.
      
      See merge request !2242
      4d64a32c
    • Douwe Maan's avatar
      Merge branch 'fix-safe-import-url' into 'master' · cda96354
      Douwe Maan authored
      Fix the undefinded variable error in Project's safe_import_url method
      
      Fixes #7982
      
      See merge request !2419
      cda96354
    • Douwe Maan's avatar
      Merge branch 'fix/private-references' into 'master' · 9f8c38bd
      Douwe Maan authored
      Show referenced MRs & Issues only when the current viewer can access them
      
      This addresses both issues identified in #6066.
      
      ## The private MR by user `remy2` with a note referencing to a public issue
      
      ![Screen_Shot_2016-01-12_at_16.45.02](/uploads/c245ec2c1fdea1f9ba05183c24e142d9/Screen_Shot_2016-01-12_at_16.45.02.png)
      
      ---
      
      ## The public issue viewed by user `remy` **who doesn't have access to `remy2/private-project`** before the fix
      
      ![Screen_Shot_2016-01-12_at_18.14.50](/uploads/8db5580e803f5bddd6cb935233c579a0/Screen_Shot_2016-01-12_at_18.14.50.png)
      
      ---
      
      ## The public issue viewed by user `remy` **who doesn't have access to `remy2/private-project`** with the fix
      
      ![Screen_Shot_2016-01-13_at_12.02.32](/uploads/cb199f7b78191fba486a11412412e307/Screen_Shot_2016-01-13_at_12.02.32.png)
      
      ---
      
      ## The public issue viewed by user `remy2` with the fix (no change)
      
      ![Screen_Shot_2016-01-13_at_11.54.06](/uploads/ddece590d69f597a95559beddcd36660/Screen_Shot_2016-01-13_at_11.54.06.png)
      
      
      See merge request !2405
      9f8c38bd
    • Douwe Maan's avatar
      Merge branch 'rs-broadcasts' into 'master' · 54734fa6
      Douwe Maan authored
      Allow broadcast messages to be edited
      
      Closes #3046 
      
      See merge request !2268
      54734fa6
    • Tomasz Maczukin's avatar
    • Tomasz Maczukin's avatar
      Update CHANGELOG [ci skip] · d8359a4f
      Tomasz Maczukin authored
      d8359a4f
    • Tomasz Maczukin's avatar
      Merge branch '8-4-stable' into ci/api-triggers · 57a67c4f
      Tomasz Maczukin authored
      * 8-4-stable: (280 commits)
        Add Changelog entry for build traces data integrity fix
        Update doc_styleguide.md [ci skip]
        Added hint that you can search users by name, username, or email.
        Add changelog
        Version 8.4.0.rc1
        Randomize metrics sample intervals
        Make the metrics sampler interval configurable
        Don't automatically require awesome_print
        Disable colorization if STDOUT is not a tty
        Block the reported user before destroying the record
        changes `$quote-gray` to `$secondary-text`
        makes message plural for multiple MRs and removes from loop. Duh.
        Prepare Installation and Update docs for 8.4 RC1
        Mention channel/key bug in irkerd docs
        Revert "Remove the `:coffee` and `:coffeescript` Haml filters"
        gets merge request discussion working again
        adds back in discussion.haml.html for issues commenting and closing/reopening properly.
        removing last chunk of MR ajax changes, rest will be in another MR
        reverting more MR ajax files, will appear in different commit
        reverting MR ajax changes, which will be in a different MR
        ...
      57a67c4f
    • Tomasz Maczukin's avatar
      633ac134
    • Dmitriy Zaporozhets's avatar
      Merge branch 'rs-milestone-buttons' into 'master' · 66360303
      Dmitriy Zaporozhets authored
      Update button style on milestone pages
      
      See merge request !2414
      66360303
    • Rémy Coutable's avatar
      Fix specs and rubocop warnings · e918493f
      Rémy Coutable authored
      e918493f
    • Achilleas Pipinellis's avatar
      Merge branch 'update-go-1.5.3' into 'master' · 60d7cfc2
      Achilleas Pipinellis authored
      Update documentation to Go 1.5.3
      
      Security fix: https://groups.google.com/forum/#!topic/golang-dev/MEATuOi_ei4
      
      See merge request !2418
      60d7cfc2
    • Gabriel Mazetto's avatar
    • Gabriel Mazetto's avatar
    • Stan Hu's avatar
      Update to Go 1.5.3 · c7f7a1ae
      Stan Hu authored
      c7f7a1ae
    • DJ Mountney's avatar
  2. 13 Jan, 2016 24 commits