summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-fix-help-links' into 'master' Douwe Maan2015-09-231-0/+5
|\
| * Simplify help path prefixingrs-fix-help-linksRobert Speicher2015-09-231-17/+4
| * Prevent double-prefixing of help page pathsRobert Speicher2015-09-221-0/+18
* | Fix error when MR source branch no longer exists.fix-mr-missing-source-branch-errorDouwe Maan2015-09-221-2/+1
|/
* Merge branch 'fix-ci-permissions' into 'master' Dmitriy Zaporozhets2015-09-221-1/+1
|\
| * Fix permissions problemsKamil Trzcinski2015-09-211-1/+1
* | Merge branch 'fix-issue-2593' into 'master' Robert Speicher2015-09-211-4/+6
|\ \ | |/ |/|
| * Fix Error 500 when comparing non-existing branchesfix-issue-2593Stan Hu2015-09-181-4/+6
* | Fetch merge request ref if it is missing when visit MR pagefix-mr-without-refsDmitriy Zaporozhets2015-09-211-0/+7
* | Merge branch 'notification-levels' into 'master' Douwe Maan2015-09-211-0/+4
|\ \
| * | Minor code cleanupnotification-levelsDouwe Maan2015-09-201-2/+3
| * | Use the `find_by_user_id` magic finder instead of `where`.Patricio Cano2015-09-161-1/+1
| * | Merge branch 'master' into notification-levelsPatricio Cano2015-09-1626-13/+941
| |\ \
| * \ \ Merge branch 'master' into notification-levelsPatricio Cano2015-09-1616-44/+63
| |\ \ \
| * | | | Notification dropdown now shows currently active level, and also shows what t...Patricio Cano2015-09-141-1/+3
| * | | | Notification level can now be saved from within the project view.Patricio Cano2015-09-141-1/+1
| * | | | PAtrially working notification buttonDarby2015-09-141-0/+1
* | | | | Bump devise-two-factor to 2.0.0rs-bump-two-factorRobert Speicher2015-09-192-2/+2
* | | | | Devise 3.5.x deprecates `confirm!` in favor of `confirm`Robert Speicher2015-09-191-1/+1
* | | | | remove API calls from CE to CIci_closer_integrationValery Sizov2015-09-181-11/+1
| |_|_|/ |/| | |
* | | | Allow to disable GitLab CIKamil Trzcinski2015-09-183-2/+16
* | | | Merge branch 'add-custom-text-to-help' into 'master' Jeroen van Baarsen2015-09-181-0/+1
|\ \ \ \
| * | | | Allow custom info to be added to Help pageJeroen van Baarsen2015-09-181-0/+1
* | | | | Merge branch 'fix-ci-non-public-project' into 'master' Dmitriy Zaporozhets2015-09-181-3/+1
|\ \ \ \ \
| * | | | | Fix 500 when accessing private project when not logged infix-ci-non-public-projectKamil Trzcinski2015-09-171-3/+1
| |/ / / /
* | | | | Merge branch 'ci_projects_order' into 'master' Valery Sizov2015-09-181-15/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix: ci projects orderci_projects_orderValery Sizov2015-09-171-15/+9
| | |_|/ | |/| |
* | | | Merge branch 'remove-ci-help' into 'master'Kamil Trzciński2015-09-171-16/+0
|\ \ \ \
| * | | | Remove CI helpKamil Trzcinski2015-09-171-16/+0
* | | | | Move partial locals out of controllerStan Hu2015-09-171-11/+0
|/ / / /
* | | | Merge branch 'fix-issue-2382' into 'master'Stan Hu2015-09-171-6/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Create a "destroyed Milestone" event and keep Milestone events around in the DBStan Hu2015-09-151-6/+1
* | | | Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree...ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gKamil Trzcinski2015-09-161-0/+1
|\ \ \ \
| * \ \ \ Merge pull request #9634 from allistera/users-autocomplete-sort-orderStan Hu2015-09-151-0/+1
| |\ \ \ \
| | * | | | Sorted autocomplete users list by nameAllister Antosik2015-09-151-0/+1
* | | | | | Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree...Kamil Trzcinski2015-09-151-0/+11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Change the replace placeholder to use the filenamefix-upload-uiStan Hu2015-09-151-0/+11
| |/ / / /
* | | | | Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree...Kamil Trzcinski2015-09-1518-53/+90
|\ \ \ \ \ | |/ / / /
| * | | | Use fixed version of fogbugz gemJared Szechy2015-09-151-5/+3
| |/ / /
| * | | Merge pull request #9138 from liyakun/masterStan Hu2015-09-141-4/+24
| |\ \ \ | | |_|/ | |/| |
| | * | Add "Replace" and "Upload" featuresliyakun2015-09-151-4/+24
| | |/
| * | Merge branch 'public_profiles' into 'master'Dmitriy Zaporozhets2015-09-142-2/+2
| |\ \
| | * | Allow access to group from root urlDmitriy Zaporozhets2015-09-141-1/+1
| | * | Skip auth for group page but return auth for other group pagesDmitriy Zaporozhets2015-09-141-1/+1
| * | | Merge branch 'forked-repo-creation-async' into 'master'Dmitriy Zaporozhets2015-09-141-4/+8
| |\ \ \
| | * | | Import forked repositories asynchronously to prevent large repositories from ...Stan Hu2015-09-111-4/+8
| | | |/ | | |/|
| * | | Merge branch 'master' into dashboard-titlesdashboard-titlesDouwe Maan2015-09-103-1/+170
| |\ \ \ | | |/ /
| * | | Fix RootControllerDouwe Maan2015-09-091-1/+1
| * | | Use new routing helperDouwe Maan2015-09-083-4/+4
| * | | Move partial to right place and fix tests.Douwe Maan2015-09-083-3/+3
View Lorry Controller Status