summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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 including/extendi...Mario de la Ossa2018-02-023-4/+3
| * 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 panelZeger-Jan van de Weg2018-01-311-0/+15
| * | Fix not all events being shown in group dashboardsh-fix-events-collectionStan Hu2018-01-301-0/+24
| * | Make pagination optional for issuablesJan Provaznik2018-01-301-0/+12
| |/
* | 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 avatarsh-fix-error-500-no-avatarsStan Hu2018-01-201-1/+7
* | Preload ancestors for subgroups matching filterBob Van Landuyt2018-01-221-0/+24
* | Fix filter on `dashboard/groups` & `explore/groupsBob Van Landuyt2018-01-221-0/+20
* | Merge branch '41208-commit-atom-feeds-double-escaped' into 'master'Douwe Maan2018-01-221-1/+7
|\ \
| * | Allows html in commits atom feedJacopo2018-01-221-1/+7
* | | Merge branch '42206-permit-password-for-git-param' into 'master'Rémy Coutable2018-01-221-0/+7
|\ \ \ | |_|/ |/| |
| * | Permits 'password_authentication_enabled_for_git' parameter for ApplicationSe...Mark Fletcher2018-01-191-0/+7
| |/
* | Merge branch '41247-timestamp' into 'master'Robert Speicher2018-01-181-19/+47
|\ \ | |/ |/|
| * Return last edited time instead of update time41247-timestampJan Provaznik2018-01-181-19/+47
* | Merge branch 'feature/merge-request-system-hook' into 'master'Douwe Maan2018-01-182-2/+30
|\ \ | |/ |/|
| * 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
* | Merge branch 'sh-validate-path-project-import-10-3' into 'security-10-3'Stan Hu2018-01-161-0/+38
* | 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 39957-redirect-to-gpc-page-if-users-try-to-create-...Matija Čupić2018-01-061-0/+47
|\ \
| * | 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 39957-redirect-to-gpc-page-if-users-try-to-create-...Matija Čupić2018-01-051-0/+58
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Backport 'Rebase' feature from EE to CEjprovazn-rebaseJan Provaznik2018-01-051-0/+58
| | |_|/ / | |/| | |
* | | | | Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-...Matija Čupić2018-01-0549-110/+181
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '3377-use-artifacts-tests-from-ee' into 'master'Rémy Coutable2018-01-041-13/+34
| |\ \ \ \
| | * | | | 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
| | |_|_|/ | |/| | |
| * | | | Fix when branch creation fails don't post system noteMateusz Bajorski2017-12-261-0/+14
| |/ / /
| * | | Merge branch '36782-replace-team-user-role-with-add_role-user-in-specs' into ...Rémy Coutable2017-12-2347-96/+96
| |\ \ \ | | |_|/ | |/| |
| | * | Replace '.team << [user, role]' with 'add_role(user)' in specs36782-replace-team-user-role-with-add_role-user-in-specsblackst0ne2017-12-2247-96/+96
| * | | Extend Cluster Applications to allow installation of PrometheusMayra Cabrera2017-12-221-1/+1
| |/ /
* | | Implement GCP billing check in cluster formMatija Čupić2017-12-211-1/+16
View Lorry Controller Status