summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-reload-find-branch' into 'master' Yorick Peterse2016-09-011-2/+15
|\
| * Optimize branch lookups and force a repository reload for Repository#find_branchsh-reload-find-branchStan Hu2016-09-011-2/+15
* | Merge branch 'issue_19734' into 'master' Douwe Maan2016-09-014-11/+118
|\ \
| * | Project tools visibility levelFelipe Artur2016-09-014-11/+118
| |/
* | Merge branch 'js-tooltips-for-mentions' into 'master' Robert Speicher2016-09-012-16/+0
|\ \
| * | Use JavaScript tooltips for mentions (!5301)winniehell2016-09-012-16/+0
* | | Merge branch '20601-emoji-tooltip-in-chronological-order' into 'master' Robert Speicher2016-09-011-1/+1
|\ \ \ | |_|/ |/| |
| * | Order award tooltips by their created_at dateAndrew Smith2016-09-011-1/+1
* | | Merge branch 'refactor/add-policies' into 'master' Robert Speicher2016-08-314-583/+14
|\ \ \ | |_|/ |/| |
| * | factor out a RuleSet so that `delegate!` retains @cannothttp://jneen.net/2016-08-301-1/+1
| * | remove the rest of the dead codehttp://jneen.net/2016-08-301-74/+0
| * | take the dive - only use abilities from Policieshttp://jneen.net/2016-08-301-8/+1
| * | port UserPolicyhttp://jneen.net/2016-08-301-11/+0
| * | port runners, namespaces, group/project_membershttp://jneen.net/2016-08-301-58/+0
| * | trim more dead codehttp://jneen.net/2016-08-301-52/+1
| * | port groupshttp://jneen.net/2016-08-301-36/+3
| * | port personal snippetshttp://jneen.net/2016-08-301-32/+1
| * | trim dead codehttp://jneen.net/2016-08-301-81/+0
| * | add automatic detection of the policy classhttp://jneen.net/2016-08-301-15/+3
| * | port CommitStatus/Buildhttp://jneen.net/2016-08-301-1/+2
| * | add and use MergeRequestPolicyhttp://jneen.net/2016-08-301-2/+5
| * | port issues to Issu{able,e}Policyhttp://jneen.net/2016-08-301-2/+4
| * | add support for anonymous abilitieshttp://jneen.net/2016-08-301-188/+6
| * | add policies, and factor out ProjectPolicyhttp://jneen.net/2016-08-301-31/+4
| * | remove Ability.abilitieshttp://jneen.net/2016-08-304-12/+3
| * | make almost everything on Ability privatehttp://jneen.net/2016-08-301-46/+44
| * | don't double-cache project_abiliteshttp://jneen.net/2016-08-301-11/+2
| * | remove six, and use a Set insteadhttp://jneen.net/2016-08-301-6/+19
| * | re-enable the cyclomatic complexity checkerhttp://jneen.net/2016-08-301-1/+0
* | | Merge branch 'remove-fishy-smell' into 'master' Douwe Maan2016-08-311-2/+2
|\ \ \
| * | | Allow setting branch refs for MRremove-fishy-smellSean McGivern2016-08-251-2/+2
* | | | Merge branch 'project-specific-lfs' into 'master' Robert Speicher2016-08-301-0/+7
|\ \ \ \
| * | | | Renamed `enable_lfs` to `lfs_enabled` for the Project field, and related fixes.project-specific-lfsPatricio Cano2016-08-301-2/+2
| * | | | Syntax and style fixes.Patricio Cano2016-08-301-1/+4
| * | | | Added project specific enable/disable setting for LFSPatricio Cano2016-08-301-0/+4
| | |/ / | |/| |
* | | | Merge branch 'master' into prevent_authored_awardable_votesbarthc2016-08-307-29/+43
|\ \ \ \ | |/ / /
| * | | Merge branch 'artifacts-from-ref-and-build-name' into 'master' Douwe Maan2016-08-303-7/+14
| |\ \ \
| | * \ \ Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-2610-107/+153
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-2424-74/+188
| | |\ \ \
| | * | | | Unify pipeline_for(ref, nil) and pipeline_for(ref), feedback:Lin Jen-Shin2016-08-191-1/+4
| | * | | | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-197-32/+231
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-1811-4/+128
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-1715-16/+121
| | |\ \ \ \ \ \
| | * | | | | | | An empty line after guard, feedback:Lin Jen-Shin2016-08-161-0/+1
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-1615-138/+250
| | |\ \ \ \ \ \ \
| | * | | | | | | | Make Pipeline.latest_successful_for return the recordLin Jen-Shin2016-08-112-7/+3
| | * | | | | | | | Remove Pipeline#latest in favour of Project#pipeline_for(ref)Lin Jen-Shin2016-08-111-4/+0
| | * | | | | | | | Fetch the current SHA if SHA was not passedLin Jen-Shin2016-08-111-1/+2
| | * | | | | | | | Reverse ref and sha in args and rename pipeline to pipeline_forLin Jen-Shin2016-08-112-4/+6
| | * | | | | | | | It's latest_for, not just latestLin Jen-Shin2016-08-101-1/+1