summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avatar-cropping' into 'master' Jacob Schatz2016-02-269-5/+129
|\
| * Merge branch 'master' into avatar-croppingavatar-croppingAlfredo Sumaran2016-02-268-73/+50
| |\
| * \ Merge branch 'rs-crowd-form-view-spec' into avatar-croppingAlfredo Sumaran2016-02-244-8/+12
| |\ \
| * | | Add `:with_avatar` trait to User factoryRobert Speicher2016-02-241-1/+1
| * | | Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-2418-62/+82
| |\ \ \
| * \ \ \ Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-23153-1811/+3800
| |\ \ \ \
| * | | | | Minor changes on avatar cropping internalsJohann Pardanaud2016-02-182-7/+8
| * | | | | Improve avatar cropping internals, based on suggestions made by @rspeicher on...Johann Pardanaud2016-02-174-15/+6
| * | | | | Merge branch 'master' into avatar-croppingJohann Pardanaud2016-02-1687-469/+576
| |\ \ \ \ \
| * | | | | | Improve user experience for avatar croppingJohann Pardanaud2016-02-162-2/+8
| * | | | | | Fix failing tests introduced in commit 6d58088Johann Pardanaud2016-02-101-2/+4
| * | | | | | Fix #7959: Fix avatar stretching by providing a cropping featureJohann Pardanaud2016-02-099-8/+133
* | | | | | | Merge branch 'sidebar-hide-class' into 'master' Rémy Coutable2016-02-263-26/+19
|\ \ \ \ \ \ \
| * | | | | | | Created helper class to hide content in issue sidebar when collapsedsidebar-hide-classPhil Hughes2016-02-253-26/+19
* | | | | | | | Merge branch 'refactor-lists' into 'master' Dmitriy Zaporozhets2016-02-2617-171/+171
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Improve help UI pageDmitriy Zaporozhets2016-02-262-104/+127
| * | | | | | | Fix description margin for groups listDmitriy Zaporozhets2016-02-265-11/+31
| * | | | | | | Refactor styles for merge requests listDmitriy Zaporozhets2016-02-263-10/+3
| * | | | | | | Refactor styles for issues listDmitriy Zaporozhets2016-02-264-16/+4
| * | | | | | | Refactor css for groups listDmitriy Zaporozhets2016-02-261-2/+2
| * | | | | | | Refactor css for snippets listDmitriy Zaporozhets2016-02-263-28/+5
| * | | | | | | Cleanup css for projects listDmitriy Zaporozhets2016-02-265-13/+12
* | | | | | | | Fix syntax error in autosave coffeescript.coffeescript_syntax_errorMarin Jankovski2016-02-261-3/+3
|/ / / / / / /
* | | | | | | Merge branch 'rs-crowd-form-view-spec' into 'master' Rémy Coutable2016-02-262-2/+6
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Move "I should see Crowd login form" feature to a view specrs-crowd-form-view-specRobert Speicher2016-02-242-2/+6
* | | | | | | Merge branch 'fix-todos' into 'master' Robert Speicher2016-02-252-3/+2
|\ \ \ \ \ \ \
| * | | | | | | Does not create a todo when commenting on commit or project snippetDouglas Barbosa Alexandre2016-02-242-3/+2
* | | | | | | | Merge remote-tracking branch 'origin/Baertierchen/gitlab-ce-showTestCoverage'Dmitriy Zaporozhets2016-02-251-1/+3
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Show test coverage on project builds pageSteffen Köhler2016-02-221-1/+3
* | | | | | | | Merge branch 'feature/jschatz1/sidebar-sizing' into 'master' Jacob Schatz2016-02-243-66/+30
|\ \ \ \ \ \ \ \
| * | | | | | | | Initialize navigation shortcuts on project's files pagefeature/jschatz1/sidebar-sizingAlfredo Sumaran2016-02-231-0/+1
| * | | | | | | | Ability to toggle sidebar on smaller screensAlfredo Sumaran2016-02-233-20/+12
| * | | | | | | | Fixes padding when right sidebar is not presentAlfredo Sumaran2016-02-231-0/+11
| * | | | | | | | Update scrollbars after toggle sidebarAlfredo Sumaran2016-02-231-0/+6
| * | | | | | | | Sidebar overlaps content when screen is below 1200px.Jacob Schatz2016-02-163-67/+22
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Wait until listeners are set before triggering a 'click' eventbugfix/jschatz/sidebar-issues/minimize-on-diffAlfredo Sumaran2016-02-241-3/+7
* | | | | | | | Remove unused methodsAlfredo Sumaran2016-02-241-16/+0
* | | | | | | | Move script inside of MergeRequestTabs classAlfredo Sumaran2016-02-242-12/+10
* | | | | | | | Merge branch 'master' into minimize-on-diffAlfredo Sumaran2016-02-24163-1870/+3812
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'andywgrant/gitlab-ce-master' into 'master' Dmitriy Zaporozhets2016-02-242-6/+6
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Add "issue" to Close/Reopen buttons for clarityandywgrant/gitlab-ce-masterAndy Grant2016-02-222-6/+6
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'user-bio-improve' into 'master' Jacob Schatz2016-02-242-18/+29
| |\ \ \ \ \ \
| | * | | | | | Improve the formatting for the user page bioconnorshea/gitlab-ce-user-bio-improveconnorshea2016-02-232-18/+29
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'highlighted-note' into 'master' Jacob Schatz2016-02-247-9/+9
| |\ \ \ \ \ \
| | * | | | | | changed variable name to -hoverhighlighted-notePhil Hughes2016-02-237-8/+8
| | * | | | | | Changed padding & background color for highlighted notesPhil Hughes2016-02-232-2/+2
| * | | | | | | Merge branch 'gray-content-block-btn-alignment' into 'master' Jacob Schatz2016-02-241-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Correctly aligned buttons vertical in gray-content-blockgray-content-block-btn-alignmentPhil Hughes2016-02-231-1/+1
| * | | | | | | | Merge branch 'activity-tabs-single-select' into 'master' Jacob Schatz2016-02-241-13/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | changed bind to on for activity link click eventactivity-tabs-single-selectPhil Hughes2016-02-241-1/+1
View Lorry Controller Status