1. 20 Jun, 2016 9 commits
  2. 18 Jun, 2016 14 commits
  3. 17 Jun, 2016 17 commits
    • Jacob Schatz's avatar
      Merge branch 'assignee-dropdown-selected' into 'master' · 0d21f8c3
      Jacob Schatz authored
      Fixed issue with assignee dropdown not selecting correctly
      
      ## What does this MR do?
      
      Fixes an issue with assignee dropdown not selecting correctly.
      
      See merge request !4762
      0d21f8c3
    • Robert Speicher's avatar
      Merge branch 'repo-check-require-push-events' into 'master' · 989b094f
      Robert Speicher authored
      Do not check repos without push events
      
      Reduce false positives from automatic repository checks by skipping
      projects without push events.
      
      See merge request !4684
      989b094f
    • Robert Speicher's avatar
      Merge branch 'fix-todos-counters' into 'master' · 6fdf383e
      Robert Speicher authored
      Ensure Todos counters doesn't count Todos for projects pending delete
      
      Use `TodosFinder` instead of `current_user.todos` to filter projects
      pending delete on Todos counters helpers.
      
      Counters should not reflect the number of Todos displayed on the tabs.
      
      Fixes #18633
      
      See merge request !4663
      6fdf383e
    • Robert Speicher's avatar
      Merge branch 'disable-saml-account-unlink' into 'master' · 4a7ba511
      Robert Speicher authored
      Disable the unlink feature for SAML connected accounts (social login).
      
      This disables the ability to manually unlink your SAML account, if you have one connected. In certain scenarios, the only allowed login mechanism can be SAML, and if you unlink your account you will be locked out of the system (configuration dependent).
      
      Fixes #18613
      
      See merge request !4662
      4a7ba511
    • Yorick Peterse's avatar
      Merge branch '18034-cache-todo-counter' into 'master' · 1ddd787c
      Yorick Peterse authored
      Cache todo counters (pending/done)
      
      See merge request !4438
      1ddd787c
    • Stan Hu's avatar
      Merge branch '18745-fix' into 'master' · 16171b7d
      Stan Hu authored
      Fix a 'wrong number of arguments' error
      
      ## What does this MR do?
      
      Fixes #18745.
      
      ## Are there points in the code the reviewer needs to double check?
      
      No.
      
      ## Why was this MR needed?
      
      To fix #18745.
      
      ## What are the relevant issue numbers?
      
      Fixes #18745.
      
      ## Does this MR meet the acceptance criteria?
      
      - [ ] 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)
      
      See merge request !4757
      16171b7d
    • Robert Speicher's avatar
      Merge branch 'track-total-method-call-time' into 'master' · c6b99253
      Robert Speicher authored
      Track method call times/counts as a single metric
      
      This changes method call tracking so only a single metric is emitted regardless of the number of calls. This allows us to more accurately measure the total execution time of a method as well as the number of times a method is called. See 851e3ff7578973c2206628424eac3b951a3c656d for more details.
      
      Method call tracking tracked calls individually meaning the end statistics may not always be accurate enough to get a good understanding of where time is spent.
      
      See merge request !4754
      c6b99253
    • Robert Speicher's avatar
      Merge branch 'fix-toggling-task-should-not-generate-todo' into 'master' · 3fa0e159
      Robert Speicher authored
      Fix error when editing an issuable with a task list
      
      Closes #18712
      
      See merge request !4751
      3fa0e159
    • Yorick Peterse's avatar
      Merge branch 'secure-request-uris' into 'master' · 5e3f9ea1
      Yorick Peterse authored
      Filter out sensitive parameters of metrics data
      
      See merge request !4748
      5e3f9ea1
    • Jacob Schatz's avatar
      Merge branch 'new-merge-request-commit-box-fix' into 'master' · c73aeed9
      Jacob Schatz authored
      Fixed styling of commit box in new MR
      
      ## What does this MR do?
      
      Fixes an issue that caused the new merge request commit box to go all funny styled.
      
      ## What are the relevant issue numbers?
      
      #18781 
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-06-17_at_14.08.44](/uploads/b1e34b0c6bf67adc1be8748306e20b06/Screen_Shot_2016-06-17_at_14.08.44.png)
      
      See merge request !4747
      c73aeed9
    • Rémy Coutable's avatar
      Merge branch 'fix/error-when-job-variables-not-defined-but-specified' into 'master' · 7db27be1
      Rémy Coutable authored
      Fix error when CI job variables key used but not specified
      
      ## What does this MR do?
      
      This MR fixes a an error when CI job variables specified, but not defined:
      
      ```yaml
      image: ruby:2.2
      
      test:
        variables:
        script:
           - rspec
      ```
      
      ## What are the relevant issue numbers?
      
      Closes #18764  
      Follow up discussion in: #18775 
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [x] 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] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      
      See merge request !4745
      7db27be1
    • Rémy Coutable's avatar
      Merge branch 'registry-500-fix' into 'master' · d44bf7e3
      Rémy Coutable authored
      Properly support application/json in Container Registry
      
      ## What does this MR do?
      When requesting tags a `application/json` is used by `docker/distribution`.
      
      ## Why was this MR needed?
      Fixes regression introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4669
      
      ## What are the relevant issue numbers?
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18736
      
      
      See merge request !4742
      d44bf7e3
    • Rémy Coutable's avatar
      Merge branch 'make-sure-that-artifacts-file-is-saved' into 'master' · cdd533cc
      Rémy Coutable authored
      Make sure that artifacts_file is nullified after removing artifacts
      
      ## What does this MR do?
      Fixes a problem that `ExpireBuildArtifactsWorker` is executed for all previously removed artifacts.
      
      ## Why was this MR needed?
      Currently the `Ci::Build::erase_artifacts!` doesn't ensure that data are saved to database.
      The bang at end of this method lets you believe that it should do so.
      This adds a missing `save` to this method.
      
      ## What are the relevant issue numbers?
      None, yet.
      
      ## CHANGELOG
      Since this is regression in feature introduce in RC4 no CHANGELOG entry is needed.
      
      cc @grzesiek 
      
      
      See merge request !4741
      cdd533cc
    • Robert Speicher's avatar
      Merge branch 'rs-devise-emails' into 'master' · 3c183d1f
      Robert Speicher authored
      Customize all Devise mails
      
      Continuing from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3354
      
      See merge request !4297
      3c183d1f
    • Douwe Maan's avatar
      Merge branch '2979-personal-access-tokens' into 'master' · a899e7e3
      Douwe Maan authored
      Allow creating Personal Access Tokens through the website
      
      Related to #2979 
      
      - Allow a user to create personal access tokens, and use them to authenticate
      - Refactor `API::Helpers` into `API::Helpers::Core` and `API::Helpers::Authentication`
      
      # Tasks
      
      - [ ]  #2979 (!3749)  - Personal Access Tokens
          - [x]  Basic Implementation
              - [x]  Add UI to add "Personal Access Tokens"
              - [x]  Reload `lib/api` on every request
              - [x]  Respect these tokens for API requests
              - [x]  Just a param or a header too?
              - [x]  Allow revoking tokens
              - [x]  Expire tokens
              - [x]  Left bar should have a "PAT" icon
              - [x]  Scopes?
              - [x]  Copy to Clipboard
              - [x]  Show active/inactive tokens separately
                  - [x]  No need to check for expired/revoked in the appropriate places
              - [x]  Why does regular ApplicationController check for private token?
              - [x]  Support non-API requests
              - [x]  Revert (or work on) `lib/api` eager loading
          - [x]  Create MR
          - [x]  Refactoring
          - [x]  Fix tests
          - [x]  Write more tests
          - [x]  Add screenshots to MR
          - [x]  Add description of query performance to MR
          - [x]  Limit the number of queries in the `personal_access_tokens` page
          - [x]  Wait for CI to pass
          - [x]  Fix merge issues in schema.rb
          - [x]  Assign MR to endboss
          - [x]  Wait for feedback
          - [x]  Fix feedback
              - [x]  Wait for CI to pass
          - [x]  Assign to @rspeicher
          - [x]  Fix @rspeicher's comments
          - [x]  Wait for CI to pass
          - [x]  Assign back to @rspeicher
          - [x]  Write documentation and ping @axil
          - [x]  Wait for Axil to respond
          - [x]  Assign to endboss
          - [x]  Address Douwe's feedback
              - [x]  Use the `private_token` or `authentication_token` param instead of `personal_access_token`
              - [x]  Ditto for the header
          - [x]  Assign to endboss
          - [x]  Make sure CI is green
          - [x]  Address Douwe's feedback
              - [x]  Don't go through the `authenticate_user_from_private_token!` method, if a private token is supplied (or combine them)
              - [x]  In `authenticate_user_from_personal_access_token!` don't hit DB if `token_string` is `nil`
              - [x]  Use `current_user.personal_access_tokens.build` in the controller
              - [x]  Remove the "We aren't using `personal_access_token` as the root param" comment
              - [x]  `No need for = "...", we can just have the Inactive ... #{...} on the next line` in the view
              - [x]  Render dates in a (more) human format
              - [x]  CSS issue with table
              - [x]  Don't show the tokens in the UI indefinitely
              - [x]  How to implement scopes? Add-on to current impl? Doorkeeper?
          - [x]  Wait for @DouweM's comments about scopes
          - [x]  Address @DouweM's second review 
              - [x]  Try not using `native['innerHTML']`
              - [x]  use contexts for all "when ..."
              - [x]  Ensure consistency (styling) with other pages for "You don't have any tokens" message
              - [x]  "Actions" table column doesn't need a label
              - [x]  %td can be moved outside of the if/else statement
              - [x]  The header title should be "Profile Settings"
              - [x]  Can this be a `before_create`, so we don't need to use `generate`?
              - [x]  If it couldn't be revoked, will we show an error?
              - [x]  If it couldn't be saved, will we show an error?
          - [x]  Merge master
          - [x]  Update CHANGELOG entry
          - [x]  Add tests for form errors?
          - [x]  Post screenshots
          - [x]  Tag @jschatz1 for review
          - [x]  Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/0dff6fd/builds) to pass
          - [x]  Respond to @jschatz1's comments
              - [x]  Hardcoded colors should be variables
              - [x]  Should not be allowed to chose a date in the past
              - [x]  Use the same table as in the Applications tab
              - [x]  button should say "Create Personal Access Token"
              - [x]  Float the revoke to the right on the `a`
              - [x]  Change revocation message. "Are you sure you want to revoke this certificate? This action cannot be undone."
              - [x]  Date stays selected and looks selected even though date is set as "never".
              - [x]  ~~hover on the calendar button shifts~~ (not caused by this MR - happens on `milestones#new` as well)
              - [x]  Don't use the panel for the created token
                  - [x]  Use a normal flash for "Your new personal access token has been created"
                  - [x]  Show the input (with the token) below it full width.
                  - [x]  Put the "Make sure you save it - you won't be able to access it again." message near the input
              - [x]  Have the input highlight all on single click
          - [x]  Update screenshots
          - [x]  Merge master in + conflicts
          - [x]  Assign to @jschatz1 again
          - [x]  Respond to @jschatz1's comments
              - [x]  No button for clipboard, only link
              - [x]  text-danger
              - [x]  highlight fade on that area where the token was created
          - [x]  Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/d754d99179f1ffe846fcc1d8e858163b39efc5dc/builds) is green
          - [x]  Assign to @jschatz1
          - [x]  Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/faa0e3f7580bc38d4d12916b4589c64d6c2678a7/builds) to pass
          - [x]  Respond to @DouweM's feedback
              - [x]  move the redirect_to out of the if/else
              - [x]  certificate -> token
              - [x]  datepicker back to text field
              - [x]  combine the get_user_from_private_token and get_user_from_personal_access_token methods in ApplicationController
              - [x]  combine the get_user_from_private_token and get_user_from_personal_access_token methods in `lib/api/helpers`
              - [x]  don't need the new constants
          - [x]  Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/9d7cda3ddce52baad9618466a5d00319b333be57/builds) to pass
          - [ ]  Wait for merge
      
      # Screenshots
      ![Screen_Shot_2016-06-16_at_8.30.33_AM](/uploads/30a168964b7c5e0eb322705747829fb6/Screen_Shot_2016-06-16_at_8.30.33_AM.png)
      ![Screen_Shot_2016-06-16_at_8.30.44_AM](/uploads/7a8202885df6120071bbe81b215aaead/Screen_Shot_2016-06-16_at_8.30.44_AM.png)
      ![Screen_Shot_2016-06-16_at_8.31.02_AM](/uploads/6905c0848864e390138b771389c7a1b2/Screen_Shot_2016-06-16_at_8.31.02_AM.png)
      ![Screen_Shot_2016-06-16_at_8.31.29_AM](/uploads/0bc92369fb2f9bc335773f6abec421c3/Screen_Shot_2016-06-16_at_8.31.29_AM.png)
      
      See merge request !3749
      a899e7e3
    • Douwe Maan's avatar
      Merge branch 'feature/project-export' into 'master' · bf029437
      Douwe Maan authored
      Export project functionality
      
      This is a MR for the export functionality of https://gitlab.com/gitlab-org/gitlab-ce/issues/3050, which adds the ability to export single projects.
      
      - [x] members
      - DB data
        - [x] issues
        - [x] issue comments
        - [x] merge requests
        - [x] merge request diff
        - [x] merge request comments
        - [x] labels
        - [x] milestones
        - [x] snippets
        - [x] releases
        - [x] events
        - [x] commit statuses
        - [x] CI builds
      - File system data
        - [x] Git repository
        - [x] wiki
        - [x] uploads
        - [ ] ~~CI build traces~~
        - [ ] ~~CI build artifacts~~
        - [ ] ~~LFS objects~~
      - DB configuration
        - [x] services
        - [x] web hooks
        - [x] protected branches
        - [x] deploy keys
        - [x] CI variables
        - [x] CI triggers
      
      See merge request !3114
      bf029437
    • Robert Speicher's avatar
      Merge branch 'clipboard-buttons-fix' into 'master' · 923e5d7d
      Robert Speicher authored
      Fix clipboard buttons on "Check out branch" modal.
      
      Closes #18794 
      
      See merge request !4760
      923e5d7d