summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Support multiple Redis instances based on queue typePaul Charlton2017-07-111-1/+4
|
* Remove remaining N+1 queries in merge requests API with emojis and labelsStan Hu2017-07-081-33/+1
| | | | Closes #34159
* Merge branch '30281-report-abusive-content-from-an-issue-or-merge-request' ↵Jacob Schatz2017-07-071-2/+1
|\ | | | | | | | | | | | | | | | | into 'master' Resolve "Report abusive content from an issue or merge request" Closes #30281 See merge request !11786
| * Revert parent param removalLuke "Jared" Bennett2017-07-072-2/+2
| |
| * Removed merge_request/issue state_event param parent and removed ↵Luke "Jared" Bennett2017-07-072-3/+2
| | | | | | | | issuable_path helpers in favour of issuable_url helpers
* | Merge branch 'master' into '33929-allow-to-enable-perf-bar-for-a-group'Sean McGivern2017-07-078-86/+104
|\ \ | | | | | | | | | # Conflicts: # db/schema.rb
| * \ Merge branch ↵Kamil Trzciński2017-07-071-5/+14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/intermediate/32568-adding-variables-to-pipelines-schedules' into 'master' Add variables to pipelines schedules Closes #32568 See merge request !12372
| | * \ Merge from master(Fix conflicts)Shinya Maeda2017-07-074-17/+115
| | |\ \ | | | |/
| | * | Remove update|admin_pipeline_schedule from Project, and grant it in ↵Kamil Trzcinski2017-07-071-0/+4
| | | | | | | | | | | | | | | | PipelineSchedule
| | * | merge from masterShinya Maeda2017-07-0754-148/+171
| | |\ \
| | * | | Revert "Implement Ci::NestedUniquenessValidator"Shinya Maeda2017-07-061-2/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 8f0a2b6d780347a5ce258ac1a6a6902ce9695ca1.
| | * | | Implement Ci::NestedUniquenessValidatorShinya Maeda2017-07-051-1/+2
| | | | |
| | * | | zj nice catchies 3Shinya Maeda2017-07-051-1/+1
| | | | |
| | * | | zh nich catches 2Shinya Maeda2017-07-051-2/+2
| | | | |
| | * | | Revert extra validation for duplication between same keys on a submitShinya Maeda2017-07-051-2/+1
| | | | |
| | * | | Define authorize_update_pipeline_schedule and apply to :edit, ↵Shinya Maeda2017-07-051-4/+6
| | | | | | | | | | | | | | | | | | | | :take_ownership, :update
| | * | | Add functionality and security.Shinya Maeda2017-07-051-0/+2
| | | | |
| | * | | Implement variables_attributes create/update casesShinya Maeda2017-07-051-2/+3
| | | | |
| | * | | Controller logic. Delete before modification. Halfway.Shinya Maeda2017-07-051-8/+4
| | | | |
| | * | | zh nich catches 2Shinya Maeda2017-07-051-2/+2
| | | | |
| | * | | Revert extra validation for duplication between same keys on a submitShinya Maeda2017-07-051-2/+1
| | | | |
| | * | | Define authorize_update_pipeline_schedule and apply to :edit, ↵Shinya Maeda2017-07-051-4/+6
| | | | | | | | | | | | | | | | | | | | :take_ownership, :update
| | * | | Add functionality and security.Shinya Maeda2017-07-051-0/+2
| | | | |
| | * | | Implement variables_attributes create/update casesShinya Maeda2017-07-051-2/+3
| | | | |
| | * | | Controller logic. Delete before modification. Halfway.Shinya Maeda2017-07-051-1/+2
| | | | |
| * | | | Merge branch '34590-fix-dashboard-labels-dropdown' into 'master'Sean McGivern2017-07-071-2/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix dashboard labels dropdown Closes #34590 See merge request !12708
| | * | | | Fix dashboard labels dropdownNick Thomas2017-07-071-2/+7
| | | |/ / | | |/| |
| * | | | Native group milestonesFelipe Artur2017-07-072-45/+60
| | | | |
| * | | | Resolve "Inconsistent location of members page between groups and projects"Tim Zallmann2017-07-074-34/+22
| | | | |
| * | | | Merge branch '34736-n-1-problem-on-milestone-page' into 'master'Douwe Maan2017-07-071-0/+1
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | N+1 problems on milestone page Closes #34736 See merge request !12670
| | * | | Avoid to repeat namespace querying on project milestoneTakuya Noguchi2017-07-071-0/+1
| | |/ /
* | | | Merge branch 'master' into 33929-allow-to-enable-perf-bar-for-a-groupSean McGivern2017-07-077-21/+132
|\ \ \ \ | |/ / /
| * | | Name as variable_params like project variable controllerShinya Maeda2017-07-071-6/+10
| | | |
| * | | Use variable_params && variable_params_attributes in project ↵Shinya Maeda2017-07-071-4/+8
| | | | | | | | | | | | | | | | variables_controller.rb
| * | | Use new project_variables_path in this MRShinya Maeda2017-07-071-3/+3
| | | |
| * | | gb nice catchesShinya Maeda2017-07-072-10/+10
| | | |
| * | | Adopt project_variable_path instead of namespace_project_variable_path. ↵Shinya Maeda2017-07-071-2/+2
| | | | | | | | | | | | | | | | (Resolve confilct from master)
| * | | ayufan nice catchesShinya Maeda2017-07-072-14/+22
| | | |
| * | | Fix variables_controller.rb and formatShinya Maeda2017-07-072-8/+9
| | | |
| * | | Basic BE changeShinya Maeda2017-07-074-19/+100
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix static-snalysis Move the precedence of group secure variable before project secure variable. Allow project_id to be null. Separate Ci::VariableProject and Ci::VariableGroup Add the forgotton files Add migration file to update type of ci_variables Fix form_for fpr VariableProject Fix test Change the table structure according to the yorik advice Add necessary migration files. Remove unnecessary migration spec. Revert safe_model_attributes.yml Fix models Fix spec Avoid self.variable. Use becomes for correct routing. Use unique index on group_id and key Add null: false for t.timestamps Fix schema version Rename VariableProject and VariableGroup to ProjectVariable and GroupVariable Rename the rest of them Add the rest of files Basic BE change Fix static-snalysis Move the precedence of group secure variable before project secure variable. Allow project_id to be null. Separate Ci::VariableProject and Ci::VariableGroup Add the forgotton files Add migration file to update type of ci_variables Fix form_for fpr VariableProject Fix test Change the table structure according to the yorik advice Add necessary migration files. Remove unnecessary migration spec. Revert safe_model_attributes.yml Fix models Fix spec Avoid self.variable. Use becomes for correct routing. Use unique index on group_id and key Add null: false for t.timestamps Fix schema version Rename VariableProject and VariableGroup to ProjectVariable and GroupVariable Rename the rest of them Add the rest of files Implement CURD Rename codes related to VariableGroup and VariableProject FE part Remove unneccesary changes Make Fe code up-to-date Add protected flag to migration file Protected group variables essential package Update schema Improve doc Fix logic and spec for models Fix logic and spec for controllers Fix logic and spec for views(pre feature) Add feature spec Fixed bugs. placeholder. reveal button. doc. Add changelog Remove unnecessary comment godfat nice catches Improve secret_variables_for arctecture Fix spec Fix StaticAnlysys & path_regex spec Revert "Improve secret_variables_for arctecture" This reverts commit c3216ca212322ecf6ca534cb12ce75811a4e77f1. Use ayufan suggestion for secret_variables_for Use find instead of find_by Fix spec message for variable is invalid Fix spec remove variable.group_id = group.id godffat spec nitpicks Use include Gitlab::Routing.url_helpers for presenter spec
| * | Add table for merge request commitsSean McGivern2017-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an ID-less table with just three columns: an association to the merge request diff the commit belongs to, the relative order of the commit within the merge request diff, and the commit SHA itself. Previously we stored much more information about the commits, so that we could display them even when they were deleted from the repo. Since 8.0, we ensure that those commits are kept around for as long as the target repo itself is, so we don't need to duplicate that data in the database.
| * | Re-enable polling for environmentsenable-polling-envFilipa Lacerda2017-07-061-0/+2
| | |
| * | Merge branch '34716-environment-specific-variables-ce' into 'master'Douwe Maan2017-07-061-6/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Backports for ee-2112 Closes #34716 See merge request !12671
| | * | Backports for ee-2112Lin Jen-Shin2017-07-061-6/+9
| | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2112
| * | | Merge branch '18000-remember-me-for-oauth-login' into 'master'Douwe Maan2017-07-061-0/+8
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Fix `migration:path` build for "Honor the 'Remember me' parameter for OAuth-based login" Closes #34713 See merge request !12668
| | * | Fix build for !11963.Timothy Andrew2017-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't use `request.env['omniauth.params']` if it isn't present. - Remove the `saml` section from the `gitlab.yml` test section. Some tests depend on this section not being initially present, so it can be overridden in the test. This MR doesn't add any tests for SAML, so we didn't really need this in the first place anyway. - Clean up the test -> omniauth section of `gitlab.yml`
| | * | Implement "remember me" for OAuth-based login.Timothy Andrew2017-07-061-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Pass a `remember_me` query parameter along with the initial OAuth request, and pick this parameter up during the omniauth callback from request.env['omniauth.params']`. - For 2FA-based login, copy the `remember_me` param from `omniauth.params` to `params`, which the 2FA process will pick up. - For non-2FA-based login, simply call the `remember_me` devise method to set the session cookie.
* | | | Allow to enable the Performance Bar for a group from the admin areaRémy Coutable2017-07-061-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Improve feature flag check for the performance barRémy Coutable2017-07-061-2/+0
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Hide 'peek' by using 'performance bar' insteadRémy Coutable2017-07-061-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status