This project is mirrored from https://jihulab.com/gitlab-cn/gitlab.git.
Pull mirroring updated .
- Oct 22, 2016
-
-
Stan Hu authored
-
Stan Hu authored
Fix bug where e-mails were not being sent out via Sidekiq Fix bug where e-mails were not being sent out via Sidekiq By default, ActionMailer uses the "mailers" queue, but this entry was not included in the list of queues for Sidekiq to use. For more details: * https://github.com/plataformatec/devise/wiki/How-To:-Send-devise-emails-in-background-(Resque,-Sidekiq-and-Delayed::Job) * http://guides.rubyonrails.org/active_job_basics.html See merge request !7053
-
Alejandro Rodríguez authored
-
- Oct 21, 2016
-
-
Alejandro Rodríguez authored
-
Alejandro Rodríguez authored
-
Alejandro Rodriguez authored
Don't autolink unsafe protocols Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23153 See merge request !2013
-
Yorick Peterse authored
Re-organize queues for EE See merge request !815
-
Douwe Maan authored
Use separate queues for all Sidekiq workers ## What does this MR do? This MR updates all workers so that they (mostly) use their own Sidekiq queues. This in turn allows us to monitor queues more accurately and in the future impose queue specific throttles, limits, etc. This is a critical part we need in 8.13, despite it being so close to release day. See https://gitlab.com/gitlab-org/gitlab-ce/issues/23370 for more information. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/23370 See merge request !7006
-
Rémy Coutable authored
-
Rémy Coutable authored
Port gitlab-org/gitlab-ce!7033 to EE See merge request !814
-
Rémy Coutable authored
Signed-off-by:
Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by:
Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Fix a search for non-default branches when ES is enabled The issue was introduced in 8.12 Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/1143 See merge request !811
-
Sean McGivern authored
Update merge_requests.md. Error in 'Approve merge request' section in API documentation ## What does this MR do? Just fix an error in API Documentation in 'Approve Merge Request' section. Url in documentation : `POST /projects/:id/merge_requests/:merge_request_id/approvals` Should be : `POST /projects/:id/merge_requests/:merge_request_id/approve` (Verified on gitlab 8.12.7-ee 40515169) See merge request !809
-
Rémy Coutable authored
Merge branch 'ce-22457-reset-filters-button-should-be-invisible-when-no-filters-are-active-ee' into 'master' `Reset filters` link should only be visible when filters are active **EE version of gitlab-org/gitlab-ce!6497.** ## What does this MR do? > Adds `issuable_filters_present` helper method to check for any filters before rendering the reset link. ## Why was this MR needed? > `Reset filters` link is always visible. See merge request !785
-
Stan Hu authored
Cache the last usage data to avoid unicorn timeouts On GitLab.com, the usage data cache was never populated because it takes longer than 60 seconds to generate. This MR also improves usage data performance. The Event default_scope was causing the query to use the wrong index, causing the query to scan through all rows unnecessarily. Closes #1044 See merge request !779
-
Fatih Acet authored
Fixed compare ellipsis messing with layout ## What does this MR do? Fixed a bug where the ellipsis would cause the form to mess with the layout. ## Screenshots (if relevant)  See merge request !7042
-
Sean McGivern authored
Change "Group#web_url" to return "/groups/twitter" rather than "/twitter" Fixes #23527 See merge request !7035
-
Rémy Coutable authored
Disable warming of the asset cache in Spinach tests under CI I suspect some combination of Knapsack tests cause no regular Rack tests to be loaded (i.e. all JavaScript tests), which leads to the error: ArgumentError: rack-test requires a rack application, but none was given In CI, we precompile all the assets so there is no need to warm the asset cache in any case. Closes #23613 See merge request !7033
-
Rémy Coutable authored
Fix broken label uniqueness label migration The previous implementation of the migration failed on staging because the migration was attempted to remove labels from projects that did not actually have duplicates. This occurred because the SQL query did not account for the project ID when selecting the labels. To replicate the problem: 1. Disable the uniqueness validation in app/models/label.rb. 2. Create a duplicate label "bug" in project A. 3. Create the same label in project B with label "bug". The migration will attempt to remove the label in B even if there are no duplicates. To fix the issue, include the project ID when selecting the labels. Closes #23609 See merge request !7030
-
Kamil Trzciński authored
Use iid deployment refs This fixes the 404, because `find_by` will return nil instead of throwing an error. See merge request !7021
-
Sean McGivern authored
Ignore external issues when bulk assigning issues to author of merge request. Fixes #23552 See merge request !7020
-
Sean McGivern authored
Preserve note_type and position for notes from emails Closes #23208 See merge request !7010
-
Stan Hu authored
Fix GitLab project import when a user has access only to their default namespace ## What does this MR do? It fixes a bug when a namespace ID was not passed to `/import/gitlab_project/new` page. It occurred when a user have no choice of the namespace, so we did not render the input for namespace ID. This MR introduces a hidden input for the described case. ## Does this MR meet the acceptance criteria? - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes #23507 See merge request !6995
-
Fatih Acet authored
Fixed issues with sticky mr tabs & sidebar ## What does this MR do? - Fixes an issue where opening the sidebar wouldn't update the merge request tabs width & positioning - Fixes issues when resizing the browser Rather than updating the JS to react to different methods, this way allows the CSS to keep control of the positioning & sizes. ## What are the relevant issue numbers? Closes #23504 See merge request !6990
-
Sean McGivern authored
Fix project member access levels Migrate invalid project members (owner -> master) Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18616 See merge request !6957 Signed-off-by:
Rémy Coutable <remy@rymai.me>
-
Jacob Schatz authored
Create protected branches bundle Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/645 See merge request !6909
-
Robert Speicher authored
Merge branch '22457-reset-filters-button-should-be-invisible-when-no-filters-are-active' into 'master' `Reset filters` link should only be visible when filters are active ## Why was this MR needed? `Reset filters` link is always visible. Closes #22457 See merge request !6497
-
Rémy Coutable authored
Fixes error 500 on Runners page (`ActionView::Template::Error (Missing partial kaminari/_paginator`) Originally reported downstream: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=819903 See merge request !5701
-
Rémy Coutable authored
[Doc] Fix `ref` parameter name for `commits/statuses` The attribute to filter by branch or tag needs to be named `ref`, not `ref_name`. And indeed the attribute in the JSON response is `ref` (and not `ref_name`). Tested on Gitlab CE 8.9. See merge request !4876
-
- Oct 20, 2016
-
-
Alejandro Rodríguez authored
-
Alejandro Rodríguez authored
-
Rémy Coutable authored
Signed-off-by:
Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by:
Rémy Coutable <remy@rymai.me>
-
Dmitriy Zaporozhets authored
Add a wait_for_ajax call to prevent Spinach failure There may be a race condition after a user clicks "Rebase" and when the DatabaseCleaner wipes all data. See https://gitlab.com/gitlab-org/gitlab-ee/builds/5302296 See merge request !810
-
Rémy Coutable authored
Use Ruby 2.1-compatible hash syntax for boards This broke the master build, because we only run Ruby 2.1 specs on master. https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6978 wouldn't help because this is in Haml
See merge request !808 -
Sean McGivern authored
Add ability to have multiple issue boards for a single project. https://gitlab.com/gitlab-org/gitlab-ee/issues/929 https://gitlab.com/gitlab-org/gitlab-ee/issues/1084 See merge request !782
-
Robert Speicher authored
Show a flash message in the project's main view when it's repo is over the limit. Fixes #1042 See merge request !762
-
Douwe Maan authored
Restrict pushes / merges to a protected branch to specific groups - Closes #675 and https://gitlab.com/gitlab-org/gitlab-ce/issues/21153 - Related to #179 **Default State**  **Filtering**  # Tasks - [ ] ee#675 !645 Restrict pushes/merges to specific groups - [x] Implementation - [x] Basic model-level implementation - [x] Test / refactor - [x] Rudimentary frontend (controller actions + autocomplete for the dropdown) - [x] Groups that a project hasn't been shared with can't be selected - [x] Look for edge cases - [x] Questions - [x] What are LDAP group links? - A GitLab group can be synced with one or more LDAP groups - The sync happens in an async task, an the LDAP group users are _imported_ into the GitLab group - `group.users` on a GitLab group returns the LDAP group users as well (after the import task has run) - We check `group.users` for this feature, so we shouldn't need any additional work to support LDAP groups - [x] CHANGELOG - [x] Removing a group should remove the access - [x] `autocomplete/groups` issue - [x] Fix uniqueness validation - [x] Assign to @alfredo1 for UI work - [x] Wait for !581 to be merged - [x] Rebase against EE master instead of !581 - [x] Add feature specs - [x] Implement frontend - [ ] Assign to endboss - [ ] Get backend + frontend reviewed - [ ] Wait for merge See merge request !645
-