summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Improve Group#users_with_parents methoddz-nested-group-accessDmitriy Zaporozhets2016-12-291-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Include group parents into read access for project and groupDmitriy Zaporozhets2016-12-261-4/+14
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Revert "Merge branch 'fix-latest-pipeine-ordering' into 'master'"Grzegorz Bizon2016-12-242-3/+6
| | | This reverts merge request !8286
* Merge branch 'issue_25887' into 'master' Douglas Barbosa Alexandre2016-12-233-8/+10
|\ | | | | | | | | | | | | Do not override incoming webhook channel for mattermost and slack Closes #25887 See merge request !8270
| * Fix rubucop offensesDouglas Barbosa Alexandre2016-12-231-2/+2
| |
| * Rename `opt` to `opts` on ChatNotificationService#executeissue_25887Douglas Barbosa Alexandre2016-12-231-4/+4
| |
| * Do not override incoming webhook channel for mattermost and slackFelipe Artur2016-12-223-6/+8
| |
* | Prefer oneline and Rubocop prefers ternary operatorLin Jen-Shin2016-12-231-7/+2
| | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8286/diffs#note_20433402
* | Ci::Pipeline.latest order by id DESCLin Jen-Shin2016-12-232-6/+8
|/ | | | | | | | | | | | | | | | | | | | | | | | The name latest implies that it's reverse chronological, and we did expect it that way. https://gitlab.com/gitlab-org/gitlab-ce/issues/25993#note_20429761 >>> ok, I think markglenfletchera is correct in https://gitlab.com/gitlab-com/support-forum/issues/1394#note_20399939 that `Project#latest_successful_builds_for` is giving oldest pipeline rather than latest pipeline. This is a ~regression introduced by !7333 where `order(id: :desc)` was removed causing this. The offending change was: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7333/diffs#b22732e5f39e176c7c719fe485847d0fb0564275_92_108 The confusion was caused by the `latest` name implication, which actually didn't order anything, and I think we should add `order(id: :desc)` to `Ci::Pipeline.latest` otherwise it's confusing that it's not actually ordered. >>> Closes #25993
* Merge branch 'zj-slack-404-error' into 'master' Kamil Trzciński2016-12-221-1/+1
|\ | | | | | | | | | | | | Fix format of Slack when result is nil Closes #25954 See merge request !8248
| * Fix format of Slack when result is nilzj-slack-404-errorZ.J. van de Weg2016-12-221-1/+1
| |
* | Merge branch 'fix-mattermost-username' into 'master' Douglas Barbosa Alexandre2016-12-221-1/+1
|\ \ | | | | | | | | | | | | Fix Mattermost command creation by specifying username See merge request !8257
| * | Fix Mattermost command creation by specifying usernameKamil Trzcinski2016-12-221-1/+1
| |/
* | Merge branch 'cache-last-commit-sha-for-path' into 'master' Yorick Peterse2016-12-221-2/+10
|\ \ | |/ |/| | | | | Cache last commit id for path See merge request !8098
| * Merge two methods.Hiroyuki Sato2016-12-201-7/+4
| |
| * Rename sha to idHiroyuki Sato2016-12-201-5/+5
| |
| * Cache last commit sha for pathHiroyuki Sato2016-12-201-2/+13
| |
* | Merge branch 'zj-mattermost-slash-config' into 'master' Kamil Trzciński2016-12-211-0/+30
|\ \ | | | | | | | | | | | | | | | | | | Mattermost slash auto config Closes #24769 See merge request !8070
| * | Improve API specsKamil Trzcinski2016-12-211-3/+3
| | |
| * | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ↵Kamil Trzcinski2016-12-201-3/+3
| |\ \ | | | | | | | | | | | | into zj-mattermost-slash-config
| | * | Fix rubocop errors [ci skip]Z.J. van de Weg2016-12-201-3/+3
| | | |
| * | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-2010-49/+259
| |\ \ \ | | |/ / | |/| |
| * | | WIPKamil Trzcinski2016-12-201-2/+6
| | | |
| * | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-209-53/+91
| |\ \ \
| * | | | Fix flowKamil Trzcinski2016-12-201-7/+4
| | | | |
| * | | | Improve sourcesKamil Trzcinski2016-12-191-25/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add proper error handling, - Use flash[:alert] and flash[:notice], - Use `resource` instead of `resources`,
| * | | | Last fixesZ.J. van de Weg2016-12-191-1/+1
| | | | |
| * | | | Merge remote-tracking branch 'origin/zj-mattermost-slash-config' into ↵Z.J. van de Weg2016-12-191-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | zj-mattermost-slash-config
| | * | | | Minor adjustments API MattermostZ.J. van de Weg2016-12-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Minor adjustments API MattermostZ.J. van de Weg2016-12-191-4/+21
| |/ / / / | | | | | | | | | | | | | | | [ci skip]
| * | | | Merge branch 'master' into 'zj-mattermost-slash-config'Zeger-Jan van de Weg2016-12-1831-164/+326
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/gitlab.yml.example # lib/mattermost/session.rb # spec/lib/mattermost/session_spec.rb
| * | | | | Incorporate reviewZ.J. van de Weg2016-12-161-6/+20
| | | | | |
| * | | | | Merge branch 'zj-mattermost-session' into zj-mattermost-slash-configZ.J. van de Weg2016-12-161-7/+7
| |\ \ \ \ \
| * | | | | | Add auto configure of commandsZ.J. van de Weg2016-12-162-8/+0
| | | | | | |
| * | | | | | Base work for auto config MM slash commandsZ.J. van de Weg2016-12-162-0/+19
| | | | | | |
* | | | | | | Merge branch 'fix/group-path-rename-error' into 'master' Douwe Maan2016-12-211-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error 500 renaming group. Also added specs and changelog. Closes #17922 and #23223 See merge request !8201
| * | | | | | | Fix error 500 renaming group. Also added specs and changelog.James Lopez2016-12-201-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'fix/25843' into 'master' Sean McGivern2016-12-204-8/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename SlackNotificationService back to SlackService ## What does this MR do? See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8191#note_20310845 ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25843 /cc @yorickpeterse @stanhu @smcgivern @felipe_artur @ayufan See merge request !8208
| * | | | | | | | Rename MattermostNotificationService back to MattermostServicefix/25843Douglas Barbosa Alexandre2016-12-203-4/+4
| | | | | | | | |
| * | | | | | | | Rename SlackNotificationService back to SlackServiceDouglas Barbosa Alexandre2016-12-203-4/+4
| | | | | | | | |
* | | | | | | | | Merge branch '19703-direct-link-pipelines' into 'master' Grzegorz Bizon2016-12-202-0/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Direct link from pipeline list to builds" ## What does this MR do? - Adds a dropdown with builds in the mini pipeline graph in the pipelines table - Unnest a lot of CSS related with pipelines in order to make it reusable ## Screenshots ![Screen_Shot_2016-12-15_at_14.45.41](/uploads/ca1c61842a422a34383e029d668034b7/Screen_Shot_2016-12-15_at_14.45.41.png) ![Screen_Shot_2016-12-15_at_14.45.49](/uploads/952e3277143639ce4ad111103034faeb/Screen_Shot_2016-12-15_at_14.45.49.png) ![Screen_Shot_2016-12-15_at_14.46.02](/uploads/f7369a124b1c3c0db4194de2cb637ef0/Screen_Shot_2016-12-15_at_14.46.02.png) ![graph_animation](/uploads/9bae036cb5acff499f992a4722943d72/graph_animation.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25071 Closes #19703 See merge request !8097
| * | | | | | | | | Add tests for stage API endpointKamil Trzcinski2016-12-202-0/+9
| | | | | | | | | |
* | | | | | | | | | Merge branch 'jej-fix-n+1-queries-milestones-show' into 'master' Sean McGivern2016-12-201-0/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix N+1 queries on milestone show pages Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/25832 See merge request !8185
| * | | | | | | | | Fix N+1 queries on milestone show pagesJames Edwards-Jones2016-12-201-0/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch 'jej-memoize-milestoneish-visible-to-user' into 'master' Sean McGivern2016-12-203-6/+36
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Memoize Milestoneish#issues_visible_to_user to reduce lookups https://gitlab.com/gitlab-org/gitlab-ce/issues/25748 See merge request !8146
| * | | | | | | | | Milestoneish SQL performance partially improved and memoizedjej-memoize-milestoneish-visible-to-userJames Edwards-Jones2016-12-203-6/+36
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Memoize Milestoneish#issues_visible_to_user and counts to reduce lookups Milstoneish SQL optimised with project, but still slow on GlobalMilestone
* | | | | | | | | Merge branch 'project-authorizations-diff' into 'master' Nick Thomas2016-12-202-28/+23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Smarter refreshing of authorized projects This MR reworks the way `User#refresh_authorized_projects`, resulting in a much more efficient process leading to fewer dead tuples. Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/25257 See merge request !7956
| * | | | | | | | | Smarter refreshing of authorized projectsproject-authorizations-diffYorick Peterse2016-12-192-28/+23
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this commit the refreshing of authorized projects was done in two steps: 1. Remove existing authorizations 2. Insert a new list of all authorizations This can lead to a high amount of dead tuples as every time all rows are being replaced. For example, if a user with 100 authorizations is given access to a new project this would lead to: * 100 rows being removed * 101 new rows being inserted This commit changes the way this system works so it only removes/inserts what is necessary. Using the above example this would lead to only 1 new row being inserted, with the initial 100 being left untouched. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/25257
* | | | | | | | | Merge branch '25678-remove-user-build' into 'master' Rémy Coutable2016-12-201-4/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary method `build_user` from model `User` Closes #25678 See merge request !8162
| * | | | | | | | remove build_user from model UserArsenev Vladislav2016-12-181-4/+0
| |/ / / / / / /