summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Rename BlobViewer max_size to overridable_max_size and absolute_max_size to ↵dm-blob-viewer-concernsDouwe Maan2017-05-155-14/+22
| | | | max_size
* Specify explicitly whether a blob viewer should be loaded asynchronouslyDouwe Maan2017-05-136-42/+42
|
* Allow blob viewer to support multiple filetypesDouwe Maan2017-05-134-7/+7
|
* Make the new repository_update_events configurable in System Hooks UIGabriel Mazetto2017-05-121-0/+3
|
* Added repository_update hookGabriel Mazetto2017-05-122-0/+3
|
* Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' Douwe Maan2017-05-121-28/+0
|\ | | | | | | | | | | | | Fix conflict resolution from corrupted upstream Closes gitlab-ee#2128 See merge request !11298
| * Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-121-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't know why this happens exactly, but given an upstream and fork repository from a customer, both of which required GC, resolving conflicts would corrupt the fork so badly that it couldn't be cloned. This isn't a perfect fix for that case, because the MR may still need to be merged manually, but it does ensure that the repository is at least usable. My best guess is that when we generate the index for the conflict resolution (which we previously did in the target project), we obtain a reference to an OID that doesn't exist in the source, even though we already fetch the refs from the target into the source. Explicitly setting the source project as the place to get the merge index from seems to prevent repository corruption in this way.
* | Merge branch 'disable-usage-ping' into 'master'Robert Speicher2017-05-121-1/+9
|\ \ | | | | | | | | | | | | | | | | | | Usage ping updates Closes #31741 and #31453 See merge request !11231
| * | Allow disabling usage ping in `gitlab.yml`Sean McGivern2017-05-111-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Setting `usage_ping_enabled` to false in `gitlab.yml`: 1. Disables the usage ping, regardless of the value stored in the database. 2. Prevents the usage ping from being enabled through the admin panel. It can only be enabled by either removing the line from `gitlab.yml` and configuring through the admin panel, or setting it to true in `gitlab.yml`.
* | | Merge branch 'dz-project-list-cache-key' into 'master' Douwe Maan2017-05-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve project list cache key Closes #31863 See merge request !11325
| * | | Change project list cache key to use route.cache_key instead of namespacedz-project-list-cache-keyDmitriy Zaporozhets2017-05-122-5/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add parent full path to project list cache keyDmitriy Zaporozhets2017-05-121-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch '27439-performance-deltas' into 'master' Douwe Maan2017-05-124-35/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Expose memory deltas between app deployments and refactor prometheus queries to support more custom queries See merge request !10981
| * | | | Keep presentation logic in one place and remove unecessary arguments.Pawel Chojnacki2017-05-112-4/+4
| | | | | | | | | | | | | | | | | | | | + fix tests
| * | | | Custom queries for prometheusPawel Chojnacki2017-05-114-34/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Tests for prometheus queries - fix rubocop warnings - Remove unused method. Add more queries to deployment queries. - Wrap BaseQuery in module hierarchy Renname Prometheus class to PrometheusClient
* | | | | Consistently use monospace font for commit SHAs and branch and tag namesDouwe Maan2017-05-123-6/+6
| | | | |
* | | | | Merge branch 'update_assignee_cache_counts_refactoring' into 'master' Sean McGivern2017-05-123-15/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rework update_assignee_cache_counts Closes #31873 See merge request !11270
| * | | | | Move update_assignee_cache_counts to the serviceValery Sizov2017-05-123-15/+5
| | |_|_|/ | |/| | |
* | | | | Merge branch 'protected-branches-no-one-merge' into 'master' Sean McGivern2017-05-123-28/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabled 'no one' as a merge access level in protected branches Closes #31541 See merge request !11232
| * | | | | Style changes to Ruby fileprotected-branches-no-one-mergePhil Hughes2017-05-121-3/+7
| | | | | |
| * | | | | Enabled no-one as a merge access level in protected branchesPhil Hughes2017-05-103-28/+18
| | | | | | | | | | | | | | | | | | | | | | | | Closes #31541
* | | | | | Merge branch 'remove-deltas-only' into 'master' Sean McGivern2017-05-121-4/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deltas_only from DiffCollection Closes gitaly#224 See merge request !11285
| * | | | | | Remove deltas_only from DiffCollectionJacob Vosmaer2017-05-111-4/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch '31978-cross-reference-fix' into 'master' Sean McGivern2017-05-121-6/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cross referencing for private and internal projects Closes #31978 See merge request !11243
| * | | | | Fix cross referencing for private and internal projects31978-cross-reference-fixJarka Kadlecova2017-05-111-6/+7
| |/ / / /
* | | | | Fix displaying a repository without a readmedm-fix-repository-without-readmeDouwe Maan2017-05-111-2/+2
| |_|/ / |/| | |
* | | | Merge branch 'zj-clean-up-ci-variables-table' into 'master' Yorick Peterse2017-05-111-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Clean up ci variables table Closes #31799 See merge request !11186
| * | | Remove rails dependent: :destroy statementZ.J. van de Weg2017-05-111-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | Enforced by the database, and no callbacks need to be called. Combined with 7b9b2c6099 and 294a8b8a6d this resolves gitlab-org/gitlab-ce#31799
* | | Reset Repository#license memo when license file is changedDouwe Maan2017-05-101-7/+13
| | |
* | | Implement auxiliary blob viewersDouwe Maan2017-05-108-22/+147
|/ /
* | Merge branch 'retried-in-database-mysql' into 'master' Regis Boudinot2017-05-102-10/+5
|\ \ | | | | | | | | | | | | | | | | | | Retried in database Closes #25737 See merge request !11115
| * | Fix rubocop failureKamil Trzcinski2017-05-091-1/+1
| | |
| * | Make retried to be nullableKamil Trzcinski2017-05-092-2/+2
| | |
| * | Store retried in database for CI buildsretried-in-database-mysqlKamil Trzcinski2017-05-072-10/+5
| | |
* | | Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into ↵Robert Speicher2017-05-1024-25/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Use consistent style for trailing commas" Closes #27144 See merge request !11063
| * | | Enable the Style/TrailingCommaInArguments copRémy Coutable2017-05-106-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Enable the Style/TrailingCommaInLiteral copRémy Coutable2017-05-1018-19/+19
| | |/ | |/| | | | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'bvl-security-patches' into 'master' Robert Speicher2017-05-101-13/+0
|\ \ \ | | | | | | | | | | | | | | | | Security patches -> `master` See merge request !11230
| * | | Merge branch 'snippets-finder-visibility' into 'security'Douwe Maan2017-05-101-13/+0
| |/ / | | | | | | | | | | | | | | | Refactor snippets finder & dont return internal snippets for external users See merge request !2094
* | | Merge branch 'dm-async-tree-readme' into 'master' Douwe Maan2017-05-103-5/+15
|\ \ \ | |/ / |/| | | | | | | | Load tree readme asynchronously See merge request !11191
| * | Load tree readme asynchronouslydm-async-tree-readmeDouwe Maan2017-05-103-5/+15
| | |
* | | Use relative paths for group/project/user avatarsblackst0ne2017-05-104-16/+33
|/ /
* | Merge branch 'deltas-only' into 'master' Sean McGivern2017-05-091-1/+3
|\ \ | | | | | | | | | | | | Don't use DiffCollection for deltas See merge request !11201
| * | Use Rails 'delegate'Jacob Vosmaer2017-05-091-3/+1
| | |
| * | Don't make Commit#raw_deltas privateJacob Vosmaer2017-05-091-4/+4
| | |
| * | Don't use DiffCollection for deltasJacob Vosmaer2017-05-091-1/+5
| | |
* | | Merge branch 'issue_27168_2' into 'master' Sean McGivern2017-05-092-14/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Preloads head pipeline for each merge request Closes #27168 See merge request !10064
| * | | Fix specs 2Felipe Artur2017-05-081-8/+3
| | | |
| * | | Add merge requests association to pipelineFelipe Artur2017-05-081-0/+1
| | | |
| * | | Preloads head pipeline for each merge requestFelipe Artur2017-05-081-6/+2
| | | |
View Lorry Controller Status