summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Only remove FK if it existszj-drop-fk-if-existsZ.J. van de Weg2017-06-012-1/+15
|
* Merge branch ↵Grzegorz Bizon2017-05-303-3/+32
|\ | | | | | | | | | | | | | | | | '33032-invalid-you-directly-addressed-yourself-todo-when-using-unsubscribe' into 'master' Resolve "Invalid 'You directly addressed yourself' TODO when using `/unsubscribe`" Closes #33032 See merge request !11788
| * Fix /unsubscribe slash command creating extra todos33032-invalid-you-directly-addressed-yourself-todo-when-using-unsubscribeSean McGivern2017-05-303-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The /unsubscribe slash command means that we check if the current user is subscribed to the issuable without having an explicit subscription. That means that we use the UserParser to find references to them in the notes. The UserParser (and all parsers inheriting from BaseParser) use RequestStore to cache ActiveRecord objects, so that we don't need to load the User object each time, if we're parsing references a bunch of times in the same request. However, it was always returning _all_ of the previously cached items, not just the ones matching the IDs passed. This would mean that we did two runs through with UserParser if you were mentioned in a comment, and then mentioned someone else in your comment while using /unsubscribe: 1. Because /unsubscribe was used, we see if you were mentioned in any comments. 2. Because you mentioned someone, we find them - but we would also get back your user, even if you didn't mention yourself. This would have the effect of creating a mention or directly addressed todo for yourself incorrectly. The fix is simple: only return values from the cache matching the IDs passed.
* | Merge branch '32653-fix-gemfile-lock' into 'master'Grzegorz Bizon2017-05-301-4/+3
|\ \ | | | | | | | | | | | | | | | | | | Fix omniauth-google-oauth2 dependencies in Gemfile.lock Closes #32653 See merge request !11787
| * | Fix omniauth-google-oauth2 dependencies in Gemfile.lock32653-fix-gemfile-lockRémy Coutable2017-05-301-4/+3
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'node-sudo-bash' into 'master'Rémy Coutable2017-05-301-1/+1
|\ \ | | | | | | | | | | | | Use 'sudo bash' when adding nodesource repository See merge request !10527
| * | Use 'sudo bash' when adding nodesource repositoryJacob Vosmaer2017-05-231-1/+1
| | | | | | | | | | | | In accordance with https://github.com/nodesource/distributions#debinstall
* | | Merge branch ↵Fatih Acet2017-05-308-43/+100
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32916-browser-notifications-for-pipeline-running-in-a-mr-is-gone' into 'master' Resolve "Browser notifications for pipeline running in a MR is gone" Closes #32916 See merge request !11734
| * | | Add rubocop:disable to gon_helper.rb32916-browser-notifications-for-pipeline-running-in-a-mr-is-goneLuke "Jared" Bennett2017-05-261-0/+2
| | | |
| * | | Added specs for handleNotifications in mr_widget_options_spec.jsLuke "Jared" Bennett2017-05-264-4/+47
| | | |
| * | | Move gon ref to the index to avoid depending on gon in any mr widget objectsLuke "Jared" Bennett2017-05-262-1/+3
| | | |
| * | | Restore notifications to MR widgetLuke "Jared" Bennett2017-05-266-43/+53
| | | |
* | | | Merge branch 'issue_32225_2' into 'master'Kamil Trzciński2017-05-305-7/+76
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Set head pipeline when creating merge requests See merge request !11669
| * | | Set head pipeline when creating merge requestsissue_32225_2Felipe Artur2017-05-295-13/+61
| | | |
| * | | Sanity check pipeline sha before saving merge request head pipelineFelipe Artur2017-05-233-3/+24
| | | |
* | | | Merge branch '30117-update-looks-job-log' into 'master'Phil Hughes2017-05-3010-483/+480
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update looks job log Closes #30117 See merge request !11663
| * | | | Update looks job logFilipa Lacerda2017-05-3010-483/+480
|/ / / /
* | | | Merge branch '31349-pipeline-url-techdeb' into 'master'Phil Hughes2017-05-304-58/+67
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use vue file for pipelines tables components See merge request !11760
| * | | | Use vue file for pipelines tables components31349-pipeline-url-techdebFilipa Lacerda2017-05-294-58/+67
| | | | |
* | | | | Merge branch 'fix-authorized-members-destroy' into 'master'Rémy Coutable2017-05-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix spec for Members::AuthorizedDestroyService See merge request !11778
| * | | | | Fix spec for Members::AuthorizedDestroyServicefix-authorized-members-destroyYorick Peterse2017-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This spec was still assuming that creating a project would not result in the owner having access to the project.
* | | | | | Merge branch '2472-assignee-dropdown-does-not-display-selected-assignee-ce' ↵Phil Hughes2017-05-307-7/+123
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Assignee dropdown does not display selected assignee Closes #2472 See merge request !11744
| * | | | | | Fix rubocop2472-assignee-dropdown-does-not-display-selected-assignee-ceClement Ho2017-05-261-3/+1
| | | | | | |
| * | | | | | Backport MR from EEClement Ho2017-05-269-8/+140
| | | | | | |
* | | | | | | Merge branch '31849-pipeline-show-view-realtime' into 'master'Phil Hughes2017-05-3010-106/+144
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a mediator for pipeline details vue in order to mount several vue apps with the same data Closes #31849 See merge request !11732
| * | | | | | | Use function to define data instead of an object31849-pipeline-show-view-realtimeFilipa Lacerda2017-05-262-4/+6
| | | | | | | |
| * | | | | | | Creates a mediator for pipeline details vue in order to mount several vue ↵Filipa Lacerda2017-05-2610-106/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apps with the same data
* | | | | | | | Merge branch '31616-add-uptime-of-gitlab-instance-in-admin-area' into 'master'Rémy Coutable2017-05-304-0/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31616-add-uptime-of-gitlab-instance-in-admin-area Closes #31616 See merge request !11590
| * | | | | | | | 31616-add-uptime-of-gitlab-instance-in-admin-areajboltz882017-05-294-0/+13
| | | | | | | | |
* | | | | | | | | Merge branch '32954-loading-icon' into 'master'Phil Hughes2017-05-302-0/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Displays loading icon in async buttons inline Closes #32954 See merge request !11735
| * | | | | | | | Displays loading icon in async buttons inline32954-loading-iconFilipa Lacerda2017-05-262-0/+8
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch '32790-pipeline_schedules-pages-throwing-error-500' into 'master'Kamil Trzciński2017-05-295-8/+41
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "pipeline_schedules pages throwing error 500" Closes #32790 See merge request !11706
| * | | | | | | | Use if pipeline_schedule.refShinya Maeda2017-05-291-1/+1
| | | | | | | | |
| * | | | | | | | Use nil? for ref evaluationShinya Maeda2017-05-291-1/+1
| | | | | | | | |
| * | | | | | | | Add a test for deletion of importing_or_inactive?Shinya Maeda2017-05-291-0/+8
| | | | | | | | |
| * | | | | | | | NULL to nilShinya Maeda2017-05-291-2/+2
| | | | | | | | |
| * | | | | | | | Validate parameters when active is falseShinya Maeda2017-05-291-7/+3
| | | | | | | | |
| * | | | | | | | Add changelogShinya Maeda2017-05-291-0/+4
| | | | | | | | |
| * | | | | | | | FixedShinya Maeda2017-05-291-1/+2
| | | | | | | | |
| * | | | | | | | Reproduced2Shinya Maeda2017-05-291-0/+24
| | | | | | | | |
| * | | | | | | | Revert "Reproduced"Shinya Maeda2017-05-292-26/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3e0d8b4ca7d7bd0f1ce014b6caaff1b1e32b1f8f.
| * | | | | | | | ReproducedShinya Maeda2017-05-292-1/+26
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch ↵Robert Speicher2017-05-2915-11/+151
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32677-migrations-using-update_column_in_batches-must-have-a-spec' into 'master' New Migration/UpdateColumnInBatches cop Closes #32677 See merge request !11611
| * | | | | | | | Disable Migration/UpdateColumnInBatches for old migrations32677-migrations-using-update_column_in_batches-must-have-a-specRémy Coutable2017-05-2911-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | New Migration/UpdateColumnInBatches copRémy Coutable2017-05-294-2/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch '30917-wiki-is-not-searchable-with-guest-permissions' into 'master'Douwe Maan2017-05-296-46/+83
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Wiki is not searchable with Guest permissions" Closes #30917 See merge request !11613
| * | | | | | | | | Create a separate helper to check if we show particular tab on a search page30917-wiki-is-not-searchable-with-guest-permissionsValery Sizov2017-05-293-21/+32
| | | | | | | | | |
| * | | | | | | | | Explicitly test that guest is able to search through the wikiValery Sizov2017-05-294-4/+10
| | | | | | | | | |
| * | | | | | | | | update changelogValery Sizov2017-05-221-0/+4
| | | | | | | | | |
| * | | | | | | | | Fix: Wiki is not searchable with Guest permissionsValery Sizov2017-05-223-36/+52
| | | | | | | | | |
View Lorry Controller Status