summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'refactor-avatars' into 'master'Dmitriy Zaporozhets2015-02-077-8/+8
|\
| * Add project-avatar and group-avatar css classesDmitriy Zaporozhets2015-02-077-8/+8
* | Merge branch 'clean-up-devise-views' into 'master'Dmitriy Zaporozhets2015-02-075-39/+22
|\ \ | |/ |/|
| * Clean up devise views.Douwe Maan2015-02-055-39/+22
* | Merge branch 'api-default-order' into 'master'Dmitriy Zaporozhets2015-02-068-55/+75
|\ \
| * | Apply default scope to labels and remove one for notesDmitriy Zaporozhets2015-02-051-1/+1
| * | Refactor sorting in projectDmitriy Zaporozhets2015-02-057-54/+74
| |/
* | gitlab.com importer: refactorigValery Sizov2015-02-057-98/+14
* | GitLab.com integration: refactoringValery Sizov2015-02-055-6/+6
* | GitLab.com integration: small view fixValery Sizov2015-02-052-2/+2
* | GitLab integration. ImporterValery Sizov2015-02-056-3/+119
|/
* Merge pull request #8726 from jvanbaarsen/sidebar-colors-commentDmitriy Zaporozhets2015-02-041-2/+4
|\
| * Also show colors in the sidebar of commentJeroen van Baarsen2015-02-031-2/+4
* | Merge branch 'blame_encoding_error_fix' into 'master'Dmitriy Zaporozhets2015-02-041-1/+1
|\ \
| * | Fix "500: Encoding error" on blame viewTimo Lilja2015-01-171-1/+1
* | | Merge branch 'mwessel/gitlab-ce-configure-protection' into 'master'Dmitriy Zaporozhets2015-02-041-0/+4
|\ \ \
| * \ \ Merge branch 'master' into mwessel/gitlab-ce-configure-protectionDmitriy Zaporozhets2015-02-0318-53/+76
| |\ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into configure-prote...Marco Wessel2015-01-3037-193/+170
| |\ \ \ \
| * | | | | Allow configuring protection of the default branch upon first pushMarco Wessel2015-01-251-0/+4
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-02-031-2/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'remove_hidden_settings_text' into 'master'Dmitriy Zaporozhets2015-02-041-2/+1
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Remove text about hidden settings.Achilleas Pipinellis2015-01-291-2/+1
* | | | | | | Spelling improvement, add in a group, not into group.Sytse Sijbrandij2015-02-032-2/+2
|/ / / / / /
* | | | | | Merge branch 'jasonblanchard-collapseable-nav' into 'master'Dmitriy Zaporozhets2015-02-032-1/+7
|\ \ \ \ \ \
| * | | | | | Improve collapsing sidebarDmitriy Zaporozhets2015-02-032-4/+4
| * | | | | | Merge branch 'collapseable-nav' of https://github.com/jasonblanchard/gitlabhq...Dmitriy Zaporozhets2015-02-032-1/+7
| |\ \ \ \ \ \
| | * | | | | | Adds persistent collapse button for left side barJason Blanchard2015-02-032-1/+7
* | | | | | | | Push can be multiple files.Sytse Sijbrandij2015-02-031-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'issue-merge-req-context-links' of https://github.com/jasonblanc...Dmitriy Zaporozhets2015-02-036-22/+33
|\ \ \ \ \ \ \
| * | | | | | | Adds link to milestone and keeping resource context on smallerJason Blanchard2015-02-036-22/+33
| |/ / / / / /
* | | | | | | Commit page: async load branches infoValery Sizov2015-02-032-17/+22
| |_|_|_|_|/ |/| | | | |
* | | | | | Improve project icons for dashboardDmitriy Zaporozhets2015-02-024-7/+8
|/ / / / /
* | | | | Use tile avatars for user/group show pagesDmitriy Zaporozhets2015-01-292-2/+2
* | | | | Remove : from headersDmitriy Zaporozhets2015-01-292-3/+3
| |_|/ / |/| | |
* | | | Load contribution calendar via AJAXDmitriy Zaporozhets2015-01-292-2/+9
|/ / /
* | | Cleanup and make contribution calendar fasterDmitriy Zaporozhets2015-01-293-30/+5
* | | Merge branch 'ux-fixes' into 'master'Dmitriy Zaporozhets2015-01-294-5/+22
|\ \ \
| * | | Better wordingDmitriy Zaporozhets2015-01-281-1/+1
| * | | Improve wording for fork project pageDmitriy Zaporozhets2015-01-281-1/+2
| * | | Improve UX for widget if merge request can not be mergedDmitriy Zaporozhets2015-01-281-2/+9
| * | | Project/Group access dropdown should contain link to permissions help pageDmitriy Zaporozhets2015-01-282-2/+11
* | | | Add a commit calendar to the user profileHannes Rosenögger2015-01-294-2/+37
|/ / /
* | | Separate admin settings from other linksDmitriy Zaporozhets2015-01-271-6/+7
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-01-2710-9/+1
|\ \ \
| * | | Fix broadcast message to show up properly with new UIVisay Keo2015-01-2810-9/+1
* | | | Fix gravatar size for head panel iconDmitriy Zaporozhets2015-01-271-1/+1
|/ / /
* | | Merge branch 'init-from-ui' into 'master'Dmitriy Zaporozhets2015-01-271-1/+1
|\ \ \
| * | | Replace p with h4 for empty repo textDmitriy Zaporozhets2015-01-271-1/+1
* | | | Merge branch 'move_external_issue_tracker_away_from_yml_config' into 'master'Dmitriy Zaporozhets2015-01-272-10/+1
|\ \ \ \
| * \ \ \ Merge branch 'master' into move_external_issue_tracker_away_from_yml_configMarin Jankovski2015-01-2613-17/+80
| |\ \ \ \