summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | refactor update user service not to do auth checksJames Lopez2017-06-231-3/+3
| | | | |
| * | | | refactor emails serviceJames Lopez2017-06-231-2/+0
| | | | |
| * | | | add missing user updatesJames Lopez2017-06-231-3/+4
| | | | |
| * | | | update missing email actionsJames Lopez2017-06-231-1/+1
| | | | |
| * | | | update to use emails destroy serviceJames Lopez2017-06-231-1/+1
| |/ / /
* | | | Merge branch 'fix/gb/fix-skipped-pipeline-with-allowed-to-fail-jobs' into ↵Kamil Trzciński2017-06-261-10/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix pipeline status when allowed to fail jobs present Closes #29059 See merge request !11166
| * | | | Check warnings when building compound status SQL queryGrzegorz Bizon2017-06-202-16/+13
| | | | |
| * | | | Move custom compound status method to commit statusGrzegorz Bizon2017-06-202-3/+7
| | | | |
| * | | | Fix pipeline status when allowed to fail jobs presentGrzegorz Bizon2017-06-201-1/+3
| | | | |
* | | | | Merge branch 'fix-34019' into 'master'Sean McGivern2017-06-261-1/+16
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Perform project housekeeping after importing projects Closes #34019 See merge request !12323
| * | | | Check if repository exists before performing housekeepingfix-34019Douglas Barbosa Alexandre2017-06-231-0/+2
| | | | |
| * | | | Break Project#perform_housekeeping in two methodsDouglas Barbosa Alexandre2017-06-231-4/+12
| | | | |
| * | | | Perform project housekeeping after importing projectsDouglas Barbosa Alexandre2017-06-231-3/+8
| | |/ / | |/| |
* | | | Add User#full_private_access? to check if user has Private accesstc-refactor-projects-finder-init-collectionToon Claes2017-06-232-1/+7
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In CE only the admin has access to all private groups & projects. In EE also an auditor can have full private access. To overcome merge conflicts, or accidental incorrect access rights, abstract this out in `User#full_private_access?`. `User#admin?` now only should be used for admin-only features. For private access-related features `User#full_private_access?` should be used. Backported from gitlab-org/gitlab-ee!2199
* | | Merge remote-tracking branch 'upstream/master' into ↵28717-additional-metrics-review-branchPawel Chojnacki2017-06-2239-265/+310
|\ \ \ | | | | | | | | | | | | 28717-additional-metrics-review-branch
| * \ \ Merge branch 'bvl-validate-path-update' into 'master'Douwe Maan2017-06-211-8/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rebuild the dynamic path before validating it Closes #33746 See merge request !12213
| | * | | Rebuild the dynamic path before validating itbvl-validate-path-updateBob Van Landuyt2017-06-211-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we won't validate updates to the path. Allowing users to change the path to something that's not allowed.
| * | | | Merge branch '34008-fix-CI_ENVIRONMENT_URL-2' into 'master'Kamil Trzciński2017-06-211-16/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't expand CI_ENVIRONMENT_URL so runner would do Closes #34008 See merge request !12344
| | * | | | Expand with all the variables so that things likeLin Jen-Shin2017-06-211-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI_ENVIRONMENT_SLUG is also available. It won't be recursive because we're not putting this value in the variables.
| | * | | | Move expanded_environment_url to CreateDeploymentServiceLin Jen-Shin2017-06-211-21/+9
| | | | | | | | | | | | | | | | | | | | | | | | Because that's the only place we need it.
| | * | | | Add comments to explain some culprit; Add changelogLin Jen-Shin2017-06-211-2/+9
| | | | | |
| | * | | | Don't expand CI_ENVIRONMENT_URL so runner would doLin Jen-Shin2017-06-211-4/+8
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And make sure CI_ENVIRONMENT_URL comes last so all variables would be available whenever the runner is trying to expand it. This is an alternative to !12333
| * | | | Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-2128-165/+165
| |/ / /
| * | | Merge branch 'refactor-projects-finder-init-collection' into 'master'Rémy Coutable2017-06-202-7/+43
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor ProjectsFinder#init_collection and GroupProjectsFinder#init_collection Closes #33632 See merge request !12135
| | * | | Refactor GroupProjectsFinder#init_collectionYorick Peterse2017-06-191-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This optimises how GroupProjectsFinder builds it collection, producing simpler and faster queries in the process. It also cleans up the code a bit to make it easier to understand.
| | * | | Refactor Project.with_feature_available_for_userYorick Peterse2017-06-162-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method used to use a UNION, which would lead to it performing the same query twice; producing less than ideal performance. Further, in certain cases ActiveRecord could get confused and mess up the variable bindings, though it's not clear how/why exactly this happens. Fortunately we can work around all of this by building some of the WHERE conditions manually, allowing us to use a simple OR statement to get all the data we want without any of the above problems.
| * | | | Merge branch 'dm-chat-message-backticks' into 'master'Sean McGivern2017-06-202-3/+3
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Remove backticks from chat messages because they're not rendered as code See merge request !12276
| | * | | Remove backticks from chat messages because they're not rendered as codedm-chat-message-backticksDouwe Maan2017-06-192-3/+3
| | | | |
| * | | | Merge branch 'dm-parallel-diff-unchanged-line-comment' into 'master'Sean McGivern2017-06-191-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't display comment on unchanged line on both sides in parallel diff Closes #33864 See merge request !12275
| | * | | | Don't display comment on unchanged line on both sides in parallel diffDouwe Maan2017-06-191-1/+1
| | |/ / /
| * | | | Merge branch '30725-reset-user-limits-when-unchecking-external-user' into ↵Douwe Maan2017-06-191-13/+16
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Ensures default user limits when external user is unchecked Closes #30725 See merge request !12218
| | * | | refactors user model validations30725-reset-user-limits-when-unchecking-external-userTiago Botelho2017-06-191-9/+9
| | | | |
| | * | | Ensures default user limits when external user is uncheckedTiago Botelho2017-06-161-6/+9
| | | | |
| * | | | Add table for files in merge request diffsSean McGivern2017-06-162-17/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds an ID-less table containing one row per file, per merge request diff. It has a column for each attribute on Gitlab::Git::Diff that is serialised currently, with the advantage that we can easily query the attributes of this new table. It does not migrate existing data, so we have fallback code when the legacy st_diffs column is present instead. For a merge request diff to be valid, it should have at most one of: * Rows in this new table, with the correct merge_request_diff_id. * A non-NULL st_diffs column. It may have neither, if the diff is empty.
| * | | | Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master'Sean McGivern2017-06-165-7/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename "Slash commands" to "Quick actions" Closes #27070 See merge request !11811
| | * | | | Rename "Slash commands" to "Quick actions"Eric Eastwood2017-06-155-7/+7
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27070 Deprecate "chat commands" in favor of "slash commands" We looked for things like: - `slash commmand` - `slash_command` - `slash-command` - `SlashCommand`
| * | | | Improve method names and add more specsFelipe Artur2017-06-164-13/+15
| | | | |
| * | | | Migration - Remove position field from issues and merge requestsFelipe Artur2017-06-162-0/+6
| | | | |
| * | | | Remove old specs and add new onesFelipe Artur2017-06-161-2/+6
| | | | |
| * | | | Order merge requests by priorityFelipe Artur2017-06-164-6/+6
| | | | |
| * | | | Order issues by priorityFelipe Artur2017-06-162-6/+8
| | | | |
| * | | | Remove Drag and drop and sorting from milestone viewFelipe Artur2017-06-162-34/+0
| | |/ / | |/| |
* | | | Remove unnecessary prometheus_service method, that is now handled by new ↵Pawel Chojnacki2017-06-201-4/+0
| | | | | | | | | | | | | | | | automagic within Project model
* | | | Move Prometheus service to project modelPawel Chojnacki2017-06-163-12/+12
| | | |
* | | | Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2017-06-1649-206/+490
|\ \ \ \ | |/ / / | | | | | | | | 28717-additional-metrics-review-branch
| * | | Deserialise existing custom notification settingsdeserialize-custom-notificationsSean McGivern2017-06-151-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | Create a post-deployment migration to update all existing notification settings with at least one custom level enabled to the new format. Also handle the same conversion when updating settings, to catch any stragglers.
| * | | Add columns for custom notification settingsSean McGivern2017-06-151-18/+7
| | | | | | | | | | | | | | | | | | | | | | | | Add columns for each custom notification level, defaulting to null. Read from those columns if non-null, otherwise fall back to the serialized column. Writing will write to the new column if `events` isn't manually set.
| * | | #13336 - display multiple messages in both the UI and git outputMike Ricketts2017-06-151-1/+1
| | | |
| * | | Merge branch 'fix-manual-actions' into 'master'Grzegorz Bizon2017-06-151-2/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Do not show manual actions that cannot be run Closes #32380 See merge request !12121
| | * | Do not show manual actions that cannot be runfix-manual-actionsKamil Trzcinski2017-06-131-2/+2
| | |/
View Lorry Controller Status