1. 15 Jun, 2016 1 commit
  2. 14 Jun, 2016 39 commits
    • Yorick Peterse's avatar
      Merge branch '18449-instrument-grape-endpoints' into 'master' · 0ca7b3ba
      Yorick Peterse authored
      Instrument Grape API endpoints
      
      See merge request !4587
      0ca7b3ba
    • Yorick Peterse's avatar
      Merge branch '18527-instrument-private-methods' into 'master' · f558bf0d
      Yorick Peterse authored
      Instrument private methods and instance private methods
      
      See merge request !4639
      f558bf0d
    • Dmitriy Zaporozhets's avatar
      Merge branch 'settings-dropdown-permissions' into 'master' · d4cd6dca
      Dmitriy Zaporozhets authored
      Fix displaying of project settings links the user cannot access.
      
      ## What does this MR do?
      
      It fixes the Project Settings dropdown displaying project settings links that the user cannot actually access.
      
      ## Are there points in the code the reviewer needs to double check?
      
      I've tested combinations I can think of, feel free to mess around with and see if it breaks?
      
      ## Why was this MR needed?
      
      Users were seeing links in the Project Settings dropdown that they shouldn't have seen, if they clicked them they would be shown permission errors.
      
      ## What are the relevant issue numbers?
      
      #18294 
      
      ## Screenshots (if relevant)
      
      Users without any permissions:
      
      ![Screen_Shot_2016-06-10_at_10.41.27_AM](/uploads/b70ca18a36b5f774b85694d8f1728882/Screen_Shot_2016-06-10_at_10.41.27_AM.png)
      
      Guest members of the project:
      
      ![Screen_Shot_2016-06-10_at_10.48.36_AM](/uploads/a37986b4daa789063661c2fa8cf59d43/Screen_Shot_2016-06-10_at_10.48.36_AM.png)
      
      Full permissions:
      
      ![Screen_Shot_2016-06-10_at_10.41.57_AM](/uploads/4c5cc97962e69a1a72ee8e237591ec22/Screen_Shot_2016-06-10_at_10.41.57_AM.png)
      
      cc: @dzaporozhets @annabeldunstone @jschatz1 
      
      See merge request !4599
      d4cd6dca
    • Rémy Coutable's avatar
      Merge branch 'artifacts-expire-date' into 'master' · 95a7fbe9
      Rémy Coutable authored
      Artifacts expire date
      
      What do you think @grzesiek?
      
      The syntax will be simple:
      ```
      job:
        artifacts:
          expire_in: 7d
      ```
      
      - [x] Implement `expire_in`
      - [x] Check current design of expiry information with @jschatz1 and @markpundsack 
      - [x] Add tests in GitLab application for a `ExpireBuildArtifactsWorker` and for `ArtifactsController::keep`
      - [x] Add user documentation how to use `artifacts:expire_in`
      - [x] Prepare GitLab Runner changes to pass `expire_in`: gitlab-org/gitlab-ci-multi-runner!191
      - [x] Fix `timeago` with help of @jschatz1
      - [x] Merge latest master after builds view changes @iamphill
      - [ ] Add Omnibus support for `expire_build_artifacts_worker` cron job
      - [ ] Add documentation how to configure `expire_build_artifacts_worker`
      
      This is based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4201.
      
      See merge request !4200
      95a7fbe9
    • Achilleas Pipinellis's avatar
      Merge branch 'update-ci-api-docs' into 'master' · 1c0c5232
      Achilleas Pipinellis authored
      Update CI API docs
      
      Since CI is now part of GitLab, it makes sense to group all API related endpoints under
      one location. This is a step towards the much awaited issue of doc restructure
      https://gitlab.com/gitlab-org/gitlab-ce/issues/3349
      
      Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18404
      
      See merge request !4567
      1c0c5232
    • Paco Guzman's avatar
      Instrument private/protected methods · dadc5313
      Paco Guzman authored
      By default instrumentation will instrument public,
      protected and private methods, because usually
      heavy work is done on private method or at least
      that’s what facts is showing
      dadc5313
    • Yorick Peterse's avatar
      Merge branch 'zj-rework-migration-award-emoji' into 'master' · fdcafe72
      Yorick Peterse authored
      Fix timing issues on convertion migration award emoji
      
      See merge request !4581
      fdcafe72
    • Kamil Trzcinski's avatar
    • Achilleas Pipinellis's avatar
      Fix grammar and syntax · f2f5a115
      Achilleas Pipinellis authored
      f2f5a115
    • Kamil Trzcinski's avatar
    • Achilleas Pipinellis's avatar
      Update CI API docs · 47c9b7d3
      Achilleas Pipinellis authored
      - Move ci/api under api/ci
      - Clean up builds.md and runners.md
      - Replace old links with new ones
      - Add CI API links in ci/README.md
      47c9b7d3
    • Yorick Peterse's avatar
      Merge branch '18528-cpu-time-instrumentation' into 'master' · 4b964011
      Yorick Peterse authored
      Measure CPU time for instrumented methods
      
      See merge request !4640
      4b964011
    • Paco Guzman's avatar
      Instrument Grape Endpoint with Metrics::RackMiddleware · 509082ba
      Paco Guzman authored
      Generating the following tags
      
      Grape#GET /projects/:id/archive
      
      from Grape::Route objects like
      
      { :path => /:version/projects/:id/archive(.:format)
        :version => “v3”,
        :method => “GET” }
      
      Use an instance variable to cache raw_path transformations.
      This variable is only going to growth to the number of 
      endpoints of the API, not with exact different requests
      
      We can store this cache as an instance variable because 
      middleware are initialised only once
      509082ba
    • Achilleas Pipinellis's avatar
      Merge branch 'registry-example' into 'master' · ab3fb00c
      Achilleas Pipinellis authored
      Update CI Docker docs
      
      ## What does this MR do?
      
      Updates documentation with:
      
      * instructions for bind-mounting for docker runners (fixes #17769 and #13898)
      * examples of using the GitLab Container Registry in docker-based builds (fixes #17968 and #17967)
      * update runner instructions for `gitlab-ci-multi-runner` (fixes https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1337)
      * some grammar fixes
      
      ## Are there points in the code the reviewer needs to double check?
      
      The markdown in general. The runner commands. I haven't been able to verify the socket version works yet.
      
      ## Why was this MR needed?
      
      Better documentation for users.
      
      ## What are the relevant issue numbers?
      #17769, #13898, #17968, #17967 
      
      ## Screenshots (if relevant)
      
      See merge request !4524
      ab3fb00c
    • Rémy Coutable's avatar
      Merge branch 'refactor/ci-config-add-global-entry' into 'master' · 47cdb699
      Rémy Coutable authored
      Add global entry with before script to new CI config
      
      ## What does this MR do?
      
      This MR adds a new entries to a new CI config class. It is next refactoring step after !4462.
      
      See #15060
      
      See merge request !4482
      47cdb699
    • Paco Guzman's avatar
      Measure CPU time for instrumented methods · 120fbbd4
      Paco Guzman authored
      120fbbd4
    • Douwe Maan's avatar
      Merge branch 'fix-markdown-spec' into 'master' · 066020fc
      Douwe Maan authored
      Add whitelisted elements correctly in sanitization
      
      Add whitelisted elements correctly in sanitization
      
      Consider this command:
      
          bundle exec rails r "include GitlabMarkdownHelper
          puts markdown('<span>this is a span</span>', pipeline: :description)
          puts markdown('<span>this is a span</span>')"
      
      And the same in the opposite order:
      
          bundle exec rails r "include GitlabMarkdownHelper
          puts markdown('<span>this is a span</span>')
          puts markdown('<span>this is a span</span>', pipeline: :description)"
      
      Before this change, they would both output:
      
          <p><span>this is a span</span></p>
          <p>this is a span</p>
      
      That's because `span` is added to the list of whitelisted elements in
      the `SanitizationFilter`, but this method tries not to make the same
      changes multiple times. Unfortunately,
      `HTML::Pipeline::SanitizationFilter::LIMITED`, which is used by the
      `DescriptionPipeline`, uses the same Ruby objects for all of its hash
      values _except_ `:elements`.
      
      That means that whichever of `DescriptionPipeline` and `GfmPipeline` is
      called first would have `span` in its whitelisted elements, and the
      second wouldn't.
      
      Fix this by adding a special check for modifying `:elements` twice, then
      checking `:transformers` as before.
      
      
      See merge request !4588
      066020fc
    • Yorick Peterse's avatar
      Fixed locking syntax for PostgreSQL · c6744b49
      Yorick Peterse authored
      c6744b49
    • Yorick Peterse's avatar
      Move LOCK TABLES to a separate execute · d032c6b0
      Yorick Peterse authored
      MySQL apparently doesn't support executing multiple queries in the same
      `execute` call so we have to use a separate one for the "LOCK TABLES"
      statement.
      d032c6b0
    • Z.J. van de Weg's avatar
      Fix MySQL migration, obtain lock the right way · fc5b3a8f
      Z.J. van de Weg authored
      As suggested by @yorrickpeterse in
      https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4581#note_12373882
      the locking of the MySQL database wasn't correct.
      fc5b3a8f
    • Z.J. van de Weg's avatar
      Fix timing issues on convertion migration award emoji · f8290c28
      Z.J. van de Weg authored
      This commit does two things:
      1. It adds logic which prevents timing issues when running the
      migration. During the migration, notes can be created which _should_
      be award emoji and thus migrated. To prevent these timing issues, a
      lock is obtained on the table (MySQL) or on Transaction level (PG).
      2. There was no down migration before as you'd probably lose some data.
      Data effected is all awards on notes. These could be migrated back, as
      the noteable type would just be Note, though this would litter the DB
      with data which should not be there. This down migration does not yet
      delete the table.
      f8290c28
    • Kamil Trzcinski's avatar
    • Kamil Trzcinski's avatar
      Fix specs · 60e0137c
      Kamil Trzcinski authored
      60e0137c
    • Douwe Maan's avatar
      Merge branch 'confidential-issues-in-private-projects' into 'master' · 0c0ef7df
      Douwe Maan authored
      Allow users to create confidential issues in private projects
      
      Closes #14787
      
      ## What does this MR do?
      
      Allow users to create confidential issues in private projects, and exclude access to them to project members with `Guest` role.
      
      ## Are there points in the code the reviewer needs to double check?
      
      The query generated by the `User#authorized_projects` method.
      
      ## Why was this MR needed?
      
      Community have been requesting this feature.
      
      ## What are the relevant issue numbers?
      
      https://gitlab.com/gitlab-org/gitlab-ce/issues/14787
      
      https://gitlab.com/gitlab-org/gitlab-ce/issues/3678
      
      ## Screenshots (if relevant)
      
      Not relevant.
      
      ## Todo
      
      - [x] Allow users to create confidential issues in private projects
      - [x] Project members with `Guest` role should not have access to confidential issues
      - [ ] ~~Apply changes in EE + Elasticsearch~~ Will be done in another MR, when this got merged
      
      See merge request !3471
      0c0ef7df
    • Grzegorz Bizon's avatar
      30e946ce
    • Grzegorz Bizon's avatar
      59eeec3f
    • Rémy Coutable's avatar
      Merge branch 'bentolor/gitlab-ce-fix/bamboo-service-trigger-auth' into 'master' · 0068ba8d
      Rémy Coutable authored
      Bamboo & TeamCity Services: Fix missing credentials & URL handling
      
      _Note: Originally opened at !4367 by @bentolor_
      
      I've also fixed the URL handling for TeamCity which is very similar to Bamboo implementation-wise.
      
      -----
      
      *Note:* This is a port from my [original pull request on GitHub](https://github.com/gitlabhq/gitlabhq/pull/9428)
      
      ## What does this MR do?
      This improves the Bamboo Service and provides two fixes:
      
      1. One for the situation, where the build trigger won't work because Bamboo is requiring authentication credentials for the trigger GET: 8f25aca307b49ee006172b8c2985a878800aa6b6
      2. One which fixes the way how the configured Bamboo base URL is assembled to the final REST URL. fe9eb30d7ebe4a83eefea7e06f8b69b135dad15d
      
      ### Regarding credentials
      The change now does provide additional HTTP Basic Auth parameters if user credentials were provided and appends an request parameter indicating the HTTP Basic Authentication should be used. This aligns interaction with Bamboo with the other calls this service executes.
      
      ### Regarding URL handling
      If one had configured a `bamboo_url` like http://foo.bar/bamboo in the previous implementation the plugin directed it's request i.e. to http://foo.bar/rest/... instead of http://foo.bar/bamboo/rest/...
      
      
      ## Are there points in the code the reviewer needs to double check?
      The second issues was probably an unwanted side effect of how Ruby's `URI.join` is working. It will only work correctly, if 
      - ... the prefix URL has at least one or more  trailing `/`
      - .. the appendix parts are _not_ prefixed with `/`
      
      I need try & figure it out using the rather lacking, official stdlib documentation and playing around in `irb`. As I'm an absolute Ruby novice I'm unable to add/provide new tests.
      
      ## Why was this MR needed?
      Because Gitlab does not work in our Bamboo-Environment at all: Neither it is able to trigger Bamboo runs nor does the Merge status check work. This MR at least fixes the trigger issues.
      
      ## What are the relevant issue numbers?
      This MR originates from my [original pull request on GitHub](https://github.com/gitlabhq/gitlabhq/pull/9428).
      Sadly the issue, that the merge status is still not working correctly for branches will still not work. But at least the trigger works. 
      
      There happened to be very much discussion about the branch status issue in #1355 and  #2562 though that one is lost as the author retracted his branch. 
      
      See merge request !4408
      0068ba8d
    • Rémy Coutable's avatar
      Merge branch 'issue_14572' into 'master' · a78cd2ec
      Rémy Coutable authored
      Add more information into RSS feed for issues
      
      ## What does this MR do?
      
      This MR adds issue text, labels , milestone, assignee and due date into issues RSS feed.
      
      ## Are there points in the code the reviewer needs to double check?
      
      #14572 requests to add 'weight' among other fields. Seems like issue weight is available
      in enterprise edition only so it is not implemented in this MR. Please correct me if I'm wrong.
      
      ## Why was this MR needed?
      
      This MR is needed because it extends issues RSS feed with useful information requested in
      #14572.
      
      ## What are the relevant issue numbers?
      
      https://gitlab.com/gitlab-org/gitlab-ce/issues/14572
      
      See merge request !4158
      a78cd2ec
    • Rémy Coutable's avatar
      Fix broken URI joining for `teamcity_url` with suffixes · 2f7b2057
      Rémy Coutable authored
      If one had configured a `teamcity_url` like http://foo.bar/teamcity in
      the previous implementation the plugin directed it's request i.e. to
      http://foo.bar/httpAuth/... instead of http://foo.bar/teamcity/httpAuth/...
      
      `URI.join` only works correctly, if the prefix URL has
        - at least one or more  trailing '/'
        - the appended parts are _not_ prefixed with '/'
      
      The current implementation should work with all sorts of TeamCity base
      URLs.
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      2f7b2057
    • Rémy Coutable's avatar
    • Benjamin Schmid's avatar
      Fix broken URI joining for `bamboo_url` with suffixes · 46f3cd7c
      Benjamin Schmid authored
      If one had configured a `bamboo_url` like http://foo.bar/bamboo in the
      previous implementation the plugin directed it's request i.e. to
      http://foo.bar/rest/... instead of http://foo.bar/bamboo/rest/...
      
      `URI.join` only works correctly, if the prefix URL has
        - at least one or more  trailing '/'
        - the appended parts are _not_ prefixed with '/'
      
      The current implementation should work with all sorts of Bamboo base URLs.
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      46f3cd7c
    • Benjamin Schmid's avatar
      Honor credentials on calling Bamboo CI trigger · 84b07f70
      Benjamin Schmid authored
      This improves the Bamboo Service and provides a fix for situations,
      where the build trigger won't work, because Bamboo is requiring
      authentication also for the trigger GET.
      
      The change now does provide additional HTTP Basic Auth parameters
      if user credentials were provided and appends an request parameter
      indicating the HTTP Basic Authentication should be used.
      This aligns interaction with Bamboo with the other calls this service
      executes.
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      84b07f70
    • Rémy Coutable's avatar
      Merge branch 'retry-spinach-tests' into 'master' · 121c6322
      Rémy Coutable authored
      Retry spinach tests in case of failure using rerun reporter
      
      ## What does this MR do?
      
      Fixes Spinach tests to retry on tests on master
      
      
      See merge request !4539
      121c6322
    • Mark Pundsack's avatar
      Remove our · 6ed7fcad
      Mark Pundsack authored
      6ed7fcad
    • Mark Pundsack's avatar
      De-note-ify · 8df7d90d
      Mark Pundsack authored
      8df7d90d
    • Mark Pundsack's avatar
      Clarify dind example · aefb08cb
      Mark Pundsack authored
      aefb08cb
    • Mark Pundsack's avatar
      Make minor grammar change · 4c571041
      Mark Pundsack authored
      4c571041
    • Mark Pundsack's avatar
      Make Achilleas' suggested changes · f95791d4
      Mark Pundsack authored
      f95791d4
    • Mark Pundsack's avatar
      Use docker:latest · a7caea9e
      Mark Pundsack authored
      a7caea9e