summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avatar-cropping' into 'master' Jacob Schatz2016-02-2621-17/+3525
|\
| * Update CHANGELOGAlfredo Sumaran2016-02-261-0/+1
| * Merge branch 'master' into avatar-croppingavatar-croppingAlfredo Sumaran2016-02-2621-80/+93
| |\
| * \ Merge branch 'rs-crowd-form-view-spec' into avatar-croppingAlfredo Sumaran2016-02-249-44/+103
| |\ \
| * | | Fix Profile Avatar feature stepsRobert Speicher2016-02-241-6/+14
| * | | Add `:with_avatar` trait to User factoryRobert Speicher2016-02-247-7/+26
| * | | Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-2425-66/+133
| |\ \ \
| * \ \ \ Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-23321-4053/+26568
| |\ \ \ \
| * | | | | 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-16189-1269/+3026
| |\ \ \ \ \
| * | | | | | 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-0913-8/+3489
* | | | | | | 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 'feature/slacky-builds-v2' into 'master' Kamil Trzciński2016-02-261-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | update gitlab-ci script syntaxJames Lopez2016-02-261-1/+1
| * | | | | | | | Merge remote-tracking branch 'origin/feature/slacky-builds-v2' into feature/s...James Lopez2016-02-261-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Update URL syntaxJames Lopez2016-02-251-1/+1
| * | | | | | | | | update gitlab-ci script syntaxJames Lopez2016-02-261-1/+1
| * | | | | | | | | gemfile random updateJames Lopez2016-02-241-1/+1
| * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/slacky-...James Lopez2016-02-242-1/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | updated gitlab-ci script to include builds URLJames Lopez2016-02-242-3/+286
| * | | | | | | | | testJames Lopez2016-02-241-5/+1
| * | | | | | | | | make build failJames Lopez2016-02-241-1/+1
| * | | | | | | | | testing scriptJames Lopez2016-02-241-285/+6
* | | | | | | | | | 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
* | | | | | | | | | Merge branch 'coffeescript_syntax_error' into 'master' revert-9cc321caJacob Schatz2016-02-261-3/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | 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-265-38/+43
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Move "I should see Crowd login form" feature to a view specrs-crowd-form-view-specRobert Speicher2016-02-245-38/+43
| |/ / / / / / /
* | | | | | | | Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-02-261-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Reformats confusing '[named here]' section for 3rd party code attributionDavid Alexander2016-02-171-1/+1
* | | | | | | | | Merge branch 'master' into 'master' Achilleas Pipinellis2016-02-261-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add instructions for pushing tags as well as branchesM. Ricketts2016-02-101-0/+1
* | | | | | | | | | Merge branch 'fix-todos' into 'master' Robert Speicher2016-02-254-3/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Does not create a todo when commenting on commit or project snippetDouglas Barbosa Alexandre2016-02-244-3/+15
* | | | | | | | | | | Merge remote-tracking branch 'origin/Baertierchen/gitlab-ce-showTestCoverage'Dmitriy Zaporozhets2016-02-256-3/+22
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add a spec for coverage indicator in project's builds listBaertierchen/gitlab-ce-showTestCoverageRémy Coutable2016-02-225-2/+19
| * | | | | | | | | | | Show test coverage on project builds pageSteffen Köhler2016-02-221-1/+3
* | | | | | | | | | | | Merge branch 'fix-gemfile-lock' into 'master' Robert Speicher2016-02-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix order in Gemfile.lockfix-gemfile-lockJacob Vosmaer2016-02-251-1/+1
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
View Lorry Controller Status