Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '2971-multiproject-grah-ce-port' into 'master' | Phil Hughes | 2017-07-25 | 1 | -1/+2 |
|\ | |||||
| * | Fix vertical alignment in firefox and safari for pipeline mini graph2971-multiproject-grah-ce-port | Filipa Lacerda | 2017-07-25 | 1 | -1/+2 |
* | | Merge branch '30634-protected-pipeline' into 'master' | Kamil Trzciński | 2017-07-25 | 8 | -42/+87 |
|\ \ | |||||
| * | | Extract validations | Lin Jen-Shin | 2017-07-21 | 1 | -24/+24 |
| * | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline | Lin Jen-Shin | 2017-07-20 | 126 | -206/+634 |
| |\ \ | |||||
| * | | | Use struct instead of hash | Lin Jen-Shin | 2017-07-20 | 1 | -2/+3 |
| * | | | Make permission checks easier to understand | Lin Jen-Shin | 2017-07-20 | 1 | -6/+6 |
| * | | | Use hash to return multiple objects | Lin Jen-Shin | 2017-07-20 | 1 | -4/+4 |
| * | | | Fix tests and fine tweak permission error message | Lin Jen-Shin | 2017-07-19 | 1 | -5/+5 |
| * | | | Eliminate N+1 queries on checking different protected refs | Lin Jen-Shin | 2017-07-19 | 1 | -4/+5 |
| * | | | Try to merge permission checks into one | Lin Jen-Shin | 2017-07-19 | 1 | -10/+10 |
| * | | | Rename :user_cannot_update to :protected_ref | Lin Jen-Shin | 2017-07-18 | 2 | -4/+4 |
| * | | | Rename can_push_or_merge_to_branch? to can_update_branch? | Lin Jen-Shin | 2017-07-18 | 3 | -5/+9 |
| * | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline | Lin Jen-Shin | 2017-07-18 | 13 | -95/+113 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline | Lin Jen-Shin | 2017-07-17 | 648 | -4331/+5912 |
| |\ \ \ \ | |||||
| * | | | | | Make message and code more clear | Lin Jen-Shin | 2017-07-06 | 1 | -2/+5 |
| * | | | | | Merge allowed_to_create? into CreatePipelineService | Lin Jen-Shin | 2017-07-05 | 4 | -31/+22 |
| * | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline | Lin Jen-Shin | 2017-07-05 | 33 | -128/+224 |
| |\ \ \ \ \ | |||||
| * | | | | | | Make sure that retryable_builds would preload project | Lin Jen-Shin | 2017-07-04 | 1 | -1/+1 |
| * | | | | | | Fix bad conflict resolution | Lin Jen-Shin | 2017-07-04 | 2 | -11/+13 |
| * | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline | Lin Jen-Shin | 2017-07-04 | 123 | -1252/+1647 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Consistently check permission for creating pipelines, | Lin Jen-Shin | 2017-07-04 | 3 | -7/+25 |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline | Lin Jen-Shin | 2017-06-29 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline | Lin Jen-Shin | 2017-06-29 | 740 | -8791/+13477 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline | Lin Jen-Shin | 2017-06-07 | 38 | -463/+812 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Still allow legacy triggers, feedback: | Lin Jen-Shin | 2017-06-06 | 1 | -5/+3 |
| * | | | | | | | | | | Try to report why it's failing and fix tests | Lin Jen-Shin | 2017-06-06 | 2 | -2/+3 |
| * | | | | | | | | | | Disallow legacy trigger without a owner | Lin Jen-Shin | 2017-06-06 | 1 | -3/+5 |
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline | Lin Jen-Shin | 2017-06-06 | 49 | -203/+329 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Don't check permission, only protected ref if no user | Lin Jen-Shin | 2017-06-06 | 1 | -1/+9 |
| * | | | | | | | | | | | Move the check to Pipeline.allowed_to_create? | Lin Jen-Shin | 2017-06-06 | 3 | -13/+31 |
| * | | | | | | | | | | | Forbid creating pipeline if it's protected and | Lin Jen-Shin | 2017-06-05 | 1 | -0/+10 |
* | | | | | | | | | | | | Merge branch '35474-fix-new-issue' into 'master' | Phil Hughes | 2017-07-25 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Move relative_path to the element that is being clicked | Jarka Kadlecova | 2017-07-25 | 1 | -2/+2 |
* | | | | | | | | | | | | | Merge branch 'backport-ee-2328' into 'master' | Sean McGivern | 2017-07-25 | 3 | -4/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/... | Nick Thomas | 2017-07-21 | 3 | -4/+5 |
* | | | | | | | | | | | | | | Merge branch 'new-navigation-custom-logo' into 'master' | Filipa Lacerda | 2017-07-25 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Fixed custom logo sizing in new navigation headernew-navigation-custom-logo | Phil Hughes | 2017-07-24 | 1 | -0/+5 |
* | | | | | | | | | | | | | | | Merge branch 'bvl-port-inverse-protected-ref-to-ce' into 'master' | Rémy Coutable | 2017-07-25 | 1 | -1/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Explicitly define inverse of acces_level relationsbvl-port-inverse-protected-ref-to-ce | Bob Van Landuyt | 2017-07-25 | 1 | -1/+7 |
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'fix/gb/fix-build-merge-request-link-to-fork-project' into 'master' | Kamil Trzciński | 2017-07-25 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Fix target project merge request link on build pagefix/gb/fix-build-merge-request-link-to-fork-project | Grzegorz Bizon | 2017-07-21 | 1 | -1/+2 |
| * | | | | | | | | | | | | | | | Fix job merge request link to a forked source project | Grzegorz Bizon | 2017-07-19 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | Merge branch '35478-allow-admin-to-read-user-list' into 'master' | Rémy Coutable | 2017-07-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Allow admin to read_users_list even if it's restricted | Lin Jen-Shin | 2017-07-25 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'archytaus/gitlab-ce-26372-duplicate-issue-slash-command' into '... | Rémy Coutable | 2017-07-25 | 9 | -10/+106 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Move duplicate issue management to a servicearchytaus/gitlab-ce-26372-duplicate-issue-slash-command | Sean McGivern | 2017-07-21 | 8 | -40/+80 |
| * | | | | | | | | | | | | | | | Changes based on MR feedback. | Ryan Scott | 2017-07-20 | 3 | -16/+17 |
| * | | | | | | | | | | | | | | | Added slash command to close an issue as a duplicate. Closes #26372 | Ryan Scott | 2017-07-20 | 4 | -1/+56 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch '35163-url-in-commit-message-can-be-broken-in-blame' into 'master' | Phil Hughes | 2017-07-25 | 2 | -2/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |