summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'noteable-touch-return-object' into 'master'Stan Hu2017-12-121-0/+3
|\
| * Return the noteable in Note#touch_noteablenoteable-touch-return-objectYorick Peterse2017-12-121-0/+3
* | Merge branch 'tmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using...Robert Speicher2017-12-121-0/+1
|\ \ | |/ |/|
| * Refactor member view by using presenterTM Lee2017-12-111-0/+1
* | Merge branch 'zj-memoization-mr-commits' into 'master'Sean McGivern2017-12-122-7/+20
|\ \
| * | Use memoization for commits on diffsZeger-Jan van de Weg2017-12-122-7/+20
* | | check the import_status field before doing SQL operations to check the import...Greg Stark2017-12-121-1/+2
* | | Merge branch 'repo-write-ref-client-prep' into 'master'Robert Speicher2017-12-122-11/+7
|\ \ \
| * | | Move Repository#write_ref to Git::Repository#write_refrepo-write-ref-client-prepKim "BKC" Carlbäcker2017-12-122-11/+7
| |/ /
* | | Merge branch 'optimize-issues-avoid-noop-empty-cache-updates2' into 'master'Sean McGivern2017-12-121-2/+1
|\ \ \
| * | | Treat empty markdown and html strings as valid cached text, not missing cache...optimize-issues-avoid-noop-empty-cache-updates2Greg Stark2017-12-121-2/+1
* | | | Merge branch 'fix-remove-branch-name-migration' into 'master'Sean McGivern2017-12-121-1/+1
|\ \ \ \
| * | | | Fix migration that removes issues.branch_namefix-remove-branch-name-migrationYorick Peterse2017-12-111-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'gitaly-mirroring-prep' into 'master'Robert Speicher2017-12-111-2/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Unify mirror addition operations to prepare for Gitaly migrationgitaly-mirroring-prepAlejandro Rodríguez2017-12-061-2/+1
* | | | Merge branch 'remove_assignee_id' into 'master'Yorick Peterse2017-12-111-0/+3
|\ \ \ \
| * | | | Add spec for removing issues.assignee_idSean McGivern2017-12-111-0/+3
* | | | | Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'Winnie Hellmann2017-12-111-4/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Resolve conflicts in app/models/user.rbmk-pick-10-2-4-security-fixesDouwe Maan2017-12-111-27/+7
| * | | | Merge branch 'bvl-10-2-email-disclosure' into 'security-10-2'Douwe Maan2017-12-081-0/+27
| | |_|/ | |/| |
* | | | Merge branch 'bw-todo-count-expiration' into 'master'Sean McGivern2017-12-111-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | expire todo count calculations to be consistent withbw-todo-count-expirationBrett Walker2017-12-081-2/+2
* | | | Allow git pull/push on project redirectsMayra Cabrera2017-12-083-5/+60
* | | | Fix N+1 query when displaying eventsfix-event-target-author-preloadingYorick Peterse2017-12-081-1/+1
|/ / /
* | | Move the circuitbreaker check out in a separate processbvl-circuitbreaker-processBob Van Landuyt2017-12-081-10/+2
* | | Merge branch '40754-fix-flash-usage-with-personal-access-token' into 'master'Grzegorz Bizon2017-12-081-0/+21
|\ \ \
| * | | Fix new personal access token showing up in a flash message40754-fix-flash-usage-with-personal-access-tokenEric Eastwood2017-12-071-0/+21
* | | | Merge branch 'feature/sm/34834-missing-dependency-should-fail-job-2' into 'ma...Kamil Trzciński2017-12-072-1/+22
|\ \ \ \ | |_|_|/ |/| | |
| * | | Change feature flag to ci_disable_validates_dependencies to enable it as defaultShinya Maeda2017-12-071-1/+1
| * | | Fix /build_spec.rbShinya Maeda2017-12-061-8/+8
| * | | Optimize valid_dependency method by ayufan thoughtShinya Maeda2017-12-061-15/+11
| * | | Add feature flagShinya Maeda2017-12-061-0/+2
| * | | Add case when artifacts have not existed on dependenciesShinya Maeda2017-12-061-5/+15
| * | | Use Class.new(StandardError) instead of custom extended error class. Bring ba...Shinya Maeda2017-12-061-2/+8
| * | | Fail jobs if its dependency is missingShinya Maeda2017-12-062-1/+8
* | | | Merge branch 'dm-commit-diff-discussions-in-mr-context' into 'master'Douwe Maan2017-12-077-19/+49
|\ \ \ \
| * | | | adding view and feature specsmicael.bergeron2017-12-071-3/+6
| * | | | cache the Note#commit methodmicael.bergeron2017-12-071-8/+6
| * | | | revert the `#all_pipelines` method to use the pluckmicael.bergeron2017-12-071-2/+1
| * | | | add support for the commit reference filtermicael.bergeron2017-12-072-9/+15
| * | | | tidying up the changesmicael.bergeron2017-12-071-9/+0
| * | | | add support for commit (in mr) to reference filtermicael.bergeron2017-12-072-0/+13
| * | | | Allow commenting on individual commits inside an MRDouwe Maan2017-12-075-2/+22
* | | | | Remove Rugged::Repository#empty?Zeger-Jan van de Weg2017-12-072-10/+12
|/ / / /
* | | | Merge branch 'ce-backport-3615' into 'master'Sean McGivern2017-12-071-3/+7
|\ \ \ \
| * | | | Refactor banzai to support referencing from group contextce-backport-3615Jarka Kadlecova2017-12-061-3/+7
* | | | | Support uploads for groupsJarka Kadlecova2017-12-071-0/+4
* | | | | Resolve "Display member role per project"Mike Greiling2017-12-073-29/+83
* | | | | Throttle the number of UPDATEs triggered by touchYorick Peterse2017-12-064-1/+47
| |_|_|/ |/| | |
* | | | Merge branch 'ee-backport-issue_40654' into 'master'Sean McGivern2017-12-061-0/+7
|\ \ \ \
View Lorry Controller Status