summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dz-nested-group-improvements-2' into 'master' Sean McGivern2016-12-131-3/+4
|\
| * Rename Routable.where_paths_in to Routable.where_full_path_indz-nested-group-improvements-2Dmitriy Zaporozhets2016-12-111-3/+3
| * Validate presence of route by Routable concernDmitriy Zaporozhets2016-12-111-0/+1
* | Merge branch 'grapify-service-api' into 'master' Rémy Coutable2016-12-125-15/+18
|\ \ | |/ |/|
| * Grapify the service APIRobert Schilling2016-12-095-15/+18
* | Do not reload diff for merge request made from fork when target branch in for...do-not-refresh-main-when-fork-target-branch-updatedAdam Niedzielski2016-12-091-1/+3
* | Merge branch 'dz-nested-groups' into 'master' Douwe Maan2016-12-094-85/+122
|\ \
| * | Add nested groups support on data leveldz-nested-groupsDmitriy Zaporozhets2016-12-084-85/+122
* | | Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security'Douwe Maan2016-12-084-22/+33
* | | Merge branch 'pipeline-stage' into 'master' Rémy Coutable2016-12-084-33/+68
|\ \ \
| * | | Code reviewKamil Trzcinski2016-12-071-1/+3
| * | | Fix success statusKamil Trzcinski2016-12-072-2/+3
| * | | Added Ci::Stage specsKamil Trzcinski2016-12-061-0/+4
| * | | Fix handling of allowed to failure jobsKamil Trzcinski2016-12-063-8/+4
| * | | Fix handling of skipped vs success statusKamil Trzcinski2016-12-061-3/+3
| * | | Fix test failuresKamil Trzcinski2016-12-061-3/+3
| * | | Added Stage testsKamil Trzcinski2016-12-061-0/+4
| * | | Add Ci::Status::StageKamil Trzcinski2016-12-061-0/+2
| * | | Preserve stage values and use StaticModelKamil Trzcinski2016-12-061-5/+11
| * | | Introduce `Ci::Stage`, right now this is artificial object that is build dyna...Kamil Trzcinski2016-12-063-24/+32
| * | | Fix broken pipeline rendering [ci skip]Kamil Trzcinski2016-12-061-4/+6
| * | | Support pipelines APIKamil Trzcinski2016-12-062-15/+25
* | | | Merge branch '25209-improve-length-validators' into 'master' Rémy Coutable2016-12-077-19/+31
|\ \ \ \ | |_|/ / |/| | |
| * | | Use :maximum instead of :within for length validators with a 0..N range25209-improve-length-validatorsRémy Coutable2016-12-067-19/+31
* | | | Merge branch 'remove-has-visible-content-caching' into 'master' Douwe Maan2016-12-071-13/+1
|\ \ \ \
| * | | | Remove caching of Repository#has_visible_content?remove-has-visible-content-cachingYorick Peterse2016-12-061-13/+1
| | |_|/ | |/| |
* | | | Merge branch '23589-open-issue-for-mr' into 'master' Sean McGivern2016-12-063-1/+13
|\ \ \ \ | |_|_|/ |/| | |
| * | | Feature: delegate all open discussions to IssueBob Van Landuyt2016-12-053-1/+13
| |/ /
* | | Merge branch 'refine-ci-statuses' into 'master' Kamil Trzciński2016-12-061-0/+4
|\ \ \
| * | | Expose pipeline detailed status using status factoryGrzegorz Bizon2016-12-051-0/+4
| | |/ | |/|
* | | Merge branch 'glm-shorthand-reference' into 'master' Sean McGivern2016-12-069-64/+69
|\ \ \
| * | | Add shorthand support to gitlab markdown referencesOswaldo Ferreira2016-12-029-64/+69
| |/ /
* | | Authorize users into imported GitLab projectfix/authorize-users-into-imported-gitlab-projectAhmad Sherif2016-12-051-0/+1
| |/ |/|
* | Merge branch '24921-hide-prompt-to-add-ssh-key-if-ssh-protocol-is-disabled' i...Sean McGivern2016-12-031-1/+1
|\ \ | |/ |/|
| * If SSH prototol is disabled don't say the user requires SSH keysAndrew Smith2016-12-011-1/+1
* | Merge branch 'process-commit-worker-improvements' into 'master' Douwe Maan2016-12-021-0/+4
|\ \
| * | Pass commit data to ProcessCommitWorkerprocess-commit-worker-improvementsYorick Peterse2016-12-011-0/+4
| |/
* | Merge branch 'use-st-commits-where-possible' into 'master' Yorick Peterse2016-12-013-12/+17
|\ \ | |/ |/|
| * Replace references to MergeRequestDiff#commits with st_commitsuse-st-commits-where-possibleAdam Niedzielski2016-12-013-12/+17
* | Refactor JiraService by moving code out of JiraService#execute methodclean-up-jira-serviceAdam Niedzielski2016-12-011-28/+29
|/
* 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
View Lorry Controller Status