summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Allow ecdsa SSH keysAkiva Levy2013-07-101-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | Update app/models/key.rb to permit SSH keys of type ecdsa rather than forcing dsa and rsa algorithms.
* | | | | | | | Remove randomly failing testDmitriy Zaporozhets2013-07-101-6/+0
| | | | | | | |
* | | | | | | | Merge pull request #4510 from Razer6/fix_not_found_lexersDmitriy Zaporozhets2013-07-101-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix Pygments 500 error if lexer not found by name
| * | | | | | | | Fix Pygments 500 error if lexer not found by name. Use first alias instead. ↵Robert Schilling2013-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #4473, #4451
* | | | | | | | | Merge pull request #4511 from yuters/patch-3Dmitriy Zaporozhets2013-07-101-0/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | UI : navbar tooltip position fix when "loading" appears.
| * | | | | | | | | navbar tooltip position fix when "loading" appears.Martin Bastien2013-07-071-0/+11
| |/ / / / / / / /
* | | | | | | | | Merge pull request #4515 from amacarthur/fork-adminDmitriy Zaporozhets2013-07-105-3/+138
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Additon of apis for fork administration.
| * | | | | | | | | Additon of apis for fork administration.Angus MacArthur2013-07-085-3/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added ability to add and remove the forked from/to relatioinship between existing repos.
* | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2013-07-103-10/+12
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #4519 from kwongius/team-assignment-textYves Senn2013-07-092-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix header text for setting greatest team access to a project
| | * | | | | | | | | | Fix header text for setting greatest team access to a projectKevin Wong2013-07-092-2/+2
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'change-to-default-installer' of ↵Dmitriy Zaporozhets2013-07-081-8/+10
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | /home/git/repositories/gitlab/gitlabhq
| | * | | | | | | | | Use default system editor.Sytse Sijbrandij2013-07-081-8/+10
| |/ / / / / / / / /
* | | | | | | | | | Sanitize user attrs on model levelDmitriy Zaporozhets2013-07-104-14/+15
|/ / / / / / / / /
* | | | | | | | | Added new entries to changelog. Version up to 5.4.0.preDmitriy Zaporozhets2013-07-082-1/+11
| | | | | | | | |
* | | | | | | | | Merge pull request #4508 from Razer6/fix_broken_api_linksDmitriy Zaporozhets2013-07-081-12/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix broken API links, fixes #4463
| * | | | | | | | | Fix broken API links, fixes #4463Robert Schilling2013-07-071-12/+12
| | | | | | | | | |
* | | | | | | | | | Add suppoort of unicorn and fog gemsDmitriy Zaporozhets2013-07-084-6/+133
| | | | | | | | | |
* | | | | | | | | | Merge branch 'rename-support-forum-to-mailing-list' of ↵Dmitriy Zaporozhets2013-07-083-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /home/git/repositories/gitlab/gitlabhq
| * | | | | | | | | | Rename support forum to mailing list to prevent duplication on community ↵Sytse Sijbrandij2013-07-073-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page of GitLab.org.
* | | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2013-07-086-21/+33
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | / / / / / / / / | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #4509 from bbodenmiller/cont-updatesYves Senn2013-07-071-3/+7
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | minor contributing guide updates
| | * | | | | | | | minor contributing guide updatesBen Bodenmiller2013-07-071-3/+7
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * issues & pr in English * appropriate language * typo & format fix * not catch all pull request * update changelog
| * | | | | | | | Merge pull request #4505 from m4tthumphrey/patch-1Dmitriy Zaporozhets2013-07-061-0/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Added client list to API doc
| | * | | | | | | Added client list to API docMatt Humphrey2013-07-061-0/+5
| |/ / / / / / /
| * | | | | | | Merge pull request #4476 from tstone2077/masterYves Senn2013-07-041-13/+16
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Updating documentation to reflect #3836 (resolving #4443)
| | * | | | | | | Updating documentation to reflect #3836 (resolving #4443)GitLab2013-07-011-13/+16
| | | | | | | | |
| * | | | | | | | Merge pull request #4484 from Razer6/add_services_to_blacklistDmitriy Zaporozhets2013-07-031-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add 'services' to path blacklist
| | * | | | | | | | Add 'services' to path blacklist, fixes #4470Robert Schilling2013-07-031-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge pull request #4488 from dekimsey/patch-1Yves Senn2013-07-031-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | Fix misspelling in social accounts tip
| | * | | | | | | | Fix misspelling in social accounts tipdekimsey2013-07-031-1/+1
| |/ / / / / / / /
| * | | | | | | | Merge pull request #4482 from kivlor/patch-1Yves Senn2013-07-031-3/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | move 'make config/database.yml readable to git only' instruction
| | * | | | | | | | move 'make config/database.yml readable to git only' instructionAndrew Gallagher2013-07-031-3/+3
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | I've moved the instruction in question to the the 'Configure GitLab DB settings'. Can't change permission to a file that doesn't already exist :wink:
* | | | | | | | | Merge branch 'puma_cluster_recommendation' of ↵Dmitriy Zaporozhets2013-07-041-0/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | /home/git/repositories/gitlab/gitlabhq
| * | | | | | | | Add cluster mode instructions to puma.rb.exampleJacob Vosmaer2013-07-041-0/+7
|/ / / / / / / /
* | | | | | | | Merge branch 'warning_relative_url' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-07-021-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Warn that relative URL's are unsupportedJacob Vosmaer2013-07-021-0/+1
| | | | | | | | |
* | | | | | | | | Fix header avatarDmitriy Zaporozhets2013-07-022-1/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #4440 from jackbot/editable-notesDmitriy Zaporozhets2013-07-0211-34/+332
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Editable notes
| * | | | | | | | Add editable notes featureJack Weeden2013-07-011-1/+1
| | | | | | | | |
| * | | | | | | | Changed 'javascript:;' links to '#'Jack Weeden2013-07-011-2/+2
| | | | | | | | |
| * | | | | | | | Removed before_filter as authentication is done within update methodJack Weeden2013-07-011-1/+0
| | | | | | | | |
| * | | | | | | | Authorize user on note updateJack Weeden2013-07-011-0/+1
| | | | | | | | |
| * | | | | | | | Ability to edit commentsJack Weeden2013-07-017-18/+285
| | | | | | | | |
| * | | | | | | | Prevent 'toplevel constant SnippetsController referenced by ↵Jack Weeden2013-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project::SnippetsController' warning
| * | | | | | | | Added update and delete_attachment actions to note controllerJack Weeden2013-07-012-1/+30
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master'Jack Weeden2013-07-0129-160/+506
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #4415 from jackbot/masterDmitriy Zaporozhets2013-06-302-2/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Couple of UI additions
* \ \ \ \ \ \ \ \ \ Merge pull request #4442 from 1ed/projects-helper-fixDmitriy Zaporozhets2013-06-301-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | fixed nav bar for empty repos (fixes #4375)
| * | | | | | | | | | fixed nav bar for empty repos (fixes #4375)Gábor Egyed2013-06-261-1/+1
| | | | | | | | | | |
View Lorry Controller Status