summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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-293-5/+9
* Merge branch 'revert-6f85eb38' into 'master' Dmitriy Zaporozhets2016-02-291-4/+2
|\
| * Revert "Merge branch 'issue_5854' into 'master' "revert-6f85eb38Dmitriy Zaporozhets2016-02-291-4/+2
* | Merge branch 'fix/project-wiki-ending' into 'master' Robert Speicher2016-02-293-3/+23
|\ \ | |/ |/|
| * fixed merge conflict and refactored specsJames Lopez2016-02-291-6/+2
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-wik...James Lopez2016-02-2981-378/+4091
| |\
| * | updated internal.rb and spec based on MR feedbackJames Lopez2016-02-262-5/+11
| * | fix changelog [ci skip]James Lopez2016-02-251-1/+1
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-wik...James Lopez2016-02-2413-44/+71
| |\ \
| * | | added changelogJames Lopez2016-02-241-0/+1
| * | | fix for projects ending in .wikiJames Lopez2016-02-242-1/+18
* | | | 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 '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 'fix-migration' into 'master' Dmitriy Zaporozhets2016-02-291-1/+1
|\ \ \ \ \
| * | | | | Fix broken migrationDmitriy Zaporozhets2016-02-291-1/+1
|/ / / / /
* | | | | Merge branch 'removed-ngprogress' into 'master' Jacob Schatz2016-02-298-13/+8
|\ \ \ \ \
| * | | | | Removed NGProgressremoved-ngprogressPhil Hughes2016-02-298-13/+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 'rs-data-links' into 'master' Douwe Maan2016-02-292-5/+21
|\ \ \ \ \ \
| * | | | | | Sanitize `vbscript:` linksrs-data-linksRobert Speicher2016-02-232-1/+10
| * | | | | | Sanitize `data:` linksRobert Speicher2016-02-212-5/+12
* | | | | | | Merge branch '11489-branded-appearance-to-ce' into 'master' Douwe Maan2016-02-2922-15/+394
|\ \ \ \ \ \ \
| * | | | | | | Branded login page also in CE11489-branded-appearance-to-ceZeger-Jan van de Weg2016-02-2622-15/+394
* | | | | | | | Merge branch 'issue_13621' into 'master' Douwe Maan2016-02-293-1/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't repeat labels listed on Labels tab.issue_13621Rubén Dávila2016-02-223-1/+8
* | | | | | | | | Merge branch 'ci_examples' into 'master' Achilleas Pipinellis2016-02-298-75/+89
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Link to examples pageAchilleas Pipinellis2016-02-293-1/+14
| * | | | | | | | | Reorganize CI sections and give descriptive names to linksAchilleas Pipinellis2016-02-294-65/+65
| * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ci_examplesAchilleas Pipinellis2016-02-2916-46/+290
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'rs-development-docs' into 'master' Douwe Maan2016-02-292-5/+109
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Update Gotchas docrs-development-docsRobert Speicher2016-02-171-8/+7
| * | | | | | | | | Add "Gotchas" development docRobert Speicher2016-02-162-0/+105
| * | | | | | | | | Fix the "How to dump production data" linkRobert Speicher2016-02-161-1/+1
| * | | | | | | | | Alphabetize Development doc indexRobert Speicher2016-02-161-5/+5
* | | | | | | | | | Update CHANGELOGRobert Speicher2016-02-271-3/+4
* | | | | | | | | | Merge branch '13679-fix' into 'master' Achilleas Pipinellis2016-02-272-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Adjust documentation of permissionsThomas Schmidt2016-02-272-1/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'rs-fix-issue-filter-spec' into 'master' Robert Speicher2016-02-271-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Fix issue milestone filter specrs-fix-issue-filter-specRobert Speicher2016-02-261-2/+2
* | | | | | | | | | Merge branch 'evuez/gitlab-ce-webhook-url-spaces' into 'master' Robert Speicher2016-02-264-10/+18
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Allow webhooks URL to have leading and trailing spacesevuez/gitlab-ce-webhook-url-spacesevuez2016-02-264-10/+18
* | | | | | | | | | Merge branch 'repository-caching-refactor' into 'master' Robert Speicher2016-02-268-25/+155
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Added specs for the various Repository hooksrepository-caching-refactorYorick Peterse2016-02-251-2/+106