1. 14 Jan, 2016 16 commits
    • Douwe Maan's avatar
      Merge branch 'ci/api-variables' into 'master' · f981da44
      Douwe Maan authored
      Add variables API
      
      References #4264 
      
      See merge request !2264
      f981da44
    • Douwe Maan's avatar
      Merge branch 'fix/titles-weight' into 'master' · 642699b0
      Douwe Maan authored
      Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages
      
      See #3956.
      
      Following is before/after for each page:
      
      ## Group title
      
      ### Before
      ![group-title-before](/uploads/d6c013c69f526d553555ff974c29b349/group-title-before.png)
      
      ### After
      ![group-title-after](/uploads/56e0bd176d12943297b5b95d20beb437/group-title-after.png)
      
      ---
      
      ## Commit title
      
      ### Before
      ![commit-title-before](/uploads/a9bda5212eea843ab4c92acbcf411cdd/commit-title-before.png)
      
      ### After
      ![commit-title-after](/uploads/e3a532460a1e7b0b2a8eb8a6af12abea/commit-title-after.png)
      
      ---
      
      ## Branch name
      
      ### Before
      ![branch-name-before](/uploads/9d77e39f07cd7b757d02a39f5bc57570/branch-name-before.png)
      
      ### After
      ![branch-name-after](/uploads/6831e9560d196d8a4da209166f224a0f/branch-name-after.png)
      
      ---
      
      ## Tags name in list
      
      ### Before
      ![tags-name-in-list-before](/uploads/cf0141713af751132fd29220621ea9ab/tags-name-in-list-before.png)
      
      ### After
      ![tags-name-in-list-after](/uploads/902c5b029dc832216ac536d2ad372b83/tags-name-in-list-after.png)
      
      ---
      
      ## Tag name
      
      ### Before
      ![tags-name-before](/uploads/495acb6b4bab8464a0ffeb8f703435b6/tags-name-before.png)
      
      ### After
      ![tags-name-after](/uploads/f86868dbad57b8226611bcb03e5a9524/tags-name-after.png)
      
      ---
      
      ## Issue title in list
      
      ### Before
      ![issue-title-in-list-before](/uploads/5f01450aceefdcc2f51984832a4ce6b5/issue-title-in-list-before.png)
      
      ### After
      ![issue-title-in-list-after](/uploads/3144fb231874d23b6b46e108da24b128/issue-title-in-list-after.png)
      
      ---
      
      ## MR title in list
      
      ### Before
      ![mr-title-in-list-before](/uploads/bd0239104ebf4a5090c724c3851df57c/mr-title-in-list-before.png)
      
      ### After
      ![mr-title-in-list-after](/uploads/16be5460dffc33ff173a6b8ff3250206/mr-title-in-list-after.png)
      
      See merge request !2422
      642699b0
    • Douwe Maan's avatar
      Fix version · 4435a3a8
      Douwe Maan authored
      4435a3a8
    • Douwe Maan's avatar
      Merge branch 'master' into ci/api-variables · 0014f193
      Douwe Maan authored
      0014f193
    • 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
    • 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
    • Rémy Coutable's avatar
      Improve the consistency of commit titles, branch names, tag names, issue/MR... · 818607f0
      Rémy Coutable authored
      Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages
      818607f0
    • 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