summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rugged-reference-cache-rescue' into 'master'Sean McGivern2018-01-311-1/+1
|\ | | | | | | | | Stop rescuing Rugged::Reference in Repository cache See merge request gitlab-org/gitlab-ce!16770
| * Remove Rugged exception in cache rescuerugged-reference-cache-rescueJacob Vosmaer2018-01-301-1/+1
| |
* | Merge branch 'fix/move-can-be-merged-to-lib-git' into 'master'Grzegorz Bizon2018-01-311-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Move Repository#can_be_merged? to Gitlab::Git::Repository Closes #42544 See merge request gitlab-org/gitlab-ce!16771
| * | Move Repository#can_be_merged? to Gitlab::Git::Repositoryfix/move-can-be-merged-to-lib-gitAhmad Sherif2018-01-301-19/+1
| | | | | | | | | | | | Fixes #42544
* | | Merge branch 'feature/migrate-wiki-page-formatted-data-to-gitaly' into 'master'Robert Speicher2018-01-302-1/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Migrate fetching wiki page formatted content to Gitaly Closes gitaly#958 See merge request gitlab-org/gitlab-ce!16716
| * | | Migrate fetching wiki page formatted content to Gitalyfeature/migrate-wiki-page-formatted-data-to-gitalyAhmad Sherif2018-01-302-1/+10
| | | | | | | | | | | | | | | | Closes gitaly#958
* | | | Merge branch 'gitaly-784-repo-write-ref' into 'master'Douwe Maan2018-01-301-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Git::Repository#write_ref to Gitaly Closes gitaly#784 See merge request gitlab-org/gitlab-ce!16513
| * | | | Migrate Git::Repository#write_ref to Gitalygitaly-784-repo-write-refKim "BKC" Carlbäcker2018-01-301-0/+2
| | |/ / | |/| |
* | | | Merge branch ↵Douwe Maan2018-01-301-0/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | '42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclass' into 'master' Resolve "Error 500 loading merge request: undefined method `index' for nil:NilClass" Closes #42160 See merge request gitlab-org/gitlab-ce!16795
| * | | 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/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that some legacy diff notes on GitLab.com have invalid line codes, which means truncated_diff_lines won't work. This is just a band-aid solution, as neither the diff nor the discussion will display correctly for these notes, but they won't cause a 500 error.
* | | | Decouple more of Repository from RuggedJacob Vosmaer (GitLab)2018-01-301-62/+5
| | | |
* | | | Merge branch 'osw-short-circuit-mergeable-disccusions-state' into 'master'Sean McGivern2018-01-301-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Check MR state before submitting queries for discussion state Closes #42236 See merge request gitlab-org/gitlab-ce!16788
| * | | Check MR state before submitting queries for discussion stateosw-short-circuit-mergeable-disccusions-stateOswaldo Ferreira2018-01-291-2/+2
| |/ /
* | | Fix JIRA not working when a trailing slash is includedStan Hu2018-01-291-1/+1
|/ / | | | | | | | | | | | | | | Leaving a trailing slash in the context option causes the jira-ruby gem to add an extra slash in HTTP requests to the URL, preventing JIRA from working properly. Closes #42494
* | Merge branch 'fix-cache-clear-windows' into 'master'Kamil Trzciński2018-01-291-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix cache clear windows Closes #42487 See merge request gitlab-org/gitlab-ce!16740
| * | Replace : with _ in cache key versioningMatija Čupić2018-01-261-1/+1
| |/
* | Fix MR revert check when no merged_at is presentSean McGivern2018-01-291-6/+6
|/
* update code based on feedback42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-errorJames Lopez2018-01-264-3/+7
|
* add specJames Lopez2018-01-261-0/+1
|
* disable retry attempts for Import/Export until that is fixedJames Lopez2018-01-261-0/+2
|
* fix validation error on servicesJames Lopez2018-01-264-3/+5
|
* Merge branch 'feature/migrate-repo-restorer-to-gitaly' into 'master'Robert Speicher2018-01-251-1/+1
|\ | | | | | | | | | | | | Migrate restoring repo from bundle to Gitaly Closes gitaly#946 See merge request gitlab-org/gitlab-ce!16623
| * Migrate restoring repo from bundle to Gitalyfeature/migrate-repo-restorer-to-gitalyAhmad Sherif2018-01-241-1/+1
| | | | | | | | Closes gitaly#946
* | Merge branch 'lint-rugged' into 'master'Rémy Coutable2018-01-252-9/+2
|\ \ | | | | | | | | | | | | Add a lint check to restrict use of Rugged See merge request gitlab-org/gitlab-ce!16656
| * | Look for rugged with static analysislint-ruggedJacob Vosmaer2018-01-252-9/+2
| | |
* | | Merge branch 'contrain-run-git' into 'master'Rémy Coutable2018-01-251-66/+15
|\ \ \ | | | | | | | | | | | | | | | | Make Gitlab::Git::Repository#run_git private See merge request gitlab-org/gitlab-ce!16622
| * | | Make Gitlab::Git::Repository#run_git privatecontrain-run-gitJacob Vosmaer2018-01-251-66/+15
| |/ /
* | | Merge branch '42377-fix-merge-request-can-be-reverted' into 'master'Rémy Coutable2018-01-251-1/+7
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Look at system notes created just before merge as well as after, when deciding if an MR can be reverted Closes #42377 See merge request gitlab-org/gitlab-ce!16678
| * | Look at notes created just before merge when deciding if an MR can be revertedNick Thomas2018-01-251-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On MySQL, at least, `Note#created_at` doesn't seem to store fractional seconds, while `MergeRequest::Metrics#merged_at` does. This breaks the optimization assumption that we only need to search for notes created *after* the MR has been merged. Unsynchronized system clocks also make this a dangerous assumption to make. Adding a minute of leeway still optimizes away most notes, but allows both cases to be handled more gracefully. If the system clocks are more than a minute out, we'll still be broken, of course.
* | | Merge branch 'dm-project-system-hooks-in-transaction' into 'master'Robert Speicher2018-01-241-2/+2
|\ \ \ | |_|/ |/| | | | | | | | Execute system hooks after-commit when executing project hooks See merge request gitlab-org/gitlab-ce!16673
| * | Execute system hooks after-commit when executing project hooksdm-project-system-hooks-in-transactionDouwe Maan2018-01-241-2/+2
| |/
* | Migrate repository bundling to Gitalyfeature/migrate-bundle-to-disk-to-gitalyAhmad Sherif2018-01-241-0/+1
|/ | | | Closes gitaly#929
* Merge branch ↵Robert Speicher2018-01-221-0/+2
|\ | | | | | | | | | | | | | | | | '40612-cannot-change-project-visibility-from-private-even-when-owner' into 'master' Resolve "Cannot change project visibility from Private (even when owner)" Closes #40612 See merge request gitlab-org/gitlab-ce!16595
| * ensure fork_source returns nil when project is the root fork, add testsMike Greiling2018-01-221-0/+2
| |
* | Merge branch 'gitaly-write-ref-error-handling' into 'master'Robert Speicher2018-01-221-9/+1
|\ \ | | | | | | | | | | | | Wrap Rugged-exceptions in Gitlab::Git::Repository#write_ref See merge request gitlab-org/gitlab-ce!16570
| * | Move error-handling to lib/gitlab/gitKim "BKC" Carlbäcker2018-01-221-11/+1
| | |
| * | Wrap Rugged-exceptions in Gitlab::Git::Repository#write_refgitaly-write-ref-error-handlingKim "BKC" Carlbäcker2018-01-181-5/+7
| | |
* | | Merge branch '41673-blank-query-members-api' into 'master'Rémy Coutable2018-01-221-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project/#/Members?query= blank causes 500 error" Closes #41673 See merge request gitlab-org/gitlab-ce!16235
| * | | Yield no results for blank searches on User name, username and emailMark Fletcher2018-01-211-0/+4
| | | | | | | | | | | | | | | | Given no search term, the `search` and `search_with_secondary_emails` methods will yield an empty result set
* | | | Merge branch 'gitaly-write-repo-config-prep' into 'master'Douwe Maan2018-01-221-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Move rugged-call from Project#write_repository_config to Git::Repository#write_config See merge request gitlab-org/gitlab-ce!16572
| * | | Move rugged-call from Project#write_repository_config to ↵Kim "BKC" Carlbäcker2018-01-191-1/+1
| | | | | | | | | | | | | | | | Git::Repository#write_config
* | | | Merge branch '41532-email-reason' into 'master'Sean McGivern2018-01-192-19/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show why a notification email was sent Closes #41532 and #1366 See merge request gitlab-org/gitlab-ce!16160
| * | | | Initial work to add notification reason to emailsMario de la Ossa2018-01-162-19/+36
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds `#build_notification_recipients` to `NotificationRecipientService` that returns the `NotificationRecipient` objects in order to be able to access the new attribute `reason`. This new attribute is used in the different notifier methods in order to add the reason as a header: `X-GitLab-NotificationReason`. Only the reason with the most priority gets sent.
* | | | Resolve "Projects API: filter 'with_issues_enabled=true' returns projects ↵Jan Christophersen2018-01-191-0/+1
| |/ / |/| | | | | | | | with 'issues_enabled=false'"
* | | Merge branch '42154-fix-artifact-size-calc' into 'master'Robert Speicher2018-01-181-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Bug calculating artifacts size for project statistics" Closes #42154 See merge request gitlab-org/gitlab-ce!16539
| * | | Fix a bug calculating artifact size for project statisticsNick Thomas2018-01-181-1/+1
| | |/ | |/|
* | | Delete conflicting orphaned routesMichael Kozono2018-01-181-0/+12
|/ /
* | Merge branch 'feature/merge-request-system-hook' into 'master'Douwe Maan2018-01-184-23/+63
|\ \ | | | | | | | | | | | | System hooks for Merge Requests See merge request gitlab-org/gitlab-ce!14387
| * | use class reader instead of dynamic constantAlexis Reigel2018-01-171-3/+5
| | |
| * | no need for a named parameterAlexis Reigel2018-01-172-2/+2
| | |
View Lorry Controller Status