| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #8865 from gemnasium/update-gemnasium-to-0-2-4 | Dmitriy Zaporozhets | 2015-02-25 | 1 | -3/+3 |
| |\ | | | | | Bump gemnasium service gem | ||||
| | * | Bump gemnasium service gem | Philippe Lafoucrière | 2015-02-25 | 1 | -3/+3 |
| |/ | |||||
| * | Merge branch 'refactor-header' into 'master' | Dmitriy Zaporozhets | 2015-02-25 | 25 | -239/+114 |
| |\ | | | | | | | | | | | UI: refactor header css See merge request !1591 | ||||
| | * | Remove unnecessary theme_type from body class | Dmitriy Zaporozhets | 2015-02-24 | 13 | -13/+13 |
| | | | |||||
| | * | Get rid of black logo | Dmitriy Zaporozhets | 2015-02-24 | 3 | -7/+10 |
| | | | |||||
| | * | Refactor header logo and setup expectation on it size | Dmitriy Zaporozhets | 2015-02-24 | 7 | -22/+18 |
| | | | |||||
| | * | Refactor gitlab themes css | Dmitriy Zaporozhets | 2015-02-24 | 6 | -200/+77 |
| | | | |||||
| | * | Fix header avatar size | Dmitriy Zaporozhets | 2015-02-24 | 1 | -8/+7 |
| | | | |||||
| * | | Merge branch 'affix-sidebar' into 'master' | Dmitriy Zaporozhets | 2015-02-25 | 4 | -4/+10 |
| |\ \ | |/ |/| | | | | | | | Improve admin projects and users pages for mobile devices See merge request !1590 | ||||
| | * | Improve admin projects and users pages for mobile devices | Dmitriy Zaporozhets | 2015-02-24 | 4 | -4/+10 |
| |/ | |||||
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Marin Jankovski | 2015-02-24 | 6 | -3/+21 |
| |\ | |||||
| | * | Merge branch 'fix-404-admin-delete' into 'master' | Dmitriy Zaporozhets | 2015-02-24 | 1 | -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 project | DJ Mountney | 2015-02-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | The deletion from the admin section was redirecting to the wrong address. | ||||
| | * | | Merge branch 'master' into 'master' | Dmitriy Zaporozhets | 2015-02-24 | 5 | -2/+20 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Updated Gitorious import icons See merge request !353 | ||||
| | | * | | Use proper Gitorious icons on import pages | Marcin Kulik | 2015-02-24 | 5 | -2/+20 |
| | | | | | |||||
| * | | | | Update changelog for 7.8.1 | Marin Jankovski | 2015-02-24 | 1 | -2/+9 |
| | | | | | |||||
| * | | | | Merge branch 'mwessel/gitlab-ce-set-last-activity-at' into 'master' | Dmitriy Zaporozhets | 2015-02-24 | 4 | -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 elsewhere | Marco Wessel | 2015-02-23 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | Give last_activity_at a default value so it will always be set | Marco Wessel | 2015-02-23 | 4 | -2/+18 |
| | | | | | |||||
| * | | | | Merge branch 'contributed-projects' into 'master' | Dmitriy Zaporozhets | 2015-02-24 | 2 | -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 Maan | 2015-02-24 | 1 | -3/+4 |
| | | | | | | |||||
| | * | | | | Exclude forks from profile contributions list. | Douwe Maan | 2015-02-24 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'update_grack' into 'master' | Dmitriy Zaporozhets | 2015-02-24 | 2 | -3/+3 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab-grack to 2.0.0.rc2 See merge request !1585 | ||||
| | * \ \ \ \ | Merge branch 'master' into update_grack | Dmitriy Zaporozhets | 2015-02-24 | 17 | -17/+100 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock | ||||
| | * | | | | | | update gitlab-grack to 2.0.0.rc2 | Valery Sizov | 2015-02-24 | 2 | -3/+3 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'sidebar_state_toggle' into 'master' | Dmitriy Zaporozhets | 2015-02-24 | 3 | -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 button | Sabba Petri | 2015-02-24 | 1 | -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 Petri | 2015-02-24 | 35 | -82/+248 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | sidebar_state_toggle | ||||
| | * | | | | | | | Toggle sidebar button more obvious | Sabba Petri | 2015-02-23 | 2 | -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 Zaporozhets | 2015-02-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c217860ae74381d75a4932fabb4417ac08b014b4. | ||||
| * | | | | | | | | Merge branch 'gitlab_linguist_update' into 'master' | Dmitriy Zaporozhets | 2015-02-24 | 2 | -3/+3 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab-linguist Closes #1859 See merge request !1588 | ||||
| | * | | | | | | | | update gitlab-linguist | Valery Sizov | 2015-02-24 | 2 | -3/+3 |
| | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'web_editor_branch' into 'master' | Dmitriy Zaporozhets | 2015-02-24 | 13 | -12/+92 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Web Editor: save to new branch Implements #1931 See merge request !1523 | ||||
| | * | | | | | | | changelog && documentation | Valery Sizov | 2015-02-24 | 4 | -2/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | WebEditor: save to new branch: spinach | Valery Sizov | 2015-02-24 | 2 | -1/+36 |
| | | | | | | | | | |||||
| | * | | | | | | | Web Editor: save to new branch | Valery Sizov | 2015-02-24 | 7 | -9/+53 |
| | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-02-24 | 2 | -1/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge pull request #8854 from Bugagazavr/patch-3 | Robert Schilling | 2015-02-24 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Update Changelog | ||||
| | | * | | | | | | | Update Changelog | Bugagazavr | 2015-02-24 | 1 | -0/+1 |
| | |/ / / / / / / | |||||
| | * | | | | | | | Merge pull request #8852 from niosus/patch-1 | Robert Schilling | 2015-02-24 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | typo fixed | ||||
| | | * | | | | | | | typo fixed | Igor Bogoslavskyi | 2015-02-24 | 1 | -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/gitlabhq | Dmitriy Zaporozhets | 2015-02-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | | Merge branch 'profile_tooltip_addition' into 'master' | Marin Jankovski | 2015-02-24 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Profile tooltip For consistency sake, the profile in the navbar has a tooltip. Fixes #2007 See merge request !1572 | ||||
| | | * | | | | | | Added Profile tooltip | Sabba Petri | 2015-02-23 | 1 | -1/+1 |
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | For consistency sake, the profile in the navbar has a tooltip. | ||||
| * | | | | | | | Fix access to attachments uploaded with 'Choose file' button for public | Dmitriy Zaporozhets | 2015-02-24 | 1 | -0/+2 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | access | ||||
| * | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-02-23 | 7 | -11/+29 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge pull request #8760 from yglukhov/diff-sticky-headers | Dmitriy Zaporozhets | 2015-02-23 | 3 | -0/+12 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Diff headers made sticky | ||||
| | | * | | | | | | Diff headers made sticky | yglukhov | 2015-02-09 | 3 | -0/+12 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge pull request #8180 from Bugagazavr/mr_update | Dmitriy Zaporozhets | 2015-02-23 | 1 | -3/+9 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Trigger merge request hook when source updated | ||||
| | | * | | | | | | | Trigger merge request hook when source updated | Kirill Zaitsev | 2014-12-09 | 1 | -3/+9 |
| | | | | | | | | | | |||||
