1. 19 Aug, 2016 9 commits
  2. 18 Aug, 2016 26 commits
  3. 17 Aug, 2016 5 commits
    • Robert Speicher's avatar
      Merge branch '2451-fix-mentions-in-issue-updates' into 'master' · 0e5ac6f9
      Robert Speicher authored
      Send notification emails when users are newly mentioned in issue or MR edits
      
      ## What does this MR do?
      
      Introduces "new mention in issue" and "new mention in MR" email notifications.  Editing a Mentionable title or description and adding a mention to a user who was not previously mentioned will now send them a notification email, following usual permissions for doing so.
      
      ## Why was this MR needed?
      
      Issues & MRs may be edited to include mentions to new people. We don't currently send out email notifications of these edits to anyone, although they do create TODOs. This brings email notifications into parity with TODOs.
      
      ## What are the relevant issue numbers?
      
      Closes #2451
      
      See merge request !5800
      0e5ac6f9
    • Douglas Barbosa Alexandre's avatar
      Merge branch 'fix-issuable-filter' into 'master' · 863f77b6
      Douglas Barbosa Alexandre authored
      Hide "Create new list button" on Issues and MRs pages
      
      ![1](/uploads/d8b08cb62cfc9e9d29e3e64b2ed0a8af/1.png)
      
      /cc @jschatz1 
      
      See merge request !5852
      863f77b6
    • Yorick Peterse's avatar
      Merge branch 'fix/eliminate-unneeded-calls-to-repository-blob-at' into 'master' · 6505a994
      Yorick Peterse authored
      Eliminate unneeded calls to Repository#blob_at when listing commits with no path
      
      See merge request !5848
      6505a994
    • Douwe Maan's avatar
      Merge branch 'vue-js-plugin' into 'master' · b09be748
      Douwe Maan authored
      Added VueJS plugin
      
      ## What does this MR do?
      
      Adds the VueJS & Vue resource plugin with environment detection. 
      
      ## What are the relevant issue numbers?
      
      Closes #20738 
      
      See merge request !5845
      b09be748
    • Douwe Maan's avatar
      Merge branch 'fix-downtime-check-formatting' into 'master' · 6d6212d2
      Douwe Maan authored
      Fix downtime check formatting
      
      ## What does this MR do?
      
      This MR adjusts the formatting of the migration downtime checker so messages are more readable.
      
      ## Are there points in the code the reviewer needs to double check?
      
      Not specifically
      
      ## Why was this MR needed?
      
      Formatting was somewhat hard to read and the online/offline indicators used the wrong colour.
      
      ## New Format
      
      ```
      [online]: /home/yorickpeterse/Projects/gitlab/gitlab-ce/db/migrate/20140407135544_fix_namespaces.rb
      [online]: /home/yorickpeterse/Projects/gitlab/gitlab-ce/db/migrate/20160705054938_add_protected_branches_push_access.rb
      [online]: /home/yorickpeterse/Projects/gitlab/gitlab-ce/db/migrate/20160705054952_add_protected_branches_merge_access.rb
      [offline]: /home/yorickpeterse/Projects/gitlab/gitlab-ce/db/migrate/20160705055254_move_from_developers_can_merge_to_protected_branches_merge_access.rb:
      
      We're creating a `merge_access_level` for each `protected_branch`. If a user creates a `protected_branch` while this
      is running, we might be left with a `protected_branch` _without_ an associated `merge_access_level`. The `protected_branches`
      table must not change while this is running, so downtime is required.
      
      https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5081#note_13247410
      
      [offline]: /home/yorickpeterse/Projects/gitlab/gitlab-ce/db/migrate/20160705055308_move_from_developers_can_push_to_protected_branches_push_access.rb:
      
      We're creating a `push_access_level` for each `protected_branch`. If a user creates a `protected_branch` while this
      is running, we might be left with a `protected_branch` _without_ an associated `push_access_level`. The `protected_branches`
      table must not change while this is running, so downtime is required.
      
      https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5081#note_13247410
      
      [online]: /home/yorickpeterse/Projects/gitlab/gitlab-ce/db/migrate/20160705055809_remove_developers_can_push_from_protected_branches.rb
      [online]: /home/yorickpeterse/Projects/gitlab/gitlab-ce/db/migrate/20160705055813_remove_developers_can_merge_from_protected_branches.rb
      [online]: /home/yorickpeterse/Projects/gitlab/gitlab-ce/db/migrate/20160716115711_add_queued_at_to_ci_builds.rb
      [online]: /home/yorickpeterse/Projects/gitlab/gitlab-ce/db/migrate/20160725083350_add_external_url_to_enviroments.rb
      [online]: /home/yorickpeterse/Projects/gitlab/gitlab-ce/db/migrate/20160727163552_create_user_agent_details.rb
      [online]: /home/yorickpeterse/Projects/gitlab/gitlab-ce/db/migrate/20160728081025_add_pipeline_events_to_web_hooks.rb
      [online]: /home/yorickpeterse/Projects/gitlab/gitlab-ce/db/migrate/20160728103734_add_pipeline_events_to_services.rb
      [offline]: /home/yorickpeterse/Projects/gitlab/gitlab-ce/db/migrate/20160729173930_remove_project_id_from_spam_logs.rb:
      
      Removing a column that contains data that is not used anywhere.
      
      [online]: /home/yorickpeterse/Projects/gitlab/gitlab-ce/db/migrate/20160801163709_add_submitted_as_ham_to_spam_logs.rb
      [online]: /home/yorickpeterse/Projects/gitlab/gitlab-ce/db/migrate/20160802010328_remove_builds_enable_index_on_projects.rb
      [online]: /home/yorickpeterse/Projects/gitlab/gitlab-ce/db/migrate/20160805041956_add_deleted_at_to_namespaces.rb
      [online]: /home/yorickpeterse/Projects/gitlab/gitlab-ce/db/migrate/20160810102349_remove_ci_runner_trigram_indexes.rb
      [online]: /home/yorickpeterse/Projects/gitlab/gitlab-ce/db/migrate/20160810142633_remove_redundant_indexes.rb
      ```
      
      ## Does this MR meet the acceptance criteria?
      
      - Tests
        - [x] Added for this feature/bug
        - [x] All builds are passing
      - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
      - [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
      - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      
      See merge request !5840
      6d6212d2