summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-buildbox-integration' into 'master'Valery Sizov2014-10-291-0/+2
|\
| * Explicitly require addressable gem feature you need. Fixes Buildbox CI integr...Dmitriy Zaporozhets2014-10-291-0/+2
* | Merge pull request #8060 from dblessing/feature/bamboo_serviceDmitriy Zaporozhets2014-10-294-3/+112
|\ \ | |/ |/|
| * Add Atlassian Bamboo serviceDrew Blessing2014-10-284-3/+112
* | Merge branch 'dashboard_issues_and_mr' into 'master'Dmitriy Zaporozhets2014-10-281-1/+5
|\ \
| * | Do not filter out issues and merge requests related to user right away.Marin Jankovski2014-10-271-1/+5
* | | Merge pull request #7572 from mr-vinn/application-js-fixDmitriy Zaporozhets2014-10-281-1/+1
|\ \ \ | |_|/ |/| |
| * | Handle undefined text area valuesVinnie Okada2014-08-221-1/+1
* | | Merge pull request #7866 from cirosantilli/input-button-to-tagDmitriy Zaporozhets2014-10-2814-14/+14
|\ \ \
| * | | Use button type=submit instead of input.Ciro Santilli2014-10-0114-14/+14
* | | | Merge pull request #8091 from cirosantilli/factor-ability-abilitiesDmitriy Zaporozhets2014-10-286-20/+13
|\ \ \ \
| * | | | Factor abilities methodsCiro Santilli2014-10-196-20/+13
* | | | | Merge pull request #8127 from cirosantilli/user-select-js-only-neededDmitriy Zaporozhets2014-10-283-35/+43
|\ \ \ \ \
| * | | | | Run user select Js only where neededCiro Santilli2014-10-273-35/+43
* | | | | | Merge pull request #8120 from cirosantilli/profile-js-only-neededDmitriy Zaporozhets2014-10-273-23/+29
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Only run profile js on pages that need itCiro Santilli2014-10-213-23/+29
* | | | | | Merge pull request #8155 from cirosantilli/unassignedDmitriy Zaporozhets2014-10-271-2/+0
|\ \ \ \ \ \
| * | | | | | Show nothing instead of unassigned on issuesCiro Santilli2014-10-231-2/+0
* | | | | | | Merge pull request #8125 from cirosantilli/namespace-select-js-only-neededDmitriy Zaporozhets2014-10-272-22/+27
|\ \ \ \ \ \ \
| * | | | | | | Only run namespace select js when neededCiro Santilli2014-10-212-22/+27
* | | | | | | | Merge pull request #8005 from cirosantilli/settings-to-gitlab-configDmitriy Zaporozhets2014-10-272-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Use Gitlab.config instead of Settings everywhereCiro Santilli2014-10-152-3/+3
* | | | | | | | | Merge pull request #8123 from cirosantilli/project-js-only-neededDmitriy Zaporozhets2014-10-274-62/+66
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Better js -> URL map to reduce unneeded executionCiro Santilli2014-10-214-62/+66
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix_raw_view_snippets' into 'master'Dmitriy Zaporozhets2014-10-271-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix raw view for public snippetsValery Sizov2014-10-271-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'master' into 7-4-stableValery Sizov2014-10-2765-305/+182
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'fix_public_snippets' into 'master'Marin Jankovski2014-10-241-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | fix for public snippetValery Sizov2014-10-241-1/+1
| * | | | | | | | | Merge pull request #8114 from cirosantilli/rm-global-avatar-jsRobert Schilling2014-10-233-11/+11
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Only run avatar chooser Js on pages that need itCiro Santilli2014-10-213-11/+11
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #8118 from cirosantilli/user-groups-space-linkRobert Schilling2014-10-231-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Remove whitespace link between user group avatarsCiro Santilli2014-10-211-1/+1
| | |/ / / / / / /
| * | | | | | | | Merge branch 'fix_milestone_link' into 'master'Dmitriy Zaporozhets2014-10-221-1/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix identation.Achilleas Pipinellis2014-10-011-1/+1
| | * | | | | | | | Fix milestone link in issue. Closes #174 (gitlab.com).Achilleas Pipinellis2014-09-291-1/+2
| * | | | | | | | | Merge branch 'master' into 'master'Dmitriy Zaporozhets2014-10-221-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | fonts: Added "DejaVu Sans Mono" and "Ubuntu Mono"Tobias Bieniek2014-10-061-1/+1
| * | | | | | | | | | Fix 500 error on login page if ldap enabled and sign-in disabledDmitriy Zaporozhets2014-10-221-10/+10
| | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'slack_team_name' into 'master'Valery Sizov2014-10-211-1/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Use allowed slack team name.Marin Jankovski2014-10-211-1/+2
| * | | | | | | | | | Merge pull request #8093 from cirosantilli/rm-duplicate-derived-admin-reposit...Dmitriy Zaporozhets2014-10-211-4/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Remove unused admin/projects#repository methodCiro Santilli2014-10-211-4/+0
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #7961 from cirosantilli/dry-log-file-namesDmitriy Zaporozhets2014-10-211-65/+22
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Dry admin logs.Ciro Santilli2014-10-061-65/+22
| * | | | | | | | | | Merge pull request #8029 from cirosantilli/rm-projects-controller-filterDmitriy Zaporozhets2014-10-211-1/+0
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Remove unused filter from ProjectsControllerCiro Santilli2014-10-131-1/+0
| * | | | | | | | | | | Merge pull request #8028 from cirosantilli/rm-dev-toolsDmitriy Zaporozhets2014-10-211-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Remove unused dev_tools helper.Ciro Santilli2014-10-131-4/+0
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-2155-215/+137
| |\ \ \ \ \ \ \ \ \ \