summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '37202-revert-changes-to-signing-enabled' into 'master'Douwe Maan2017-09-013-8/+6
|\ | | | | | | | | | | | | Rollback changes made to signing_enabled. Closes #37202 See merge request !13956
| * Rollsback changes made to signing_enabled.Tiago Botelho2017-09-013-8/+6
| |
* | Merge branch ↵Tim Zallmann2017-08-311-1/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '31273-creating-an-project-within-an-internal-sub-group-gives-the-option-to-set-it-a-public' into 'master' Resolve various visibility level settings issues Closes #31273 See merge request !13442
| * | Add check for access to NamespaceRubén Dávila2017-08-301-1/+4
| | |
| * | Address some suggestions from first code reviewRubén Dávila2017-08-291-10/+1
| | |
| * | Build Project in context of Namespace if availableRubén Dávila2017-08-261-1/+10
| | |
* | | Merge branch ↵Douwe Maan2017-08-311-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37266-nomethoderror-undefined-method-current_application_settings-build-failed-30837482' into 'master' `current_application_settings` belongs on `Gitlab::CurrentSettings` Closes #37266 See merge request !13955
| * | | `current_application_settings` belongs on `Gitlab::CurrentSettings`Sean McGivern2017-08-311-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The initializers including this were doing so at the top level, so every object loaded after them had a `current_application_settings` method. However, if someone had rack-attack enabled (which was loaded before these initializers), it would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't have that method. To fix this: 1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need `Object.new.current_application_settings` to work. 2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it like that in several places. 3. Change the initializers to use that new form.
* | | | Merge branch 'zj-disable-pages-in-subgroups' into 'master'Grzegorz Bizon2017-08-311-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't show references to Pages when not available Closes #34864 See merge request !13888
| * | | | Don't show references to Pages when not availableZeger-Jan van de Weg2017-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this instance its subgroups, and given we can't deploy it, we shouldn't allow it to be shown. Fixes gitlab-org/gitlab-ce#34864
* | | | | Merge branch '28938-password-change-workflow-for-admins' into 'master'Sean McGivern2017-08-311-4/+11
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Changes the password change workflow for admins. Closes #28938 See merge request !13901
| * | | | Changes the password change workflow for admins.28938-password-change-workflow-for-adminsTiago Botelho2017-08-311-4/+11
| | |_|/ | |/| |
* | | | Fix MySQL failure for emoji autocompleteSean McGivern2017-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | Postgres lets you treat `count` as another alias for `COUNT(*)` apparently, even if that's not the actual alias used.
* | | | Add filter by my reactionHiroyuki Sato2017-08-301-1/+17
| | | |
* | | | Merge branch 'mr-index-eager-load' into 'master'Douwe Maan2017-08-301-1/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Eager load head pipeline projects for MRs index See merge request !13877
| * | | | Eager load head pipeline projects for MRs indexmr-index-eager-loadYorick Peterse2017-08-281-1/+11
| | |_|/ | |/| | | | | | | | | | | | | | | | | | This ensures the project of an MR's head pipeline is eager loaded, preventing an N+1 query problem from occurring when viewing the list of MRs of a project.
* | | | Merge branch '35793_fix_predicate_names' into 'master'Robert Speicher2017-08-292-4/+4
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Remove `is_` prefix from predicate method names See merge request !13810
| * | | replace `is_legacy_group_milestone?` with `legacy_group_milestone?`Maxim Rydkin2017-08-291-3/+3
| | | |
| * | | replace `is_edited?` with `edited?`Maxim Rydkin2017-08-291-1/+1
| |/ /
* | | Rename MergeRequest#async_merge to merge_asyncOswaldo Ferreira2017-08-281-2/+2
| | |
* | | Track enqueued and ongoing MRsOswaldo Ferreira2017-08-281-2/+2
|/ /
* | Define ldap methods at runtimeBob Van Landuyt2017-08-242-8/+8
| | | | | | | | | | This avoids loading the `OmniAuthCallbacksController` at boot time so it doesn't mess up the `before_action`-chain
* | Refactor Admin::ProjectsFinder by extracting finders as private methodsMehdi Lahmam2017-08-241-3/+3
|/
* Merge branch 'rs-fix-admin-logs-timeout' into 'master'Douwe Maan2017-08-231-0/+9
|\ | | | | | | | | Fix a potential timeout in `Gitlab::Logger.read_latest` See merge request !13751
| * Refactor `Admin::LogsController#show`rs-fix-admin-logs-timeoutRobert Speicher2017-08-221-0/+9
| | | | | | | | | | We should be defining the list of loggers in the controller, not the view.
* | Merge branch 'fix-broken-testing-of-some-integrations' into 'master'Douwe Maan2017-08-231-6/+3
|\ \ | |/ |/| | | | | | | | | Fix inability to test some project integrations Closes gitlab-ee#3194 See merge request !13729
| * Fix inability to test some project integrationsfix-broken-testing-of-some-integrationsRubén Dávila2017-08-221-6/+3
| |
* | Merge branch '35845-improve-subgroup-creation-permissions' into 'master'Douwe Maan2017-08-221-0/+7
|\ \ | |/ |/| | | | | | | | | Improves subgroup creation permissions Closes #35845 See merge request !13418
| * Improves subgroup creation permissions35845-improve-subgroup-creation-permissionsTiago Botelho2017-08-211-0/+7
| |
* | Merge branch 'rs-more-public-send-whitelists' into 'master'Rémy Coutable2017-08-163-3/+3
|\ \ | | | | | | | | | | | | Whitelist or fix additional `Gitlab/PublicSend` cop violations See merge request !13467
| * | Whitelist or fix additional `Gitlab/PublicSend` cop violationsrs-more-public-send-whitelistsRobert Speicher2017-08-143-3/+3
| | | | | | | | | | | | | | | An upcoming update to rubocop-gitlab-security added additional violations.
* | | Merge branch 'rs-trailingwhitespace-cop' into 'master'Rémy Coutable2017-08-164-17/+17
|\ \ \ | | | | | | | | | | | | | | | | Enable Layout/TrailingWhitespace cop and auto-correct offenses See merge request !13573
| * | | Enable Layout/TrailingWhitespace cop and auto-correct offensesRobert Speicher2017-08-154-17/+17
| | |/ | |/|
* | | Many Repo FixesJacob Schatz2017-08-151-0/+5
|/ /
* | Merge branch '7-days-cycle-analytics' into 'master'Rémy Coutable2017-08-141-1/+8
|\ \ | | | | | | | | | | | | | | | | | | Add a `Last 7 days` option for Cycle Analytics view Closes #36300 See merge request !13443
| * | Add a `Last 7 days` option for Cycle Analytics viewMehdi Lahmam2017-08-111-1/+8
| | |
* | | Merge branch '36089-handle-ref-failure-better' into 'master'Douwe Maan2017-08-141-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Refactor how we fetch ref for merge requests Closes #36089 and #36296 See merge request !13416
| * | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-08-147-16/+26
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36089-handle-ref-failure-better * upstream/master: (47 commits) Update CHANGELOG.md for 9.4.5 Update charlock_holmes add a changelog entry switch to multi-line before block restructure the #new_key notification spec don't send devise notifications to the ghost user reset_delivered_emails before testing #new_key skip the :read_project check for new_project_member move the member spec to be with the other ones add a spec for new_group_member add a spec for never emailing the ghost user rubocop fix a membership with no user is always notifiable check notifiability for more emails add Member#notifiable?(type, opts) make NotificationRecipient a little more customizable Add notes about database performance for MySQL fix confidential border issue as well as confidential styles leaking on new MR Migrate force push check to Gitaly Add option to disable project export on instance ...
| * | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-08-113-14/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36089-handle-ref-failure-better * upstream/master: (62 commits) Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb. Docs: update user docs index Fix minor typos in views Fix Layout/SpaceBeforeBlockBraces violation in bin/changelog_spec Merge branch 'rs-alphanumeric-ssh-params' into 'security-9-4' Merge branch 'import-symlinks-9-3' into 'security-9-3' Fix wrong method call on prometheus histogram Document new all-in-one Helm chart - docs Fix 404 on link path Fix line numbers not matching up to code in code viewer. Hide overflow-x on collapsed sidebar removed global use of breakpoint checker Increase performance of the breakpoint size checker Filter sensitive query string parameters from NGINX access logs Added a template for database changes Render new issue link in failed job as a regular link instead of a UJS one Include RE2 in the upgrade docs Remove affix plugin from issuable sidebar with new navigation Fix linter error alternative route for download archive ...
| * | | Avoid ambiguity, which happened in a single test runLin Jen-Shin2017-08-101-1/+1
| | | |
* | | | Use Prev/Next pagination for exploring projectspagination-projects-exploreYorick Peterse2017-08-141-4/+7
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | This changes the pagination of the "Explore" pages so they use a simpler pagination system that only shows "Prev" and "Next" buttons. This removes the need for getting the total number of rows to display, a process that can easily take up to 2 seconds when browsing through a large list of projects. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/27390
* | | Merge branch 'disable-project-export' into 'master'Rémy Coutable2017-08-111-0/+5
|\ \ \ | | | | | | | | | | | | | | | | Add option to disable project export on instance See merge request !13211
| * | | Add option to disable project export on instanceRobin Bobbitt2017-08-111-0/+5
| | | |
* | | | Better categorize test coverage resultsrs-coverage-updatesRobert Speicher2017-08-111-1/+3
| | | | | | | | | | | | | | | | Also marks a few things as uncovered, and removes an unused class.
* | | | Merge branch 'dm-session-delete-challenge' into 'master'Robert Speicher2017-08-111-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Delete correct key from `session` after authenticating using U2F Closes #36096 See merge request !13499
| * | | Delete correct key from `session` after authenticating using U2Fdm-session-delete-challengeDouwe Maan2017-08-111-1/+1
| | |/ | |/|
* | | Merge branch 'split-events-into-push-events' into 'master'Sean McGivern2017-08-114-13/+16
|\ \ \ | | | | | | | | | | | | | | | | Use a separate table for storing push events See merge request !12463
| * | | Use a specialized class for querying eventsYorick Peterse2017-08-104-13/+16
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes various controllers to use the new EventCollection class for retrieving events. This class uses a JOIN LATERAL query on PostgreSQL to retrieve queries in a more efficient way, while falling back to a simpler / less efficient query for MySQL. The EventCollection class also includes a limit on the number of events to display to prevent malicious users from cycling through all events, as doing so could put a lot of pressure on the database. JOIN LATERAL is only supported on PostgreSQL starting with version 9.3.0 and as such this optimisation is only used when using PostgreSQL 9.3 or newer.
* | | Cache Appearance instances in Redisappearances-caching-and-schemaYorick Peterse2017-08-101-1/+1
|/ / | | | | | | | | | | | | | | This caches the result of Appearance.first in a similar fashion to how ApplicationSetting instances are cached. We also add some NOT NULL constraints to the table and correct the timestamp types. Fixes gitlab-org/gitlab-ce#36066, fixes gitlab-org/gitlab-ce#31698
* | Remove unused `redirect_to_external_issue_tracker` methodMehdi Lahmam2017-08-101-12/+0
| | | | | | | | Its usage has been removed at 2fa22a0729.