summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Rubocop enabled for: Use spaces inside hash literal bracesDmitriy Zaporozhets2015-02-023-26/+26
* Convert hashes to ruby 1.9 styleDmitriy Zaporozhets2015-02-023-10/+10
* Merge pull request #8642 from fchasen/masterDmitriy Zaporozhets2015-01-291-1/+4
|\
| * use new hash syntaxFred Chasen2015-01-231-4/+4
| * Split up line and use single qoutes to declare Cors settingsFred Chasen2015-01-231-1/+4
| * Expose Link header in CORS Api callsFred Chasen2015-01-231-1/+1
* | Load contribution calendar via AJAXDmitriy Zaporozhets2015-01-291-4/+3
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into haynes/gitlab-ce...Dmitriy Zaporozhets2015-01-281-2/+2
|\ \
| * \ Merge branch 'ldap_defaults' into 'master'Job van der Voort2015-01-281-2/+2
| |\ \
| | * | Make 'plain', port 389 the default for LDAPJacob Vosmaer2015-01-281-2/+2
* | | | Add a commit calendar to the user profileHannes Rosenögger2015-01-291-0/+4
|/ / /
* | | SEtup new routes for creating and changing repository filesDmitriy Zaporozhets2015-01-261-5/+8
|/ /
* | Merge branch 'haynes/gitlab-ce-project_avatar' into 'master'Dmitriy Zaporozhets2015-01-251-21/+23
|\ \
| * | Fix tests, merge conflicts, some minor issues and make the project avatar fea...Hannes Rosenögger2015-01-241-22/+22
| * | adding avatar to project settings page added avatar removal show project avat...Steven Thonus2015-01-241-0/+2
* | | Fixes typo in config.rbYatish Mehta2015-01-241-1/+1
|/ /
* | Increase password reset timeout since other people trigger it when they creat...Sytse Sijbrandij2015-01-231-1/+2
|/
* allow to use http in redirect urlValery Sizov2015-01-221-0/+6
* Mix wrong comment about signupDmitriy Zaporozhets2015-01-221-1/+1
* Merge pull request #7999 from cirosantilli/append-inplaceDmitriy Zaporozhets2015-01-211-6/+6
|\
| * Append in place for strings and arraysCiro Santilli2015-01-011-6/+6
* | Merge pull request #7762 from jubianchi/commit-closing-issuesDmitriy Zaporozhets2015-01-212-2/+2
|\ \
| * | Allow commit messages to close several issues at once (thanks @123Haynesjubianchi2015-01-202-2/+2
* | | Github Importer: AJAX update statusValery Sizov2015-01-201-0/+1
|/ /
* | Merge pull request #8040 from drag00n/updatedhintDrew Blessing2015-01-181-1/+1
|\ \
| * | Use full path from root of project.drag00n2015-01-181-1/+1
* | | Application admin scaffoldValery Sizov2015-01-172-1/+3
* | | Fix signup settingsDmitriy Zaporozhets2015-01-161-1/+1
* | | Merge pull request #7987 from cirosantilli/get-instead-matchDmitriy Zaporozhets2015-01-151-2/+2
|\ \ \
| * | | Replace match via get with get on routesCiro Santilli2014-12-291-2/+2
* | | | Enable signup by defaultJacob Vosmaer2015-01-141-1/+1
* | | | Merge branch 'oauth_api_doc' into 'master'Dmitriy Zaporozhets2015-01-131-0/+5
|\ \ \ \
| * | | | OAuth API documentation updateValery Sizov2015-01-121-0/+5
* | | | | Merge branch 'github_importer'Dmitriy Zaporozhets2015-01-131-0/+8
|\ \ \ \ \
| * | | | | Github ImporterValery Sizov2015-01-101-0/+8
| | |_|_|/ | |/| | |
* | | | | Merge branch 'git-http-blacklist' into 'master'Jacob Vosmaer2015-01-134-0/+80
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge remote-tracking branch 'dev_gitlab_org/master' into git-http-blacklistJacob Vosmaer2015-01-084-2/+177
| |\ \ \ \ | | |/ / /
| * | | | White-list requests from 127.0.0.1Jacob Vosmaer2015-01-062-0/+4
| * | | | Add more comments explaining how we block IPsJacob Vosmaer2014-12-181-0/+2
| * | | | Another comment fixJacob Vosmaer2014-12-161-2/+2
| * | | | Fix copy-paste error in commentJacob Vosmaer2014-12-161-1/+1
| * | | | Improve Redis::Store monkey-patch robustnessJacob Vosmaer2014-12-161-0/+23
| * | | | Block Git HTTP Basic Auth after 10 failed attemptsJacob Vosmaer2014-12-154-0/+51
* | | | | Create ApplicationSettings if does not exist in runtimeDmitriy Zaporozhets2015-01-081-11/+0
* | | | | Hack for migrating to new settingsDmitriy Zaporozhets2015-01-081-2/+1
* | | | | Improve application settings and write testsDmitriy Zaporozhets2015-01-081-1/+1
* | | | | Init ApplicationSettings resource with defaults from config fileDmitriy Zaporozhets2015-01-082-0/+14
| |/ / / |/| | |
* | | | Merge branch 'user_ssh_keys_on_admin' into 'master'Dmitriy Zaporozhets2014-12-301-0/+1
|\ \ \ \
| * | | | Move user key manipulation in admin section to a separate controller.Marin Jankovski2014-12-301-2/+1
| * | | | Add user key actions to admins.Marin Jankovski2014-12-291-0/+2
View Lorry Controller Status