summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Fix the external URLs generated for online view of HTML artifactsNick Thomas2017-10-201-6/+11
* Merge branch 'fix-application-setting-nil-cache' into 'master'Winnie Hellmann2017-10-201-1/+4
|\
| * Prevent ApplicationSetting to cache nil valueKamil Trzcinski2017-10-191-1/+4
* | Merge branch 'sh-security-fix-backports-master' into 'master'Robert Speicher2017-10-182-1/+3
|\ \
| * \ Merge branch 'master' into sh-security-fix-backports-masterStan Hu2017-10-176-5/+157
| |\ \ | | |/
| * | Merge branch 'security-10-1' into '10-1-stable'Jen-Shin Lin2017-10-172-1/+3
* | | Merge branch '30140-restore-readme-only-preference' into 'master'Douwe Maan2017-10-181-7/+2
|\ \ \ | |_|/ |/| |
| * | Fix specAnnabel Dunstone Gray2017-10-161-1/+0
| * | Add readme only option as project viewAnnabel Dunstone Gray2017-10-161-7/+3
| |/
* | Merge branch 'bvl-fix-deleting-forked-projects' into 'master'Douwe Maan2017-10-171-1/+1
|\ \
| * | Fix errors when deleting a forked projectBob Van Landuyt2017-10-171-1/+1
* | | Merge branch 'prevent-creating-multiple-application-settings' into 'master'Yorick Peterse2017-10-171-0/+2
|\ \ \ | |/ / |/| |
| * | Prevent creating multiple ApplicationSetting by forcing it to always have id=1prevent-creating-multiple-application-settingsKamil Trzcinski2017-10-161-0/+2
* | | Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-171-0/+7
|\ \ \
| * | | Allow configuring the circuitbreaker through the API and UIBob Van Landuyt2017-10-171-0/+7
| | |/ | |/|
* | | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-175-4/+147
|\ \ \ | |/ / |/| |
| * | Update preloaded count queries for MySQLBob Van Landuyt2017-10-121-3/+3
| * | Use Arel to build preloaded countsBob Van Landuyt2017-10-121-48/+45
| * | Pass `archived:` as a keyword argumentBob Van Landuyt2017-10-121-3/+3
| * | Handle archived projects in the `GroupDescendantsFinder`Bob Van Landuyt2017-10-111-11/+21
| * | Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-1041-116/+524
| |\ \
| * | | Don't preload all memberships for a userBob Van Landuyt2017-10-101-9/+0
| * | | Move the `ancestors_upto` to `Project` and `Namespace`Bob Van Landuyt2017-10-103-10/+25
| * | | Use `alias_attribute` & `alias_method` to define parent-methodsBob Van Landuyt2017-10-051-8/+2
| * | | Optimize finding a membership for a user to avoid extra queriesBob Van Landuyt2017-10-051-0/+9
| * | | Load counts everywhere we render a group treeBob Van Landuyt2017-10-052-0/+66
| * | | Force parents to be preloaded for building a hierarchyBob Van Landuyt2017-10-051-5/+11
| * | | Move merging of Hashes out of the `GroupDescendant` concernBob Van Landuyt2017-10-041-53/+4
| * | | Return an empty array when no matches are foundBob Van Landuyt2017-10-041-1/+1
| * | | Always preload all elements in a hierarchy to avoid extra queries.Bob Van Landuyt2017-10-041-3/+12
| * | | Clean up public/private api of `GroupDescendant`Bob Van Landuyt2017-10-041-24/+22
| * | | Only preload ancestors for search results in the specified parentBob Van Landuyt2017-10-041-1/+2
| * | | Minimize the number of queries by preloading counts and ancestorsBob Van Landuyt2017-10-042-9/+16
| * | | Rename hierarchies to descendants where applicableBob Van Landuyt2017-10-041-20/+20
| * | | Keep the `parent` method in `Project`Bob Van Landuyt2017-10-042-8/+4
| * | | Rename `GroupHierarchy` to `GroupDescendant`Bob Van Landuyt2017-10-043-18/+14
| * | | Handle all cases for merging a hierarchyBob Van Landuyt2017-10-041-12/+32
| * | | Handle case where 2 matches in the same tree are foundBob Van Landuyt2017-10-041-1/+6
| * | | Merge group hierarchies when parents are sharedBob Van Landuyt2017-10-041-2/+45
| * | | Add a concern to build hierarchies of groupsBob Van Landuyt2017-10-043-0/+29
* | | | Merge branch 'conflict-resolution-refactor' into 'master'Sean McGivern2017-10-161-11/+1
|\ \ \ \
| * | | | Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-121-8/+0
| * | | | Clean hierarchy of calls between models and Gitalb::Git for blob searchAlejandro Rodríguez2017-10-121-3/+1
* | | | | Popen with a timeoutAndrew Newdigate2017-10-161-1/+1
* | | | | Merge branch 'fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cl...Kamil Trzciński2017-10-161-0/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, inste...fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cluster-disabled-instead-of-gcp-cluster-countShinya Maeda2017-10-111-0/+3
| | |_|/ | |/| |
* | | | Merge branch 'gitlab-ee-1312-time-spent-at' into 'master'Sean McGivern2017-10-131-2/+7
|\ \ \ \
| * | | | added date parameter for time trackinggitlab-ee-1312-time-spent-atVlad2017-10-131-2/+7
| | |/ / | |/| |
* | | | Merge branch '39032-improve-merge-ongoing-check-consistency' into 'master'Sean McGivern2017-10-131-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Simplify check for running job on Redis39032-improve-merge-ongoing-check-consistencyOswaldo Ferreira2017-10-131-1/+1
View Lorry Controller Status