summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-add-schedule-pipeline-run-now' into 'master'Kamil Trzciński2017-12-181-0/+6
|\
| * Avoid Gitaly N+1 calls by caching tag_namesStan Hu2017-12-121-0/+6
* | Fixes 40842 - Adds extra cookies to JIRA service requestsStanislaw Wozniak2017-12-181-0/+2
* | Fix job count in pipeline success mailChristiaan Van den Poel2017-12-181-0/+4
* | Merge branch 'no-ivar-in-modules' into 'master'Robert Speicher2017-12-1510-40/+49
|\ \
| * \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-12-1543-216/+750
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-3029-262/+293
| |\ \ \
| * | | | Fix a few layout errorLin Jen-Shin2017-11-221-0/+1
| * | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-2223-55/+241
| |\ \ \ \
| * | | | | Move ModuleWithInstanceVariables to Gitlab namespaceLin Jen-Shin2017-11-226-21/+21
| * | | | | Updates based on feedbackLin Jen-Shin2017-11-221-4/+1
| * | | | | Use StrongMemoize and enable/disable cops properlyLin Jen-Shin2017-11-188-34/+33
| * | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-1733-213/+643
| |\ \ \ \ \
| * | | | | | WIPLin Jen-Shin2017-11-061-13/+5
| * | | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-0670-354/+1275
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-09-2514-105/+55
| |\ \ \ \ \ \ \
| * | | | | | | | Allow simple ivar ||= form. Update accordinglyLin Jen-Shin2017-09-1912-19/+25
| * | | | | | | | Add cop to make sure we don't use ivar in a moduleLin Jen-Shin2017-09-1814-2/+17
* | | | | | | | | Merge branch 'dm-ldap-email-readonly' into 'master'Sean McGivern2017-12-153-5/+11
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Make sure user email is read only when synced with LDAPDouwe Maan2017-12-153-5/+11
* | | | | | | | | Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master'Robert Speicher2017-12-141-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Migrate Gitlab::Git::Repository#merge_base_commit to Gitalyfeature/migrate-merge-base-to-gitalyAhmad Sherif2017-12-131-1/+1
* | | | | | | | | | Merge branch 'dm-batchloader-project' into 'master'Sean McGivern2017-12-141-3/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Include project in BatchLoader key to prevent returning blobs for the wrong p...Douwe Maan2017-12-141-3/+9
* | | | | | | | | | | sorting for tags apihaseeb2017-12-141-1/+3
* | | | | | | | | | | Merge branch 'zj-mr-diff-memoization-bug' into 'master'Sean McGivern2017-12-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Clear caches before updating MR diffsZeger-Jan van de Weg2017-12-141-1/+1
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '41110-dependencies-validator-fails-when-depended-job-is-manual'...Kamil Trzciński2017-12-141-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Dependencies Validator fails when depended job is `manual`41110-dependencies-validator-fails-when-depended-job-is-manualShinya Maeda2017-12-141-1/+0
* | | | | | | | | | | Make discussion mail References all notes in the discussiontc-correct-email-in-reply-toToon Claes2017-12-131-4/+5
* | | | | | | | | | | Make mail notifications of discussion notes In-Reply-To of each otherToon Claes2017-12-131-0/+9
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '13695-order-contributors-in-api' into 'master'Rémy Coutable2017-12-132-2/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Adds ordering to projects contributors in APIJacopo2017-12-132-2/+21
* | | | | | | | | | | Merge branch '33926-update-issuable-icons' into 'master'Annabel Dunstone Gray2017-12-131-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update issuable status icons33926-update-issuable-iconsEric Eastwood2017-12-131-3/+3
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'issue_41021' into 'master'Sean McGivern2017-12-131-0/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Prevent worker that updates merge requests head pipeline from failing jobsFelipe Artur2017-12-131-0/+8
* | | | | | | | | | | 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
| | |_|/ / / / / / / / | |/| | | | | | | | |