summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tc-fix-group-finder-subgrouping' into 'master'Douwe Maan2017-06-161-4/+5
|\
| * Subgroups page should show groups authorized through inheritanceToon Claes2017-06-151-4/+5
* | Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master'Sean McGivern2017-06-161-1/+1
|\ \
| * | Rename "Slash commands" to "Quick actions"Eric Eastwood2017-06-151-1/+1
| |/
* | Deserialise existing custom notification settingsdeserialize-custom-notificationsSean McGivern2017-06-151-2/+2
* | Add columns for custom notification settingsSean McGivern2017-06-151-2/+8
|/
* Correct RSpec/SingleLineHook cop offensesRobert Speicher2017-06-1421-91/+280
* Merge remote-tracking branch 'upstream/master' into 33149-rename-more-buildsLin Jen-Shin2017-06-141-7/+30
|\
| * Update tests and applicationfix-external-ci-servicesKamil Trzcinski2017-06-131-7/+30
* | Merge remote-tracking branch 'upstream/master' into 33149-rename-more-builds33149-rename-more-buildsLin Jen-Shin2017-06-1318-91/+272
|\ \ | |/
| * Merge branch 'use-request-store-helper-instead-actual-code' into 'master'Douwe Maan2017-06-123-23/+4
| |\
| | * Use :request_store hooks on specsuse-request-store-helper-instead-actual-codeOswaldo Ferreira2017-06-093-23/+4
| * | Make sure reCAPTCHA configuration is loaded when spam checks are initiatedsh-recaptcha-fix-try2Stan Hu2017-06-101-0/+1
| * | Revert 'New file from interface on existing branch'dm-revert-mr-8427Douwe Maan2017-06-091-14/+0
| |/
| * Merge branch 'dashboard-milestone-tabs-loading-async' into 'master'Sean McGivern2017-06-091-0/+38
| |\
| | * Fixed dashboard milestone tabs not loadingdashboard-milestone-tabs-loading-asyncPhil Hughes2017-06-091-0/+38
| * | Merge branch 'use-request-store-on-mr-controller-query-count-spec' into 'master'Douwe Maan2017-06-081-1/+6
| |\ \
| | * | Use RequestStore on MR show.json query count specuse-request-store-on-mr-controller-query-count-specOswaldo Ferreira2017-06-081-1/+6
| * | | Merge branch 'master-security-update' into 'master'Regis Boudinot2017-06-081-10/+20
| |\ \ \
| | * | | Merge branch 'dz-restrict-autocomplete' into 'security-9-1'DJ Mountney2017-06-081-10/+20
| | |/ /
| * | | Merge branch 'master' into 25426-group-dashboard-ui25426-group-dashboard-uiAlfredo Sumaran2017-06-081-3/+3
| |\ \ \ | | |/ /
| | * | Allow group reporters to promote labelsallow-reporters-to-promote-group-labelsSean McGivern2017-06-081-3/+3
| | |/
| * | Merge branch 'master' into 25426-group-dashboard-uiAlfredo Sumaran2017-06-0715-123/+327
| |\ \ | | |/
| | * Sync email address from specified omniauth providerRobin Bobbitt2017-06-071-0/+31
| | * Merge branch 'expand-backlog-closed-lists-issue-boards' into 'master'Douwe Maan2017-06-071-1/+1
| | |\
| | | * spec updatesPhil Hughes2017-05-311-1/+1
| | * | Merge branch 'instrument-infra' into 'master'Grzegorz Bizon2017-06-072-39/+70
| | |\ \
| | | * | Do not cleanup temp directory as this apparently causes silent rspec failures...Pawel Chojnacki2017-06-071-8/+2
| | | * | Add prometheus text formatterPawel Chojnacki2017-06-021-6/+6
| | | * | Move Prometheus presentation logic to PrometheusTextPawel Chojnacki2017-06-021-2/+2
| | | * | Mark migration as requiring no downtimePawel Chojnacki2017-06-021-0/+5
| | | * | Move most of MetricsController logic to MetricsServicePawel Chojnacki2017-06-021-2/+3
| | | * | move check if metrics are enabled to before actionPawel Chojnacki2017-06-021-0/+10
| | | * | Correctly handle temporary folder for testing multiproces metricsPawel Chojnacki2017-06-021-0/+9
| | | * | Split metrics from health controller into metrics controllerPawel Chojnacki2017-06-022-39/+51
| | * | | Merge branch '12910-snippets-description' into 'master'Phil Hughes2017-06-073-2/+84
| | |\ \ \
| | | * | | Support uploads for newly created personal snippets12910-snippets-descriptionJarka Kadlecova2017-06-071-0/+34
| | | * | | Support descriptions for snippetsJarka Kadlecova2017-05-312-2/+50
| | | | |/ | | | |/|
| | * | | Merge branch '27148-limit-bulk-create-memberships' into 'master'Douwe Maan2017-06-062-3/+12
| | |\ \ \
| | | * | | Limit non-administrators to adding 100 members at a time to groups and projectsNick Thomas2017-06-062-3/+12
| | * | | | redesign caching of application settingsPaul Charlton2017-06-061-1/+1
| | |/ / /
| * | | | Fix failing specAlfredo Sumaran2017-06-071-1/+1
| * | | | Add json support to group members leave action in controllerDmitriy Zaporozhets2017-06-061-0/+7
* | | | | Fix raw_path with the new job path, rename to jobLin Jen-Shin2017-06-061-68/+68
| |/ / / |/| | |
* | | | Support hard deletion in Admin::UsersController#destroyNick Thomas2017-06-051-2/+13
* | | | Refactor the DeleteUserWorkerNick Thomas2017-06-051-1/+1
* | | | Merge branch 'zj-job-view-goes-real-time' into 'master'Kamil Trzciński2017-06-051-11/+34
|\ \ \ \
| * | | | Fix test failuresKamil Trzcinski2017-06-031-2/+2
| * | | | Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeKamil Trzcinski2017-06-023-64/+55
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Add user to BuildDetailsEntityZ.J. van de Weg2017-06-021-1/+2
View Lorry Controller Status