- 25 Oct, 2016 19 commits
-
-
Alfredo Sumaran authored
Stop appending templates - Temporary fix This is the temporary fix for #23315. This stops the templates appending to any existing text. See merge request !7050 Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
This will change the update process to checkout gitlab-shell version 3.6.6 instead of 3.6.3 as currently described in the update document See merge request !6976
-
Douwe Maan authored
Fix branch protection API. - Fixes the branch protection API. - Closes #21513 - EE Merge Request: gitlab-org/gitlab-ee!718 See merge request !6215 Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Sean McGivern authored
Stop unauthorized users dragging on issue boards Closes #23763 See merge request !7096 Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Douwe Maan authored
Fix `User#to_reference` Fix the method signature of `User#to_reference` so that moving an issue with a user reference does not throw a "invalid number of arguments" exception. 1. Changes in 8.13 require `Referable`s that don't have a project reference to accept two arguments - `from_project` and `target_project`. 2. `User#to_reference` was not changed to accept the `target_project` (even though it is not used). Moving an issue containing a user reference would throw a "invalid number of arguments" exception. 3. The regression was introduced in [c8b2b3f7](https://gitlab.com/gitlab-org/gitlab-ce/commit/c8b2b3f7c32db873f1bebce3e3b1847ea24d235f#91fabb7ad88bd2fde6fef1c100a719c00e503047_75_79), which expects all `Referable`s that don't respond to `:project` to have a `to_reference` method that takes two arguments. Closes #23662 See merge request !7088 Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Sean McGivern authored
Fix constrainers for relative url Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23675 See merge request !7071 Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Yorick Peterse authored
Fix reply-by-email not working due to queue name mismatch See merge request !7068 Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Fix bug where labels would be assigned to issues that were moved If you attempt to move an issue from one project to another and leave labels blank, LabelsFinder would assign all labels in the new project to that issue. The issue is that :title is passed along to the Finder, but since it appears empty no filtering is done. As a result, all labels in the group are returned. This fix handles that case. Closes #23668 See merge request !7065 Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Yorick Peterse authored
See merge request !7064 Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Jacob Schatz authored
Only show register tab if signup enabled. Fixes a regression where the register tab is activated, even if sign-up enabled is not activated in application_settings. https://gitlab.com/gitlab-org/gitlab-ce/issues/23654 See merge request !7058 Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Yorick Peterse authored
Stop clearing the database cache on rake cache:clear See merge request !7056 Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Fix error in generating labels Attempting to generate default set of labels would result in an error: ArgumentError: wrong number of arguments (given 1, expected 0) Closes #23649 See merge request !7055 Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Fatih Acet authored
This MR removes an odd line for empty description Closes #23557 #23695 See merge request !7045 Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Sean McGivern authored
Fixes #23575 See merge request !7037 Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Achilleas Pipinellis authored
Refactor and add new environment functionality to CI yaml reference Add new `environment` functionality to the yaml reference. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/23484 See merge request !7026 Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Fatih Acet authored
Use root_url for issue boards user link Rather than using `/` as the root path, it now correctly sends the root URL from Rails to prevent errors with installations in subdirectories. Closes #23556 See merge request !7018 Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Jacob Schatz authored
Support LDAP login tabs wrapping to second line (and a few other login fixes) Fixes some regressions introduced for customers with multiple servers configured for login and/or long label names. Also, improves styling for the login page on small screens. See the bad behavior here: https://gitlab.com/gitlab-org/gitlab-ce/issues/23435#note_17117893 https://gitlab.com/gitlab-org/gitlab-ce/issues/23435#note_17117677 See merge request !6993 Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Fatih Acet authored
Resolve "Cycle analytics date filter is not working" Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22892 See merge request !6906 Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Alfredo Sumaran authored
Fix pipeline graph hidden on commit and mr pages ## What does this MR do? Dynamically invokes `new gl.Pipelines();` when an MR `builds` tab is clicked. Dispatches `new gl.Pipelines();` on a `commit#builds` page. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? The pipeline graph was hidden on commit and mr pages ## Screenshots (if relevant) Commit page: ![Screen_Shot_2016-10-14_at_18.16.18](/uploads/ee11dea0825d1489dc167292e16c8f41/Screen_Shot_2016-10-14_at_18.16.18.png) MR: ![Screen_Shot_2016-10-14_at_18.16.39](/uploads/602c2fce2397c799bedb757bfd3010af/Screen_Shot_2016-10-14_at_18.16.39.png) ## 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 - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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 it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23325 See merge request !6895 Signed-off-by: Rémy Coutable <remy@rymai.me>
-
- 22 Oct, 2016 5 commits
-
-
Stan Hu authored
-
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
-
- 21 Oct, 2016 16 commits
-
-
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
-
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
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
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) ![Screen_Shot_2016-10-21_at_13.45.37](/uploads/d1dc18d294dace599b8036541b70ccaf/Screen_Shot_2016-10-21_at_13.45.37.png) 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
-