summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'login-flash' into 'master' Dmitriy Zaporozhets2016-03-011-0/+4
|\
| * Add bottom margin for flash container on login pageDmitriy Zaporozhets2016-03-011-0/+4
* | Merge branch 'sidebar-overlap-fix' into 'master' Dmitriy Zaporozhets2016-03-013-3/+3
|\ \
| * | Fix issue with overlap of sidebar links.Jacob Schatz2016-03-013-3/+3
| |/
* | Merge branch 'rs-avatar-validation' into 'master' Douwe Maan2016-03-011-1/+1
|\ \
| * | Only validate avatar cropping values when avatar is present AND changedrs-avatar-validationRobert Speicher2016-02-291-1/+1
* | | Merge branch 'rs-fix-user-namespace_uniq' into 'master' Douwe Maan2016-03-011-1/+2
|\ \ \ | |/ /
| * | Properly check for a pre-existing error in `User#namespace_uniq`rs-fix-user-namespace_uniqRobert Speicher2016-02-291-1/+2
* | | Merge branch 'rs-improve-grace-period' into 'master' Douwe Maan2016-03-012-10/+13
|\ \ \ | |_|/ |/| |
| * | Don't show any "2FA required" message if it's not actually requiredrs-improve-grace-periodRobert Speicher2016-02-291-5/+7
| * | Reset `otp_grace_period_started_at` after disabling 2FARobert Speicher2016-02-291-5/+6
| * | Revert "Merge branch 'issue_5854' into 'master' "revert-6f85eb38Dmitriy Zaporozhets2016-02-291-4/+2
| * | Merge branch 'issue_5854' into 'master' Dmitriy Zaporozhets2016-02-291-2/+4
| |\ \
| | * | Add commit message to JIRA's notification payload.Rubén Dávila2016-02-261-2/+4
* | | | Merge branch 'mr-prefix-activity-view' into 'master' Jacob Schatz2016-03-015-6/+6
|\ \ \ \
| * | | | Changed page titlePhil Hughes2016-03-011-1/+1
| * | | | Fixed issue based on feedback with link text outputPhil Hughes2016-03-011-1/+1
| * | | | Removed un-used variablesPhil Hughes2016-03-012-3/+1
| * | | | Replaced prefix with to_reference method callsPhil Hughes2016-03-014-11/+6
| * | | | Changed # to ! on merge requests on activity viewPhil Hughes2016-03-014-5/+12
* | | | | Merge branch 'safe-content-type' into 'master' Douwe Maan2016-03-013-12/+23
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Explain why we mangle blob content typessafe-content-typeJacob Vosmaer2016-02-243-12/+23
* | | | | Merge branch 'issue_13851' into 'master' Rémy Coutable2016-03-011-1/+14
|\ \ \ \ \
| * | | | | Bring back Gitlab textissue_13851Alfredo Sumaran2016-02-291-1/+14
* | | | | | Merge branch 'fix/contributions-forked-projects' into 'master' Douwe Maan2016-03-011-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/contributio...James Lopez2016-02-29113-624/+1038
| |\ \ \ \ \
| * | | | | | include contributions from forked projects on profile calendarJames Lopez2016-02-221-1/+1
* | | | | | | Merge branch 'master' into issue_13212issue_13212Alfredo Sumaran2016-02-2922-76/+244
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'issue_13648' into 'master' Dmitriy Zaporozhets2016-02-292-14/+22
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Logged in user should be able to read internal forks.Rubén Dávila2016-02-271-1/+1
| | * | | | | Improve implementation to check read access to forks and add pagination.Rubén Dávila2016-02-262-14/+22
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'removed-ngprogress' into 'master' Jacob Schatz2016-02-296-10/+8
| |\ \ \ \ \
| | * | | | | Removed NGProgressremoved-ngprogressPhil Hughes2016-02-296-10/+8
| * | | | | | Merge branch 'too-many-changes-btns' into 'master' Jacob Schatz2016-02-291-6/+5
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Changed too many changes buttons to whitetoo-many-changes-btnsPhil Hughes2016-02-291-6/+5
| | |/ / / /
| * | | | | Merge branch 'improve-todos-css' into 'master' Dmitriy Zaporozhets2016-02-292-35/+6
| |\ \ \ \ \
| | * | | | | Small css cleanup for todos featureimprove-todos-cssDmitriy Zaporozhets2016-02-272-35/+6
| | |/ / / /
| * | | | | Merge branch '11489-branded-appearance-to-ce' into 'master' Douwe Maan2016-02-299-10/+199
| |\ \ \ \ \
| | * | | | | Branded login page also in CE11489-branded-appearance-to-ceZeger-Jan van de Weg2016-02-269-10/+199
| * | | | | | Merge branch 'issue_13621' into 'master' Douwe Maan2016-02-291-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Don't repeat labels listed on Labels tab.issue_13621Rubén Dávila2016-02-221-1/+1
| * | | | | | Merge branch 'evuez/gitlab-ce-webhook-url-spaces' into 'master' Robert Speicher2016-02-261-0/+3
| |\ \ \ \ \ \
| | * | | | | | Allow webhooks URL to have leading and trailing spacesevuez/gitlab-ce-webhook-url-spacesevuez2016-02-261-0/+3
* | | | | | | | Comment icon vertically alignedAlfredo Sumaran2016-02-291-0/+1
* | | | | | | | Wrap icon with edited timeAlfredo Sumaran2016-02-292-2/+2
* | | | | | | | Increase paddingAlfredo Sumaran2016-02-291-1/+1
* | | | | | | | Keep edited time on the same line as wellAlfredo Sumaran2016-02-291-1/+1
* | | | | | | | Apply nice date when diff page loadsAlfredo Sumaran2016-02-291-0/+1
* | | | | | | | Keep date in the same lineAlfredo Sumaran2016-02-291-0/+4
* | | | | | | | Prevent content misalignmentAlfredo Sumaran2016-02-291-0/+8
|/ / / / / / /