1. 30 Nov, 2016 6 commits
    • Robert Speicher's avatar
      Merge branch 'sh-update-sidekiq-cron' into 'master' · fb17ce1f
      Robert Speicher authored
      Update Sidekiq-cron to fix compatibility issues with Sidekiq 4.2.1
      
      The "Enqueue Now" button would not work in the admin panel due to changes in the Web extension interface: https://github.com/ondrejbartas/sidekiq-cron/commit/88ada926132d4658e3fd370c9f44899b6c88ccaf
      
      Closes #24376
      
      See merge request !7815
      fb17ce1f
    • Robert Speicher's avatar
      Merge branch '23666-set-null-true-for-timestamps-columns-in-migrations' into 'master' · 4a3a4131
      Robert Speicher authored
      Add `null: true` to timestamps in migrations that does not define it
      
      This is to ensure that migrations will still be consitent when we will
      upgrade to Rails 5 which default to `null: false` for timestamps
      columns.
      
      Fixes #23666.
      
      See merge request !7791
      4a3a4131
    • Douwe Maan's avatar
      Merge branch 'improve/invite-accept-page' into 'master' · f0c44b5d
      Douwe Maan authored
      Alert user when logged in user email is not the same as the invitation
      
      ## What does this MR do?
      
      Add a note to the invitation page when the logged in user email is not the same as the invitation.
      
      ## Why was this MR needed?
      
      Help users to not accept invitations logged in with a wrong account.
      
      ## Screenshots (if relevant)
      
      ![1](/uploads/78ac6d3db67c9ed60cf74a20ad240d0b/1.png)
      
      ## Relevant issues
      
      Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24955
      
      See merge request !7803
      f0c44b5d
    • Douwe Maan's avatar
      Merge branch 'ee-1137-follow-up-protected-branch-users-and-groups' into 'master' · ef3a898d
      Douwe Maan authored
      CE-specific changes for gitlab-org/gitlab-ee#1137
      
      ## What does this MR do?
      
      - gitlab-org/gitlab-ee#1137 is a `technical debt` issue to clean up the EE protected branch access levels (for users and groups) implementation.
      - Some of this cleanup bleeds over to code shared by CE and EE, which is why this MR is required.
      - An EE-specific MR has also been created: gitlab-org/gitlab-ee!927
      
      See merge request !7821
      ef3a898d
    • Annabel Dunstone Gray's avatar
      Merge branch '24999-fix-project-avatar-alignment' into 'master' · 32f6e444
      Annabel Dunstone Gray authored
      Fix the width of project avatars in order to adjust alignment within their container element
      
      ## What does this MR do?
      Adjusts the width of project avatars in order to fix their alignment within the container elements.
      
      ## Are there points in the code the reviewer needs to double check?
      To make sure there are no unintentional styles changes on unrelated elements.
      
      ## Why was this MR needed?
      To fix the issue seen below.
      
      ## Screenshots (if relevant)
      Before: ![Screen_Shot_2016-11-26_at_3.55.58_PM](/uploads/c0012ee7bb5f9e83af41190f71f030fa/Screen_Shot_2016-11-26_at_3.55.58_PM.png)
      
      After: ![Screen_Shot_2016-11-26_at_3.56.17_PM](/uploads/c1236216382e6baa094570c17565e8cf/Screen_Shot_2016-11-26_at_3.56.17_PM.png)
      
      Affected pages: ![Screen_Shot_2016-11-26_at_4.12.38_PM](/uploads/8db6d86a5998843e7b7a755fb4000add/Screen_Shot_2016-11-26_at_4.12.38_PM.png)
      
      ## What are the relevant issue numbers?
      Closes #24999
      
      See merge request !7772
      32f6e444
    • Annabel Dunstone Gray's avatar
      Merge branch '25002-sentence-case-dashboard-tabs' into 'master' · 34603595
      Annabel Dunstone Gray authored
      Changes project dashboard tabs to sentence casing
      
      Changes the nav tab titles on the project dashboard page (```https://gitlab.com/dashboard/projects```) from title casing to sentence casing.
      
      Before: ![Screen_Shot_2016-11-26_at_11.17.23_PM](/uploads/a31c951cf83f7670acee778db9337be5/Screen_Shot_2016-11-26_at_11.17.23_PM.png)
      
      After: ![Screen_Shot_2016-11-26_at_11.17.39_PM](/uploads/a0cb5f6b6771e6f5149750ea1e7beb02/Screen_Shot_2016-11-26_at_11.17.39_PM.png)
      
      Closes #25002
      
      See merge request !7774
      34603595
  2. 29 Nov, 2016 34 commits