1. 16 May, 2016 16 commits
    • Robert Speicher's avatar
      1beee64e7408
    • Robert Speicher's avatar
      Rename `Event#note_commit?` to `commit_note?` · b4171aba3ca8
      Robert Speicher authored
      b4171aba3ca8
    • Robert Speicher's avatar
      Remove redundant `html_escape` calls from `title` attributes · 4026d19909fe
      Robert Speicher authored
      These get escaped automatically.
      4026d19909fe
    • Robert Speicher's avatar
      Fix titles for commit references in Event feed · 73aeb18acacf
      Robert Speicher authored
      Prior, the `title` attribute was being included as an argument to the
      route helper rather than as an argument to `link_to`.
      73aeb18acacf
    • Robert Speicher's avatar
      Simplify Event's target type-checking · ebd49bbf7199
      Robert Speicher authored
      ebd49bbf7199
    • Robert Speicher's avatar
      Add an Event's target's title to its reference link · 7f5253bd668c
      Robert Speicher authored
      Given an activity feed entry like:
      
      > Douwe Maan commented on [issue #123] at [gitlab-org/gitlab-ce]
      
      ...the `issue #123` link will now have a `title` attribute.
      7f5253bd668c
    • Douwe Maan's avatar
      Merge branch... · 3c04c89ee61a
      Douwe Maan authored
      Merge branch '17227-upcoming-milestone-is-confusing-when-projects-have-different-milestones' into 'master'
      
      Make upcoming milestone work across projects
      
      Before: we took the next milestone due across all projects in the
      search and found issues whose milestone title matched that
      one. Problems:
      
      1. The milestone could be closed.
      2. Different projects have milestones with different schedules.
      3. Different projects have milestones with different titles.
      4. Different projects can have milestones with different schedules, but
         the _same_ title. That means we could show issues from a past
         milestone, or one that's far in the future.
      
      After: gather the ID of the next milestone on each project we're looking
      at, and find issues with those milestone IDs. Problems:
      
      1. For a lot of projects, this can return a lot of IDs.
      2. The SQL query has to be different between Postgres and MySQL, because
         MySQL is much more lenient with HAVING: as well as the columns
         appearing in GROUP BY or in aggregate clauses, MySQL allows them to
         appear in the SELECT list (un-aggregated).
      
      Closes #17227.
      
      See merge request !4125
      3c04c89ee61a
    • Robert Speicher's avatar
      Merge branch... · 4c8d7b1861bd
      Robert Speicher authored
      Merge branch '13691-allow-admin-to-reset-user-password-and-force-password-reset-on-next-login' into 'master'
      
      Force password change after admin reset
      
      Closes #13691.
      
      See merge request !4016
      4c8d7b1861bd
    • Douwe Maan's avatar
      Merge branch 'docker-registry' into 'master' · 76b928ce986c
      Douwe Maan authored
      Added authentication service for docker registry
      
      This adds a simple authentication service for docker which uses current user credentials to authenticate pulls and pushes.
      
      I have only one concern. Since the `.docker/config` is unencrypted, thus the password for user stored there is unencrypted, maybe we should from the start implement function to generate/provide a separate password just for the purposes of accessing docker registry?
      
      What do you think @jacobvosmaer @sytses @marin?
      
      cc @marin 
      
      See merge request !3787
      76b928ce986c
    • Douwe Maan's avatar
      Merge branch 'gh-pull-requests' · 9e3e8a9307f5
      Douwe Maan authored
      9e3e8a9307f5
    • Kamil Trzcinski's avatar
      Bring back port to registry configuration · d27eaea27cc2
      Kamil Trzcinski authored
      d27eaea27cc2
    • Sean McGivern's avatar
      Return a relation with Postgres · 98ea3a9253c8
      Sean McGivern authored
      Postgres only needs to select a single column, so that can used as a
      sub-query where `Milestone.upcoming_ids_by_projects` is actually used in
      `IssuableFinder`.
      
      MySQL needs to select the `due_date` column because it's used in the
      `HAVING` clause, so it has to return an array of IDs.
      98ea3a9253c8
    • Sean McGivern's avatar
      Make upcoming milestone work across projects · 6dcb77744929
      Sean McGivern authored
      Before: we took the next milestone due across all projects in the
      search and found issues whose milestone title matched that
      one. Problems:
      
      1. The milestone could be closed.
      2. Different projects have milestones with different schedules.
      3. Different projects have milestones with different titles.
      4. Different projects can have milestones with different schedules, but
         the _same_ title. That means we could show issues from a past
         milestone, or one that's far in the future.
      
      After: gather the ID of the next milestone on each project we're looking
      at, and find issues with those milestone IDs. Problems:
      
      1. For a lot of projects, this can return a lot of IDs.
      2. The SQL query has to be different between Postgres and MySQL, because
         MySQL is much more lenient with HAVING: as well as the columns
         appearing in GROUP BY or in aggregate clauses, MySQL allows them to
         appear in the SELECT list (un-aggregated).
      6dcb77744929
    • Sean McGivern's avatar
      Tidy up IssuesFinder specs · 0501eddcc22e
      Sean McGivern authored
      - Don't do setup in spec bodies.
      - Don't `describe` a symbol.
      - Don't use 'should'.
      0501eddcc22e
    • Sean McGivern's avatar
      Force password change after admin reset · 41a8c412848a
      Sean McGivern authored
      When an admin changes a user's password for them, force the user to
      reset the password after logging in by expiring the new password
      immediately.
      41a8c412848a
    • Yorick Peterse's avatar
      Merge branch 'add-cache-count-metrics' into 'master' · e5f351f86206
      Yorick Peterse authored
      Add cache count metrics to rails cache
      
      See merge request !4157
      e5f351f86206
  2. 15 May, 2016 7 commits
  3. 14 May, 2016 11 commits
  4. 13 May, 2016 6 commits