summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/rename-merge-request-head-pipeline' into 'master' Kamil Trzciński2016-11-302-4/+4
|\
| * Rename `MergeRequest#pipeline` to `head_pipeline`fix/rename-merge-request-head-pipelineGrzegorz Bizon2016-11-292-4/+4
* | Merge branch 'ee-1137-follow-up-protected-branch-users-and-groups' into 'mast...Douwe Maan2016-11-303-14/+10
|\ \ | |/ |/|
| * CE-specific changes gitlab-org/gitlab-ee#1137ee-1137-follow-up-protected-branch-users-and-groupsTimothy Andrew2016-11-293-14/+10
* | Merge branch 'hoopes/gitlab-ce-21027-add-diff-hunks-to-notification-emails' i...Douwe Maan2016-11-291-3/+9
|\ \
| * | Tidy up text emailsSean McGivern2016-11-281-2/+5
| * | Add keyword arguments to truncated_diff methodhhoopes2016-11-251-3/+4
| * | Change diff highlight/truncate for reusabilityhhoopes2016-11-251-5/+7
* | | Merge branch 'jej-use-issuable-finder-instead-of-access-check' into 'security' Douwe Maan2016-11-281-2/+2
* | | Merge branch 'jej-fix-missing-access-check-on-issues' into 'security'Douwe Maan2016-11-282-4/+6
* | | Merge branch '24813-project-members-with-developer-access-can-no-longer-creat...Sean McGivern2016-11-281-10/+4
|\ \ \
| * | | Pass tag SHA to post-receive hook when tag is created via UI24813-project-members-with-developer-access-can-no-longer-create-tagsAdam Niedzielski2016-11-281-2/+3
| * | | Revert "Pass correct tag target to post-receive hook when creating tag via UI"Adam Niedzielski2016-11-281-10/+3
| | |/ | |/|
* | | Prevent error when submitting a merge request and pipeline is not defined24860-actionview-template-error-undefined-method-size-for-nil-nilclassAdam Niedzielski2016-11-281-1/+1
|/ /
* | Merge branch 'refresh-authorizations-with-lease' into 'master' Douwe Maan2016-11-281-21/+15
|\ \
| * | Refresh project authorizations using a Redis leaserefresh-authorizations-with-leaseYorick Peterse2016-11-251-21/+15
* | | Merge branch 'events-cache-invalidation' into 'master' Douwe Maan2016-11-286-74/+4
|\ \ \ | |_|/ |/| |
| * | Removed data-user-is view codeevents-cache-invalidationYorick Peterse2016-11-251-0/+4
| * | Remove event caching codeYorick Peterse2016-11-236-74/+0
* | | Merge branch 'fix-cancelling-pipelines' into 'master' Kamil Trzciński2016-11-252-8/+17
|\ \ \
| * | | Wrap against 80 chars and rename failed_or_canceledfix-cancelling-pipelinesLin Jen-Shin2016-11-231-7/+9
| * | | Merge remote-tracking branch 'upstream/master' into fix-cancelling-pipelinesLin Jen-Shin2016-11-2210-209/+262
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into fix-cancelling-pipelinesLin Jen-Shin2016-11-2119-225/+409
| |\ \ \ \
| * | | | | Allow to retry failed or canceled builds and fix cancel running specs failureKamil Trzcinski2016-11-192-6/+9
| * | | | | Merge remote-tracking branch 'upstream/master' into fix-cancelling-pipelinesLin Jen-Shin2016-11-1815-77/+136
| |\ \ \ \ \
| * | | | | | Improve how we could cancel pipelines:Lin Jen-Shin2016-11-172-2/+6
* | | | | | | Merge branch 'backport-commands-params' into 'master' Douwe Maan2016-11-241-0/+3
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Backport Note#commands_changes from EEbackport-commands-paramsDouwe Maan2016-11-241-0/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'mrchrisw/add-namespace-logging' into 'master' Robert Speicher2016-11-241-0/+2
|\ \ \ \ \ \
| * | | | | | Log mv_namespace parametersmrchrisw/add-namespace-loggingChris Wilson2016-11-241-0/+2
* | | | | | | Merge branch 'dz-allow-nested-group-routing' into 'master' Douwe Maan2016-11-242-1/+6
|\ \ \ \ \ \ \
| * | | | | | | Add nested groups support to the routingdz-allow-nested-group-routingDmitriy Zaporozhets2016-11-232-1/+6
* | | | | | | | Merge branch '24863-mrs-without-discussions-are-mergeable' into 'master' Sean McGivern2016-11-231-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Correctly determine mergeability of MR with no discussions24863-mrs-without-discussions-are-mergeableDouwe Maan2016-11-231-1/+5
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'milestone_start_date' into 'master' Sean McGivern2016-11-233-41/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a starting date to milestonesmilestone_start_dateValery Sizov2016-11-233-41/+41
| |/ / / / / / /
* | | | | | | | Update ProjectTeam#fetch_members to use project authorizationsfix/drop-project-authorized-for-userAhmad Sherif2016-11-232-53/+8
* | | | | | | | Update ProjectTeam#max_member_access_for_user_ids to use project authorizationsAhmad Sherif2016-11-232-43/+7
* | | | | | | | Update user's authorized projects if project is allowed to share with groupAhmad Sherif2016-11-232-1/+11
* | | | | | | | Drop Project#authorized_for_user? in favor of ProjectTeam#member?Ahmad Sherif2016-11-233-11/+7
* | | | | | | | Refresh user's authorized projects when one of his memberships are updatedAhmad Sherif2016-11-231-1/+1
* | | | | | | | Change personal projects access level to master in User#project_authorization...Ahmad Sherif2016-11-231-1/+1
* | | | | | | | Use the minimum access level of group link and group member when inserting au...Ahmad Sherif2016-11-231-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'rs-project-team-helpers' into 'master' Sean McGivern2016-11-222-0/+17
|\ \ \ \ \ \ \
| * | | | | | | Add shortcuts for adding users to a project team with a specific rolers-project-team-helpersRobert Speicher2016-11-182-0/+17
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'revert-a0d5bb0b' into 'master' Achilleas Pipinellis2016-11-221-3/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Change documentation link in JIRA servicerevert-a0d5bb0bAchilleas Pipinellis2016-11-221-3/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'zj-mattermost-command-help-message' into 'master' Fatih Acet2016-11-221-7/+0
|\ \ \ \ \ \
| * | | | | | Improve the mattermost help boxZ.J. van de Weg2016-11-211-7/+0
* | | | | | | Merge branch 'fix-failed-email-for-external-jobs' into 'master' Kamil Trzciński2016-11-221-3/+7
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
View Lorry Controller Status