summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'backup-chdir' into 'master'Dmitriy Zaporozhets2015-03-261-7/+8
|\
| * Change directory when removing old backupsVinnie Okada2015-03-241-7/+8
* | Merge branch 'master' into 'master'Dmitriy Zaporozhets2015-03-261-2/+2
|\ \
| * | Change ordering so that confirm is removed from attrs before attempting to Us...RICKETTM@uk.ibm.com2015-03-241-2/+2
* | | Merge pull request #9021 from nicklegr/faster_auto_mergeDmitriy Zaporozhets2015-03-251-5/+1
|\ \ \
| * | | Reset parking branch to HEAD everytimenicklegr2015-03-251-5/+1
* | | | Merge pull request #8007 from mr-vinn/markdown-tagsDmitriy Zaporozhets2015-03-251-9/+25
|\ \ \ \
| * \ \ \ Merge branch 'master' into markdown-tagsVinnie Okada2015-03-248-60/+124
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' into markdown-tagsVinnie Okada2015-03-226-24/+38
| |\ \ \ \
| * | | | | Fix SanitizationFilter bugsVinnie Okada2015-03-221-1/+2
| * | | | | Merge branch 'master' into markdown-tagsVinnie Okada2015-03-218-33/+37
| |\ \ \ \ \
| * | | | | | Don't allow style attributes in inline HTMLVinnie Okada2015-03-211-1/+1
| * | | | | | Change HTML sanitizationVinnie Okada2015-03-191-13/+23
| * | | | | | Merge branch 'master' into markdown-tagsVinnie Okada2015-03-17111-786/+3129
| |\ \ \ \ \ \
| * | | | | | | Allow HTML tags in user Markdown inputVinnie Okada2014-10-101-0/+5
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-255-6/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Merge branch 'more-rubocop-styles' into 'master'Dmitriy Zaporozhets2015-03-255-6/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Style/RedundantReturn enabledmore-rubocop-stylesDmitriy Zaporozhets2015-03-243-4/+4
| | * | | | | | | Enable more rubocop style checksDmitriy Zaporozhets2015-03-242-3/+3
| | | |_|_|_|/ / | | |/| | | | |
* | | | | | | | Merge pull request #8988 from atomaka/atomaka/bugfix/gitlab-shell-taskRobert Schilling2015-03-251-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix newline spacing after authorized_keys rebuildAndrew Tomaka2015-03-201-0/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'api-internal-errors' into 'master'Dmitriy Zaporozhets2015-03-255-68/+105
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Respond with full GitAccess error if user has project read access.api-internal-errorsDouwe Maan2015-03-241-1/+1
| * | | | | | Refactor GitAccess to use instance variables.Douwe Maan2015-03-245-67/+104
* | | | | | | Merge pull request #9012 from dantudor/patch-1Dmitriy Zaporozhets2015-03-241-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Unescape branch param to deleteDan Tudor2015-03-241-1/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'git-auth-rack-attack-improvements' into 'master'Dmitriy Zaporozhets2015-03-242-14/+62
|\ \ \ \ \ \ \
| * | | | | | | Reduce Rack Attack false positives by clearing out auth failure count uponStan Hu2015-03-242-14/+62
| |/ / / / / /
* | | | | | | Merge branch 'fix-nested-tasks' into 'master'Dmitriy Zaporozhets2015-03-241-2/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix nested task listsVinnie Okada2015-03-211-2/+3
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'notes-count-without-system' into 'master'Dmitriy Zaporozhets2015-03-241-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Don't include system notes in issue/MR comment count.notes-count-without-systemDouwe Maan2015-03-231-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-232-41/+56
|\ \ \ \ \
| * \ \ \ \ Merge branch 'improve-contributions-calendar' into 'master'Dmitriy Zaporozhets2015-03-232-41/+56
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Improve contribution calendar per day infoDmitriy Zaporozhets2015-03-221-2/+2
| | * | | | Contribution calendar will use events instead of commits to count contributionsDmitriy Zaporozhets2015-03-221-12/+7
| | * | | | Refactor contributions events and write tests for calendarDmitriy Zaporozhets2015-03-221-6/+2
| | * | | | Replace commits calendar with contributions calendarDmitriy Zaporozhets2015-03-212-41/+65
* | | | | | Merge pull request #8995 from MichaelAlt/patch-1Douwe Maan2015-03-231-1/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Faulty LDAP DN name escaping removedMichael Alt2015-03-211-1/+0
| | |/ / / | |/| | |
* | | | | Fix OAuth2 issue importing a new project from GitHub and GitLabStan Hu2015-03-223-4/+4
* | | | | Merge branch 'disable-ref-generation-in-code-blocks' into 'master'Dmitriy Zaporozhets2015-03-221-1/+7
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Disable reference creation for comments surrounded by code/preformatted blocksStan Hu2015-03-191-1/+7
* | | | | Merge branch 'backup-permissions' into 'master'Dmitriy Zaporozhets2015-03-211-18/+25
|\ \ \ \ \
| * | | | | Call chdir() with a blockVinnie Okada2015-03-191-18/+17
| * | | | | Change permissions on backup filesVinnie Okada2015-03-171-5/+13
| | |_|_|/ | |/| | |
* | | | | Extend push_tag event to include tag message and last commitKamil Trzcinski2015-03-211-1/+2
| |_|/ / |/| | |
* | | | Revert "Increase timeout for Git-over-HTTP requests."Dmitriy Zaporozhets2015-03-191-13/+0
* | | | Merge branch 'bugfix/block_ldap_users_cronjob' into 'master'Dmitriy Zaporozhets2015-03-191-4/+5
|\ \ \ \
| * | | | fixed rake task to block removed ldap usersDaniel Steinborn2015-02-161-4/+5
View Lorry Controller Status