summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Address review comments with playing pipeline schedulersh-add-schedule-pipeline-run-nowStan Hu2017-12-121-15/+15
|
* Fix Rubocop offense and use a symbol instead of a stringStan Hu2017-12-121-1/+1
|
* Add a spec for rate limiting pipeline schedulesStan Hu2017-12-121-2/+2
|
* Add rate limiting to guard against excessive scheduling of pipelinesStan Hu2017-12-121-0/+11
|
* Fix Sidekiq worker and make flash message return a link to the pipelines pageStan Hu2017-12-121-1/+1
|
* Create a play_pipeline_schedule policy and use itStan Hu2017-12-121-1/+5
|
* Address some comments with running a pipeline scheduleStan Hu2017-12-121-3/+3
|
* Add button to run scheduled pipeline immediatelyStan Hu2017-12-121-1/+15
| | | | Closes #38741
* Merge branch ↵Robert Speicher2017-12-125-9/+34
|\ | | | | | | | | | | | | | | | | 'tmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenter' into 'master' Refactor member view by using presenter Closes #28004 See merge request gitlab-org/gitlab-ce!15715
| * Present member collection at the controller leveltmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenterRémy Coutable2017-12-125-9/+34
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'single-list-multiple-clusters' into 'master'Kamil Trzciński2017-12-121-5/+2
|\ \ | |/ |/| | | | | Use Single list for multiple clusters See merge request gitlab-org/gitlab-ce!15848
| * Remove cluster scope from ClustersController#indexMatija Čupić2017-12-111-5/+2
| |
* | Merge branch ↵Douwe Maan2017-12-112-2/+2
|\ \ | |/ |/| | | | | | | | | | | | | '40743-bug-accepting-new-group-members-when-permission-level-developer' into 'master' Bugfix: User can't change the access level of an access requester Closes #40743 See merge request gitlab-org/gitlab-ce!15832
| * Bugfix: User can't change the access level of an access requesterRubén Dávila2017-12-112-2/+2
| | | | | | | | | | The endpoint was returning 404 because it was only searching on the current members of a Group or Project and not the access requesters.
* | Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'Winnie Hellmann2017-12-111-1/+1
|\ \ | | | | | | | | | | | | Pick 10.2.4 security fixes into master See merge request gitlab-org/gitlab-ce!15821
| * | Merge branch '36679-non-authorized-user-may-see-wikis-or-pipeline-page' into ↵Douwe Maan2017-12-081-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | 'security-10-2' Fixes project visibility guidelines See merge request gitlab/gitlabhq!2226 (cherry picked from commit 877c42c0aaf3298d6001614c9706bc366ae4014c) e4fd1c26 Ensure project wiki visibility guidelines are met
* | Add recaptcha_check_if_spammable for issualbes than arent spammablesrecaptcha_check_if_spammable_ce_backportLuke Bennett2017-12-081-2/+8
|/
* Resolve "No feedback when checking on checklist if potential spam was detected"Luke Bennett2017-12-082-4/+15
|
* Move the circuitbreaker check out in a separate processbvl-circuitbreaker-processBob Van Landuyt2017-12-082-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | Moving the check out of the general requests, makes sure we don't have any slowdown in the regular requests. To keep the process performing this checks small, the check is still performed inside a unicorn. But that is called from a process running on the same server. Because the checks are now done outside normal request, we can have a simpler failure strategy: The check is now performed in the background every `circuitbreaker_check_interval`. Failures are logged in redis. The failures are reset when the check succeeds. Per check we will try `circuitbreaker_access_retries` times within `circuitbreaker_storage_timeout` seconds. When the number of failures exceeds `circuitbreaker_failure_count_threshold`, we will block access to the storage. After `failure_reset_time` of no checks, we will clear the stored failures. This could happen when the process that performs the checks is not running.
* Merge branch '40754-fix-flash-usage-with-personal-access-token' into 'master'Grzegorz Bizon2017-12-081-1/+3
|\ | | | | | | | | | | | | Fix new personal access token showing up in a flash message Closes #40754 See merge request gitlab-org/gitlab-ce!15707
| * Fix new personal access token showing up in a flash message40754-fix-flash-usage-with-personal-access-tokenEric Eastwood2017-12-071-1/+3
| |
* | Merge branch ↵Kamil Trzciński2017-12-071-1/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '40761-remove-the-checkbox-for-starting-a-new-pipeline-in-auto-devops-settings' into 'master' Resolve "Remove the checkbox for starting a new pipeline in Auto DevOps settings" Closes #40761 See merge request gitlab-org/gitlab-ce!15714
| * | Remove Auto DevOps checkboxes - backendbikebilly2017-12-041-1/+0
| |/
* | add support for the commit reference filtermicael.bergeron2017-12-072-13/+3
| |
* | tidying up the changesmicael.bergeron2017-12-071-3/+0
| |
* | add support for commit (in mr) to reference filtermicael.bergeron2017-12-071-1/+10
| |
* | corrects the url buildingmicael.bergeron2017-12-072-6/+8
| |
* | diff notes created in merge request on a commit have the right contextmicael.bergeron2017-12-072-8/+7
| | | | | | | | add a spec for commit merge request diff notes
* | Allow commenting on individual commits inside an MRDouwe Maan2017-12-072-14/+44
| |
* | Support uploads for groupsJarka Kadlecova2017-12-073-23/+63
| |
* | Resolve "Display member role per project"Mike Greiling2017-12-074-9/+45
| |
* | Merge branch ↵Tim Zallmann2017-12-061-8/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '22680-unlabel-slash-command-limit-autocomplete-to-applied-labels' into 'master' Resolve "/unlabel quick action - limit autocomplete to applied labels" Closes #22680 and #27319 See merge request gitlab-org/gitlab-ce!11110
| * | Limit autocomplete menu to applied labelsVitaliy @blackst0ne Klachkov2017-11-281-8/+8
| | |
* | | Merge branch ↵Sean McGivern2017-12-061-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39364-in-issue-board-url-doesn-t-take-in-account-hostname-settings' into 'master' Resolve "In Issue board url doesn't take in account hostname settings" Closes #39364 See merge request gitlab-org/gitlab-ce!15703
| * | | Use path helper instead of url helperLuke Bennett2017-12-031-1/+1
| | |/ | |/|
* | | Merge branch 'list-multiple-clusters' into 'master'Grzegorz Bizon2017-12-061-8/+31
|\ \ \ | | | | | | | | | | | | | | | | List multiple clusters See merge request gitlab-org/gitlab-ce!15403
| * \ \ Merge remote-tracking branch 'origin/master' into list-multiple-clustersMatija Čupić2017-12-051-3/+3
| |\ \ \
| * | | | Use ClustersFinder for setting countsMatija Čupić2017-12-051-4/+3
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into list-multiple-clustersKamil Trzcinski2017-12-051-2/+2
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/list-multiple-clusters' into ↵Kamil Trzcinski2017-12-051-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | cluster-page-with-list-clusters
| | * | | | | Remove references of project.cluster from specsMatija Čupić2017-12-041-1/+1
| | | | | | |
| | * | | | | Merge branch 'master' into list-multiple-clustersFilipa Lacerda2017-12-047-13/+22
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (154 commits) Don't disable the Rails mailer when seeding the test environment Documentation bug fixes: Added procedure to disable built-in Issues. Ensure `Namespace`'s is namespaced in `Gitlab::Kubernetes::Helm#initialize` and fix a transient failing spec due to that Add changelog entry Show only group name by default and put full namespace in tooltip Adds validation for Project#ci_config_path not to contain leading slash Gracefully handle case when repository's root ref does not exist Set EE variable issue note store allow caching options to be specified for counting services Update CHANGELOG.md for 10.2.3 Add link to gitaly converation Fix pipeline config source specs and test it explicitly Set an artificial $HOME for gitaly in test Add a fixture file that uses seed-fu in the test env so that a borken seed-fu is detected Pin seed-fu to 2.3.6 since 2.3.7 is broken Do not set pipeline source after initialization updated diff spec fix for special charecter in file names We could simply count the commits ...
| * | | | | | Merge branch '35616-move-k8-to-cluster-page' into ↵Kamil Trzcinski2017-12-052-3/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | cluster-page-with-list-clusters
| | * | | | | | Use find instead of find_by!Shinya Maeda2017-12-051-1/+1
| | | | | | | |
| | * | | | | | Optimize Projects::ClustersController#clusterShinya Maeda2017-12-041-1/+2
| | | | | | | |
| | * | | | | | Use status polling definitinoShinya Maeda2017-12-041-1/+1
| | | | | | | |
| | * | | | | | Optimize Clusters::CreateService#executeShinya Maeda2017-12-041-1/+1
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/list-multiple-clusters' into ↵Kamil Trzcinski2017-12-031-9/+33
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / / cluster-page-with-list-clusters
| | * | | | | Refactor ClustersController pagination testMatija Čupić2017-12-011-1/+1
| | | | | | |
| | * | | | | Use strings for @scope in ClustersController#indexMatija Čupić2017-11-301-1/+1
| | | | | | |
View Lorry Controller Status