summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* update to current master and fix conflictsissue-title-vueRegis2017-03-2133-299/+290
|\
| * Merge branch 'dz-hide-share-group-ancestors' into 'master' Douwe Maan2017-03-211-1/+1
| |\ | | | | | | | | | | | | | | | | | | Hide ancestor groups in the share group dropdown list Closes #29311 See merge request !9965
| | * Hide ancestor groups in the share group dropdown listdz-hide-share-group-ancestorsDmitriy Zaporozhets2017-03-211-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Merge branch '29618-clarify-help-text-on-prometheus-integration-page' into ↵Douwe Maan2017-03-211-1/+8
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Clarify help text on Prometheus Integration Page Closes #29618 See merge request !10034
| | * | Move text to a MD heredoc.Joshua Lambert2017-03-211-1/+8
| | | |
| | * | Add additional details on metric source being k8s nodesJoshua Lambert2017-03-181-1/+1
| | | |
| | * | Clarify help text29618-clarify-help-text-on-prometheus-integration-pageJoshua Lambert2017-03-171-1/+1
| | | |
| * | | Merge branch 'fix/gb/pipeline-intermittent-running-status' into 'master' Kamil Trzciński2017-03-211-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pipeline status for transition between stages Closes #29699 See merge request !10094
| | * | | Fix pipeline status for transition between stagesGrzegorz Bizon2017-03-201-0/+1
| | | | |
| * | | | Merge branch ↵Sean McGivern2017-03-212-8/+7
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '29685-wrong-number-of-arguments-calling-http_url_to_repo-on-cloning-project-wikis' into 'master' Fix ProjectWiki#http_url_to_repo signature Closes #29685 See merge request !10079
| | * | | Fix ProjectWiki#http_url_to_repo signatureRémy Coutable2017-03-202-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New Gitlab::UrlSanitizer.http_credentials_for_user method responsible for generating a credentials hash from a user. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Merge branch 'sh-fix-admin-application-settings' into 'master' Robert Speicher2017-03-211-0/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when application settings are saved Closes #29674 and #29115 See merge request !10070
| | * | | | Fix Error 500 when application settings are savedStan Hu2017-03-181-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a Rails bug, fetching the application settings from Redis may prevent the attribute methods from being loaded for the `ApplicationSetting` model. More details here: https://github.com/rails/rails/issues/27348 There was also a secondary problem introduced by overriding these association methods which caused all default visibility levels to be set to `nil`. Before, the previous implementation allowed the string "20" to be saved as an integer, while now a table lookup happens before that. We fix this by enforcing the integer value in the controller and default to PRIVATE. Closes #29674
| * | | | | Merge branch 'rs-issue-29592' into 'master' Stan Hu2017-03-211-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle Route#name being nil after an update Closes #29592 See merge request !10102
| | * | | | | Handle Route#name being nil after an updateRobert Speicher2017-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was possible for the `routes.name` field to be `NULL`, causing `name_was` to be `nil` after a rename, resulting a bad first argument to `sub` when attempting to rename descendants. This change adds a condition to make sure `name_was` is present before attempting the descendant update.
| * | | | | | Merge remote-tracking branch 'dev/master'DJ Mountney2017-03-203-1/+4
| |\ \ \ \ \ \
| | * | | | | | Merge branch 'ssrf' into 'security' Douwe Maan2017-03-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protect server against SSRF in project import URLs See merge request !2068
| | * | | | | | Merge branch '28058-hide-emails-in-atom-feeds' into 'security'Rémy Coutable2017-03-202-1/+3
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only show public emails in atom feeds See merge request !2066
| * | | | | | Merge branch 'issue_27212' into 'master' Sean McGivern2017-03-201-0/+8
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add closed_at field to issues Closes #27212 See merge request !9977
| | * | | | | Add closed_at field to issuesFelipe Artur2017-03-171-0/+8
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'routes-lower-case' into 'master' Yorick Peterse2017-03-201-4/+6
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | Remove repeated routes.path check for postgresql database See merge request !10063
| | * | | | Remove repeated routes.path check for postgresql databasemhasbini2017-03-181-4/+6
| | | |/ / | | |/| |
| * | | | Fix Project Wiki updateDongqing Hu2017-03-201-3/+5
| | | | |
| * | | | Merge branch '29534-todos-performance' into 'master' Sean McGivern2017-03-201-4/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Todos performance: Include associations in Finder See merge request !10076
| | * | | | Todos performance: Include associations in FinderJarka Kadlecova2017-03-201-4/+1
| | |/ / /
| * | | | Simplify Ci::Build#dependencies methodTomasz Maczukin2017-03-201-8/+3
| | | | |
| * | | | Send only defined dependenciesTomasz Maczukin2017-03-201-0/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In APIv1 we've been sending all jobs from previous stages and a `dependencies` list with names of jobs that user want to download artifacts from. This was selected on Runners side. In APIv1 we've planned to send only jobs that were defined (if any; and all previous jobs by default). However I've missed the fact that it was Runner who selected jobs, not GitLab. And now current version of APIV4 sends all jobs everytime. This commit fixes this. If user will define `dependencies` in his job, then GitLab will send only selected jobs.
| * | | All CI offline migrationsKamil Trzciński2017-03-1716-269/+55
| |/ /
| * | Merge branch 'feature/use-gitaly-for-commit-show' into 'master'Robert Speicher2017-03-171-1/+8
| |\ \ | | | | | | | | | | | | | | | | Use Gitaly for CommitController#show See merge request !9629
| | * | Use Gitaly for CommitController#showfeature/use-gitaly-for-commit-showAhmad Sherif2017-03-151-1/+8
| | | |
| * | | Merge branch 'add-labels-to-issue-hook' into 'master' Sean McGivern2017-03-172-0/+5
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Added labels to the issue web hook Closes #22313 See merge request !9972
| | * | Added labels to the issue web hookLuke "Jared" Bennett2017-03-172-0/+5
| | | |
| * | | removes n+1 query from tags and branches indexesfix-slow-queries-for-branches-indexTiago Botelho2017-03-161-0/+6
| |/ /
| * | Merge branch '28991-viewing-old-wiki-page-version-edit-button-exists' into ↵29565-name-of-the-uncompressed-folder-of-a-tag-archive-changedRémy Coutable2017-03-161-0/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [#28991] Resolve "Viewing old wiki page version, "Edit" button exists, brings up latest markup" Closes #28991 See merge request !9966
| | * | [#28991] Wiki page edit button only appears on the current commit pageTM Lee2017-03-161-0/+6
| | |/ | | | | | | | | | | | | | | | | | | - Added method to check if the current Page version is the current latest version - Conditionally checks for current version when showing Edit button - Added feature specs for viewing project wiki page and expect edit button - Added Changelog
| * | Don't try to load status when there is no commitBob Van Landuyt2017-03-161-0/+2
| | | | | | | | | | | | | | | | | | This could happen when the repository is missing. In which case cache needs to be cleared
| * | Render cached pipeline status on project dashboardBob Van Landuyt2017-03-161-0/+4
| | |
| * | Update the pipeline cache when updating a pipeline-statusBob Van Landuyt2017-03-161-0/+6
| | |
| * | Add a wrapper for pipeline statusesBob Van Landuyt2017-03-161-0/+84
| | | | | | | | | | | | | | | | | | This reads status from redis & stores it in redis if it was missing. If the project has no HEAD, the cache is deleted
| * | Adds pipeline mini-graph to system information box in Commit ViewFilipa Lacerda2017-03-161-0/+4
| | |
| * | Merge branch 'better-priority-sorting' into 'master' Douwe Maan2017-03-153-4/+38
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Better priority sorting Closes #28754 See merge request !9938
| | * | Allow filtering by all started milestonesbetter-priority-sortingSean McGivern2017-03-151-0/+1
| | | |
| | * | Allow sorting by due date and label prioritySean McGivern2017-03-152-4/+37
| | |/
| * | Merge branch '27271-missing-time-spent-in-issue-webhook' into 'master' Douwe Maan2017-03-152-2/+11
| |\ \ | | |/ | |/| | | | | | | | | | | | | Include time tracking attributes in webhooks payload Closes #27271 See merge request !9942
| | * Include time tracking attributes in webhooks payload27271-missing-time-spent-in-issue-webhookRuben Davila2017-03-142-2/+11
| | |
* | | Add backend changesissue-title-vue-adam-2Adam Niedzielski2017-03-151-0/+11
|/ /
* | Merge branch 'preserve_order_issue_board' into 'master' Douwe Maan2017-03-141-0/+7
|\ \ | | | | | | | | | | | | Preserve order by priority on issues board See merge request !9939
| * | Preserve order by priority on issues boardpreserve_order_issue_boardValery Sizov2017-03-141-0/+7
| |/
* | [Issue sorting]Addressed review commentsfix_relative_position_calculationValery Sizov2017-03-141-23/+54
| |
* | [Issue sorting] Filling positions preferable in the middleValery Sizov2017-03-141-10/+13
| |
View Lorry Controller Status