summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7257 from cirosantilli/patch-4Jeroen van Baarsen2014-07-161-1/+1
|\
| * Clariy squash comes after review.Ciro Santilli2014-07-041-1/+1
* | Ensure the readme answers the most important questions.Sytse Sijbrandij2014-07-161-0/+9
* | Fix user params when edit from admin areaDmitriy Zaporozhets2014-07-161-2/+4
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-07-161-0/+4
|\ \
| * \ Merge pull request #7314 from axilleas/houndci_single_quotesSytse Sijbrandij2014-07-161-0/+4
| |\ \
| | * | Make houndci prefer single quotes.Achilleas Pipinellis2014-07-161-0/+4
| |/ /
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2014-07-161-12/+11
|\ \ \
| * \ \ Merge branch 'release-template' into 'master'Dmitriy Zaporozhets2014-07-161-12/+11
| |\ \ \ | | |/ / | |/| |
| | * | Link to issues with #Sytse Sijbrandij2014-07-161-12/+11
* | | | Fix typo in CHANGELOGDmitriy Zaporozhets2014-07-161-1/+1
|/ / /
* | | Merge branch 'release-template' into 'master'Dmitriy Zaporozhets2014-07-161-16/+53
|\ \ \ | |/ /
| * | Split work to the 17th and make issue template.Sytse Sijbrandij2014-07-151-16/+53
* | | More stuff to CHANGELOGDmitriy Zaporozhets2014-07-161-0/+3
* | | If MR commits are empty if does not mean compare failedDmitriy Zaporozhets2014-07-151-1/+1
* | | Default gix max size to 20mbDmitriy Zaporozhets2014-07-151-1/+1
* | | Merge branch 'fix-huge-mr' into 'master'Dmitriy Zaporozhets2014-07-1523-302/+337
|\ \ \
| * | | Fix testsDmitriy Zaporozhets2014-07-151-4/+1
| * | | Refactor diff suppress logic and diff viewsDmitriy Zaporozhets2014-07-1517-192/+165
| * | | Cleanup diff stats UIDmitriy Zaporozhets2014-07-152-16/+28
| * | | Refactor MR build processDmitriy Zaporozhets2014-07-157-116/+169
| * | | Increase grit memory limitDmitriy Zaporozhets2014-07-151-1/+1
| |/ /
* | | Merge branch 'show_milestone_status_on_show_page' into 'master'Dmitriy Zaporozhets2014-07-152-3/+2
|\ \ \ | |/ / |/| |
| * | Fix test for no milestone description.Marin Jankovski2014-07-151-1/+0
| * | Show milestone state on group milestone show page.Marin Jankovski2014-07-151-2/+2
|/ /
* | Milestone is closed only if all milestones are closed.Marin Jankovski2014-07-141-3/+3
* | Merge branch 'branches_with_no_parent' into 'master'Dmitriy Zaporozhets2014-07-143-72/+81
|\ \
| * | Error message needs to be correct.Marin Jankovski2014-07-141-1/+1
| * | Branches without parent commit cannot be merged.Marin Jankovski2014-07-143-72/+81
* | | Merge branch 'satellite_chdir' into 'master'Dmitriy Zaporozhets2014-07-143-2/+3
|\ \ \
| * | | Remove thread-unsafe Dir.chdir from Satellite#lockJacob Vosmaer2014-07-143-2/+3
| |/ /
* | | Merge pull request #7131 from skv-headless/per_request_rules_cachingDmitriy Zaporozhets2014-07-143-24/+29
|\ \ \
| * | | per request project rules cachingskv-headless2014-06-143-24/+29
* | | | Merge pull request #7196 from cirosantilli/patch-2Dmitriy Zaporozhets2014-07-141-31/+37
|\ \ \ \ | |_|/ / |/| | |
| * | | Enforce md style.Ciro Santilli2014-06-251-31/+37
* | | | Restore blue color for sign-in buttonDmitriy Zaporozhets2014-07-141-3/+1
* | | | Merge pull request #7285 from jvanbaarsen/fixed-wrong-permissionDmitriy Zaporozhets2014-07-141-1/+1
|\ \ \ \
| * | | | A Developer cannot manage milestonesJeroen van Baarsen2014-07-091-1/+1
* | | | | Merge branch 'improve-login-page' into 'master'Dmitriy Zaporozhets2014-07-134-18/+24
|\ \ \ \ \
| * | | | | Improve login page behaviourDmitriy Zaporozhets2014-07-134-18/+24
* | | | | | Merge branch 'redirect_on_signin' into 'master'Dmitriy Zaporozhets2014-07-118-15/+41
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add in the tests.Marin Jankovski2014-07-112-1/+48
| * | | | | Use devise stored_location to redirect after signing for both public and priv...Marin Jankovski2014-07-113-2/+16
| * | | | | Revert "Merge branch 'redirect_after_login' into 'master'"Marin Jankovski2014-07-117-42/+7
|/ / / / /
* | | | | Make brand image fill 100% width of spaceDmitriy Zaporozhets2014-07-111-1/+1
* | | | | Add bottom links for sign-in page so I can get to Public areaDmitriy Zaporozhets2014-07-112-0/+10
* | | | | Rename brand helperDmitriy Zaporozhets2014-07-111-1/+1
* | | | | Merge branch 'ee-login-layout' into 'master'Dmitriy Zaporozhets2014-07-1114-125/+164
|\ \ \ \ \
| * | | | | Small fixes for sign-in page textDmitriy Zaporozhets2014-07-111-2/+2
| * | | | | Less distracting git clone line for public pageDmitriy Zaporozhets2014-07-112-3/+3