summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'winh-kubernetes-clusters' into 'master'Phil Hughes2018-02-061-5/+5
|\ | | | | | | | | | | | | Replace "cluster" with "Kubernetes cluster" Closes #41963 See merge request gitlab-org/gitlab-ce!16778
| * Replace "cluster" with "Kubernetes cluster"winh-kubernetes-clustersWinnie Hellmann2018-02-061-5/+5
| |
* | Refactor :trace to :trace_live in specShinya Maeda2018-02-061-5/+5
| |
* | Finish all testsShinya Maeda2018-02-061-1/+22
|/
* 31885 - Ability to transfer a single group to another groupMayra Cabrera2018-02-061-0/+83
|
* Change UserCallout feautre_name to enumMatija Čupić2018-02-031-11/+25
|
* Merge branch 'master' into persistent-calloutsMatija Čupić2018-02-0212-12/+76
|\
| * use Gitlab::UserSettings directly as a singleton instead of ↵Mario de la Ossa2018-02-023-4/+3
| | | | | | | | including/extending it
| * port of 594e6a0a625^..f74c90f68c6Micaël Bergeron2018-02-014-4/+18
| |
| * Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-012-4/+4
| |
| * Merge branch 'zj-gitaly-server-info' into 'master'Sean McGivern2018-01-311-0/+15
| |\ | | | | | | | | | | | | Gitaly Server info for admin panel See merge request gitlab-org/gitlab-ce!16794
| | * Gitaly Server info for admin panelZeger-Jan van de Weg2018-01-311-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements the client side for gitlab-org/gitaly#819. Which is a server info command. This checks the server version and git binairy version on the server. A small UI was added for administrators, so they can check the status of the Gitaly server. This is done for each storage the monolith knows. Because of this commit, gitlab-org/gitlab-ce!15580 is now closed. That MR removed the Git version too, but didn't replace it with anything.
| * | Fix not all events being shown in group dashboardsh-fix-events-collectionStan Hu2018-01-301-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | The group activity feed was limited to the first 20 projects found in the group, which caused activity from some projects to be omitted. A limit of 20 is applied to the query for events, so the extra pagination does little in the way of performance. Closes #42560
| * | Make pagination optional for issuablesJan Provaznik2018-01-301-0/+12
| |/ | | | | | | | | | | | | | | | | | | On epics roadmap page we list all epics in the given time frame without pagination (at least for the first iteration), in this case it would be nice to use the existing issuables index logic except pagination (see MR gitlab-ee!4281). For this reason this patch allows to easily disable pagination. Related gitlab-ee!4281
* | Rename Callout to UserCalloutMatija Čupić2018-02-021-3/+3
| |
* | Refactor CalloutsControllerMatija Čupić2018-02-021-2/+2
| |
* | Remove dismissed_state from Callout modelMatija Čupić2018-02-021-4/+0
| |
* | Add CalloutsController specsMatija Čupić2018-01-261-0/+39
|/
* Merge branch 'sh-fix-error-500-no-avatars' into 'master'Robert Speicher2018-01-221-1/+7
|\ | | | | | | | | | | | | Fix Error 500 when repository has no avatar Closes #42249 See merge request gitlab-org/gitlab-ce!16601
| * Fix Error 500 when repository has no avatarsh-fix-error-500-no-avatarsStan Hu2018-01-201-1/+7
| | | | | | | | Closes #42249
* | Preload ancestors for subgroups matching filterBob Van Landuyt2018-01-221-0/+24
| | | | | | | | | | | | | | Otherwise we'd only preload the ancestors that would fit the page. That way, when a search result was on the first page, but the ancestor didn't fit the page anymore. We would not have the preloaded ancestor when rendering the hierarchy.
* | Fix filter on `dashboard/groups` & `explore/groupsBob Van Landuyt2018-01-221-0/+20
| | | | | | | | | | | | When searching we would limit the scope of ancestors to load because the filter would be applied to the ancestors. Instead, we need to load _all_ ancestors for matching projects.
* | Merge branch '41208-commit-atom-feeds-double-escaped' into 'master'Douwe Maan2018-01-221-1/+7
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Commits atom feed is double-escaped" Closes #41208 See merge request gitlab-org/gitlab-ce!16603
| * | Allows html in commits atom feedJacopo2018-01-221-1/+7
| | | | | | | | | | | | Html code now works in commits atom feed `title` and `summary`.
* | | Merge branch '42206-permit-password-for-git-param' into 'master'Rémy Coutable2018-01-221-0/+7
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Resolve "Password authentication enabled for Git over HTTP(S) can not be disabled via UI" Closes #42206 See merge request gitlab-org/gitlab-ce!16577
| * | Permits 'password_authentication_enabled_for_git' parameter for ↵Mark Fletcher2018-01-191-0/+7
| |/ | | | | | | ApplicationSettingsController
* | Merge branch '41247-timestamp' into 'master'Robert Speicher2018-01-181-19/+47
|\ \ | |/ |/| | | | | | | | | Use last_edited_at instead of updated_at for displaying issuable last change Closes #41247 See merge request gitlab-org/gitlab-ce!16406
| * Return last edited time instead of update time41247-timestampJan Provaznik2018-01-181-19/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | For issuable models we keep two timestamps: updated_at which is updated whenever any model attribute is changed, last_edited_at which is changed when only title or description is changed. In UI bellow description we display who and when updated the item. But last_edited_by (used for 'who') is mistakenly combined with updated_at (when), last_edited_at should be used instead. Closes #41247
* | Merge branch 'feature/merge-request-system-hook' into 'master'Douwe Maan2018-01-182-2/+30
|\ \ | |/ |/| | | | | System hooks for Merge Requests See merge request gitlab-org/gitlab-ce!14387
| * reference triggers.values for permitted parametersAlexis Reigel2018-01-172-3/+30
| |
| * add missing permitted paramAlexis Reigel2018-01-171-0/+1
| |
* | Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3'Robert Speicher2018-01-161-0/+75
| | | | | | | | | | | | | | | | | | | | [10.3] Prevent login with disabled OAuth providers See merge request gitlab/gitlabhq!2296 (cherry picked from commit 4936650427ffc88e6ee927aedbb2c724d24b094c) a0f9d222 Prevents login with disabled OAuth providers
* | Merge branch 'sh-validate-path-project-import-10-3' into 'security-10-3'Stan Hu2018-01-161-0/+38
| | | | | | | | | | | | | | | | | | | | Validate project path in Gitlab import - 10.3 port See merge request gitlab/gitlabhq!2268 (cherry picked from commit 94c82376d66fc80d46dd2d5eeb5bade408ec6a7e) 2b94a7c2 Validate project path in Gitlab import
* | Fix error on changes tab when merge request cannot be createdissue_41460Felipe Artur2018-01-151-17/+25
| |
* | Refactor GCP redirect test suiteMatija Čupić2018-01-111-5/+4
| |
* | Fix GCP Controller specMatija Čupić2018-01-111-1/+5
| |
* | disables the shortcut to the issue boards when issues are disabledChristiaan Van den Poel2018-01-081-0/+10
| |
* | Merge branch 'master' into ↵Matija Čupić2018-01-061-0/+47
|\ \ | | | | | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
| * | Change reset_cache action from get to postMatija Čupić2018-01-051-1/+1
| | |
| * | Merge branch 'master' into 41249-clearing-the-cacheMatija Čupić2018-01-051-0/+58
| |\ \
| * \ \ Merge branch 'master' into 41249-clearing-the-cacheMatija Čupić2018-01-0448-109/+180
| |\ \ \
| * | | | Move cache reset to ci_cd_settings controllerMatija Čupić2018-01-042-47/+47
| | | | |
| * | | | Merge branch 'master' into 41249-clearing-the-cacheMatija Čupić2017-12-222-1/+9
| |\ \ \ \
| * | | | | Add tests for projects#reset_cacheMatija Čupić2017-12-211-0/+47
| | | | | |
* | | | | | Merge branch 'master' into ↵Matija Čupić2018-01-051-0/+58
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
| * | | | | Backport 'Rebase' feature from EE to CEjprovazn-rebaseJan Provaznik2018-01-051-0/+58
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301
* | | | | Merge branch 'master' into ↵Matija Čupić2018-01-0549-110/+181
|\ \ \ \ \ | |/ / / / | | | | | | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
| * | | | Merge branch '3377-use-artifacts-tests-from-ee' into 'master'Rémy Coutable2018-01-041-13/+34
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE: Unify CE and EE tests in spec/controllers/projects/artifacts_controller_spec.rb Closes gitlab-ee#3377 See merge request gitlab-org/gitlab-ce!16133
| | * | | | Just use the tests from EE3377-use-artifacts-tests-from-eeLin Jen-Shin2017-12-261-13/+34
| | | | | |
| * | | | | 41054-Disallow creation of new Kubernetes integrationsMayra Cabrera2018-01-041-0/+36
| | |_|_|/ | |/| | |
View Lorry Controller Status