summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |/ |/|
* | 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
| |
* | Merge branch 'help-landing-page-customizations' into 'master'Douwe Maan2017-06-141-2/+12
|\ \ | | | | | | | | | | | | Allow more customization to Help landing page See merge request !11878
| * | Help landing page customizationsRobin Bobbitt2017-06-141-2/+12
| | |
* | | Merge branch 'dm-diff-viewers' into 'master'Sean McGivern2017-06-1415-8/+238
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Implement diff viewers Closes #30501 and #19931 See merge request !11777
| * | | Implement diff viewersDouwe Maan2017-06-1415-8/+238
| | | |
* | | | Merge branch '2525-backport-kubernetes-service-changes' into 'master'Kamil Trzciński2017-06-141-19/+18
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Backport EE changes to the Kubernetes service Closes gitlab-ee#2525 See merge request !12139
| * | | Backport EE changes to the Kubernetes serviceNick Thomas2017-06-141-19/+18
| | | |
* | | | Merge branch 'zj-raise-etag-route-regex-miss' into 'master'Kamil Trzciński2017-06-141-1/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Raise etag route regex miss Closes #33106 See merge request !12084
| * | | Fix etag route missesZ.J. van de Weg2017-06-121-1/+2
| | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#33106
* | | | Merge branch 'fix-external-ci-services' into 'master'Grzegorz Bizon2017-06-141-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Allow to access statuses for external CI services Closes #30714, #29369, and #15220 See merge request !11176
| * | | Allow to access pipelines even if they are disabled, but only present jobs ↵Kamil Trzcinski2017-06-131-0/+1
| | |/ | |/| | | | | | | and commit statuses without giving ability to access them
* | | Handle legacy jobs without namezj-commit-status-sortable-nameZ.J. van de Weg2017-06-131-2/+2
|/ / | | | | | | | | | | | | | | Older pipelines can contain jobs without a name, in which case 'nameless' is used right now, so we can properly still handle other actions on these jobs. Fixes gitlab-org/gitlab-ce#33403
* | Merge branch 'fix/import-commit-status-issue' into 'master'Douwe Maan2017-06-121-1/+1
|\ \ | |/ |/| | | | | | | | | Ignore commit status name validation on importing Closes #33490 See merge request !12039
| * ignore name validation on importingfix/import-commit-status-issueJames Lopez2017-06-121-1/+1
| |
* | Improve Job detail view to make it refreshed in real-time instead of reloadingFilipa Lacerda2017-06-121-0/+5
|/
* Detect if file that appears to be text in the first 1024 bytes is actually ↵dm-blob-binaryness-changeDouwe Maan2017-06-082-9/+12
| | | | binary afer loading all data
* Merge branch 'dm-blob-file-type' into 'master'Grzegorz Bizon2017-06-082-1/+5
|\ | | | | | | | | Add Blob#file_type convenience method See merge request !11982
| * Add Blob#file_type convenience methoddm-blob-file-typeDouwe Maan2017-06-082-1/+5
| |
* | Merge branch 'dm-empty-blob-viewer-binary' into 'master'Grzegorz Bizon2017-06-082-2/+1
|\ \ | |/ |/| | | | | Empty blob viewer isn’t binary-only See merge request !11979
| * Empty blob viewer isn’t binary-onlydm-empty-blob-viewer-binaryDouwe Maan2017-06-072-2/+1
| |
* | Merge branch 'blob-load-all-data' into 'master'Grzegorz Bizon2017-06-083-4/+6
|\ \ | | | | | | | | | | | | Blob#load_all_data! doesn’t need an argument See merge request !11977
View Lorry Controller Status