1. 08 12月, 2015 1 次提交
    • K
      Merge branch 'fix-docker-syntax' into 'master' · 24c7eafb
      Kamil Trzciński 提交于
      Update Docker Syntax
      
      I think this documentation is using an out-of-date docker client. I guess that `-n` means `--name` (there is no `-n` in up-to-date docker) and `-l` means `--link` (`-l` is short for `--label` now).
      
      See merge request !2001
      24c7eafb
  2. 07 12月, 2015 17 次提交
  3. 06 12月, 2015 7 次提交
    • S
      Merge branch 'duplicate_notifications_fix' into 'master' · e2c57a41
      Stan Hu 提交于
      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
    • V
    • A
      Fixed duplicated issue note email notifications. · caa6851b
      Anton Baklanov 提交于
      Fixes #2560
      caa6851b
    • G
      Remove space before exclamation mark in award alert · bfe91b69
      Grzegorz Bizon 提交于
      [ci skip]
      bfe91b69
    • G
    • S
      Merge pull request #9876 from atomaka/atomaka/feature/project-limit-notify · 4294d2cd
      Stan Hu 提交于
      Clarify Project Limit Reached
      4294d2cd
    • A
      Notify user if they cannot create projects · 1c53dc28
      Andrew Tomaka 提交于
      1c53dc28
  4. 05 12月, 2015 8 次提交
    • S
    • S
      Fix Error 500 when creating global milestones with Unicode characters · d800a949
      Stan Hu 提交于
      Two issues:
      
      1. The constraints in the resources were incorrect. Here's what it was before:
      ```
      group_milestone  GET /groups/:group_id/milestones/:id(.:format)  groups/milestones#show {:id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/}
      ```
      
      In this case, id is actually the title of the milestone, which can be anything at the moment.
      
      After:
      
      ```
      group_milestone  GET /groups/:group_id/milestones/:id(.:format)  groups/milestones#show {:id=>/[^\/]+/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/}
      ```
      
      2. `parameterize` would strip all Unicode characters, leaving a blank string. Rails would report something like:
      
      ActionView::Template::Error (No route matches {:action=>"show", :controller=>"groups/milestones", :group_id=>#<Group id: 48, name: "ops-dev", path: "ops-dev", owner_id: nil, created_at: "2015-11-15 08:55:30", updated_at: "2015-12-02 06:23:26", type: "Group", description: "", avatar: "sha1.c71e73d51af1865c1bbbf6208e10044d46c9bb93.png", public: false>, :id=>"", :title=>"肯定不是中文的问题"} missing required keys: [:id]):
      
      This change uses the babosa library to create a better slug, which surprisingly
      isn't actually used by the global milestone controllers. Instead, they use the
      title passed as a query string for some reason.
      
      Closes https://github.com/gitlabhq/gitlabhq/issues/9881
      
      Fix constraints
      d800a949
    • R
      Merge branch 'link-refs' into 'master' · d2f9a901
      Robert Speicher 提交于
      Recognize issue/MR/snippet/commit links as references.
      
      Fixes #3744 and #3745
      
      See merge request !1933
      d2f9a901
    • D
    • R
      Update CHANGELOG · 3c805177
      Robert Speicher 提交于
      [ci skip]
      3c805177
    • D
      Merge branch 'issue_3583' into 'master' · e7e22ece
      Dmitriy Zaporozhets 提交于
      Ensure "Remove Source Branch" button is not shown when branch is being deleted.
      
      Given the merging of the Merge Request happens in the background, sometimes when the client JS code reloads the page the source branch is not still gone.
      
      This fix appends a new query string parameter that is checked in the view before rendering the `Remove Source Branch` button.
      
      Closes #3583
      
      See merge request !1897
      e7e22ece
    • D
      Merge branch 'fix-application-settings-not-expiring' into 'master' · 40143a8e
      Dmitriy Zaporozhets 提交于
      Fix application settings cache not expiring after changes
      
      cache_key is an instance method that relies on updated_at. When changes
      were made, the time-dependent key was being used instead of X.application_setting.last.
      
      Closes #3609 
      
      
      See merge request !1972
      40143a8e
    • D
      Merge branch 'make-current-user-first-in-dropdown' into 'master' · eafa55f1
      Douwe Maan 提交于
      Make current user the first user in assignee dropdown in issues detail page
      
      Closes #3679
      
      See merge request !1913
      eafa55f1
  5. 04 12月, 2015 7 次提交