1. 14 Jun, 2016 40 commits
    • Alfredo Sumaran's avatar
      a0d58a83
    • Alfredo Sumaran's avatar
      Turn off handlers before binding events · 72d87d6c
      Alfredo Sumaran authored
      72d87d6c
    • Jacob Schatz's avatar
      Merge branch 'nav-horizontal-alignment' into 'master' · 400b4159
      Jacob Schatz authored
      Aligned the two navs horizontally
      
      ## What does this MR do?
      
      Previously the 2 top navs were not aligned horizontally together. The top nav would be slightly to the left due to the settings dropdown. This corrects that by putting `position: absolute` on the dropdown toggle.
      
      ## What are the relevant issue numbers?
      
      Closes #18513 
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-06-13_at_10.20.22](/uploads/46f39a84dde74707578970f70ddda511/Screen_Shot_2016-06-13_at_10.20.22.png)
      
      See merge request !4616
      400b4159
    • Rémy Coutable's avatar
      Merge branch 'update-allocations-gem-fix-names' into 'master' · a50af363
      Rémy Coutable authored
      Update allocations Gem & ignore classes without names
      
      ## What does this MR do?
      
      1. Updates the allocations Gem to 1.0.5 so it can be used on 2.2/2.3 without crashing
      2. Changes the background sampler to ignore classes/modules without a name (as we can't do much with these)
      
      ## Are there points in the code the reviewer needs to double check?
      
      No.
      
      ## Why was this MR needed?
      
      Using MRI 2.2 or 2.3 would lead to a segmentation fault in the allocations Gem, sometimes this problem would also occur on 2.1
      
      ## What are the relevant issue numbers?
      
      Not an issue, but the merge request that highlighted these problems: !3807
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
      - [ ] ~~API support added~~
      - [ ] Tests
        - [x] Added for this feature/bug
        - [ ] All builds are passing
      - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
      - [ ] 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 !4645
      a50af363
    • Phil Hughes's avatar
      Removed console.log · 0b1eea8f
      Phil Hughes authored
      Uses outerWidth instead of width
      0b1eea8f
    • Douwe Maan's avatar
      Merge branch 'revert-06e0ef07' into 'master' · 9a61eada
      Douwe Maan authored
      Revert "Added API endpoint for Sidekiq Metrics"
      
      @DouweM please merge my accidental push to master.
      
      See merge request !4651
      9a61eada
    • Patricio Cano's avatar
      Revert "Added API endpoint for Sidekiq Metrics" · 6023dc35
      Patricio Cano authored
      This reverts commit 06e0ef07
      6023dc35
    • Patricio Cano's avatar
      Added API endpoint for Sidekiq Metrics · 06e0ef07
      Patricio Cano authored
      06e0ef07
    • Yorick Peterse's avatar
      7eabc67e
    • Yorick Peterse's avatar
      Filter out classes without names in the sampler · ab91f122
      Yorick Peterse authored
      We can't do a lot with classes without names as we can't filter by them,
      have no idea where they come from, etc. As such it's best to just ignore
      these.
      ab91f122
    • Yorick Peterse's avatar
      Update the allocations Gem to 1.0.5 · 82090d29
      Yorick Peterse authored
      This allows it to be used on Ruby 2.3 without it crashing all the time.
      82090d29
    • Jacob Schatz's avatar
      Merge branch '18539-nav-alignment' into 'master' · c6cc7680
      Jacob Schatz authored
      Put all sidebar icons in fixed width container
      
      ## What does this MR do?
      Puts all icons (font awesome and custom) in fixed width container to fix weird alignment
      
      ## Why was this MR needed?
      Mix of font awesome icons & custom icons results in different icon widths
      
      ## What are the relevant issue numbers?
      Closes #18539 
      
      ## Screenshots (if relevant)
      <img src="/uploads/94a82258d5d71df0b9608ccd4d7e5cd1/Screen_Shot_2016-06-14_at_9.57.25_AM.png" width="400px">
      
      
      
      See merge request !4648
      c6cc7680
    • Annabel Dunstone's avatar
      d183e27e
    • Douwe Maan's avatar
      Merge branch '13948-access-request-to-projects-and-groups' into 'master' · fe32942f
      Douwe Maan authored
      Allow users to request access to projects and groups
      
      #### TODO:
      
      - [x] Factorize the projects & groups members list
      - [x] Factorize `request_access` and `approve` controller methods into a concern
      - [x] Factorize the project & group dropdowns
      - [x] Factorize access request routes
      - [x] Factorize mailers
      
      #### Will be done in separate MRs
      
      - [ ] Documentation
      - [ ] API
      
      #### Access request to project
      
      - [x] Design project access request button to spec (defined in #13948)
      - [x] Request access to a project as a logged in user
      - [x] Withdraw access request to a project as a logged in user
      - [x] Do not treat project member request as actual membership (done partly in Ability)
      - [x] Display access requests on project's members page (+ allow to change level, approve, and deny request)
      - [x] Email requesting user at notification email address when accepted/denied
      - [x] Email all project admins at notification email addresses when new access request
      - [x] Unit specs to cover new functionality: `AccessRequestable` is missing specs
      - [x] Controller specs to cover new functionality
      - [x] Mailer specs to cover new functionality
      - [x] Features specs to cover new UI and interactions
      - [x] Regression specs still passing
      
      #### Access request to group
      
      - [x] Design group access request button to spec (defined in #13948)
      - [x] Request access to a group as a logged in user
      - [x] Withdraw access request to a group as a logged in user
      - [x] Do not treat group member request as actual membership
      - [x] Display access requests on group's members page (+ allow to change level, approve, and deny request)
      - [x] Email requesting user at notification email address when accepted/denied
      - [x] Email all project admins at notification email addresses when new access request
      - [x] Unit specs to cover new functionality
      - [x] Controller specs to cover new functionality
      - [x] Mailer specs to cover new functionality
      - [x] Features specs to cover new UI and interactions
      - [x] Regression specs still passing
      
      Closes #13948.
      
      ### Requesting access to a project
      
      #### Responsive UI
      
      ![request-access-to-project](/uploads/59337d84ca4c2f637dfd73fca038def9/request-access-to-project.gif)
      
      #### Request access link
      
      ![1-project-request-access-link](/uploads/5436f7854bc48bff74b2664b311920c6/1-project-request-access-link.png)
      
      #### Flash once access is requested
      
      ![2-project-request-access-flash](/uploads/8b304dd737431c47d00ee90ab88b8098/2-project-request-access-flash.jpg)
      
      #### Email sent to project admins on new access requests
      
      ##### HTML Email
      
      ![3-project-request-access-email-html](/uploads/63842c9bd4e43a907ab189087dd24cad/3-project-request-access-email-html.jpg)
      
      ##### Plain Email
      
      ![4-project-request-access-email-plain](/uploads/249289418678c65abfcf4c1e944986c6/4-project-request-access-email-plain.jpg)
      
      ### Withdrawing access request to a project
      
      #### Withdraw access request link
      
      ![5-project-withdraw-request-link](/uploads/932984713a98f03ad75cd9606245cbe2/5-project-withdraw-request-link.png)
      
      #### Withdraw access request confirmation dialog box
      
      ![6-project-withdraw-request-confirm](/uploads/bf6afb5b83ad8ba31443812d0ccbc50b/6-project-withdraw-request-confirm.png)
      
      #### Flash once access has been withdrawn
      
      ![6-2-project-withdraw-request-confirm](/uploads/4dea00452adc4febd7cff4a969a7830a/6-2-project-withdraw-request-confirm.png)
      
      ### Access requests management page
      
      ![7-project-access-requests](/uploads/2030399fa9ce261e0df4bd3d399bfc24/7-project-access-requests.jpg)
      
      #### Deny access request confirmation dialog box
      
      ![8-project-access-request-deny-confirm](/uploads/b6ffcc3092b037fb4d3a5f1929befa90/8-project-access-request-deny-confirm.png)
      
      #### Email sent to requester on denied access requests
      
      ##### HTML Email
      
      ![9-project-request-access-denied-email-html](/uploads/7fb26d627f8919039ce88302e72ede83/9-project-request-access-denied-email-html.jpg)
      
      ##### Plain Email
      
      ![10-project-request-access-denied-email-plain](/uploads/34a21f2266e3238dc29b93f855183fb0/10-project-request-access-denied-email-plain.jpg)
      
      #### Email sent to requester on granted access requests
      
      ##### HTML Email
      
      ![11-project-request-access-granted-email-html](/uploads/cecd4d874885c48dd8bb420f19defd8f/11-project-request-access-granted-email-html.jpg)
      
      ##### Plain Email
      
      ![12-project-request-access-granted-email-plain](/uploads/636446f7a711904231d592add2de83dc/12-project-request-access-granted-email-plain.jpg)
      
      ----------------------------------
      
      ----------------------------------
      
      ### Requesting access to a group
      
      #### Responsive UI
      
      ![request-access-to-group](/uploads/b319b8844836ad599ad4d562f3ba6057/request-access-to-group.gif)
      
      #### Request access link
      
      ![1-group-request-access-link](/uploads/1eccd38061f0183ba71c482f51ebf53a/1-group-request-access-link.png)
      
      #### Flash once access is requested
      
      ![2-group-request-access-flash](/uploads/bbb94ede6c54cd0b6b28e8e1196f687c/2-group-request-access-flash.jpg)
      
      #### Email sent to project admins on new access requests
      
      ##### HTML Email
      
      ![3-group-request-access-email-html](/uploads/7df7196e83d80bea861ea94bd8f3f390/3-group-request-access-email-html.jpg)
      
      ##### Plain Email
      
      ![4-group-request-access-email-plain](/uploads/55a1abcd7a42368f3ba8f20650339e4a/4-group-request-access-email-plain.jpg)
      
      ### Withdrawing access request to a project
      
      #### Withdraw access request link
      
      ![5-group-withdraw-request-link](/uploads/d02ed4f353a334a0a6c181da6006f0d6/5-group-withdraw-request-link.png)
      
      #### Withdraw access request confirmation dialog box
      
      ![6-group-withdraw-request-confirm](/uploads/09d6e123390f257aff9aed3b08695ad6/6-group-withdraw-request-confirm.png)
      
      #### Flash once access has been withdrawn
      
      ![6-2-group-withdraw-request-confirm](/uploads/cf300d2292d0c10ca592424860b80d20/6-2-group-withdraw-request-confirm.png)
      
      ### Access requests management page
      
      ![7-group-access-requests](/uploads/821c55ba4276112b1994ca87b0c5e1ad/7-group-access-requests.jpg)
      
      #### Deny access request confirmation dialog box
      
      ![8-group-access-request-deny-confirm](/uploads/68fad9da8bc82492be3f6d55d33dba17/8-group-access-request-deny-confirm.png)
      
      #### Email sent to requester on denied access requests
      
      ##### HTML Email
      
      ![9-group-request-access-denied-email-html](/uploads/48a8e0cc2cea3b36529b04d259dc8e65/9-group-request-access-denied-email-html.jpg)
      
      ##### Plain Email
      
      ![10-group-request-access-denied-email-plain](/uploads/85d95642a218eaf52a35da8a7a0ac8ed/10-group-request-access-denied-email-plain.jpg)
      
      #### Email sent to requester on granted access requests
      
      ##### HTML Email
      
      ![11-group-request-access-granted-email-html](/uploads/b18949a6538168824f3d0c272d89dd81/11-group-request-access-granted-email-html.jpg)
      
      ##### Plain Email
      
      ![12-group-request-access-granted-email-plain](/uploads/c33c7847ab86eeab4b07714467573f63/12-group-request-access-granted-email-plain.jpg)
      
      See merge request !3798
      fe32942f
    • 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
    • Douwe Maan's avatar
      Merge branch 'master' into 13948-access-request-to-projects-and-groups · 9413d1c2
      Douwe Maan authored
      # Conflicts:
      #	app/views/layouts/nav/_project.html.haml
      9413d1c2
    • 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
    • Rémy Coutable's avatar
      UI and copywriting improvements · 515205d3
      Rémy Coutable authored
      + Move 'Edit Project/Group' out of membership-related partial
      + Show the access request buttons only to logged-in users
      + Put the request access buttons out of in a more visible button
      + Improve the copy in the #remove_member_message helper
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      515205d3
    • Rémy Coutable's avatar
    • Rémy Coutable's avatar
    • Rémy Coutable's avatar
      Factorize #request_access and #approve_access_request into a new... · d71fbe0d
      Rémy Coutable authored
      Factorize #request_access and #approve_access_request  into a new AccessRequestActions controller concern
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      d71fbe0d
    • Rémy Coutable's avatar
      Add request access for groups · d26f8123
      Rémy Coutable authored
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      d26f8123
    • 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