summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix importers with OCCValery Sizov2015-03-103-14/+21
* Improve tree view UIDmitriy Zaporozhets2015-03-101-3/+8
* Merge branch 'active-users' into 'master'Dmitriy Zaporozhets2015-03-106-22/+9
|\
| * Blocking user does not remove him/her from project/groups but show blocked labelDmitriy Zaporozhets2015-03-096-22/+9
* | Merge branch 'cve-if-needed' into 'master'Dmitriy Zaporozhets2015-03-101-1/+1
|\ \
| * | Add criteria for requesting CVEDmitriy Zaporozhets2015-03-091-1/+1
* | | Fix font size for collapse buttonDmitriy Zaporozhets2015-03-091-0/+1
* | | Merge branch 'font-size-14' into 'master'Dmitriy Zaporozhets2015-03-1013-29/+14
|\ \ \ | |_|/ |/| |
| * | Reduce base vertical paddingDmitriy Zaporozhets2015-03-092-4/+2
| * | Increate default font-size from 13 to 14pxDmitriy Zaporozhets2015-03-0911-25/+12
* | | Fix heading small color to darker oneDmitriy Zaporozhets2015-03-091-1/+1
|/ /
* | Make broadcast message look like a warning by defaultDmitriy Zaporozhets2015-03-092-12/+11
* | Fix wrong body padding and pre colorDmitriy Zaporozhets2015-03-092-2/+2
* | Merge branch 'more-flat-ui' into 'master'Dmitriy Zaporozhets2015-03-106-23/+31
|\ \ | |/ |/|
| * Apply more styles from Flatly themeDmitriy Zaporozhets2015-03-096-23/+31
* | Merge branch 'improve-milestones-ui' into 'master'Dmitriy Zaporozhets2015-03-108-12/+23
|\ \ | |/ |/|
| * Make milestone titles in list to be boldDmitriy Zaporozhets2015-03-091-0/+6
| * Render milestone progress with one helper methodDmitriy Zaporozhets2015-03-097-12/+17
* | Merge branch 'starred-projects' into 'master'Dmitriy Zaporozhets2015-03-0911-3/+99
|\ \
| * | Add tests for starred projects pageDmitriy Zaporozhets2015-03-093-0/+31
| * | Add starred projects page to dashboardDmitriy Zaporozhets2015-03-098-3/+68
| |/
* | Merge branch 'admin-user-block' into 'master'Dmitriy Zaporozhets2015-03-092-38/+43
|\ \ | |/ |/|
| * Improve user block/unblock UI in admin areaDmitriy Zaporozhets2015-03-092-38/+43
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-094-11/+5
|\
| * Merge branch 'fix_initial_push_mass_sql' into 'master'Dmitriy Zaporozhets2015-03-093-10/+4
| |\
| | * fix mass SQL statements on initial pushHannes Rosenögger2015-03-093-10/+4
| |/
| * Merge branch 'fix-bitbucket-doc-link' into 'master'Hannes Rosenögger2015-03-091-1/+1
| |\
| | * Fix link to bitbucket import documentationMartin Bastien2015-03-081-1/+1
| |/
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-093-5/+5
|\ \
| * \ Merge pull request #8938 from kcyeu/masterRobert Schilling2015-03-093-5/+5
| |\ \ | | |/ | |/|
| | * remove duplicate right braces ('}') in configuration examples of GitHub,Kuo-Cheng Yeu2015-03-093-5/+5
| |/
* | Merge branch 'dashboard-groups' into 'master'Dmitriy Zaporozhets2015-03-0912-93/+90
|\ \
| * | Fix dashboard groups testDmitriy Zaporozhets2015-03-081-1/+1
| * | Move Profile groups tests to Dashboard group testsDmitriy Zaporozhets2015-03-085-76/+73
| * | Move profile groups page to dashboardDmitriy Zaporozhets2015-03-087-16/+16
| |/
* | Merge branch 'smtp_example_update' into 'master'Marin Jankovski2015-03-091-1/+4
|\ \
| * | Add link to smtp documentation.Marin Jankovski2015-03-041-1/+4
* | | Merge branch 'button_changes' into 'master'Marin Jankovski2015-03-093-3/+3
|\ \ \
| * | | Added a warning class to buttonSabba Petri2015-02-241-1/+1
| * | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into button_changesSabba Petri2015-02-2434-82/+242
| |\ \ \
| * | | | Changed button stylesSabba Petri2015-02-233-3/+3
* | | | | Merge branch 'active-users' into 'master'Dmitriy Zaporozhets2015-03-091-2/+2
|\ \ \ \ \
| * | | | | Show total user count on dashboard pageDmitriy Zaporozhets2015-03-081-4/+4
| * | | | | Show active users(non-blocked) on admin dashboardDmitriy Zaporozhets2015-03-081-4/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix-dev-fixture' into 'master'Dmitriy Zaporozhets2015-03-091-13/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix user fixtures for developmentDmitriy Zaporozhets2015-03-081-13/+14
|/ / / /
* | | | Merge branch 'emails-on-push'Dmitriy Zaporozhets2015-03-0813-56/+249
|\ \ \ \
| * | | | Fix EmailsOnPush comparison link to include first commit.Douwe Maan2015-02-252-3/+3
| * | | | Clarify EmailsOnPushService options.Douwe Maan2015-02-253-2/+11
| * | | | Fix EmailsOnPush to allow sending from @company.com for GitLab at gitlab.corp...Douwe Maan2015-02-252-5/+41