summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge branch 'help-landing-page-customizations' into 'master'Douwe Maan2017-06-141-0/+2
|\ \ \ \
| * | | | Help landing page customizationsRobin Bobbitt2017-06-141-0/+2
* | | | | Merge branch 'fix-external-ci-services' into 'master'Grzegorz Bizon2017-06-143-6/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update tests and applicationfix-external-ci-servicesKamil Trzcinski2017-06-131-4/+0
| * | | | Allow to access pipelines even if they are disabled, but only present jobs an...Kamil Trzcinski2017-06-132-2/+0
* | | | | Merge branch 'tidy-up-issues-controller-filters' into 'master'Douwe Maan2017-06-131-9/+6
|\ \ \ \ \
| * | | | | Always check read_issue permissions when loading issuetidy-up-issues-controller-filtersSean McGivern2017-06-131-9/+6
* | | | | | Merge branch 'fix/33584-atom-layout' into 'master'Rémy Coutable2017-06-137-7/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Refactor atom builder by using xml.atom layoutTieu-Philippe KHIM2017-06-127-7/+7
* | | | | | Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-121-1/+17
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix linting, route, and specsRémy Coutable2017-06-091-1/+1
| * | | | | Small adjustmentsRémy Coutable2017-06-091-0/+2
| * | | | | Don't use Pygment,rb, use Rouge instead, and put peek-pg in the :postgres groupRémy Coutable2017-06-091-0/+1
| * | | | | New performance bar that can be enabled with the `p b` shortcutRémy Coutable2017-06-091-1/+14
* | | | | | Merge branch 'rs-simplify-todo-count-spec' into 'master'Rémy Coutable2017-06-121-5/+0
|\ \ \ \ \ \
| * | | | | | Test todos_count_format helper at the correct level to improve speedrs-simplify-todo-count-specRobert Speicher2017-06-091-5/+0
| | |/ / / / | |/| | | |
* | | | | | Make sure reCAPTCHA configuration is loaded when spam checks are initiatedsh-recaptcha-fix-try2Stan Hu2017-06-101-1/+9
|/ / / / /
* | | | | Revert 'New file from interface on existing branch'dm-revert-mr-8427Douwe Maan2017-06-094-14/+1
|/ / / /
* | | | Merge branch 'pat-msg-on-auth-failure' into 'master'Rémy Coutable2017-06-092-2/+2
|\ \ \ \
| * | | | Instruct user to use a personal access token for Git over HTTPRobin Bobbitt2017-06-072-2/+2
* | | | | Merge branch 'dashboard-milestone-tabs-loading-async' into 'master'Sean McGivern2017-06-092-2/+6
|\ \ \ \ \
| * | | | | Fixed dashboard milestone tabs not loadingdashboard-milestone-tabs-loading-asyncPhil Hughes2017-06-092-2/+6
* | | | | | Merge branch 'master-security-update' into 'master'Regis Boudinot2017-06-081-1/+1
|\ \ \ \ \ \
| * | | | | | Merge branch 'dz-restrict-autocomplete' into 'security-9-1'DJ Mountney2017-06-081-1/+1
* | | | | | | Merge branch '25426-group-dashboard-ui' into 'master'Douwe Maan2017-06-082-9/+28
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'master' into 25426-group-dashboard-ui25426-group-dashboard-uiAlfredo Sumaran2017-06-084-21/+21
| |\ \ \ \ \ \
| * | | | | | | Use group and project finders instead of direct ActiveRecord relationsDouwe Maan2017-06-071-10/+11
| * | | | | | | Merge branch 'master' into 25426-group-dashboard-uiAlfredo Sumaran2017-06-0766-200/+281
| |\ \ \ \ \ \ \
| * | | | | | | | Minor visual adjustmentsAlfredo Sumaran2017-06-061-1/+1
| * | | | | | | | Add json support to group members leave action in controllerDmitriy Zaporozhets2017-06-061-2/+7
| * | | | | | | | Merge remote-tracking branch 'origin/master' into 25426-group-dashboard-uiDmitriy Zaporozhets2017-06-0265-536/+914
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Serialize groups as json for Dashboard::GroupsControllerDmitriy Zaporozhets2017-05-041-7/+20
* | | | | | | | | | Use Diff::File blob methods from diff highlighterdm-highlight-diff-file-blobDouwe Maan2017-06-081-3/+5
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'allow-reporters-to-promote-group-labels' into 'master'Douwe Maan2017-06-081-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow group reporters to promote labelsallow-reporters-to-promote-group-labelsSean McGivern2017-06-081-3/+3
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'zj-i18n-pipeline-schedules' into 'master'Douwe Maan2017-06-081-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Allow translation of Pipeline SchedulesZ.J. van de Weg2017-06-081-2/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'blob-load-all-data' into 'master'Grzegorz Bizon2017-06-081-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Blob#load_all_data! doesn’t need an argumentblob-load-all-dataDouwe Maan2017-06-071-3/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Translate project & repository pagesBob Van Landuyt2017-06-071-13/+13
|/ / / / / /
* | | | | | Sync email address from specified omniauth providerRobin Bobbitt2017-06-071-2/+2
* | | | | | Merge branch 'expand-backlog-closed-lists-issue-boards' into 'master'Douwe Maan2017-06-071-1/+3
|\ \ \ \ \ \
| * | | | | | moved creating backlog list into list servicePhil Hughes2017-06-061-2/+2
| * | | | | | Expand/collapse close & backlog lists in issue boardsPhil Hughes2017-05-311-0/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '3191-deploy-keys-update' into 'master'Rémy Coutable2017-06-072-6/+47
|\ \ \ \ \ \
| * | | | | | Implement ability to update deploy keysAlexander Randa2017-06-022-6/+47
* | | | | | | Merge branch 'feature/gb/persist-pipeline-stages' into 'master'Kamil Trzciński2017-06-071-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'feature/gb/migrate-pipeline-stages' into feature/gb/persist-pip...Grzegorz Bizon2017-06-069-91/+37
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into feature/gb/persist-pipeline-stagesGrzegorz Bizon2017-06-0532-211/+394
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Rename pipeline methods related to legacy stagesGrzegorz Bizon2017-06-011-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
View Lorry Controller Status