summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |_|/ / | |/| | |
* | | | | 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
View Lorry Controller Status