summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '2971-multiproject-grah-ce-port' into 'master'Phil Hughes2017-07-251-1/+2
|\
| * Fix vertical alignment in firefox and safari for pipeline mini graph2971-multiproject-grah-ce-portFilipa Lacerda2017-07-251-1/+2
* | Merge branch '30634-protected-pipeline' into 'master'Kamil Trzciński2017-07-258-42/+87
|\ \
| * | Extract validationsLin Jen-Shin2017-07-211-24/+24
| * | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-20126-206/+634
| |\ \
| * | | Use struct instead of hashLin Jen-Shin2017-07-201-2/+3
| * | | Make permission checks easier to understandLin Jen-Shin2017-07-201-6/+6
| * | | Use hash to return multiple objectsLin Jen-Shin2017-07-201-4/+4
| * | | Fix tests and fine tweak permission error messageLin Jen-Shin2017-07-191-5/+5
| * | | Eliminate N+1 queries on checking different protected refsLin Jen-Shin2017-07-191-4/+5
| * | | Try to merge permission checks into oneLin Jen-Shin2017-07-191-10/+10
| * | | Rename :user_cannot_update to :protected_refLin Jen-Shin2017-07-182-4/+4
| * | | Rename can_push_or_merge_to_branch? to can_update_branch?Lin Jen-Shin2017-07-183-5/+9
| * | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-1813-95/+113
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-17648-4331/+5912
| |\ \ \ \
| * | | | | Make message and code more clearLin Jen-Shin2017-07-061-2/+5
| * | | | | Merge allowed_to_create? into CreatePipelineServiceLin Jen-Shin2017-07-054-31/+22
| * | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-0533-128/+224
| |\ \ \ \ \
| * | | | | | Make sure that retryable_builds would preload projectLin Jen-Shin2017-07-041-1/+1
| * | | | | | Fix bad conflict resolutionLin Jen-Shin2017-07-042-11/+13
| * | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-04123-1252/+1647
| |\ \ \ \ \ \
| * | | | | | | Consistently check permission for creating pipelines,Lin Jen-Shin2017-07-043-7/+25
| * | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-291-1/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-29740-8791/+13477
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-0738-463/+812
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Still allow legacy triggers, feedback:Lin Jen-Shin2017-06-061-5/+3
| * | | | | | | | | | Try to report why it's failing and fix testsLin Jen-Shin2017-06-062-2/+3
| * | | | | | | | | | Disallow legacy trigger without a ownerLin Jen-Shin2017-06-061-3/+5
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-0649-203/+329
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Don't check permission, only protected ref if no userLin Jen-Shin2017-06-061-1/+9
| * | | | | | | | | | | Move the check to Pipeline.allowed_to_create?Lin Jen-Shin2017-06-063-13/+31
| * | | | | | | | | | | Forbid creating pipeline if it's protected andLin Jen-Shin2017-06-051-0/+10
* | | | | | | | | | | | Merge branch '35474-fix-new-issue' into 'master'Phil Hughes2017-07-251-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Move relative_path to the element that is being clickedJarka Kadlecova2017-07-251-2/+2
* | | | | | | | | | | | | Merge branch 'backport-ee-2328' into 'master'Sean McGivern2017-07-253-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/...Nick Thomas2017-07-213-4/+5
* | | | | | | | | | | | | | Merge branch 'new-navigation-custom-logo' into 'master'Filipa Lacerda2017-07-251-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed custom logo sizing in new navigation headernew-navigation-custom-logoPhil Hughes2017-07-241-0/+5
* | | | | | | | | | | | | | | Merge branch 'bvl-port-inverse-protected-ref-to-ce' into 'master'Rémy Coutable2017-07-251-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Explicitly define inverse of acces_level relationsbvl-port-inverse-protected-ref-to-ceBob Van Landuyt2017-07-251-1/+7
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'fix/gb/fix-build-merge-request-link-to-fork-project' into 'master'Kamil Trzciński2017-07-251-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix target project merge request link on build pagefix/gb/fix-build-merge-request-link-to-fork-projectGrzegorz Bizon2017-07-211-1/+2
| * | | | | | | | | | | | | | | Fix job merge request link to a forked source projectGrzegorz Bizon2017-07-191-1/+1
* | | | | | | | | | | | | | | | Merge branch '35478-allow-admin-to-read-user-list' into 'master'Rémy Coutable2017-07-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Allow admin to read_users_list even if it's restrictedLin Jen-Shin2017-07-251-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'archytaus/gitlab-ce-26372-duplicate-issue-slash-command' into '...Rémy Coutable2017-07-259-10/+106
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Move duplicate issue management to a servicearchytaus/gitlab-ce-26372-duplicate-issue-slash-commandSean McGivern2017-07-218-40/+80
| * | | | | | | | | | | | | | | Changes based on MR feedback.Ryan Scott2017-07-203-16/+17
| * | | | | | | | | | | | | | | Added slash command to close an issue as a duplicate. Closes #26372Ryan Scott2017-07-204-1/+56
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '35163-url-in-commit-message-can-be-broken-in-blame' into 'master'Phil Hughes2017-07-252-2/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |