summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into git-archive-golanggit-archive-golangDouwe Maan2015-10-153-25/+38
|\
| * Fix: Images cannot show when projects' path was changeduploads_path_fixValery Sizov2015-10-141-2/+2
| * Merge branch 'cleanup-ci-pages' into 'master' Dmitriy Zaporozhets2015-10-071-23/+0
| |\
| | * Move CI services to project settings areaDmitriy Zaporozhets2015-10-071-23/+0
| * | Add directory feature buttonStan Hu2015-10-071-0/+36
| |/
* | Remove archive file sending specJacob Vosmaer2015-10-141-28/+0
|/
* Merge branch 'master' into flevour/gitlab-ce-project-path-insensitive-lookupDouwe Maan2015-10-017-104/+76
|\
| * WIPKamil Trzcinski2015-09-291-8/+4
| * Merge branch 'fxposter/gitlab-ce-login-from-admin'Douwe Maan2015-09-281-0/+15
| |\
| | * Move login button to user page, switched to POST methodPavel Forkert2015-09-241-3/+3
| | * Add option to admin area to sign in as a specific userPavel Forkert2015-09-241-0/+15
| * | Add user preference to view project activity and starred project activity as ...Stan Hu2015-09-261-1/+23
| |/
| * Remove test for non existing functionalitycleanup-ci-dashboardDmitriy Zaporozhets2015-09-231-50/+0
| * Merge branch 'fix-issue-2593' into 'master' Robert Speicher2015-09-211-0/+26
| |\
| | * Fix Error 500 when comparing non-existing branchesfix-issue-2593Stan Hu2015-09-181-0/+26
| * | Remove milestones from merge requests when milestones are deletedStan Hu2015-09-211-0/+6
| * | Bump devise-two-factor to 2.0.0rs-bump-two-factorRobert Speicher2015-09-191-2/+2
| * | remove API calls from CE to CIci_closer_integrationValery Sizov2015-09-181-43/+0
| |/
* | Fix indentationFrancesco Levorato2015-09-181-2/+2
* | Redirect case sensitive project path to the normalized oneFrancesco Levorato2015-09-182-0/+20
* | Refactor spec to go through ApplicationController#projectFrancesco Levorato2015-09-181-4/+4
|/
* Merge branch 'ci_projects_order' into 'master' Valery Sizov2015-09-181-1/+1
|\
| * Fix: ci projects orderci_projects_orderValery Sizov2015-09-171-1/+1
* | Merge branch 'fix-issue-2382' into 'master'Stan Hu2015-09-171-0/+4
|\ \ | |/ |/|
| * Create a "destroyed Milestone" event and keep Milestone events around in the DBStan Hu2015-09-151-0/+4
* | Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree...Kamil Trzcinski2015-09-153-18/+8
|\ \ | |/
| * Merge branch 'public_profiles' into 'master'Dmitriy Zaporozhets2015-09-142-14/+4
| |\
| | * Fix tests and improve wordingDmitriy Zaporozhets2015-09-141-2/+2
| | * Make all group publicValery Sizov2015-09-092-12/+2
| * | Merge branch 'master' into dashboard-titlesdashboard-titlesDouwe Maan2015-09-101-0/+39
| |\ \ | | |/
| * | Move partial to right place and fix tests.Douwe Maan2015-09-081-4/+4
* | | Fix ci/projects_controller_spec.rbKamil Trzcinski2015-09-151-27/+9
* | | fix specs. Stage 5Valery Sizov2015-09-151-5/+8
* | | rubocop satisfyValery Sizov2015-09-141-9/+9
* | | Fix more testsDmitriy Zaporozhets2015-09-101-3/+3
* | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-092-0/+76
|\ \ \ | | |/ | |/|
| * | FogBugz project importJared Szechy2015-09-081-0/+39
| |/
| * add Content-Type header of raw image filepilsner2015-09-041-0/+14
| * Remove the filename argument from Content-Disposition header to avoidStan Hu2015-09-021-0/+23
* | Refactor CI testsDmitriy Zaporozhets2015-09-091-9/+9
* | Merge CI factories and CI spec/support with GitLabDmitriy Zaporozhets2015-09-092-0/+135
|/
* Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLabStan Hu2015-08-233-23/+48
* Merge branch 'fix-email-autocomplete' into 'master'Douwe Maan2015-08-211-1/+1
|\
| * Fix bug preventing invite by e-mailStan Hu2015-08-211-1/+1
* | Fix blame view line groupingsStan Hu2015-08-201-0/+43
|/
* Merge branch 'disable-internal-tracker-when-external-in-use' into 'master'Dmitriy Zaporozhets2015-08-141-0/+37
|\
| * Disable internal issue tracker if external tracker in useStan Hu2015-07-171-0/+37
* | Provide more feedback what went wrong if HipChat service failed testStan Hu2015-08-121-0/+35
* | Show incompatible projects in Bitbucket import statusStan Hu2015-08-071-1/+3
* | Merge branch 'add-current-user-to-autocomplete' into 'master'Dmitriy Zaporozhets2015-08-061-0/+22
|\ \