summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into project-header-titlesDouwe Maan2015-09-1811-101/+35
|\
| * Merge branch 'remove-ci-help' into 'master'Kamil TrzciƄski2015-09-172-60/+0
| |\
| | * Remove CI helpKamil Trzcinski2015-09-172-60/+0
| * | Move partial locals out of controllerStan Hu2015-09-173-7/+11
| |/
| * Fix nav_link for dashboardKamil Trzcinski2015-09-171-2/+2
| * Integrate CI navigation more tightly with projectKamil Trzcinski2015-09-176-34/+22
* | "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-1762-13/+98
|/
* Merge branch 'fix-issue-2382' into 'master'Stan Hu2015-09-171-2/+3
|\
| * Create a "destroyed Milestone" event and keep Milestone events around in the DBStan Hu2015-09-151-2/+3
* | 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
* | | Style CI projects page and builds listDmitriy Zaporozhets2015-09-163-13/+13
|/ /
* | Merge branch 'add-links-to-ci' into 'master'Dmitriy Zaporozhets2015-09-162-0/+9
|\ \
| * | Add links from GitLab to CIDmitriy Zaporozhets2015-09-162-0/+9
* | | Fix projects editKamil Trzcinski2015-09-161-1/+1
|/ /
* | Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree...Kamil Trzcinski2015-09-155-48/+20
|\ \
| * | Change the replace placeholder to use the filenamefix-upload-uiStan Hu2015-09-154-36/+8
| * | Improve wording for header and placeholdersRobert Schilling2015-09-153-7/+7
| * | Cleanup some html/css for upload featureDmitriy Zaporozhets2015-09-154-17/+17
* | | Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree...Kamil Trzcinski2015-09-1553-250/+370
|\ \ \ | |/ /
| * | Merge branch 'fix_empty_project' into 'master'Dmitriy Zaporozhets2015-09-151-1/+1
| |\ \
| | * | Fix empty project UIDrew Blessing2015-09-141-1/+1
| * | | Merge branch 'import-in-progress-fix' into 'master'Dmitriy Zaporozhets2015-09-151-2/+6
| |\ \ \
| | * | | Display "Forking in Progress" when importing a forked projectStan Hu2015-09-151-2/+5
| | * | | Don't display "git clone --bare <URL>" if no URL is availableStan Hu2015-09-151-1/+2
| | | |/ | | |/|
| * | | Merge branch 'ui-fixes' into 'master'Dmitriy Zaporozhets2015-09-153-24/+25
| |\ \ \ | | |/ / | |/| |
| | * | Fix UI for web editorDmitriy Zaporozhets2015-09-151-1/+1
| | * | Fix last push widgetDmitriy Zaporozhets2015-09-152-23/+24
| * | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-09-155-5/+68
| |\ \ \ | | |/ / | |/| |
| | * | Merge pull request #9138 from liyakun/masterStan Hu2015-09-145-5/+68
| | |\ \
| | | * | Add "Replace" and "Upload" featuresliyakun2015-09-155-5/+68
| * | | | Improve project settings button on profileDmitriy Zaporozhets2015-09-151-2/+2
| |/ / /
| * | | Add current_ref helper methodheader-titlesDmitriy Zaporozhets2015-09-143-5/+5
| * | | Remove repeating titles on members and label pagesDmitriy Zaporozhets2015-09-142-29/+28
| * | | Add page titles to header for group and projectDmitriy Zaporozhets2015-09-144-3/+7
| * | | Merge branch 'public_profiles' into 'master'Dmitriy Zaporozhets2015-09-143-43/+51
| |\ \ \ | | |_|/ | |/| |
| | * | Hide search panel for group page if you dont have accesspublic_profilesDmitriy Zaporozhets2015-09-142-2/+6
| | * | Fix tests and improve wordingDmitriy Zaporozhets2015-09-141-2/+1
| | * | Hide group sidebar menu if user cant access itDmitriy Zaporozhets2015-09-141-29/+30
| | * | Show activity/projects depends on accessDmitriy Zaporozhets2015-09-141-14/+18
| | * | Make all group publicValery Sizov2015-09-091-7/+7
| * | | Merge branch 'dashboard-titles' into 'master'Dmitriy Zaporozhets2015-09-1133-136/+177
| |\ \ \ | | |_|/ | |/| |