summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | 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
| | * | | | | | Upgrade to devise 3.2.4Marin Jankovski2014-07-092-9/+10
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-07-101-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge pull request #7291 from tbpgr/fix_gitlab_markdown_helper_typoSytse Sijbrandij2014-07-101-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fix gitlab_markdown_helper method header typo. rquest => request.tbpgr2014-07-101-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'rework-counters' into 'master'Dmitriy Zaporozhets2014-07-1010-9/+52
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Show counters in sidebar filter in same way like we did for projects pageDmitriy Zaporozhets2014-07-1010-9/+52
|/ / / / / / /
* | | | | | | Merge branch 'prevent-html-injection' into 'master'Dmitriy Zaporozhets2014-07-102-3/+12
|\ \ \ \ \ \ \
| * | | | | | | Prevent html injection on commits page by commit messageDmitriy Zaporozhets2014-07-102-3/+12
|/ / / / / / /
* | | | | | | Merge branch 'group_milestones_description' into 'master'Dmitriy Zaporozhets2014-07-103-2/+24
|\ \ \ \ \ \ \
| * | | | | | | Update the tests with milestones descriptions.Marin Jankovski2014-07-102-2/+12
| * | | | | | | Use heading instead of strong and line breaks in description.Marin Jankovski2014-07-101-3/+1
| * | | | | | | Add milestone descriptions on the group show page.Marin Jankovski2014-07-101-0/+14
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'fix/notes_reply_click_issue401' into 'master'Marin Jankovski2014-07-102-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Added .closest() to find Reply button on click; fixes #401Ali Tavakoli2014-07-092-1/+2
|/ / / / / /
* | | | | | More entries to CHANGELOGDmitriy Zaporozhets2014-07-091-0/+11
* | | | | | Merge branch 'browse_file' into 'master'Dmitriy Zaporozhets2014-07-094-2/+54
|\ \ \ \ \ \
| * | | | | | Add tests to check for correct browse link name.Marin Jankovski2014-07-093-6/+45
| * | | | | | Move the links decision to helper.Marin Jankovski2014-07-092-6/+13
| * | | | | | Differentiate between dirs, files and general code.Marin Jankovski2014-07-091-2/+5
| * | | | | | Check if blob is requested.Marin Jankovski2014-07-091-1/+1
| * | | | | | Show browse file if we are browsing file history.Marin Jankovski2014-07-091-1/+4
* | | | | | | Merge branch 'active_highlight' into 'master'Dmitriy Zaporozhets2014-07-091-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Active link based on controller rather than action.Marin Jankovski2014-07-091-1/+1
|/ / / / / /
* | | | | | Merge branch 'update-highlight-js' into 'master'Dmitriy Zaporozhets2014-07-093-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
View Lorry Controller Status