summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-more-public-send-whitelists' into 'master'Rémy Coutable2017-08-1613-21/+27
|\
| * Whitelist or fix additional `Gitlab/PublicSend` cop violationsrs-more-public-send-whitelistsRobert Speicher2017-08-1413-21/+27
* | Merge branch 'rs-trailingwhitespace-cop' into 'master'Rémy Coutable2017-08-163-3/+3
|\ \
| * | Enable Layout/TrailingWhitespace cop and auto-correct offensesRobert Speicher2017-08-153-3/+3
* | | Merge branch '34643-fix-project-path-slugify' into 'master'Rémy Coutable2017-08-162-5/+6
|\ \ \ | |/ / |/| |
| * | Fix CI_PROJECT_PATH_SLUG slugifyvanadium232017-08-152-5/+6
* | | Merge branch 'forks-count-cache' into 'master'Douwe Maan2017-08-151-1/+4
|\ \ \
| * | | Cache the number of forks of a projectforks-count-cacheYorick Peterse2017-08-141-1/+4
| | |/ | |/|
* | | Merge branch '34533-speed-up-group-project-authorizations' into 'master'Douwe Maan2017-08-153-8/+51
|\ \ \ | |_|/ |/| |
| * | Speed up Group#user_ids_for_project_authorizationsNick Thomas2017-08-143-8/+51
* | | Merge branch 'rs-remove-username-from-sanitize-attrs' into 'master'Rémy Coutable2017-08-141-3/+3
|\ \ \
| * | | Remove `username` from `User#sanitize_attrs` callbackrs-remove-username-from-sanitize-attrsRobert Speicher2017-08-111-3/+3
* | | | Use with_repo_branch_commit instead of fetch_ref directlyLin Jen-Shin2017-08-141-9/+8
* | | | Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-...Lin Jen-Shin2017-08-1413-8/+380
|\ \ \ \ | | |_|/ | |/| |
| * | | don't send devise notifications to the ghost userhttp://jneen.net/2017-08-111-0/+1
| * | | skip the :read_project check for new_project_memberhttp://jneen.net/2017-08-111-1/+6
| * | | rubocop fixhttp://jneen.net/2017-08-111-2/+1
| * | | a membership with no user is always notifiablehttp://jneen.net/2017-08-113-6/+14
| * | | add Member#notifiable?(type, opts)http://jneen.net/2017-08-113-0/+12
| * | | make NotificationRecipient a little more customizablehttp://jneen.net/2017-08-111-3/+15
| | |/ | |/|
| * | Merge branch 'disable-project-export' into 'master'Rémy Coutable2017-08-111-0/+1
| |\ \ | | |/ | |/|
| | * Add option to disable project export on instanceRobin Bobbitt2017-08-111-0/+1
| * | Better caching and indexing of broadcast messagesYorick Peterse2017-08-111-2/+12
| |/
| * Merge branch 'split-events-into-push-events' into 'master'Sean McGivern2017-08-115-3/+307
| |\
| | * Use a specialized class for querying eventsYorick Peterse2017-08-102-2/+105
| | * Migrate events into a new formatYorick Peterse2017-08-104-1/+202
| * | Merge branch 'appearances-caching-and-schema' into 'master'Sean McGivern2017-08-111-0/+20
| |\ \ | | |/ | |/|
| | * Cache Appearance instances in Redisappearances-caching-and-schemaYorick Peterse2017-08-101-0/+20
* | | Since now fetch_ref is reliable, we could just rely on itLin Jen-Shin2017-08-111-5/+5
* | | Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-...Lin Jen-Shin2017-08-114-12/+28
|\ \ \ | |/ /
| * | Merge branch 'mk-fix-case-insensitive-redirect-matching' into 'master'Sean McGivern2017-08-101-1/+9
| |\ \ | | |/ | |/|
| | * Remove unnecessary work for MySQLMichael Kozono2017-08-081-1/+9
| | * Fix conflicting redirect searchMichael Kozono2017-08-081-1/+1
| * | Prevent user from changing username with container registry tagsMichael Kozono2017-08-091-0/+8
| * | Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-092-11/+11
* | | Don't try to create diffs if one of the branch is missingLin Jen-Shin2017-08-101-1/+2
* | | Introduce MergeRequest#write_ref and Repository#write_refLin Jen-Shin2017-08-103-9/+21
* | | Just detect exit status rather than check refLin Jen-Shin2017-08-101-1/+1
* | | Fix some tests and report the error messageLin Jen-Shin2017-08-091-2/+2
* | | Detect if we didn't create the ref soonerLin Jen-Shin2017-08-091-1/+4
|/ /
* | Use full path of user's avatar in webhooks34339-user_avatar-url-in-push-event-webhook-json-payload-is-relative-should-be-absoluteblackst0ne2017-08-091-1/+1
* | Merge branch 'add-rubocop-gitlab-security' into 'master'Robert Speicher2017-08-0810-19/+20
|\ \ | |/ |/|
| * Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-0810-19/+20
* | Merge branch '36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-...Rémy Coutable2017-08-081-7/+12
|\ \ | |/ |/|
| * Add checks for branch existence before changing HEAD36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-default-oneblackst0ne2017-08-081-7/+12
* | Merge branch 'gitaly-find-commit' into 'master'Dmitriy Zaporozhets2017-08-083-17/+8
|\ \
| * | Incorporate Gitaly's CommitService.FindCommit RPCgitaly-find-commitAlejandro Rodríguez2017-08-071-1/+1
| * | Move `deltas` and `diff_from_parents` logic to Gitlab::Git::CommitAlejandro Rodríguez2017-08-071-12/+2
| * | Refactor Gitlab::Git::Commit to include a repositoryAlejandro Rodríguez2017-08-073-4/+5
* | | Merge branch 'master' into ideMike Greiling2017-08-077-37/+50
|\ \ \