summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | 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
| * | | | | | | Improve signin/signup/reset pages UIDmitriy Zaporozhets2014-07-119-116/+121
| * | | | | | | Add box shadow to login boxDmitriy Zaporozhets2014-07-111-0/+1
| * | | | | | | Improve login page for small screensDmitriy Zaporozhets2014-07-111-2/+2
| * | | | | | | Fix brand logoDmitriy Zaporozhets2014-07-111-0/+0
| * | | | | | | Use same login layout between CE and EE versionsDmitriy Zaporozhets2014-07-114-11/+44
|/ / / / / / /
* | | | | | | Merge branch 'update-architecture-diagram' into 'master'Dmitriy Zaporozhets2014-07-112-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Updated the picture based on comments.Sytse Sijbrandij2014-07-102-0/+0
| * | | | | | | Update the diagram and make clear that rails accesses the repo's via shell.Sytse Sijbrandij2014-07-102-0/+0
* | | | | | | | Merge branch 'escape-before-autolink' into 'master'Dmitriy Zaporozhets2014-07-111-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add html_escape to project description. auto_link set description to html_saf...Dmitriy Zaporozhets2014-07-111-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2014-07-1011-19/+74
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'upgrade_devise' into 'master'Dmitriy Zaporozhets2014-07-1011-19/+74
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Override strong params for sign up.Marin Jankovski2014-07-102-1/+4
| | * | | | | | | Update to accomodate devise deprecations and backward incompatible changes.Marin Jankovski2014-07-105-5/+8
| | * | | | | | | Check for the correct param for token.Marin Jankovski2014-07-101-1/+6
| | * | | | | | | Try to keep token authenticable compatibilityMarin Jankovski2014-07-094-5/+48