summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'dev/master'Felipe Artur2018-07-262-4/+4
|\
| * Merge branch 'security-event-counters-private-data' into 'master'Felipe Artur Cardozo2018-07-242-4/+4
| |\
| | * Don't expose project names in various countersYorick Peterse2018-06-212-4/+4
* | | Fix namespace move callback behavior, especially to fix Geo replication of na...Michael Kozono2018-07-261-6/+5
* | | Merge branch 'ce-5158-metrics-alerting' into 'master'Sean McGivern2018-07-262-4/+19
|\ \ \
| * | | Move kubeclient and namespace variables to the private interfaceTiago Botelho2018-07-251-1/+1
| * | | Backports relevant changes made in https://gitlab.com/gitlab-org/gitlab-ee/me...Tiago Botelho2018-07-253-5/+20
* | | | Merge branch 'ce-6064-geo-sql-query-for-counting-projects-with-wikis-is-very-...Douglas Barbosa Alexandre2018-07-253-0/+105
|\ \ \ \
| * | | | Document site statistics APIce-6064-geo-sql-query-for-counting-projects-with-wikis-is-very-slowGabriel Mazetto2018-07-241-0/+21
| * | | | Apply pattern to make `find_or_create` atomicGabriel Mazetto2018-07-241-7/+10
| * | | | Use activerecord migration version instead of rescuing for missing tablesGabriel Mazetto2018-07-241-10/+14
| * | | | Added SiteStatistics as counter cache for Projects and WikisGabriel Mazetto2018-07-243-0/+77
| | |/ / | |/| |
* | | | fixes #47716 where email confirmation fails after adding additional emailsMuhammad Nuzaihan2018-07-251-0/+4
* | | | Merge branch 'backport-reactive-caching' into 'master'Rémy Coutable2018-07-251-2/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Backport reactive cachingShinya Maeda2018-07-251-2/+8
| |/ /
* | | Use limit parameter to retrieve Wikis from Gitalysh-use-wiki-limit-parameter-gitalyStan Hu2018-07-241-1/+1
|/ /
* | Add min_access_level filter to projects APIMarko, Peter2018-07-231-0/+1
* | Resolve "Deploy Tokens failed to clone LFS repository"Mayra Cabrera2018-07-231-1/+5
* | Merge branch 'hangouts_chat_integration' into 'master'Sean McGivern2018-07-233-0/+69
|\ \
| * | Fix couple of moments in HangoutsChatService and its specKukovskii Vladimir2018-07-141-5/+7
| * | Fix fetch_attachment_title method of Hangouts Chat serviceKukovskii Vladimir2018-07-141-2/+1
| * | Add Hangouts Chat service implementationKukovskii Vladimir2018-07-141-0/+25
| * | Add dummy Google Hangouts Chat integrationKukovskii Vladimir2018-07-143-0/+43
* | | Merge branch '6104-extract-ee-specific-files-lines-for-some-platform-related-...Robert Speicher2018-07-201-0/+5
|\ \ \
| * | | Reduce CE/EE difference in app/views/projects/protected_tags/_protected_tag.h...Rémy Coutable2018-07-171-0/+5
* | | | Remove duplicated include IgnorableColumnLin Jen-Shin2018-07-191-1/+0
* | | | Client implementation for Repository#new_commitsZeger-Jan van de Weg2018-07-181-5/+2
* | | | Render MR page when no persisted diff_refs or diffs sizeOswaldo Ferreira2018-07-181-1/+1
* | | | Merge branch 'satishperala/gitlab-ce-20720_webhooks_full_image_url' into 'mas...Douwe Maan2018-07-172-2/+2
|\ \ \ \
| * \ \ \ Merge branch 'master' into satishperala/gitlab-ce-20720_webhooks_full_image_urlSean McGivern2018-07-0626-85/+225
| |\ \ \ \
| * | | | | Add base class for hook builders, and use it for notes and wikisSean McGivern2018-06-202-6/+2
| * | | | | Passing absolute image urls in the markdown content in the webhooksSatish Perala2018-06-202-2/+6
* | | | | | Merge branch 'gitaly-issue-cross-reference' into 'master'Sean McGivern2018-07-171-0/+1
|\ \ \ \ \ \
| * | | | | | Add cross-link to N+1 issueJacob Vosmaer2018-07-171-0/+1
* | | | | | | Merge branch '14995-custom_wiki_sidebar' into 'master'Sean McGivern2018-07-171-0/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into 14995-custom_wiki_sidebarLin Jen-Shin2018-07-164-7/+6
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into 14995-custom_wiki_sidebarLin Jen-Shin2018-07-1334-198/+428
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into 14995-c...Andreas Kämmerle2018-07-024-15/+21
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 14995-custom_wiki_sidebarLin Jen-Shin2018-06-27144-811/+3265
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Introduce #find_sidebar and use a constant to find the page14995-custom_wiki_sidebarLin Jen-Shin2018-03-261-0/+7
* | | | | | | | | | Migrate merge base, merged branches, write refJacob Vosmaer (GitLab)2018-07-171-4/+6
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'fix/gb/rename-environments-stop-actions' into 'master'Kamil Trzciński2018-07-162-5/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Remove unused `stop_action?` method from deployment classfix/gb/rename-environments-stop-actionsGrzegorz Bizon2018-07-121-4/+0
| * | | | | | | | Rename environments stop action methodGrzegorz Bizon2018-07-121-1/+1
* | | | | | | | | Merge branch 'fix/gb/fix-project-settings-build-time-validation' into 'master'Kamil Trzciński2018-07-131-2/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improve project build time setting validationGrzegorz Bizon2018-07-121-2/+4
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fix/gb/add-missing-before-sha-predefined-variable' into 'master'Kamil Trzciński2018-07-131-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Add missing `CI_COMMIT_BEFORE_SHA` predefined variableGrzegorz Bizon2018-07-121-0/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'gitaly-mandatory-20180712-jv' into 'master'Sean McGivern2018-07-131-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix find_branch call sitesgitaly-mandatory-20180712-jvJacob Vosmaer2018-07-121-2/+2