- 15 Jun, 2016 3 commits
-
-
Z.J. van de Weg authored
-
Dmitriy Zaporozhets authored
-
Stan Hu authored
Don't fail builds for projects that are deleted when they are stuck ## What does this MR do? Solves when dropping stuck connection. ``` Dropping stuck pending build 1545510 for runner NoMethodError: undefined method `origin_merge_requests' for nil:NilClass from /opt/gitlab/embedded/service/gitlab-rails/app/services/merge_requests/base_service.rb:50:in `merge_request_from' from /opt/gitlab/embedded/service/gitlab-rails/app/services/merge_requests/base_service.rb:57:in `each_merge_request' from /opt/gitlab/embedded/service/gitlab-rails/app/services/merge_requests/add_todo_when_build_fails_service.rb:5:in `execute' from /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/metrics/instrumentation.rb:164:in `execute' from /opt/gitlab/embedded/service/gitlab-rails/app/models/commit_status.rb:51:in `block (2 levels) in <class:CommitStatus>' from /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/state_machines-0.4.0/lib/state_machines/eval_helpers.rb:79:in `call' ... ``` This happens, because that `default_scope` of `Projects` filters returns the projects that are not deleted, where `Ci::Build` doesn't take into account. See merge request !4609
-
- 14 Jun, 2016 37 commits
-
-
Stan Hu authored
Fix typo in obtaining a backtrace from all threads in gdb See merge request !4612
-
Jacob Schatz authored
Fix note polling when a window has been hidden `refresh` was called, `refreshing` was set to true, but then because `document.hidden` was true, `getContent` was never called, and `refreshing` never got reset to `false`, which stopped polling entirely until refresh. See merge request !4635
-
Stan Hu authored
Manually create todo for issuable ## What does this MR do? Adds a button to the sidebar in issues & merge requests to allow users to manually create a todo item themselves. ## What are the relevant issue numbers? Closes #15045 ## Screenshots (if relevant)    See merge request !4502
-
Robert Speicher authored
Only show notes through JSON on confidential issues that the user has access to Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18535 See merge request !1970
-
Jacob Schatz authored
Update CHANGELOG ## What does this MR do? Updates the CHANGELOG See merge request !4549
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Annabel Dunstone authored
-
Jacob Schatz authored
Fixes bulk-assign labels not working when navigating through pages ## What does this MR do? This MR fixes an issue on bulk-assign labels not working when navigating though pages. The functionality was not working because events on checkboxes weren't working. This re-runs `Issuable.initChecks()` and makes sure we are not leaving zombie event handlers by turning them off first. Also fixes tests to use `wait_for_ajax` since label filtering is now using `Turbolinks` for redirection. ## Does this MR meet the acceptance criteria? - [ ] [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 - [ ] 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] 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 !4632
-
Alfredo Sumaran authored
-
Alfredo Sumaran authored
-
Alfredo Sumaran authored
-
Alfredo Sumaran authored
-
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)  See merge request !4616
-
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
-
Phil Hughes authored
Uses outerWidth instead of width
-
Douwe Maan authored
Revert "Added API endpoint for Sidekiq Metrics" @DouweM please merge my accidental push to master. See merge request !4651
-
Patricio Cano authored
This reverts commit 06e0ef07
-
Patricio Cano authored
-
Yorick Peterse authored
-
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.
-
Yorick Peterse authored
This allows it to be used on Ruby 2.3 without it crashing all the time.
-
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
-
Annabel Dunstone authored
-
Robert Speicher authored
Forbid scripting for wiki files Wiki files (not pages - files in the repo) are just sent to the browser with whatever content-type the mime_types gem assigns to them based on their extension. As this is from the same domain as the GitLab application, this is an XSS vulnerability. Set a CSP forbidding all sources for scripting, CSS, XHR, etc. on these files. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17298. See merge request !1969
-
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 link  #### Flash once access is requested  #### Email sent to project admins on new access requests ##### HTML Email  ##### Plain Email  ### Withdrawing access request to a project #### Withdraw access request link  #### Withdraw access request confirmation dialog box  #### Flash once access has been withdrawn  ### Access requests management page  #### Deny access request confirmation dialog box  #### Email sent to requester on denied access requests ##### HTML Email  ##### Plain Email  #### Email sent to requester on granted access requests ##### HTML Email  ##### Plain Email  ---------------------------------- ---------------------------------- ### Requesting access to a group #### Responsive UI  #### Request access link  #### Flash once access is requested  #### Email sent to project admins on new access requests ##### HTML Email  ##### Plain Email  ### Withdrawing access request to a project #### Withdraw access request link  #### Withdraw access request confirmation dialog box  #### Flash once access has been withdrawn  ### Access requests management page  #### Deny access request confirmation dialog box  #### Email sent to requester on denied access requests ##### HTML Email  ##### Plain Email  #### Email sent to requester on granted access requests ##### HTML Email  ##### Plain Email  See merge request !3798
-
Yorick Peterse authored
Instrument Grape API endpoints See merge request !4587
-
Yorick Peterse authored
Instrument private methods and instance private methods See merge request !4639
-
Douwe Maan authored
# Conflicts: # app/views/layouts/nav/_project.html.haml
-
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:  Guest members of the project:  Full permissions:  cc: @dzaporozhets @annabeldunstone @jschatz1 See merge request !4599
-
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 -
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
-
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
-
Yorick Peterse authored
Fix timing issues on convertion migration award emoji See merge request !4581
-
Kamil Trzcinski authored
-
Achilleas Pipinellis authored
-
Kamil Trzcinski authored
-
