summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'add-sentry-logging-to-api' into 'master' Robert Speicher2016-08-242-22/+28
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Sentry logging to API calls ## What does this MR do? This MR adds support for Sentry logging in the API. ## Are there points in the code the reviewer needs to double check? Since the `Grape::Middleware` doesn't have a `params` method, I had to define one using the Rack Request. ## Why was this MR needed? We are missing a lot of useful errors in the API causing git push/pull errors ## What are the relevant issue numbers? #21043 See merge request !5882
| * Add Sentry logging to API callsadd-sentry-logging-to-apiStan Hu2016-08-242-22/+28
| | | | | | | | Closes #21043
* | Merge branch '20909-use-total-count-instead-of-size' into 'master' Douwe Maan2016-08-241-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes from using size to count and caching it to get the number of members in a group - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] 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) Closes #20909 See merge request !5935
| * | change from members using size to start using total_count in the group20909-use-total-count-instead-of-sizetiagonbotelho2016-08-241-1/+1
| | | | | | | | | | | | members page
* | | Merge branch 'github-importer' into 'master' Douwe Maan2016-08-242-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Does not halt the GitHub import process when an error occurs ## What are the relevant issue numbers? Fixes #20385 https://gitlab.com/gitlab-org/gitlab-ce/issues/20149 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [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 !5763
| * | | Does not halt the GitHub import process when an error occursDouglas Barbosa Alexandre2016-08-242-2/+2
| |/ /
* | | Merge branch 'restore-get_id' into 'master' Douwe Maan2016-08-241-8/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | Restore get_id in ExtractsPath fixes #21334 `Addressable::URI.normalize_component()` around `get_id` which was introduced by 68cea38e94886e69099a3faa0d1e2fbde2e71899 and removed in !5878 is still intentionally omitted. Using `normalize_component()` instead of `unescape()` left `%` as is but still broke e.g. spaces (which were replaced by `%20`). See merge request !5974
| * | Restore get_id in ExtractsPathwinniehell2016-08-241-8/+1
| |/
* | Show "Create Merge Request" widget for push events to fork projects on the ↵Paco Guzman2016-08-242-12/+13
|/ | | | source project
* Merge branch 'disable-commenting-on-unrelatable-diff-line' into 'master' Douwe Maan2016-08-231-5/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable commenting on unrelatable diff line ## What does this MR do? Fixes a bug where users can comment on diff lines that can't be commented on and attached to. This is the case for unfolded lines and lines that appear as snippets in the discussion tab. **!5864 should be merged before this MR.** ## Are there points in the code the reviewer needs to double check? :confused: ## Why was this MR needed? Comments were getting lost on the discussion feed, unable to find their related diff. ## What are the relevant issue numbers? Closes #20633. ## Screenshots (if relevant) ![diffs-comment-fix](/uploads/f902b687fda75492e38397f9705283e0/diffs-comment-fix.mp4) ## 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 [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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5681
| * Added unfold test to parallel and added 'diff discussion' contextLuke Bennett2016-08-231-1/+1
| |
| * Added addtional 'renderable' validator to check 'data-note-type' attr existsLuke Bennett2016-08-231-5/+10
| |
* | Merge branch 'fix-file-links-on-project-page' into 'master' Douwe Maan2016-08-231-1/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix file links on project page Files view ## What does this MR do? Fix the project show page when the default view is set to Files so that the links work. ## Are there points in the code the reviewer needs to double check? I can't figure out what caused this to break :confused: ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-com/support-forum/issues/959. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) (N/A) - [x] API support added (N/A) - 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) - [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 !5933
| * | Fix file links on project page Files viewfix-file-links-on-project-pageSean McGivern2016-08-231-1/+8
| | |
* | | Merge branch 'fix-spam-submit-button' into 'master' Robert Speicher2016-08-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Also check if Akismet is enabled, before showing the `Submit as spam` button. Fixes #21229 See merge request !5948
| * | | Also check if Akismet is enabled, before showing the `Submit as spam` button.fix-spam-submit-buttonPatricio Cano2016-08-221-1/+1
| |/ /
* | | Merge branch 'fix-impersonation-log' into 'master' Robert Speicher2016-08-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect "stopped impersonation" log message Minor bug: Usernames were swapped in the log message. Closes #21015 See merge request !5949
| * | | Fix incorrect "stopped impersonation" log messagefix-impersonation-logStan Hu2016-08-231-1/+1
| |/ / | | | | | | | | | Closes #21015
* | | Merge branch '21107-mr-pipeline-404' into 'master' Robert Speicher2016-08-231-11/+11
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project namespace links #### What does this MR do? Fixes pipeline links #### Why was this MR needed? Links went to a 404 on fork MR pipelines tab #### What are the relevant issue numbers? Closes #21107 See merge request !5912
| * | Fix project namespace links21107-mr-pipeline-404Annabel Dunstone2016-08-201-11/+11
| | |
* | | Allow passing an index to selectRowAtIndexAlfredo Sumaran2016-08-231-2/+7
| | |
* | | Fixed enter key in search input not workingPhil Hughes2016-08-231-10/+18
| |/ |/| | | | | Closes #20627
* | Merge branch 'rs-description-templates-tabindex' into 'master' Robert Speicher2016-08-231-1/+1
|\ \ | | | | | | | | | | | | Remove tab stop from issuable form added by description templates See merge request !5929
| * | Remove tab stop from issuable form added by description templatesrs-description-templates-tabindexRobert Speicher2016-08-211-1/+1
| | |
* | | Merge branch 'revert_revert_issuable_lock' into 'master' Douwe Maan2016-08-234-2/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert the revert of Optimistic Locking ## What does this MR do? It reverts the revert of optimistic lock https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5146 (and revert MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5245) Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19871 Actually the code is already reviewed, except: * Monkey patch `config/initializers/ar_monkey_patch.rb` * We removed default values from migration `db/migrate/20160707104333_add_lock_to_issuables.rb` See merge request !5623
| * | | Revert the revert of Optimistic Lockingrevert_revert_issuable_lockValery Sizov2016-08-224-2/+24
| |/ /
* | | fix location of markdown help locationchange-markdown-help-locationJohn Northrup2016-08-221-1/+1
| | |
* | | Merge branch 'docs-koding-change-loc' into 'master' Achilleas Pipinellis2016-08-223-5/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Split Koding admin/user docs Backend/Frontend MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5909 See merge request !5938
| * | | Remove documentation rendering from /koding for nowdocs-koding-change-locAchilleas Pipinellis2016-08-221-3/+0
| | | |
| * | | Split Koding admin/user docsAchilleas Pipinellis2016-08-222-2/+2
| |/ /
* | | Merge branch 'issue-boards-doc' into 'master' Achilleas Pipinellis2016-08-221-1/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation for Issue Boards ## What does this MR do? Add documentation for issue boards. ## What are the relevant issue numbers? - Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/17907 - Backend MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5548 - Frontend MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5554 See merge request !5713
| * | | Remove link to docs from new list textissue-boards-docAchilleas Pipinellis2016-08-221-3/+0
| | | |
| * | | Change images to reflect current status, add link to inline docsAchilleas Pipinellis2016-08-221-1/+7
| |/ /
* | | Change location of slash commands in notes widgetAchilleas Pipinellis2016-08-221-1/+1
|/ /
* | Merge branch 'fix-empty-dropdown' into 'master' Rubén Dávila Santos2016-08-214-5/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | Fix empty dropdown Deselecting the current selected option on a dropdown they were removing the input related to them. This led to a unexpected cases. The forms were submitted without all required inputs and the label was still indicating an option was selected. This MR fixes that. See merge request !5927
| * | Set default label if user unselects the option from dropdownfix-empty-dropdownAlfredo Sumaran2016-08-211-2/+6
| | |
| * | Toggle dropdown disabled attributeAlfredo Sumaran2016-08-211-3/+1
| | | | | | | | | | | | Before this the dropdowns were not being disabled if the user unselected an option from the allowed to merge/push dropdowns.
| * | Do not update if one dropdown has not selected any optionAlfredo Sumaran2016-08-211-0/+3
| | | | | | | | | | | | No need to update the branch permission if no option is marked on the dropdown
| * | Make dropdown selectablesAlfredo Sumaran2016-08-211-0/+2
| | | | | | | | | | | | This makes dropdown to look according the dropdowns on the edit form. This options add a tick mark next to the selected option.
* | | Fix inputs not being found due to incorrect class in wrap elementce-fix-protected-branchAlfredo Sumaran2016-08-201-2/+2
|/ /
* | Fix Error 500 resulting when loading network graphfix-network-graph-error-500Stan Hu2016-08-201-0/+2
| | | | | | | | | | | | | | | | `discussion_id` may not be present when the SELECT call for notes does not include this attribute. Don't attempt to set the discussion ID unless the model contains the attribute. Closes #21119, #21128
* | Make Ability#project_abilities return unique values and fix countsfix-rspec-failures-due-to-cached-permissionsStan Hu2016-08-201-1/+1
| |
* | Fix assorted rspec failures due to stale, cached user permissionsStan Hu2016-08-201-21/+27
|/ | | | | | | RequestStore is disabled in tests, but the Ability class was caching user permissions based on the user and project ID of previous test runs. Revise code to use RequestStore only if it is active.
* Merge branch '581-ee-backport-branch-permissions' into 'master' Douwe Maan2016-08-202-14/+19
|\ | | | | | | | | | | | | Backport changes from gitlab-org/gitlab-ee!581 See merge request !5884
| * Add element container to dropdowns581-ee-backport-branch-permissionsAlfredo Sumaran2016-08-191-6/+8
| |
| * Use typeof instead of Underscore methodAlfredo Sumaran2016-08-191-2/+2
| |
| * check if selectedObject is definedAlfredo Sumaran2016-08-191-1/+1
| |
| * make input name to be a functionAlfredo Sumaran2016-08-191-8/+11
| |
* | Merge branch 'disable-issue-by-email' into 'master' Robert Speicher2016-08-201-1/+4
|\ \ | | | | | | | | | | | | | | | | | | Disable “issue by email” feature until it uses a different token Separate token being worked on in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5914, but too late for 8.11. See merge request !5915
| * | Disable “issue by email” feature until it uses a different tokenDouwe Maan2016-08-191-1/+4
| | |