summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Improve Group#users_with_parents methoddz-nested-group-accessDmitriy Zaporozhets2016-12-291-1/+1
* Include group parents into read access for project and groupDmitriy Zaporozhets2016-12-261-4/+14
* Revert "Merge branch 'fix-latest-pipeine-ordering' into 'master'"Grzegorz Bizon2016-12-242-3/+6
* Merge branch 'issue_25887' into 'master' Douglas Barbosa Alexandre2016-12-233-8/+10
|\
| * 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
* | Ci::Pipeline.latest order by id DESCLin Jen-Shin2016-12-232-6/+8
|/
* Merge branch 'zj-slack-404-error' into 'master' Kamil Trzciński2016-12-221-1/+1
|\
| * 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 usernameKamil Trzcinski2016-12-221-1/+1
| |/
* | Merge branch 'cache-last-commit-sha-for-path' into 'master' Yorick Peterse2016-12-221-2/+10
|\ \ | |/ |/|
| * 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
|\ \
| * | 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
| |\ \
| | * | 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
| * | | | Last fixesZ.J. van de Weg2016-12-191-1/+1
| * | | | Merge remote-tracking branch 'origin/zj-mattermost-slash-config' into zj-matt...Z.J. van de Weg2016-12-191-2/+2
| |\ \ \ \
| | * | | | Minor adjustments API MattermostZ.J. van de Weg2016-12-191-2/+2
| * | | | | Minor adjustments API MattermostZ.J. van de Weg2016-12-191-4/+21
| |/ / / /
| * | | | Merge branch 'master' into 'zj-mattermost-slash-config'Zeger-Jan van de Weg2016-12-1831-164/+326
| |\ \ \ \
| * | | | | 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.James Lopez2016-12-201-2/+2
* | | | | | | | Merge branch 'fix/25843' into 'master' Sean McGivern2016-12-204-8/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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 pagesJames Edwards-Jones2016-12-201-0/+2
* | | | | | | | | | Merge branch 'jej-memoize-milestoneish-visible-to-user' into 'master' Sean McGivern2016-12-203-6/+36
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Milestoneish SQL performance partially improved and memoizedjej-memoize-milestoneish-visible-to-userJames Edwards-Jones2016-12-203-6/+36
| |/ / / / / / / /
* | | | | | | | | Merge branch 'project-authorizations-diff' into 'master' Nick Thomas2016-12-202-28/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Smarter refreshing of authorized projectsproject-authorizations-diffYorick Peterse2016-12-192-28/+23
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch '25678-remove-user-build' into 'master' Rémy Coutable2016-12-201-4/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | remove build_user from model UserArsenev Vladislav2016-12-181-4/+0
| |/ / / / / / /