Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'shortcuts-help' into 'master' | Rémy Coutable | 2016-03-02 | 1 | -1/+3 |
|\ | |||||
| * | Fix help keyboard shortcut for relative URL setups | Artem Sidorenko | 2016-03-01 | 1 | -1/+3 |
* | | Merge branch 'logged-out-search' into 'master' | Robert Speicher | 2016-03-01 | 8 | -43/+40 |
|\ \ | |/ |/| | |||||
| * | Refactor UI header for logged out users | Dmitriy Zaporozhets | 2016-03-01 | 3 | -47/+28 |
| * | Enable search for logged-out users | Dmitriy Zaporozhets | 2016-03-01 | 6 | -6/+22 |
* | | Merge branch 'login-flash' into 'master' | Dmitriy Zaporozhets | 2016-03-01 | 1 | -0/+4 |
|\ \ | |||||
| * | | Add bottom margin for flash container on login page | Dmitriy Zaporozhets | 2016-03-01 | 1 | -0/+4 |
| |/ | |||||
* | | Merge branch 'sidebar-overlap-fix' into 'master' | Dmitriy Zaporozhets | 2016-03-01 | 3 | -3/+3 |
|\ \ | |||||
| * | | Fix issue with overlap of sidebar links. | Jacob Schatz | 2016-03-01 | 3 | -3/+3 |
| |/ | |||||
* | | Merge branch 'rs-avatar-validation' into 'master' | Douwe Maan | 2016-03-01 | 1 | -1/+1 |
|\ \ | |||||
| * | | Only validate avatar cropping values when avatar is present AND changedrs-avatar-validation | Robert Speicher | 2016-02-29 | 1 | -1/+1 |
* | | | Merge branch 'rs-fix-user-namespace_uniq' into 'master' | Douwe Maan | 2016-03-01 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | Properly check for a pre-existing error in `User#namespace_uniq`rs-fix-user-namespace_uniq | Robert Speicher | 2016-02-29 | 1 | -1/+2 |
* | | | Merge branch 'rs-improve-grace-period' into 'master' | Douwe Maan | 2016-03-01 | 2 | -10/+13 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Don't show any "2FA required" message if it's not actually requiredrs-improve-grace-period | Robert Speicher | 2016-02-29 | 1 | -5/+7 |
| * | | Reset `otp_grace_period_started_at` after disabling 2FA | Robert Speicher | 2016-02-29 | 1 | -5/+6 |
| * | | Revert "Merge branch 'issue_5854' into 'master' "revert-6f85eb38 | Dmitriy Zaporozhets | 2016-02-29 | 1 | -4/+2 |
| * | | Merge branch 'issue_5854' into 'master' | Dmitriy Zaporozhets | 2016-02-29 | 1 | -2/+4 |
| |\ \ | |||||
| | * | | Add commit message to JIRA's notification payload. | Rubén Dávila | 2016-02-26 | 1 | -2/+4 |
* | | | | Merge branch 'mr-prefix-activity-view' into 'master' | Jacob Schatz | 2016-03-01 | 5 | -6/+6 |
|\ \ \ \ | |||||
| * | | | | Changed page title | Phil Hughes | 2016-03-01 | 1 | -1/+1 |
| * | | | | Fixed issue based on feedback with link text output | Phil Hughes | 2016-03-01 | 1 | -1/+1 |
| * | | | | Removed un-used variables | Phil Hughes | 2016-03-01 | 2 | -3/+1 |
| * | | | | Replaced prefix with to_reference method calls | Phil Hughes | 2016-03-01 | 4 | -11/+6 |
| * | | | | Changed # to ! on merge requests on activity view | Phil Hughes | 2016-03-01 | 4 | -5/+12 |
* | | | | | Merge branch 'safe-content-type' into 'master' | Douwe Maan | 2016-03-01 | 3 | -12/+23 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Explain why we mangle blob content typessafe-content-type | Jacob Vosmaer | 2016-02-24 | 3 | -12/+23 |
* | | | | | Merge branch 'issue_13851' into 'master' | Rémy Coutable | 2016-03-01 | 1 | -1/+14 |
|\ \ \ \ \ | |||||
| * | | | | | Bring back Gitlab textissue_13851 | Alfredo Sumaran | 2016-02-29 | 1 | -1/+14 |
* | | | | | | Merge branch 'fix/contributions-forked-projects' into 'master' | Douwe Maan | 2016-03-01 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/contributio... | James Lopez | 2016-02-29 | 113 | -624/+1038 |
| |\ \ \ \ \ | |||||
| * | | | | | | include contributions from forked projects on profile calendar | James Lopez | 2016-02-22 | 1 | -1/+1 |
* | | | | | | | Merge branch 'master' into issue_13212issue_13212 | Alfredo Sumaran | 2016-02-29 | 22 | -76/+244 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Merge branch 'issue_13648' into 'master' | Dmitriy Zaporozhets | 2016-02-29 | 2 | -14/+22 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | Logged in user should be able to read internal forks. | Rubén Dávila | 2016-02-27 | 1 | -1/+1 |
| | * | | | | | Improve implementation to check read access to forks and add pagination. | Rubén Dávila | 2016-02-26 | 2 | -14/+22 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge branch 'removed-ngprogress' into 'master' | Jacob Schatz | 2016-02-29 | 6 | -10/+8 |
| |\ \ \ \ \ | |||||
| | * | | | | | Removed NGProgressremoved-ngprogress | Phil Hughes | 2016-02-29 | 6 | -10/+8 |
| * | | | | | | Merge branch 'too-many-changes-btns' into 'master' | Jacob Schatz | 2016-02-29 | 1 | -6/+5 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| | * | | | | | Changed too many changes buttons to whitetoo-many-changes-btns | Phil Hughes | 2016-02-29 | 1 | -6/+5 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'improve-todos-css' into 'master' | Dmitriy Zaporozhets | 2016-02-29 | 2 | -35/+6 |
| |\ \ \ \ \ | |||||
| | * | | | | | Small css cleanup for todos featureimprove-todos-css | Dmitriy Zaporozhets | 2016-02-27 | 2 | -35/+6 |
| | |/ / / / | |||||
| * | | | | | Merge branch '11489-branded-appearance-to-ce' into 'master' | Douwe Maan | 2016-02-29 | 9 | -10/+199 |
| |\ \ \ \ \ | |||||
| | * | | | | | Branded login page also in CE11489-branded-appearance-to-ce | Zeger-Jan van de Weg | 2016-02-26 | 9 | -10/+199 |
| * | | | | | | Merge branch 'issue_13621' into 'master' | Douwe Maan | 2016-02-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | Don't repeat labels listed on Labels tab.issue_13621 | Rubén Dávila | 2016-02-22 | 1 | -1/+1 |
| * | | | | | | Merge branch 'evuez/gitlab-ce-webhook-url-spaces' into 'master' | Robert Speicher | 2016-02-26 | 1 | -0/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Allow webhooks URL to have leading and trailing spacesevuez/gitlab-ce-webhook-url-spaces | evuez | 2016-02-26 | 1 | -0/+3 |
* | | | | | | | | Comment icon vertically aligned | Alfredo Sumaran | 2016-02-29 | 1 | -0/+1 |
* | | | | | | | | Wrap icon with edited time | Alfredo Sumaran | 2016-02-29 | 2 | -2/+2 |