summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ability to edit commentsJack Weeden2013-07-017-18/+285
* Prevent 'toplevel constant SnippetsController referenced by Project::Snippets...Jack Weeden2013-07-011-1/+1
* 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
| |\
| * \ Merge pull request #4442 from 1ed/projects-helper-fixDmitriy Zaporozhets2013-06-301-1/+1
| |\ \
| | * | fixed nav bar for empty repos (fixes #4375)Gábor Egyed2013-06-261-1/+1
| * | | Merge pull request #4460 from tstone2077/feature_help_markdownDmitriy Zaporozhets2013-06-302-123/+454
| |\ \ \
| | * | | Adding detailed documentation of the markdown syntax.Thurston Stone2013-06-292-123/+454
| * | | | Fixed db/schema.rbDmitriy Zaporozhets2013-06-301-1/+1
| * | | | Doc: set permission on config.database.ymlAriejan de Vroom2013-06-291-0/+3
| * | | | Merge branch 'bbodenmiller-master'Ariejan de Vroom2013-06-291-3/+7
| |\ \ \ \
| | * | | | Tweak wording and phrasingAriejan de Vroom2013-06-291-1/+5
| | * | | | Merge branch 'master' of git://github.com/bbodenmiller/gitlabhq into bbodenmi...Ariejan de Vroom2013-06-291-3/+3
| | |\ \ \ \ | |/ / / / /
| | * | | | contributing guideline updatesBen Bodenmiller2013-06-181-3/+3
| * | | | | Merge branch 'muskox-master'Ariejan de Vroom2013-06-291-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | fixed typo in assgnedScott Pustay2013-06-291-1/+1
| |/ / / /
| * | | | Merge pull request #4323 from axilleas/update_docsDmitriy Zaporozhets2013-06-281-3/+12
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Create uploads dir otherwise backup fails. Fix #4304Axilleas Pipinellis2013-06-171-3/+12
| * | | | Merge pull request #4239 from karlhungus/feature-alt-text-for-gravatarsDmitriy Zaporozhets2013-06-2618-19/+18
| |\ \ \ \
| | * | | | Rebasing on masterIzaak Alpert2013-06-261-2/+1
| | * | | | Gravatar image fixes when gravatar unavailableIzaak Alpert2013-06-2618-19/+19
| |/ / / /
| * | | | Merge pull request #4393 from dosire/scrum-improvementsDmitriy Zaporozhets2013-06-252-3/+3
| |\ \ \ \
| | * | | | Rename unspecified to make it clearer and in line with scrum terminology.Sytse Sijbrandij2013-06-222-3/+3
| * | | | | Merge pull request #4412 from senny/fix_bad_constant_referenceDmitriy Zaporozhets2013-06-251-1/+1
| |\ \ \ \ \
| | * | | | | fix bad constant reference in `project_routing_spec.rb`.Yves Senn2013-06-241-1/+1
| * | | | | | Merge pull request #4419 from jlgeering/masterYves Senn2013-06-251-4/+4
| |\ \ \ \ \ \
| | * | | | | | whitespaces in gitlab.yml.exampleJean-Luc Geering2013-06-251-4/+4
| * | | | | | | Merge pull request #4361 from kenips/masterDmitriy Zaporozhets2013-06-251-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fix missing assigned_to renaming in 2e839ceKen Ip2013-06-201-1/+1
* | | | | | | | | Merge remote-tracking branch 'upstream/master'vagrant2013-06-2511-14/+88
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'contributing-pull-requests' of /home/git/repositories/gitlab/gi...Dmitriy Zaporozhets2013-06-251-2/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Notes about what PR's we would like to see.Sytse Sijbrandij2013-06-241-2/+3
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'gem-update-policy' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-06-251-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Detail gem update policy.Sytse Sijbrandij2013-06-241-1/+1
| * | | | | | | | | Merge branch 'animated-gif' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-06-251-0/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add animated screenshots.Sytse Sijbrandij2013-06-231-0/+2
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #4410 from senny/dont_console_log_in_codeDmitriy Zaporozhets2013-06-241-3/+1
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | we should not use `console.log` in production code...Yves Senn2013-06-241-3/+1
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #3898 from jacargentina/notifymentionedDmitriy Zaporozhets2013-06-248-8/+81
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Show participants on issues, including mentions, and notify email to all part...Javier Castro2013-06-248-8/+81
| |/ / / / / / /
| * | | | | | | Merge pull request #4407 from jackbot/masterDmitriy Zaporozhets2013-06-242-2/+3
| |\ \ \ \ \ \ \
* | | | | | | | | Don't show 'Filter by labels' text if there are no labelsJack Weeden2013-06-251-13/+15
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Added tooltip to snippet public/private iconsJack Weeden2013-06-241-2/+2
* | | | | | | | Added delete button to snippet viewJack Weeden2013-06-241-0/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'master' of github.com:jackbot/gitlabhqJack Weeden2013-06-242-2/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | cattr_accessor removed from IssueObserver and MergeRequestObserver but not up...Jack Weeden2013-06-242-2/+3
* | | | | | | Merge pull request #4369 from zeehio/patch-1Yves Senn2013-06-241-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | [Doc] Update 5.0 to 5.1: Recompile assetsSergio Oller2013-06-211-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4385 from Razer6/fix_update_docs_for_masterDmitriy Zaporozhets2013-06-221-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |