1. 20 Dec, 2016 24 commits
  2. 19 Dec, 2016 16 commits
    • Kamil Trzcinski's avatar
      Merge branch 'introduce-build-minutes' of gitlab.com:gitlab-org/gitlab-ee into... · 35b94edd
      Kamil Trzcinski authored
      Merge branch 'introduce-build-minutes' of gitlab.com:gitlab-org/gitlab-ee into introduce-build-minutes
      35b94edd
    • Mike Greiling's avatar
    • Mike Greiling's avatar
      add feature tests for CI limit warnings · 90741eea
      Mike Greiling authored
      90741eea
    • Mike Greiling's avatar
      a0b99f45
    • Alejandro Rodríguez's avatar
      Update CHANGELOG.md for 8.13.10 · cb6ffd9c
      Alejandro Rodríguez authored
      [ci skip]
      cb6ffd9c
    • Alejandro Rodríguez's avatar
      Update CHANGELOG-EE.md for 8.13.10-ee · 9f309fbe
      Alejandro Rodríguez authored
      [ci skip]
      9f309fbe
    • Alejandro Rodríguez's avatar
      Update CHANGELOG.md for 8.14.5 · 8ec718fa
      Alejandro Rodríguez authored
      [ci skip]
      8ec718fa
    • Alejandro Rodríguez's avatar
      Update CHANGELOG-EE.md for 8.14.5-ee · 57a3410e
      Alejandro Rodríguez authored
      [ci skip]
      57a3410e
    • Alfredo Sumaran's avatar
      Merge branch '789-geo-clone-ui' into 'master' · f8bfa469
      Alfredo Sumaran authored
      Geo: Improve project view UI to teach users how to clone from a secondary Geo node and push to a primary.
      
      This Merge request adds a new button into the "repository clone widget" to guide Geo (#76) users how to define a different remote URL for pushing code.
      We can infer the primary's node URL when using `HTTP` method, but not for `SSH` or `Kerberos` (as they can vary according to configuration defined into config files).
      
      For the `HTTP` method the instruction will be "complete", while for the others there will be a placeholder instead of the primary's node URL for that repository.  (See screenshots below)
      
      Checklist
      - [x] Display a button after the clipboard icon only in secondary Geo nodes
      - [x] Clicking in the Geo info button, shows up a dialog with instructions
      - [x] Instructions use the selected clone mode to display correct text (HTTP/SSH/KERBEROS)
      
      Closes #789
      
      ----
      
      ![http_clone](/uploads/4e0298faab6ea602aba158e61d7a3d2c/http_clone.png)
      
      ![ssh_clone](/uploads/2e9d421de842db0a938c181326522fd2/ssh_clone.png)
      
      See merge request !905
      f8bfa469
    • Mike Greiling's avatar
    • Douglas Barbosa Alexandre's avatar
      Merge branch 'ce-to-ee' into 'master' · 4e86cbda
      Douglas Barbosa Alexandre authored
      CE upstream
      
      Unmerged paths: (use "git add/rm ..." as appropriate to mark resolution)
      
      ```
      both modified:   Gemfile.lock
      both modified:   app/assets/javascripts/diff_notes/diff_notes_bundle.js.es6
      both modified:   app/assets/javascripts/merge_request_widget.js.es6
      both modified:   app/assets/javascripts/protected_branches/protected_branch_dropdown.js.es6
      both modified:   app/assets/javascripts/protected_branches/protected_branch_edit.js.es6
      both modified:   app/assets/stylesheets/framework/variables.scss
      both added:      app/controllers/concerns/oauth_applications.rb
      both modified:   app/controllers/concerns/service_params.rb
      both modified:   app/helpers/projects_helper.rb
      both modified:   app/helpers/sorting_helper.rb
      both modified:   app/models/project.rb
      both modified:   app/policies/group_member_policy.rb
      both modified:   app/policies/group_policy.rb
      both modified:   app/views/projects/merge_requests/widget/_open.html.haml
      both modified:   app/views/projects/merge_requests/widget/open/_accept.html.haml
      both added:      changelogs/unreleased/25482-fix-api-sudo.yml
      both modified:   config/application.rb
      both modified:   config/gitlab.yml.example
      both modified:   db/schema.rb
      both modified:   doc/README.md
      deleted by them: features/admin/settings.feature
      both modified:   features/steps/shared/paths.rb
      both modified:   lib/api/helpers.rb
      both modified:   public/500.html
      both modified:   public/502.html
      both modified:   spec/features/admin/admin_settings_spec.rb
      both modified:   spec/javascripts/awards_handler_spec.js
      both modified:   spec/lib/gitlab/auth_spec.rb
      both modified:   spec/models/project_services/chat_message/pipeline_message_spec.rb
      both modified:   spec/requests/api/helpers_spec.rb
      ```
      
      See merge request !974
      4e86cbda
    • Kamil Trzcinski's avatar
      Fixed cron settings · 3e147204
      Kamil Trzcinski authored
      3e147204
    • Kamil Trzcinski's avatar
      Added a first bunch of tests · acaa36cb
      Kamil Trzcinski authored
      acaa36cb
    • Rémy Coutable's avatar
      Quick fix issuable update when only time spent is updated · 2bfde899
      Rémy Coutable authored
      Since 9f97fa4d, we don't always set label_ids, meaning that we don't
      call `issuable.update` is `params` are empty. The issue is that if you
      only send a `/spent 5m` command, it builds an associated `timelogs`
      record on the issuable that is only save when we update the issuable.
      
      For now, we check that if we have a `spent_time`, we need to update the
      issuable in order to save the associated record. This should be
      improved.
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      2bfde899
    • Kamil Trzcinski's avatar
      Fix specs · 9ca8ea6c
      Kamil Trzcinski authored
      9ca8ea6c
    • Douglas Barbosa Alexandre's avatar
      208f1f27