summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Expand)AuthorAgeFilesLines
* port of 594e6a0a625^..f74c90f68c6Micaël Bergeron2018-02-012-60/+15
* Merge branch '42497-rubocop-style-regexpliteral' into 'master'Rémy Coutable2018-02-011-2/+2
|\
| * Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-011-2/+2
* | Merge branch 'rugged-reference-cache-rescue' into 'master'Sean McGivern2018-01-311-5/+3
|\ \ | |/ |/|
| * Remove Rugged exception in cache rescuerugged-reference-cache-rescueJacob Vosmaer2018-01-301-5/+3
* | Merge branch 'feature/migrate-wiki-page-formatted-data-to-gitaly' into 'master'Robert Speicher2018-01-301-5/+15
|\ \
| * | Migrate fetching wiki page formatted content to Gitalyfeature/migrate-wiki-page-formatted-data-to-gitalyAhmad Sherif2018-01-301-5/+15
* | | Merge branch '42160-error-500-loading-merge-request-undefined-method-index-fo...Douwe Maan2018-01-301-0/+10
|\ \ \ | |_|/ |/| |
| * | Fix truncated_diff_lines for legacy notes without a line42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclassSean McGivern2018-01-301-0/+10
* | | Merge branch 'osw-short-circuit-mergeable-disccusions-state' into 'master'Sean McGivern2018-01-301-0/+4
|\ \ \ | |/ / |/| |
| * | Check MR state before submitting queries for discussion stateosw-short-circuit-mergeable-disccusions-stateOswaldo Ferreira2018-01-291-0/+4
* | | Fix JIRA not working when a trailing slash is includedStan Hu2018-01-291-0/+23
|/ /
* | Merge branch 'fix-cache-clear-windows' into 'master'Kamil Trzciński2018-01-291-1/+1
|\ \
| * | Replace : with _ in cache key versioningMatija Čupić2018-01-261-1/+1
| |/
* | Fix an order dependency in a specNick Thomas2018-01-291-3/+3
* | Close and do not reload MR diffs when source branch is deletedOswaldo Ferreira2018-01-291-1/+1
* | Don't allow Repository#log with limit zeroJacob Vosmaer (GitLab)2018-01-291-15/+15
* | Fix MR revert check when no merged_at is presentSean McGivern2018-01-291-10/+20
|/
* Merge branch 'lint-rugged' into 'master'Rémy Coutable2018-01-251-18/+10
|\
| * Look for rugged with static analysislint-ruggedJacob Vosmaer2018-01-251-18/+10
* | Merge branch '42377-fix-merge-request-can-be-reverted' into 'master'Rémy Coutable2018-01-251-2/+12
|\ \ | |/ |/|
| * Look at notes created just before merge when deciding if an MR can be revertedNick Thomas2018-01-251-2/+12
* | Merge branch 'fix/add-formatted-data-to-wiki-page' into 'master'Robert Speicher2018-01-241-0/+11
|\ \
| * | Add formatted_data attribute to Git::WikiPageAhmad Sherif2018-01-241-0/+11
| |/
* | Merge branch '40744-idempotent-ids' into 'master'Robert Speicher2018-01-244-22/+25
|\ \
| * | Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'Nick Thomas2018-01-244-22/+25
| |/
* | Execute system hooks after-commit when executing project hooksdm-project-system-hooks-in-transactionDouwe Maan2018-01-241-0/+17
|/
* GitalyClient::ConflictsService#conflicts? should return true for conflicts wi...fix/gitaly-can-be-merged-for-missing-conflict-filesAhmad Sherif2018-01-231-1/+7
* Merge branch '40612-cannot-change-project-visibility-from-private-even-when-o...Robert Speicher2018-01-221-0/+4
|\
| * ensure fork_source returns nil when project is the root fork, add testsMike Greiling2018-01-221-0/+4
* | Merge branch '41673-blank-query-members-api' into 'master'Rémy Coutable2018-01-221-0/+16
|\ \ | |/ |/|
| * Yield no results for blank searches on User name, username and emailMark Fletcher2018-01-211-0/+16
* | Merge branch '42154-fix-artifact-size-calc' into 'master'Robert Speicher2018-01-181-0/+6
|\ \
| * | Fix a bug calculating artifact size for project statisticsNick Thomas2018-01-181-0/+6
| |/
* | Delete conflicting orphaned routesMichael Kozono2018-01-181-0/+61
|/
* Merge branch 'feature/merge-request-system-hook' into 'master'Douwe Maan2018-01-183-1/+64
|\
| * no need for a named parameterAlexis Reigel2018-01-171-1/+1
| * accepts `.all` as a hook scope as wellAlexis Reigel2018-01-171-1/+9
| * use safer .hooks_for instead of .public_sendAlexis Reigel2018-01-171-0/+18
| * extract concern for hook triggersAlexis Reigel2018-01-171-0/+17
| * invoke SystemHooksService instead of direct modelAlexis Reigel2018-01-041-7/+3
| * execute system hooks from projectAlexis Reigel2018-01-042-1/+25
* | Resolve conflicts in VERSION, db/schema.rb, and spec/models/service_spec.rbStan Hu2018-01-161-3/+3
* | Merge branch '41293-fix-command-injection-vulnerability-on-system_hook_push-q...Robert Speicher2018-01-161-0/+6
* | Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'securit...Douwe Maan2018-01-161-1/+1
* | Merge branch '41567-projectfix' into 'security-10-3'Sean McGivern2018-01-161-0/+4
* | Merge branch 'security-10-3-do-not-expose-passwords-or-tokens-in-service-inte...Stan Hu2018-01-161-0/+34
* | Merge branch '40818-last-push-widget-does-not-appear-after-pushing-new-commit...Rémy Coutable2018-01-161-5/+21
|\ \
| * | Last push widget will show banner for new pushes to previously merged branchDrew Blessing2018-01-151-5/+21
* | | Merge branch '41666-cannot-search-with-keyword-merge' into 'master'Rémy Coutable2018-01-161-1/+1
|\ \ \
View Lorry Controller Status