summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Clean up overlap between dashboard and explore.Douwe Maan2015-09-0811-33/+46
| * | | Make Help accessible for guests.Douwe Maan2015-09-081-0/+2
* | | | Fix: features/ci/runners_spec.rbKamil Trzcinski2015-09-151-1/+1
* | | | fix specs. Stage 5Valery Sizov2015-09-151-2/+2
* | | | Merge commit '4c53cc0ebac36560d806732ff1fefba9206c75f3' into ci-and-ce-sittin...Kamil Trzcinski2015-09-1413-54/+54
|\ \ \ \
| * | | | rubocop satisfyValery Sizov2015-09-1413-54/+54
* | | | | Fix navigation and header tileKamil Trzcinski2015-09-142-2/+2
* | | | | Fix runners administrationKamil Trzcinski2015-09-141-1/+1
* | | | | Remove duplicate noticesKamil Trzcinski2015-09-141-1/+1
|/ / / /
* | | | Fix 500 when search for gitlab projectsDmitriy Zaporozhets2015-09-111-1/+1
* | | | Use GitLab UI when render CIDmitriy Zaporozhets2015-09-112-0/+2
* | | | Remove network from CIDmitriy Zaporozhets2015-09-112-31/+2
* | | | Fix ci commits features specsDmitriy Zaporozhets2015-09-111-1/+1
* | | | Fix project pages for authorized userDmitriy Zaporozhets2015-09-102-4/+5
* | | | fix of project creationValery Sizov2015-09-102-56/+1
* | | | integration with gitlab authValery Sizov2015-09-095-61/+25
* | | | Fix brakemanDmitriy Zaporozhets2015-09-091-3/+9