summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Key strong paramsDmitriy Zaporozhets2014-06-264-6/+7
* Group and Event strong_paramsDmitriy Zaporozhets2014-06-265-11/+12
* Note strong_paramsDmitriy Zaporozhets2014-06-262-4/+9
* User model to strong params. Comment other attr_accessible to let tests runDmitriy Zaporozhets2014-06-2613-44/+45
* Use strong params for 5 more modelsDmitriy Zaporozhets2014-06-268-16/+20
* Project services to strong paramsDmitriy Zaporozhets2014-06-268-16/+8
* Remove protected_atrributes gem and start moving to strong paramsDmitriy Zaporozhets2014-06-2610-40/+39
* Add html meta tag with software descriptionDmitriy Zaporozhets2014-06-261-0/+1
* Merge branch 'small-changes' into 'master'Dmitriy Zaporozhets2014-06-261-3/+3
|\
| * Small fixes to the requirements doc.Sytse Sijbrandij2014-06-261-3/+3
* | Merge branch 'rename-home-tabs' into 'master'Dmitriy Zaporozhets2014-06-2610-16/+12
|\ \
| * | Fix testsDmitriy Zaporozhets2014-06-261-1/+1
| * | Better name for admin home page. Move groups tab after usersDmitriy Zaporozhets2014-06-261-3/+3
| * | Replace home icon with tab namesDmitriy Zaporozhets2014-06-2610-14/+10
* | | Merge branch 'commit-log-25' into 'master'Dmitriy Zaporozhets2014-06-261-1/+1
|\ \ \
| * | | Increase commit log amount for tree view from 10 to 25Dmitriy Zaporozhets2014-06-261-1/+1
| |/ /
* | | Merge branch 'improve-markdwon-render' into 'master'Dmitriy Zaporozhets2014-06-262-6/+29
|\ \ \ | |_|/ |/| |
| * | Improve markdown parsingDmitriy Zaporozhets2014-06-262-6/+29
* | | Simplify the supported/unsupported sections of the requirements guide.Sytse Sijbrandij2014-06-261-13/+9
* | | Change newlines in requirements doc.Sytse Sijbrandij2014-06-261-7/+2
| |/ |/|
* | Merge branch 'dash-between-description-and-readme-link' into 'master'Dmitriy Zaporozhets2014-06-261-0/+1
|\ \
| * | Put a dash before the readme link so it doesn't look like it is part of the d...Sytse Sijbrandij2014-06-251-0/+1
| |/
* | Merge branch 'remove_group_filter' into 'master'Dmitriy Zaporozhets2014-06-261-29/+0
|\ \
| * | Remove unused group filterMarin Jankovski2014-06-251-29/+0
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-06-261-2/+3
|\ \ \
| * \ \ Merge branch 'small-contributions-no-rebase' into 'master'Sytse Sijbrandij2014-06-251-2/+3
| |\ \ \ | | |_|/ | |/| |
| | * | Document that we don't want pushed commits to be rebased and give a rationale...small-contributions-no-rebaseSytse Sijbrandij2014-06-041-2/+3
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-06-262-5/+7
|\ \ \ \
| * \ \ \ Merge pull request #7190 from Nighoo/gravatar_profile_avatarDmitriy Zaporozhets2014-06-261-4/+6
| |\ \ \ \
| | * | | | do not advertise gravatar in profile if disabledNico Suhl2014-06-241-4/+6
| * | | | | Merge pull request #7197 from jbrooksuk/patch-1Sytse Sijbrandij2014-06-251-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix the PullReview tool linkJames Brooks2014-06-251-1/+1
| |/ / / /
* | | | | Merge branch 'doc/groups' into 'master'Sytse Sijbrandij2014-06-2510-0/+72
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix broken image linkJacob Vosmaer2014-06-251-1/+1
| * | | | Document the basics of working with GroupsJacob Vosmaer2014-06-2510-0/+72
* | | | | Merge branch 'version-file' into 'master'Dmitriy Zaporozhets2014-06-254-0/+36
|\ \ \ \ \
| * | | | | Show VERSION information on project sidebarDmitriy Zaporozhets2014-06-254-0/+36
| | |_|_|/ | |/| | |
* | | | | Merge branch 'remove-ruby-update-guide' into 'master'Sytse Sijbrandij2014-06-252-60/+0
|\ \ \ \ \
| * | | | | remove ruby upgrade guideJob van der Voort2014-06-252-60/+0
|/ / / / /
* | | | | Merge branch 'ruby-update-in-guide' into 'master'Sytse Sijbrandij2014-06-251-6/+38
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | update ruby in update guideJob van der Voort2014-06-251-6/+38
|/ / / /
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-06-251-1/+1
|\ \ \ \
| * \ \ \ Merge pull request #7195 from cirosantilli/patch-1Sytse Sijbrandij2014-06-251-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Typo.Ciro Santilli2014-06-251-1/+1
* | | | | Fix diff comments toggle buttonDmitriy Zaporozhets2014-06-258-12/+20
|/ / / /
* | | | dont render discussion diff unless note is for diffDmitriy Zaporozhets2014-06-252-0/+4
|/ / /
* | | 7.1.0 startedDmitriy Zaporozhets2014-06-242-1/+11
* | | More noticable filter iconsDmitriy Zaporozhets2014-06-241-1/+2
* | | Fix some MR commenting testsDmitriy Zaporozhets2014-06-241-2/+2
* | | Merge branch 'improve-discussions' into 'master'Dmitriy Zaporozhets2014-06-2410-87/+115
|\ \ \