1. 07 Dec, 2015 2 commits
  2. 06 Dec, 2015 3 commits
    • Stan Hu's avatar
      Merge branch 'fix-gitlab-workhorse-initd-check' into 'master' · 234f4bf2
      Stan Hu authored
      Check GitLab Workhorse status in init.d script when reporting all components are up and running
      
      Closes https://github.com/gitlabhq/gitlabhq/issues/9869
      
      See merge request !1969
      234f4bf2
    • Stan Hu's avatar
      Merge branch 'duplicate_notifications_fix' into 'master' · e2c57a41
      Stan Hu authored
      Fixed duplicated issue note email notifications.
      
      Fixes #2560 
      
      
      
      See issue for the details.
      
      Without `uniq` modified tests were failing with:
      ```
           Failure/Error: notification.new_note(note)
             (Notify (class)).note_issue_email(21, 1)
                 expected: 1 time with arguments: (21, 1)
                 received: 2 times with arguments: (21, 1)
           # /home/bak1an/.rvm/gems/ruby-2.1.6@gitlab/gems/sidekiq-3.3.0/lib/sidekiq/extensions/action_mailer.rb:17:in `public_send'
           # /home/bak1an/.rvm/gems/ruby-2.1.6@gitlab/gems/sidekiq-3.3.0/lib/sidekiq/extensions/action_mailer.rb:17:in `perform'
           # /home/bak1an/.rvm/gems/ruby-2.1.6@gitlab/gems/sidekiq-3.3.0/lib/sidekiq/testing.rb:74:in `block in raw_push'
           # /home/bak1an/.rvm/gems/ruby-2.1.6@gitlab/gems/sidekiq-3.3.0/lib/sidekiq/testing.rb:69:in `each'
           # /home/bak1an/.rvm/gems/ruby-2.1.6@gitlab/gems/sidekiq-3.3.0/lib/sidekiq/testing.rb:69:in `raw_push'
           # /home/bak1an/.rvm/gems/ruby-2.1.6@gitlab/gems/sidekiq-3.3.0/lib/sidekiq/client.rb:68:in `push'
           # /home/bak1an/.rvm/gems/ruby-2.1.6@gitlab/gems/sidekiq-3.3.0/lib/sidekiq/worker.rb:85:in `client_push'
           # /home/bak1an/.rvm/gems/ruby-2.1.6@gitlab/gems/sidekiq-3.3.0/lib/sidekiq/extensions/generic_proxy.rb:19:in `method_missing'
           # ./app/services/notification_service.rb:144:in `block in new_note'
           # ./app/services/notification_service.rb:143:in `each'
           # ./app/services/notification_service.rb:143:in `new_note'
           # ./spec/services/notification_service_spec.rb:63:in `block (5 levels) in <top (required)>'
      ```
      
      I have also added `once` to all `should_email` checks within `notification_service_spec.rb` since it's probably the correct behavior to notify users only once on the same event. Nothing else failed out of the box but we can keep these assertions for future.
      
      See merge request !1925
      e2c57a41
    • Anton Baklanov's avatar
      Fixed duplicated issue note email notifications. · caa6851b
      Anton Baklanov authored
      Fixes #2560
      caa6851b
  3. 05 Dec, 2015 2 commits
  4. 04 Dec, 2015 24 commits
  5. 03 Dec, 2015 9 commits
    • Kamil Trzciński's avatar
      Merge branch 'ci_docker_docs' into 'master' · 95fd7983
      Kamil Trzciński authored
      fixes #3263 slashes are replaced with two underscores
      
      
      
      See merge request !1981
      95fd7983
    • Kevin Pankonen's avatar
      387e5656
    • Robert Schilling's avatar
      Update .ruby-version to 2.1.7 · 83e6d829
      Robert Schilling authored
      83e6d829
    • Drew Blessing's avatar
      Merge branch 'issue_3468_broken_link' into 'master' · 1481255e
      Drew Blessing authored
      Fixed invalid link on starred projects dashboard.
      
      Fixes #3468
      
      The MR fixes 'Project' links on a dashboard pages headers. See the issue for the details.
      
      This MR does not include tests since the change is rather trivial and there are no (as far as I have seen) existing tests for checking links validity.
      
      In case tests are required I would like to get some guidance on the implementation first. At least I would like to know what should be covered: changed links, all header links, all navigation?
      
      See merge request !1926
      1481255e
    • Dmitriy Zaporozhets's avatar
      Merge branch 'ui/wiki' into 'master' · abb72618
      Dmitriy Zaporozhets authored
      UI: Use new style for wiki
      
      Depends on !1953
      
      See the commits for more details, the messages mostly speak for themselves.
      
      # Highlights
      
      ## Wiki Page
      
      Before:
      
      ![Screen_Shot_2015-12-02_at_17.48.45](/uploads/aa53f768b8760f2e15d765e06d5ff773/Screen_Shot_2015-12-02_at_17.48.45.png)
      
      After:
      
      ![Screen_Shot_2015-12-02_at_17.48.16](/uploads/f8a376651aff9c8de82621578aaeb002/Screen_Shot_2015-12-02_at_17.48.16.png)
      
      ## Edit Wiki Page
      
      Before:
      
      ![Screen_Shot_2015-12-02_at_17.48.59](/uploads/c9ffddaca3156046b99cba11bdb0ea4f/Screen_Shot_2015-12-02_at_17.48.59.png)
      
      After:
      
      ![Screen_Shot_2015-12-02_at_17.48.26](/uploads/1aa62049f120c91436ed68fd7441c156/Screen_Shot_2015-12-02_at_17.48.26.png)
      
      See merge request !1967
      abb72618
    • Dmitriy Zaporozhets's avatar
      Merge branch 'ui/new-project' into 'master' · e7452c6b
      Dmitriy Zaporozhets authored
      UI: New Project form tweaks
      
      Depends on !1953 
      
      See the commits for more details, the messages mostly speak for themselves.
      
      Before:
      
      ![Screen_Shot_2015-12-02_at_17.43.23](/uploads/302e734f6796a85a9f4be9c2f494869d/Screen_Shot_2015-12-02_at_17.43.23.png)
      
      After:
      
      ![Screen_Shot_2015-12-02_at_17.44.11](/uploads/411980e53a4f87cf0a04e5bcb7329f82/Screen_Shot_2015-12-02_at_17.44.11.png)
      
      
      See merge request !1964
      e7452c6b
    • Dmitriy Zaporozhets's avatar
      Merge branch 'ui/issuable-filter' into 'master' · 805b4cf5
      Dmitriy Zaporozhets authored
      UI: Issuable filter tweaks
      
      Depends on !1953
      
      See the commits for more details, the messages mostly speak for themselves.
      
      # Highlights
      
      ## Filter bar
      
      Before:
      
      ![filter_before](/uploads/b061be7521c6d5babb77c7d12e77f65e/filter_before.png)
      
      After:
      
      ![filter_after](/uploads/aadfbcd77caf1b49fde8ca6d781f1004/filter_after.png)
      
      ## Bulk edit bar
      
      Before:
      
      ![bulk_before](/uploads/849c98224e1f335c65c0de5616bbcdae/bulk_before.png)
      
      After:
      
      ![bulk_after](/uploads/185d29116663f9f663acab76d328096f/bulk_after.png)
      
      
      See merge request !1963
      805b4cf5
    • Dmitriy Zaporozhets's avatar
      Merge branch 'bugfix/star_cache' into 'master' · 15ea1285
      Dmitriy Zaporozhets authored
      Touch project when toggling stars to update cache
      
      This is a fix for gitlab-org/gitlab-ce#3513.
      
      When a star toggle event happens, we touch project to clear cache key.
      This will trigger a new "updated_at" at the project model. If it's undesirable, please let me know and I will try to solve it in a different way.
      
      See merge request !1970
      15ea1285
    • Anton Baklanov's avatar
      Fixed invalid link on starred projects dashboard. · c5b6b31c
      Anton Baklanov authored
      Fixes #3468
      c5b6b31c