Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/controllers
AgeCommit message (Collapse)Author
2017-05-30Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki
28717-additional-metrics-review-branch
2017-05-29Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan
Rework project authorizations and nested groups for better performance See merge request !10885
2017-05-26Add per page to user autocompleteClement Ho
2017-05-26Merge branch 'dm-consistent-last-push-event' into 'master'Robert Speicher
Consistently display last push event widget See merge request !11585
2017-05-26Merge branch 'dm-diff-cleanup' into 'master'Robert Speicher
Clean up diff rendering See merge request !11390
2017-05-25Consistently display last push event widgetDouwe Maan
2017-05-25Merge branch '32748-emails-are-being-sent-with-the-wrong-language' into 'master'Douwe Maan
Bugfix: Always use the default language when generating emails. Closes #32748 See merge request !11662
2017-05-25Add per deployment additional metricsPawel Chojnacki
2017-05-25Bugfix: Always use the default language when generating emails.Ruben Davila
There was a race condition issue when the application was generating an email and was using a language that was previously being used in other request.
2017-05-25Merge branch 'revert-b0498c17' into 'master'Robert Speicher
Refactor `DynamicPathValidator` and `GitLab::Regex` some more See merge request !11693
2017-05-25Use before action to respond with 404 if prometheus metrics are missingPawel Chojnacki
2017-05-25Merge branch '17848-web-hook-logging' into 'master'Dmitriy Zaporozhets
Implement Web Hooks calls logging Closes #17848 See merge request !11027
2017-05-25Additional metrics initial work, with working metrics listing, but without ↵Pawel Chojnacki
actoual metrics mesurements
2017-05-25Implement web hooks loggingAlexander Randa
* implemented logging of project and system web hooks * implemented UI for user area (project hooks) * implemented UI for admin area (system hooks) * implemented retry of logged webhook * NOT imeplemented log remover
2017-05-24Revert "Remove changes that are not absolutely necessary"Douwe Maan
This reverts commit b0498c176fa134761d899c9b369be12f1ca789c5
2017-05-24user can reset his rss token on the account pageAlexis Reigel
2017-05-24atom links with rss token instead of private tokenAlexis Reigel
2017-05-23Remove @commit in compare and MR controllersDouwe Maan
2017-05-23Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan
2017-05-23Clean up diff renderingDouwe Maan
2017-05-23Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Valery Sizov
17489-hide-code-from-guests
2017-05-23Merge branch 'zj-sort-env-folders' into 'master'Kamil Trzciński
Sort environments folders when opening them Closes #30814 See merge request !11436
2017-05-22Merge branch 'dz-rename-pipelines-settings-tab' into 'master'Dmitriy Zaporozhets
Rename CI/CD Pipelines to Pipelines in the project settings Closes #31980 See merge request !11305
2017-05-19Merge branch 'fix-json-endpoint-redirection' into 'master'Douwe Maan
Bugfix: don't redirect to JSON endpoints after sign in See merge request !11561
2017-05-19Merge branch '32536-mr-widget-performance-improvements' into 'master'Fatih Acet
Load improvements related to MR widget See merge request !11518
2017-05-19Merge branch 'fix-issue-32506' into 'master'Douwe Maan
Fix redirects modifying the host Closes #32506 See merge request !11498
2017-05-19Bugfix: don't redirect to JSON endpoints after sign inRuben Davila
2017-05-19Refactor to more robust implementationMichael Kozono
In order to avoid string manipulation or modify route params (to make them unambiguous for `url_for`), we are accepting a behavior change: When being redirected to the canonical path for a group, if you requested a group show path starting with `/groups/…` then you’ll now be redirected to the group at root `/…`.
2017-05-19Fixes the 500 for custom apearance header logo and logoAlexis Reigel
2017-05-19Fix ensure_canonical_path for top level routesMichael Kozono
Don’t replace a substring of the path if it is part of the top level route. E.g. When redirecting from `/groups/ups` to `/groups/foo`, be careful not to do `/grofoo/ups`. Projects are unaffected by this issue, but I am grouping the `#ensure_canonical_path` tests similar to the group and user tests.
2017-05-19Drop merge_check endpoint and use only MR show insteadOswaldo Ferreira
2017-05-18Fix #32506Michael Kozono
The host should not be modified, nor is it needed for the redirect.
2017-05-17Hide nested group UI/API support for MySQLYorick Peterse
This hides/disables some UI elements and API parameters related to nested groups when MySQL is used, since nested groups are not supported for MySQL.
2017-05-17Show last commit for current tree on tree pageDouwe Maan
2017-05-17Sort environments folders when opening themZ.J. van de Weg
Fixes gitlab-org/gitlab-ce#30814
2017-05-16Merge branch 'dm-blob-viewer-concerns' into 'master' Robert Speicher
Move some blob viewer stuff around without changing behavior See merge request !11358
2017-05-15Merge branch 'rename-rendered_title' into 'master' Rémy Coutable
Rename all references to rendered_title to realtime_changes See merge request !11359
2017-05-15Ruby files that are not meant to be executable should be 644 not 755Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-05-13Rename all references to rendered_title to realtime_changesLuke "Jared" Bennett
2017-05-13Specify explicitly whether a blob viewer should be loaded asynchronouslyDouwe Maan
2017-05-13Make the new repository_update_events configurable in System Hooks UIGabriel Mazetto
2017-05-12Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' Douwe Maan
Fix conflict resolution from corrupted upstream Closes gitlab-ee#2128 See merge request !11298
2017-05-12Fix conflict resolution from corrupted upstreamSean McGivern
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.
2017-05-12Merge branch '27439-performance-deltas' into 'master' Douwe Maan
Expose memory deltas between app deployments and refactor prometheus queries to support more custom queries See merge request !10981
2017-05-12Respond with 404 when metrics are not enabled or deployment_metrics is not ↵Pawel Chojnacki
implemented
2017-05-12Merge branch 'fixes_for_multiple_issue_assignees' into 'master' Sean McGivern
Fix for Follow-up from "Backport of Multiple Assignees feature Closes #31888 See merge request !11178
2017-05-12Merge branch 'refactor-realtime-issue' into 'master' Filipa Lacerda
Refactored issue tealtime elements See merge request !11242
2017-05-12Fix redirect message for groups and usersMichael Kozono
2017-05-12Custom queries for prometheusPawel Chojnacki
- 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
2017-05-11Rename CI/CD Pipelines to Pipelines in the project settingsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-05 12:37:04 +0300