1. 05 10月, 2016 30 次提交
  2. 04 10月, 2016 10 次提交
    • L
      Merge remote-tracking branch 'upstream/master' into all-skipped-equals-success · aafb0171
      Lin Jen-Shin 提交于
      * upstream/master: (55 commits)
        Restrict failed login attempts for users with 2FA
        Update RuboCop to 0.43.0 and update configuration
        Use SELECT 1, instead SELECT COUNT(*) to ask for notes existency
        Simplify Mentionable concern instance methods
        Fix issues importing services via Import/Export
        deployment refs in own folder, new method for creating refs
        Update method name
        Save a fetchable ref per deployement
        GrapeDSL for Namespace endpoint
        Remove SCSS rules for short hex chars.
        Fix bug when trying to cache closed issues from external issue trackers
        Upgrade acts-as-taggable-on from 3.5.0 to 4.0.0.
        Remove useless code now that Member#add_user handles it
        Combine requestFileSuccess arguments into `opts`
        Append issue template to existing description
        Invert method's naming
        Fix a few things after the initial improvment to Members::DestroyService
        Improve Members::DestroyService
        Add Container Registry on/off status to admin area
        Enable Lint/StringConversionInInterpolation cop and autocorrect offenses
        ...
      aafb0171
    • R
      Merge branch 'rs-update-rubocop' into 'master' · c38b85f3
      Rémy Coutable 提交于
      Update RuboCop to 0.43.0 and update configuration
      
      `Style/VariableNumber` is explicitly disabled because I don't think we
      care if we name a variable `var_1` or `var1`.
      
      See merge request !6670
      c38b85f3
    • P
      Fixed banzai test failures · f377f826
      Phil Hughes 提交于
      f377f826
    • R
      Merge branch 'restrict-failed-2fa-attempts' into 'master' · b8005b61
      Rémy Coutable 提交于
      Restrict failed login attempts from users with 2FA enabled.
      
      Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19799.
      
      See merge request !6668
      b8005b61
    • S
      Restrict failed login attempts for users with 2FA · 194fbc3c
      Sean McGivern 提交于
      Copy logic from `Devise::Models::Lockable#valid_for_authentication?`, as
      our custom login flow with two pages doesn't call this method. This will
      increment the failed login counter, and lock the user's account once
      they exceed the number of failed attempts.
      
      Also ensure that users who are locked can't continue to submit 2FA
      codes.
      194fbc3c
    • K
      Merge branch 'zj-save-environment-deployment-refs' into 'master' · 385817a1
      Kamil Trzciński 提交于
      Save a fetchable ref per deployement
      
      cc @DouweM @ayufan
      
      See merge request !6618
      385817a1
    • P
      Removed puts code 🙈 · cd2556e7
      Phil Hughes 提交于
      cd2556e7
    • P
      Adds v-pre to code blocks in comments · 138e26b1
      Phil Hughes 提交于
      Closes #22911
      138e26b1
    • F
      Merge branch '22343-honor-user-fixed-layout-pref' into 'master' · 88fa5916
      Fatih Acet 提交于
      Ensure the 'fixed layout' preference is honored whenever possible
      
      ## What does this MR do?
      
      Currently, when viewing any Merge Request the user's fixed-layout preference is overridden if they have set "Side-by-Side" view as their preference when viewing diffs.  This makes sense if they are currently viewing a diff, but this is confusing when their layout preference is overridden while they are on another tab (i.e. "Discussion" or "Builds").
      
      This MR moves all responsibility for overriding the fixed layout from the Ruby page layout helper into frontend JavaScript where it is only applied when needed.
      
      ## Are there points in the code the reviewer needs to double check?
      
      Check that nothing broke for users which have their layout preference set to "Fluid" as well as those which have it set to "Fixed".  I've already done this but double checking is always good idea 😄.
      
      ## Screenshots (if relevant)
      
      ![side-by-side-toggle-fixed](/uploads/033dc73e70b73da5692b75606733c938/side-by-side-toggle-fixed.gif)
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - Tests
        - [ ] 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)
      
      ## What are the relevant issue numbers?
      
      Closes #22343 
      
      ## Other Notes
      
      As @lbennett noted in #22343, this is something of a band-aid.  It fixed most of the issue, but we still need to have a discussion about whether or not is acceptable to override user layout preferences for "Side-by-Side" views in general.  At least this MR limits the scope of this behavior to a single tab within an MR or merge conflict page.
      
      See merge request !6422
      88fa5916
    • R
      Update RuboCop to 0.43.0 and update configuration · 961c53c2
      Robert Speicher 提交于
      `Style/VariableNumber` is explicitly disabled because I don't think we
      care if we name a variable `var_1` or `var1`.
      961c53c2