summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Use `project_member` instead of `team_member`.Douwe Maan2015-03-155-6/+6
* Use `group_member` instead of `users_group` or `membership`.Douwe Maan2015-03-156-25/+25
* Merge branch 'more-flatly'Dmitriy Zaporozhets2015-03-141-1/+1
|\
| * Return some merge widget styles and make it more compactDmitriy Zaporozhets2015-03-141-1/+1
* | Merge branch 'resetyle-import' into 'master'Dmitriy Zaporozhets2015-03-141-25/+18
|\ \ | |/ |/|
| * Improve import buttons on new project pageDmitriy Zaporozhets2015-03-141-25/+18
* | Refactor buttonsDmitriy Zaporozhets2015-03-1445-88/+88
|/
* Improve css for file actionsDmitriy Zaporozhets2015-03-136-17/+33
* Merge branch 'fix-encoding' into 'master'Dmitriy Zaporozhets2015-03-131-1/+1
|\
| * Everything from gitlab_git is already UTF-8.Douwe Maan2015-03-131-1/+1
* | Use custom LDAP label in LDAP signin form.Douwe Maan2015-03-132-4/+4
|/
* Merge branch 'master' into mr-filter-by-titleDmitriy Zaporozhets2015-03-126-7/+7
|\
| * Merge branch 'group-icon-performance' into 'master'Dmitriy Zaporozhets2015-03-125-5/+5
| |\
| | * Prevent database query each time we render group avatarDmitriy Zaporozhets2015-03-125-5/+5
| * | Merge branch 'replace_passwords_with_asterisk' into 'master'Marin Jankovski2015-03-121-2/+2
| |\ \ | | |/ | |/|
| | * Show asterisks instead of password in service edit form.Marin Jankovski2015-03-121-2/+2
* | | Implement merge requests searchDmitriy Zaporozhets2015-03-124-29/+33
|/ /
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-123-3/+3
|\ \
| * \ Merge branch 'fix_email_images' into 'master'Douwe Maan2015-03-123-3/+3
| |\ \
| | * | replace images in emails with inline imagesHannes Rosenögger2015-03-123-3/+3
| | |/
* | | Merge branch 'improve-import-page' into 'master'Dmitriy Zaporozhets2015-03-124-4/+4
|\ \ \ | |/ / |/| |
| * | Style improvements to import pageDmitriy Zaporozhets2015-03-124-4/+4
| |/
* | Add blue theme to GitLabDmitriy Zaporozhets2015-03-111-0/+5
|/
* Merge branch 'dashboard-restyle' into 'master'Dmitriy Zaporozhets2015-03-1110-233/+75
|\
| * Rename dashboard landing page to Your projectsDmitriy Zaporozhets2015-03-101-1/+1
| * Remove projects page from dashboardDmitriy Zaporozhets2015-03-102-65/+0
| * Add project filter by visibility and tag to explore pageDmitriy Zaporozhets2015-03-104-127/+68
| * Remove group rendering from dashboard pageDmitriy Zaporozhets2015-03-105-40/+6
* | Fix features checkboxes at admin settings pageDmitriy Zaporozhets2015-03-101-16/+24
|/
* Merge branch 'master' into 'master'Hannes Rosenögger2015-03-101-1/+1
|\
| * Added a link_to for the LinkedIn portion of the user's profile. It felt odd t...Ben Carson2015-03-101-1/+1
* | Blocking user does not remove him/her from project/groups but show blocked labelDmitriy Zaporozhets2015-03-093-3/+6
* | Merge branch 'more-flat-ui' into 'master'Dmitriy Zaporozhets2015-03-101-1/+1
|\ \
| * | Apply more styles from Flatly themeDmitriy Zaporozhets2015-03-091-1/+1
* | | Merge branch 'improve-milestones-ui' into 'master'Dmitriy Zaporozhets2015-03-106-12/+6
|\ \ \ | |/ / |/| |
| * | Render milestone progress with one helper methodDmitriy Zaporozhets2015-03-096-12/+6
| |/
* | Merge branch 'starred-projects' into 'master'Dmitriy Zaporozhets2015-03-094-3/+31
|\ \
| * | Add starred projects page to dashboardDmitriy Zaporozhets2015-03-094-3/+31
| |/
* | Improve user block/unblock UI in admin areaDmitriy Zaporozhets2015-03-091-36/+41
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-091-1/+1
|\
| * Fix link to bitbucket import documentationMartin Bastien2015-03-081-1/+1
* | Merge branch 'dashboard-groups' into 'master'Dmitriy Zaporozhets2015-03-094-7/+7
|\ \
| * | Move profile groups page to dashboardDmitriy Zaporozhets2015-03-084-7/+7
| |/
* | 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-244-10/+4
| |\ \
| * | | Changed button stylesSabba Petri2015-02-233-3/+3
* | | | 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 'emails-on-push'Dmitriy Zaporozhets2015-03-086-35/+113
|\ \ \
View Lorry Controller Status