summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issue_22664' into 'master' Sean McGivern2016-12-291-2/+3
|\
| * Check if user can read issue before being assignedissue_22664Felipe Artur2016-12-271-3/+3
| * Fix issuable assignee update bug when previous assignee is nullFelipe Artur2016-12-201-3/+4
* | Merge branch 'mentioned-but-not-closed-issues-messages' into 'master' Sean McGivern2016-12-291-5/+1
|\ \
| * | use MergeRequest#closes_issues instead of rewriting code to retrieve closing ...Gabriel Gizotti2016-12-281-5/+1
* | | Merge branch 'dz-nested-group-access' into 'master' Dmitriy Zaporozhets2016-12-291-4/+14
|\ \ \ | |/ / |/| |
| * | 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
* | | Merge branch 'master' into 'dz-rename-reserved-project-names'Dmitriy Zaporozhets2016-12-2710-22/+114
|\ \ \
| * \ \ Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' Douwe Maan2016-12-272-4/+18
| |\ \ \
| | * \ \ Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-2046-249/+811
| | |\ \ \
| | * \ \ \ Merge CSSFilipa Lacerda2016-12-1219-174/+275
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-0632-412/+312
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-2228-461/+742
| | |\ \ \ \ \ \
| | * | | | | | | We never check user privilege if it's a deploy keyLin Jen-Shin2016-11-181-4/+0
| | * | | | | | | Don't notify user for deploy keys, feedback:Lin Jen-Shin2016-11-182-4/+10
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-1716-67/+127
| | |\ \ \ \ \ \ \
| | * | | | | | | | Introduce has_access_to? so that we could reuse itLin Jen-Shin2016-11-162-1/+9
| | * | | | | | | | Add more tests and fix write to project checkLin Jen-Shin2016-11-111-0/+4
| * | | | | | | | | Merge branch '25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourc...Douwe Maan2016-12-271-1/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Use raw_diffs to calculate MR files changedSean McGivern2016-12-261-1/+3
| * | | | | | | | | | Merge branch 'fix-latest-pipeine-ordering-again' into 'master' Kamil Trzciński2016-12-261-6/+3
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Order only for latest_successful_forLin Jen-Shin2016-12-261-6/+3
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'feature/more-storage-statistics' into 'master' Sean McGivern2016-12-266-11/+90
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Add more storage statisticsMarkus Koller2016-12-216-11/+90
* | | | | | | | | | Rename projects with reserved path namesDmitriy Zaporozhets2016-12-241-2/+2
|/ / / / / / / / /
* | | | | | | | | 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