1. 19 3月, 2016 1 次提交
  2. 18 3月, 2016 1 次提交
  3. 17 3月, 2016 3 次提交
  4. 16 3月, 2016 15 次提交
    • Z
      59064aee
    • R
      Merge branch '12743-subscribe-to-label' into 'master' · bc590ce6
      Rémy Coutable 提交于
      Allow subscribing to labels
      
      This implement #12743 and supersedes !2799 (thanks @timothyandrew!).
      
      - Subscribe (and unsubscribe) for labels
      - When an issue/merge request is created, notify all subscribers of all its labels
      - When an issue/merge request is edited, notify all subscribers of all its newly-added labels
      
      ## Done
      
      - [x] Verify that a user is signed in to subscribe/unsubscribe from a label.
      - [x] Merge conflicts
      - [x] Integration tests
      - [x] `issuable.subscribed?` should check subscribers and participants
      - [x] When an issuable is relabeled, notify subscribers of the *newly added* labels only
      - [x] Screenshots:
      
      ### Labels page
      
      ![Screen_Shot_2016-03-07_at_19.05.44](/uploads/3e69064e9e1a06ee2e27c778776c1407/Screen_Shot_2016-03-07_at_19.05.44.png)
      
      ### HTML email
      
      ![Screen_Shot_2016-03-07_at_19.07.36](/uploads/e484e06366a738385f1f6d71b52eecf7/Screen_Shot_2016-03-07_at_19.07.36.png)
      
      ### Plain text email
      
      ![Screen_Shot_2016-03-07_at_19.07.50](/uploads/dc05f710a8f7ab5eae9f72aa2110e741/Screen_Shot_2016-03-07_at_19.07.50.png)
      
      PS: I've set the milestone to 8.6 since it's getting late for 8.5...
      
      See merge request !3115
      bc590ce6
    • Z
      Doc external users feature · aaf4434b
      Zeger-Jan van de Weg 提交于
      aaf4434b
    • R
    • R
      c98089b2
    • R
      Improving the original label-subscribing implementation · 54ec7e95
      Rémy Coutable 提交于
      1. Make the "subscribed" text in Issuable sidebar reflect the labels
         subscription status
      
      2. Current user mut be logged-in to toggle issue/MR/label subscription
      54ec7e95
    • R
      Add 8.5.6 CHANGELOG items · ac8c6f24
      Rémy Coutable 提交于
      [ci skip]
      ac8c6f24
    • J
      Merge branch 'css-style-guide' into 'master' · 37707ac5
      Jacob Schatz 提交于
      CSS style guide
      
      Working towards what was discussed in #13552, this adds the [SCSS Linter gem](https://github.com/brigade/scss-lint) for style guide conformity in CI.
      
      TODO:
      - [x] Agree on and write SCSS Style Guide Documentation.
      - [x] Document the `scss-lint` config file.
      - [x] Figure out how best to run this in CI, right now it's taking longer than I would think it should.
      - [x] Use CSSComb for auto-correction (Maybe just include a CSSComb config file and have developers run the node package manually if they're interested in using it?).
      
      My logic for not using CSSComb in the first place is that, AFAIK, we don't currently require Node/NPM, even in the dev environment. Maybe I'm wrong about that? `scss-lint` is a Ruby implementation of a similar concept, but it doesn't include autocorrect.
      
      Is there a way we can run get GitLab CI to run `scss-lint` without having to put together the full GitLab application? Seeing as it's just static analysis, it seems like a waste of time/resources.
      
      /cc @jschatz1 @rspeicher
      
      See merge request !3069
      37707ac5
    • R
      Merge branch 'if-statement-syntax-fix' into 'master' · 0602091f
      Robert Speicher 提交于
      Remove parentheses from if statement
      
      Otherwise Rubocop will give a warning after we upgrade it.
      
      As discussed in !3197.
      
      [ci skip]
      
      See merge request !3231
      0602091f
    • C
      Remove parentheses from if statement · 0129f346
      connorshea 提交于
      Otherwise Rubocop will give a warning.
      
      As mentioned in !3197.
      0129f346
    • T
      Original implementation to allow users to subscribe to labels · 0444fa56
      Timothy Andrew 提交于
      1. Allow subscribing (the current user) to a label
      
      - Refactor the `Subscription` coffeescript class
        - The main change is that it accepts a container, and conducts all
          DOM queries within its scope. We need this because the labels
          page has multiple instances of `Subscription` on the same page.
      
      2. Creating an issue or MR with labels notifies users subscribed to those labels
      
      - Label `has_many` subscribers through subscriptions.
      
      3. Adding a label to an issue or MR notifies users subscribed to those labels
      
      - This only applies to subscribers of the label that has just been
        added, not all labels for the issue.
      0444fa56
    • R
      Merge branch 'fix-activerecord-join-stupidity' into 'master' · 178c80a5
      Robert Speicher 提交于
      Ignore eager loading in Project.search UNION
      
      This fixes issues such as filtering groups by names on pages such as
      https://gitlab.com/dashboard/groups.
      
      See merge request !3229
      178c80a5
    • R
      Merge branch 'todos-title-attr' into 'master' · 09494ff4
      Robert Speicher 提交于
      Set link title for todos. Closes #14042
      
      See merge request !3161
      09494ff4
    • Y
      Merge branch 'external-issue-tracker' into 'master' · b5a47c0a
      Yorick Peterse 提交于
      See merge request !3218
      b5a47c0a
    • J
      Merge branch 'patch-1' into 'master' · 07325005
      Jeroen van Baarsen 提交于
      Fix typo in Ruby CI test and deploy example
      
      [skip ci]
      
      See merge request !3201
      07325005
  5. 15 3月, 2016 20 次提交