summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into ci-build-listDmitriy Zaporozhets2015-09-1879-167/+195
|\
| * Merge branch 'add-custom-text-to-help' into 'master' Jeroen van Baarsen2015-09-183-0/+9
| |\
| | * Allow custom info to be added to Help pageJeroen van Baarsen2015-09-183-0/+9
| * | 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 'fix-trending-projects' into 'master' Dmitriy Zaporozhets2015-09-182-14/+5
| |\ \
| | * | Fix 500 on trending projects if isntance has 100k+ projectsDmitriy Zaporozhets2015-09-182-14/+5
| | |/
| * | Merge branch 'fix-ci-settings-cancel' into 'master' Dmitriy Zaporozhets2015-09-181-1/+0
| |\ \
| | * | Remove Cancel button in Project settingsfix-ci-settings-cancelKamil Trzcinski2015-09-171-1/+0
| | |/
| * | Merge branch 'project-header-titles' into 'master' Dmitriy Zaporozhets2015-09-1866-55/+107
| |\ \
| | * \ Merge branch 'master' into project-header-titlesDouwe Maan2015-09-1816-237/+44
| | |\ \ | | | |/
| | * | "Back to x" links are lowercase.project-header-titlesDouwe Maan2015-09-171-1/+1
| | * | Fix active state of CI Help nav link.Douwe Maan2015-09-171-1/+1
| | * | Rename "CI" in sidebar to "GitLab CI".Douwe Maan2015-09-171-1/+1
| | * | Move project header title definition to view in question.Douwe Maan2015-09-1764-53/+103
| * | | Merge branch 'ci_projects_order' into 'master' Valery Sizov2015-09-186-94/+71
| |\ \ \ | | |_|/ | |/| |
| | * | Fix: ci projects orderci_projects_orderValery Sizov2015-09-176-94/+71
* | | | Style CI project/build listDmitriy Zaporozhets2015-09-1811-46/+21
|/ / /
* | | Merge branch 'remove-ci-help' into 'master'Kamil TrzciƄski2015-09-173-76/+0
|\ \ \
| * | | Remove CI helpKamil Trzcinski2015-09-173-76/+0
* | | | Move partial locals out of controllerStan Hu2015-09-174-18/+11
|/ / /
* | | Merge pull request #9618 from pjknkda/repo-info-to-issue-hookStan Hu2015-09-171-0/+6
|\ \ \
| * | | add repository field to issue hook dataJungkook Park2015-09-171-0/+6
* | | | Fix nav_link for dashboardKamil Trzcinski2015-09-171-2/+2
* | | | Remove duplicate codeKamil Trzcinski2015-09-171-108/+0
* | | | Check current_controller against controller_pathKamil Trzcinski2015-09-171-1/+3
* | | | Integrate CI navigation more tightly with projectKamil Trzcinski2015-09-176-34/+22
| |_|/ |/| |
* | | Merge branch 'fix-issue-2382' into 'master'Stan Hu2015-09-177-11/+52
|\ \ \ | |_|/ |/| |
| * | Create a "destroyed Milestone" event and keep Milestone events around in the DBStan Hu2015-09-157-11/+52
* | | Merge branch 'enable_ssl_by_default' into 'master'Valery Sizov2015-09-171-1/+1
|\ \ \
| * | | enable SSL by defaultenable_ssl_by_defaultValery Sizov2015-09-171-1/+1
| | |/ | |/|
* | | Merge branch 'fix-ci-500-on-settings' into 'master'Dmitriy Zaporozhets2015-09-171-1/+1
|\ \ \
| * | | Fix 500 on CI project settingsfix-ci-500-on-settingsKamil Trzcinski2015-09-161-1/+1
| |/ /
* | | Merge branch 'fix-public-projects' into 'master'Dmitriy Zaporozhets2015-09-171-5/+0
|\ \ \
| * | | Fix displaying public projectsfix-public-projectsKamil Trzcinski2015-09-161-5/+0
* | | | Fix HTML link that was improperly escaped in new user e-mailStan Hu2015-09-161-1/+1
| |/ / |/| |
* | | Merge branch 'fix-ci-nav' into 'master'Dmitriy Zaporozhets2015-09-165-10/+4
|\ \ \ | |/ / |/| |
| * | Fix confusing behaviour of back link in CI sidebarDmitriy Zaporozhets2015-09-165-10/+4
* | | Merge branch 'style-ci-page' into 'master'Dmitriy Zaporozhets2015-09-164-21/+56
|\ \ \
| * | | Style CI projects page and builds listDmitriy Zaporozhets2015-09-164-21/+56
| |/ /
* | | Merge branch 'fix-issue-2555' into 'master'Dmitriy Zaporozhets2015-09-163-3/+3
|\ \ \ | |/ / |/| |
| * | Eliminate combined image_tag and image_path in providers listStan Hu2015-09-161-1/+1
| * | Fix default avatars to ensure that helpers don't have /assets dir appendedStan Hu2015-09-162-2/+2
* | | Merge branch 'add-links-to-ci' into 'master'Dmitriy Zaporozhets2015-09-163-0/+10
|\ \ \
| * | | Add links from GitLab to CIDmitriy Zaporozhets2015-09-163-0/+10
| |/ /
* | | Fix CI testsKamil Trzcinski2015-09-161-1/+1
* | | Fix ordering issueKamil Trzcinski2015-09-161-1/+1
* | | Fix projects editKamil Trzcinski2015-09-161-1/+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
| |\ \