summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Minor clean up on admin/users_controller_specclean-up-user-controller-specZeger-Jan van de Weg2016-03-301-12/+3
|
* Merge branch 'tests/isolate-carrierwave-uploads' into 'master' Robert Speicher2016-03-302-0/+11
|\ | | | | | | | | | | | | | | | | | | | | | | Isolate CarrierWave uploads in test enviroment Purpose of this merge request is to isolate CarrierWave uploads in test environment, from regular development/production uploads. We need to persist some files in order to test some features thoroughly. If we - for example - want to check if file exists after being uploaded via API, or we need to write tests that check if file has been correctly removed we need to persist uploads using CarrierWave. This approach simply sets `root` path for uploads in test environment and removes temporary directory after executing RSpec tests suite. We set this in `spec_helper` to keep this in one place, this also can be set up in test environment initializer. This issue is a workaround for #12968, but does not solve this problem completely, because if uploader defines absolute path in `store_dir` or defines custom `root` path, this may not work correctly (but it looks like we do have such uploaders at this moment). See merge request !3435
| * Ensure uploads dir exists when running backup specstests/isolate-carrierwave-uploadsGrzegorz Bizon2016-03-301-0/+4
| |
| * Move CarrierWave test env config to separate fileGrzegorz Bizon2016-03-302-5/+7
| |
| * Isolate CarrierWave uploads in test enviromentGrzegorz Bizon2016-03-291-0/+5
| |
* | Merge branch '2364-fallback-to-in-reply-to-header' into 'master' Douwe Maan2016-03-3014-97/+303
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fall back to In-Reply-To and References headers when sub-addressing is not available _Originally opened at !3024 by @dabit._ - - - Fixes #2364 Summary of the changes: - No more need to have the `%{key}` placeholder in the `incoming_email.address` - The fallback message id format is `reply-[key]@[gitlab_host]` (reminder: it doesn't have to be a real email address) - The fallback message id that includes the reply key is added to both `References` header - Documentation for the "Reply by email" feature updated See merge request !3305
| * | Improve and finish the fallback to the In-Reply-To and References header for ↵2364-fallback-to-in-reply-to-headerRémy Coutable2016-03-2514-125/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the reply-by-email feature A few things to note: - The IncomingEmail feature is now enabled even without a correctly-formatted sub-address - Message-ID for new thread mail are kept the same so that subsequent notifications to this thread are grouped in the thread by the email service that receives the notification (i.e. In-Reply-To of the answer == Message-ID of the first thread message) - To maximize our chance to be able to retrieve the reply key, we look for it in the In-Reply-To header and the References header - The pattern for the fallback reply message id is "reply-[key]@[gitlab_host]" - Improve docs thanks to Axil
| * | Fix #2364. Fall back to In-Reply-To header when reply key not availableDavid Padilla2016-03-257-4/+87
| | |
* | | Merge branch 'patch/fix-mergerequest-diff' into 'master' Robert Speicher2016-03-304-7/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Raw / Rendered diff producing different results on merge requests The raw diff endpoint (`merge_requests/####.diff`) produces a diff based on `target_branch` instead of the original branching point. Same is valid for `merge_requests/####.patch`. Fixes #14680, #3017 See merge request !3450
| * | | Fixed MergeRequestController specpatch/fix-mergerequest-diffGabriel Mazetto2016-03-302-2/+3
| | | |
| * | | We need `sha` reference from `diff_base_commit` to generate the diffGabriel Mazetto2016-03-291-2/+2
| | | |
| * | | Use `diff_base_commit` instead of `target_branch` to generate diffsGabriel Mazetto2016-03-292-6/+6
| | | |
* | | | Merge branch 'refactor/project-badges-interface' into 'master' Robert Speicher2016-03-303-2/+99
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor builds badge, encapsulate inside a class This merge requests attempts to introduce interface for all badges. Currently we only have a build badge, but other badges are in plans, like coverage badge. See merge request !3403
| * | | | Extend specs for build badgerefactor/project-badges-interfaceGrzegorz Bizon2016-03-291-9/+48
| | | | |
| * | | | Refactor builds badge, encapsulate inside a classGrzegorz Bizon2016-03-293-2/+60
| | |/ / | |/| |
* | | | Add 8.6.2 CHANGELOG itemsRémy Coutable2016-03-301-4/+22
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'functional-closed-sidebar' into 'master' Dmitriy Zaporozhets2016-03-309-26/+116
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Functional closed sidebar Adds functionality to include the closed sidebar. When sidebar is closed the details will be visible once changed in open sidebar. This MR fixes some bugs and adds some features from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3175 Fixes: #13594 See merge request !3411
| * | | | Remove console logsJacob Schatz2016-03-301-1/+0
| | | | |
| * | | | Off the event initiallyJacob Schatz2016-03-301-1/+2
| | | | |
| * | | | Collapsed sidebar opens over instead of pushing content.Jacob Schatz2016-03-302-1/+7
| | | | |
| * | | | Sidebar collapse update issueJacob Schatz2016-03-307-18/+71
| | | | |
| * | | | User selection from collapsed sidebarJacob Schatz2016-03-301-0/+17
| | | | |
| * | | | Add json response for user avatar in merge requestJacob Schatz2016-03-301-1/+1
| | | | |
| * | | | Make changed values visible in minimized sidebar.Jacob Schatz2016-03-303-25/+39
|/ / / /
* | | | Merge branch 'notification-settings-save' into 'master' Rémy Coutable2016-03-301-16/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with notification settings not saving Closes #14736 See merge request !3452
| * | | | Fixed issue with notification settings not savingPhil Hughes2016-03-301-16/+17
|/ / / / | | | | | | | | | | | | Closes #14736
* | | | Merge branch 'rs-banzai-requires' into 'master' Rémy Coutable2016-03-3018-38/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove redundant `require`s from Banzai files We're trying to avoid circular dependency errors. Related: https://gitlab.com/gitlab-org/gitlab-ce/issues/13521 Sentry: https://sentry.gitlap.com/gitlab/gitlabcom/issues/8/ See merge request !3391
| * | | | Remove redundant `require`s from Banzai filesrs-banzai-requiresRobert Speicher2016-03-2418-38/+0
| | | | | | | | | | | | | | | | | | | | We're trying to avoid circular dependency errors.
* | | | | Merge branch 'added-milestone-upcoming' into 'master' Rémy Coutable2016-03-3012-59/+139
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dropdown bug fixes - Added back upcoming to milestone filter ![Screen_Shot_2016-03-23_at_16.45.22](/uploads/8c31eff7e0984aad17881f6397ff17cd/Screen_Shot_2016-03-23_at_16.45.22.png) - Fixed bug that would cause the currently selected value to disappear on filters - Fixed bug that throw an error when filtering by upcoming when there is only a milestone in the past Closes #14536 See merge request !3368
| * | | | Spec updatesadded-milestone-upcomingPhil Hughes2016-03-292-8/+6
| | | | |
| * | | | Updated based on Ruby feedbackPhil Hughes2016-03-294-6/+6
| | | | |
| * | | | Ruby fixesPhil Hughes2016-03-292-12/+5
| | | | |
| * | | | Fixed multiselectPhil Hughes2016-03-292-28/+6
| | | | |
| * | | | Fixed rubocop issuesPhil Hughes2016-03-291-5/+6
| | | | |
| * | | | Fixed issue with milestone not being un-selectablePhil Hughes2016-03-291-0/+2
| | | | |
| * | | | Standardised the output of the JSON to always include the namePhil Hughes2016-03-296-14/+31
| | | | | | | | | | | | | | | | | | | | The frontend will then always use the name as the ID - like previous
| * | | | Removed un-used codePhil Hughes2016-03-291-11/+0
| | | | |
| * | | | Updated to only include upcoming on filtersPhil Hughes2016-03-292-3/+24
| | | | | | | | | | | | | | | | | | | | Fixes tests
| * | | | Added tests for upcoming milestone filterPhil Hughes2016-03-292-0/+68
| | | | |
| * | | | Dropdown bug fixesPhil Hughes2016-03-296-23/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added back upcoming to milestone filter Fixed bug that would cause the currently selected value to disappear on filters Fixed bug that throw an error when filtering by upcoming when there is only a milestone in the past
* | | | | Merge branch 'fix-mr-comment-commit-pruned' into 'master' Robert Speicher2016-03-293-4/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gracefully handle notes on deleted commits in merge requests Closes #3250 See merge request !3402
| * | | | | Gracefully handle notes on deleted commits in merge requestsStan Hu2016-03-283-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | Closes #3250
* | | | | | Merge branch ↵Robert Speicher2016-03-295-44/+83
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'mariusz_jachimowicz/gitlab-ce-i_14415_expose_label_description' into 'master' api - expose label description Resolves #14415 See merge request !3314
| * | | | | | api - expose label descriptionMariusz Jachimowicz2016-03-245-44/+83
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'fix_wip_in_mr_api' into 'master' Robert Speicher2016-03-293-5/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensuring Merge Request API returns boolean values for work_in_progress Fixes #14692. See merge request !3432
| * | | | | | Ensuring Merge Request API returns boolean values for work_in_progressAbhi Rao2016-03-283-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #14692
* | | | | | | Merge branch 'handle-nil-description-slack-message' into 'master' Robert Speicher2016-03-293-1/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle nil descriptions in Slack issue messages Closes #14676 See merge request !3420
| * | | | | | | Handle nil descriptions in Slack issue messagesStan Hu2016-03-283-1/+12
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Closes #14676
* | | | | | | Merge branch 'gitlab-shell-2.7' into 'master' Robert Speicher2016-03-291-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated gitlab-shell to 2.7 This is done to include the changes introduced in https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/42. See merge request !3437
| * | | | | | | Updated gitlab-shell to 2.7gitlab-shell-2.7Yorick Peterse2016-03-291-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done to include the changes introduced in https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/42.
View Lorry Controller Status