summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 8.13.2v8.13.2Rémy Coutable2016-10-311-1/+1
|
* Fix CHANGELOGRémy Coutable2016-10-311-201/+174
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch ↵Rémy Coutable2016-10-312-8/+195
| | | | | | | | | | | | '23872-members-of-group-that-has-project-access-getting-404-on-accessing-a-project-issue' into 'master' Fix project member access for group links Closes #23872. See merge request !7144 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '23866-builds-dropdown' into 'master'Fatih Acet2016-10-311-2/+2
| | | | | | | | | | | | | | | Increase z index on fixed mr tabs Before: <img src="/uploads/e890a4f185af87b66251d744fbe840d5/Screen_Shot_2016-10-26_at_11.58.45_AM.png" width="400px"> After: <img src="/uploads/0bbf72888f6a47bd3027ee7dfff542da/Screen_Shot_2016-10-26_at_11.58.28_AM.png" width="400px"> Closes #23866 See merge request !7124 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'adam-fix-labels-find-or-create' into 'master'Douwe Maan2016-10-3110-46/+70
| | | | | | | | | | | | Pass user instance to Labels::FindOrCreateService or skip_authorization: true It fixes a bug described in #23694 when `project.owner` was passed to `Labels::FindOrCreateService`. `Labels::FindOrCreateService` expected a user instance and `project.owner` may return a group as well. This MR makes sure that we either pass a user instance or `skip_authorization: true`. Fixes #23694 See merge request !7093 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch ↵Annabel Dunstone Gray2016-10-311-1/+1
| | | | | | | | | | | | | | | | '23661-lacking-padding-on-syntax-highlight-blocks-in-diff-comments' into 'master' Resolve "Lacking padding on syntax highlight blocks in diff comments" Enforces horizontal padding on highlight block. There was no horizontal padding on diff comment highlight blocks. Closes #23661 See merge request !7062 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch ↵Fatih Acet2016-10-311-1/+1
| | | | | | | | | | | | | | '21248-wrong-urlencoding-when-switching-branch-in-graphs-contributers' into 'master' Fix refs dropdown selection with special characters Remove unneeded encode from the project-refs-dropdown renderRow method. Closes #21248 See merge request !7061 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'fix/make-github-import-retryable' into 'master'Sean McGivern2016-10-3111-27/+119
| | | | | | | | | | Modify GitHub importer to be retryable Closes #23533 See merge request !7003 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'fix/gh-import-bugs' into 'master'Sean McGivern2016-10-313-13/+24
| | | | | | | | | | Fix couple of GitHub importing bugs Fix a bug in GH comment importing and label applying for imported MRs. See merge request !7139 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '23849-pipeline-graph-bug' into 'master'Fatih Acet2016-10-311-1/+1
| | | | | | | | | | Only remove right connector of first build of last stage Closes #23849 See merge request !7179 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'adam-fix-ruby-2-1-cycle-analytics' into 'master'Douwe Maan2016-10-311-2/+2
| | | | | | | | | | Use Hash rocket syntax to fix cycle analytics under Ruby 2.1 Refers to #23510 See merge request !6977 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '23258-invalid-encoding' into 'master' Kamil Trzciński2016-10-281-1/+1
| | | | | | | | | | | | | | | | | | Fix encoding issues on pipeline commits ## What does this MR do? #### What does this MR do? Sets `escape: false` on `truncate` method to fix commit message on pipelines page #### Screenshots (if relevant) Before: ![Screen_Shot_2016-10-12_at_8.53.10_AM](/uploads/5e26e98a272139fe2264c315d579178f/Screen_Shot_2016-10-12_at_8.53.10_AM.png) After: ![Screen_Shot_2016-10-12_at_8.52.49_AM](/uploads/58c6c69f2ba735fdcd5a0b6922b56aa7/Screen_Shot_2016-10-12_at_8.52.49_AM.png) #### What are the relevant issue numbers? Closes #23258 See merge request !6832
* Merge branch '23890-api-should-accepts-boolean' into 'master' Sean McGivern2016-10-282-11/+19
| | | | | | | | API: Fix booleans not recognized as such when using the `to_boolean` helper Fixes #22831 Fixes #23890 See merge request !7149
* Merge branch '23928-sortable-highest_label_priority-is-bugged' into 'master' Rémy Coutable2016-10-285-52/+102
| | | | | | | Fix and improve `Sortable.highest_label_priority` Closes #23928 See merge request !7165
* Merge branch 'sticky-mr-tabs-pinned-nav' into 'master' Fatih Acet2016-10-282-0/+13
| | | | | | | | | | | | | | | | | Fixed sticky MR tabs positioning when sidebar is pinned ## What does this MR do? The sticky MR tabs where positioned underneath the pinned sidebar. This fixes that by accounting for the size of the pinned nav. ## Screenshots (if relevant) ![Screen_Shot_2016-10-28_at_09.37.18](/uploads/0d23f2bb0e02d698c012c22c8653afd7/Screen_Shot_2016-10-28_at_09.37.18.png) ## What are the relevant issue numbers? Closes #23926 See merge request !7167
* Merge branch 'fix-8-13-changelog-gh-import' into 'master' Rémy Coutable2016-10-281-0/+42
| | | | | Fix CHANGELOG for GH import fixes See merge request !7173
* Merge branch ↵Stan Hu2016-10-282-11/+73
| | | | | | | | | | | | | | 'ee-1159-allow-permission-check-bypass-in-approve-access-request-service' into 'master' Allow Members::ApproveAccessRequestService to accept a new `:force` option ## What does this MR do? See the commit message. This is a backport of the EE fix for https://gitlab.com/gitlab-org/gitlab-ee/issues/1159: gitlab-org/gitlab-ee!830 See merge request !7168
* Merge branch 'docs/update-gitlab-shell-version' into '8-13-stable' Achilleas Pipinellis2016-10-260-0/+0
|\ | | | | | | | | | | | | Update gitlab-shell version to 3.6.6 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23659 See merge request !7118
| * Update gitlab-shell version to 3.6.6Achilleas Pipinellis2016-10-261-1/+1
| | | | | | | | [ci skip]
* | Update VERSION to 8.13.1v8.13.1Alejandro Rodríguez2016-10-251-1/+1
| |
* | Merge branch 'fix-events-api' into 'master'Rémy Coutable2016-10-253-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix events order in users/:id/events endpoint Order of events in contributions API is currently being lost, though docs are saying: > Get the contribution events for the specified user, sorted **from newest to oldest**. Order becomes different after `.merge(ProjectsFinder.new.execute(current_user))` call, so I moved ordering below this line. This MR also removes extra `.page(params[:page])` call in the method chain, since [`paginate(events)` already does it](https://gitlab.com/airat/gitlab-ce/blob/master/lib/api/helpers.rb#L112). See merge request !7039 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'project-cache-worker-scheduling' into 'master'Rémy Coutable2016-10-256-18/+77
| | | | | | | | | | | | | | | | | | | | Don't schedule ProjectCacheWorker unless needed This MR changes `ProjectCacheWorker.perform_async` so scheduling only takes place when needed. See the commits for more details. See merge request !7099 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'sh-optimize-label-finder' into 'master'Stan Hu2016-10-252-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce overhead of LabelFinder by avoiding #presence call Some users experienced 502 timeouts when viewing group labels. Labels#open_issues_count and Label#open_merge_requests_count were taking a long time to load because they were loading every ActiveRecord of the user-accessible projects into memory. This change modifies so that only the IDs are loaded into memory. Closes #23684 See merge request !7094 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch ↵Alfredo Sumaran2016-10-254-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | 'temporarily-revert-appending-templates-before-long-term-ux-fix' into 'master' 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>
* | Merge branch 'patch-7' into 'master' Rémy Coutable2016-10-251-1/+1
| | | | | | | | | | 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
* | Merge branch '21513-fix-branch-protection-api' into 'master'Douwe Maan2016-10-256-100/+220
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'board-dragging-disabled' into 'master'Sean McGivern2016-10-253-1/+6
| | | | | | | | | | | | | | | | | | | | Stop unauthorized users dragging on issue boards Closes #23763 See merge request !7096 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '23662-issue-move-user-reference-exception' into 'master'Douwe Maan2016-10-253-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'dz-fix-constrainer-for-relative-url' into 'master'Sean McGivern2016-10-253-1/+23
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'sh-fix-mailroom-config' into 'master'Yorick Peterse2016-10-254-2/+66
| | | | | | | | | | | | | | | | Fix reply-by-email not working due to queue name mismatch See merge request !7068 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'sh-fix-labels-move-issue' into 'master'Rémy Coutable2016-10-254-7/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/sh-flush-cache-after-import'Yorick Peterse2016-10-253-28/+21
| | | | | | | | | | | | See merge request !7064 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'register-tab' into 'master'Jacob Schatz2016-10-253-2/+69
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch '23653-dont-clear-db-cache-every-release' into 'master'Yorick Peterse2016-10-252-1/+2
| | | | | | | | | | | | | | | | Stop clearing the database cache on rake cache:clear See merge request !7056 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'sh-fix-broken-label-controller' into 'master'Rémy Coutable2016-10-253-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch '23557-remove-extra-line-for-empty-issue-description' into 'master'Fatih Acet2016-10-254-2/+5
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'fix-container-registry-project-settings' into 'master'Sean McGivern2016-10-252-1/+2
| | | | | | | | | | | | | | | | Fixes #23575 See merge request !7037 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'docs/dynamic-envs-yaml' into 'master'Achilleas Pipinellis2016-10-252-25/+136
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'issue-boards-user-url' into 'master'Fatih Acet2016-10-252-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'ldap-login-styles' into 'master'Jacob Schatz2016-10-254-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch '22892-cycle-analytics-date-filter-is-not-working' into 'master'Fatih Acet2016-10-252-1/+7
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch '23325-pipeline-graph-hidden' into 'master'Alfredo Sumaran2016-10-253-3/+6
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Update VERSION to 8.13.0v8.13.0Stan Hu2016-10-221-1/+1
|
* Update VERSION to 8.13.0-rc7v8.13.0-rc7Stan Hu2016-10-211-1/+1
|
* Merge branch 'sh-add-mailers-to-sidekiq-config' into 'master' Stan Hu2016-10-211-0/+1
| | | | | | | | | | | | | | | 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
* Revert "Merge branch 'markdown-xss-fix-option-2' into 'security'Stan Hu2016-10-212-35/+0
| | | | This reverts commit eb54c711a0c43f768cd46aa2cc1b00f9a9c9a078.
* Update VERSION to 8.13.0-rc6v8.13.0-rc6Alejandro Rodríguez2016-10-211-1/+1
|
* Update VERSION to 8.13.0-rc5v8.13.0-rc5Alejandro Rodríguez2016-10-211-1/+1
|
* Merge branch 'markdown-xss-fix-option-2' into 'security' Alejandro Rodriguez2016-10-212-0/+35
| | | | | | | Don't autolink unsafe protocols Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23153 See merge request !2013
* Merge branch 'separate-sidekiq-queues' into 'master' Douwe Maan2016-10-2162-68/+425
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
View Lorry Controller Status