summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8865 from gemnasium/update-gemnasium-to-0-2-4Dmitriy Zaporozhets2015-02-251-3/+3
|\ | | | | Bump gemnasium service gem
| * Bump gemnasium service gemPhilippe Lafoucrière2015-02-251-3/+3
|/
* Merge branch 'refactor-header' into 'master'Dmitriy Zaporozhets2015-02-2525-239/+114
|\ | | | | | | | | | | UI: refactor header css See merge request !1591
| * Remove unnecessary theme_type from body classDmitriy Zaporozhets2015-02-2413-13/+13
| |
| * Get rid of black logoDmitriy Zaporozhets2015-02-243-7/+10
| |
| * Refactor header logo and setup expectation on it sizeDmitriy Zaporozhets2015-02-247-22/+18
| |
| * Refactor gitlab themes cssDmitriy Zaporozhets2015-02-246-200/+77
| |
| * Fix header avatar sizeDmitriy Zaporozhets2015-02-241-8/+7
| |
* | Merge branch 'affix-sidebar' into 'master'Dmitriy Zaporozhets2015-02-254-4/+10
|\ \ | |/ |/| | | | | | | Improve admin projects and users pages for mobile devices See merge request !1590
| * Improve admin projects and users pages for mobile devicesDmitriy Zaporozhets2015-02-244-4/+10
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-02-246-3/+21
|\
| * Merge branch 'fix-404-admin-delete' into 'master'Dmitriy Zaporozhets2015-02-241-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | Fix 404 when deleting a project from the admin section This is some additional fallout from the rails upgrade. Need to use plural namespaces in the path function to get project deletion to go back to the project listing. See merge request !351
| | * Fix 404 when deleting a projectDJ Mountney2015-02-231-1/+1
| | | | | | | | | | | | The deletion from the admin section was redirecting to the wrong address.
| * | Merge branch 'master' into 'master'Dmitriy Zaporozhets2015-02-245-2/+20
| |\ \ | | | | | | | | | | | | | | | | | | | | Updated Gitorious import icons See merge request !353
| | * | Use proper Gitorious icons on import pagesMarcin Kulik2015-02-245-2/+20
| | | |
* | | | Update changelog for 7.8.1Marin Jankovski2015-02-241-2/+9
| | | |
* | | | Merge branch 'mwessel/gitlab-ce-set-last-activity-at' into 'master'Dmitriy Zaporozhets2015-02-244-2/+18
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Give last_activity_at a default value so it will always be set For https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/345 See merge request !1589
| * | | use update_column and set to created_at like elsewhereMarco Wessel2015-02-231-3/+3
| | | |
| * | | Give last_activity_at a default value so it will always be setMarco Wessel2015-02-234-2/+18
| | | |
* | | | Merge branch 'contributed-projects' into 'master'Dmitriy Zaporozhets2015-02-242-4/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve contributed project and commit calendar selection. Fixes #2024. See merge request !1554
| * | | | Contributed projects either have user pushes or created MRs.Douwe Maan2015-02-241-3/+4
| | | | |
| * | | | Exclude forks from profile contributions list.Douwe Maan2015-02-241-1/+3
| | | | |
* | | | | Merge branch 'update_grack' into 'master'Dmitriy Zaporozhets2015-02-242-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab-grack to 2.0.0.rc2 See merge request !1585
| * \ \ \ \ Merge branch 'master' into update_grackDmitriy Zaporozhets2015-02-2417-17/+100
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock
| * | | | | | update gitlab-grack to 2.0.0.rc2Valery Sizov2015-02-242-3/+3
| | | | | | |
* | | | | | | Merge branch 'sidebar_state_toggle' into 'master'Dmitriy Zaporozhets2015-02-243-8/+16
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Toggle sidebar button more obvious The toggle is now at the top of the sidebar because it is not noticeable near the bottom. By placing it at the top, users will immediately know that they can have more space if they desire versus on the bottom, they will have to search for it and that's not desired. Fixes #2044 See merge request !1579
| * | | | | | Added square caret to Back to Settings buttonSabba Petri2015-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done to show difference between Open/Close toggle, which was using the same arrow as Back to Settings button previously.
| * | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵Sabba Petri2015-02-2435-82/+248
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | sidebar_state_toggle
| * | | | | | | Toggle sidebar button more obviousSabba Petri2015-02-232-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The toggle is now at the top of the sidebar because it is not noticeable near the bottom. By placing it at the top, users will immediately know that they can have more space if they desire versus on the bottom, they will have to search for it and that's not desired. Fixes #2044
* | | | | | | | Revert "Update charlock_holmes to 0.7.3"Dmitriy Zaporozhets2015-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c217860ae74381d75a4932fabb4417ac08b014b4.
* | | | | | | | Merge branch 'gitlab_linguist_update' into 'master'Dmitriy Zaporozhets2015-02-242-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab-linguist Closes #1859 See merge request !1588
| * | | | | | | | update gitlab-linguistValery Sizov2015-02-242-3/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'web_editor_branch' into 'master'Dmitriy Zaporozhets2015-02-2413-12/+92
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Web Editor: save to new branch Implements #1931 See merge request !1523
| * | | | | | | changelog && documentationValery Sizov2015-02-244-2/+3
| | | | | | | |
| * | | | | | | WebEditor: save to new branch: spinachValery Sizov2015-02-242-1/+36
| | | | | | | |
| * | | | | | | Web Editor: save to new branchValery Sizov2015-02-247-9/+53
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-02-242-1/+2
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #8854 from Bugagazavr/patch-3Robert Schilling2015-02-241-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update Changelog
| | * | | | | | | Update ChangelogBugagazavr2015-02-241-0/+1
| |/ / / / / / /
| * | | | | | | Merge pull request #8852 from niosus/patch-1Robert Schilling2015-02-241-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | typo fixed
| | * | | | | | | typo fixedIgor Bogoslavskyi2015-02-241-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | fixed a typo in an url to gitlab-ssl. Now it does not return the 404 error
* | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-02-241-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'profile_tooltip_addition' into 'master'Marin Jankovski2015-02-241-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Profile tooltip For consistency sake, the profile in the navbar has a tooltip. Fixes #2007 See merge request !1572
| | * | | | | | Added Profile tooltipSabba Petri2015-02-231-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | For consistency sake, the profile in the navbar has a tooltip.
* | | | | | | Fix access to attachments uploaded with 'Choose file' button for publicDmitriy Zaporozhets2015-02-241-0/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | access
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-02-237-11/+29
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #8760 from yglukhov/diff-sticky-headersDmitriy Zaporozhets2015-02-233-0/+12
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Diff headers made sticky
| | * | | | | | Diff headers made stickyyglukhov2015-02-093-0/+12
| | | | | | | |
| * | | | | | | Merge pull request #8180 from Bugagazavr/mr_updateDmitriy Zaporozhets2015-02-231-3/+9
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Trigger merge request hook when source updated
| | * | | | | | | Trigger merge request hook when source updatedKirill Zaitsev2014-12-091-3/+9
| | | | | | | | |