summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-todos' into 'master' Douglas Barbosa Alexandre2016-03-093-2/+6
|\
| * Avoid error 500 when todo author was removedDouglas Barbosa Alexandre2016-03-092-2/+5
| * Destroy all related todos when removing a projectDouglas Barbosa Alexandre2016-03-091-0/+1
* | Merge branch 'snippet-visibility-spacing' into 'master' Jacob Schatz2016-03-091-1/+1
|\ \
| * | Snippet visibility badge spacingsnippet-visibility-spacingPhil Hughes2016-03-081-1/+1
* | | Merge branch 'commit-limits' into 'master' Jacob Vosmaer2016-03-094-6/+26
|\ \ \ | |_|/ |/| |
| * | Prevent performance issuescommit-limitsJacob Vosmaer2016-03-092-2/+2
| * | Change "some commits hidden" messageJacob Vosmaer2016-03-072-2/+2
| * | Finish refactorJacob Vosmaer2016-03-071-1/+1
| * | Remove outdated commentJacob Vosmaer2016-03-041-1/+0
| * | Put 'hidden commits' logic in CommitsHelperJacob Vosmaer2016-03-043-12/+23
| * | Limit the number of commits shown in MRsJacob Vosmaer2016-03-041-1/+11
| * | Show at most 100 commits in the web UIJacob Vosmaer2016-03-041-1/+1
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-03-095-24/+3
|\ \ \
| * \ \ Merge branch 'rs-snippets-dont-expire' into 'master' Dmitriy Zaporozhets2016-03-095-24/+3
| |\ \ \
| | * | | Remove `Snippet#expires_at`rs-snippets-dont-expireRobert Speicher2016-03-055-24/+3
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2016-03-092-2/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'security_bug_fix_close_issue' into 'master' Douwe Maan2016-03-052-2/+6
| |\ \ \ \
| | * | | | Security: Fix issue auto closingValery Sizov2016-03-032-2/+6
* | | | | | Merge branch 'improve-archived-projects'Dmitriy Zaporozhets2016-03-0912-68/+82
|\ \ \ \ \ \
| * | | | | | Updated project list dropdown to use dropdown classesimprove-archived-projectsPhil Hughes2016-03-052-32/+11
| * | | | | | Align projects sort checkboxDmitriy Zaporozhets2016-03-042-1/+22
| * | | | | | Show active sorting method for projects listDmitriy Zaporozhets2016-03-042-21/+26
| * | | | | | Add projects list sort dropdown to group pageDmitriy Zaporozhets2016-03-042-6/+9
| * | | | | | Make projects sort dropdown shared so it can be reused for other pagesDmitriy Zaporozhets2016-03-044-23/+15
| * | | | | | Add option to show archived projects on dahsboardDmitriy Zaporozhets2016-03-044-22/+36
* | | | | | | Merge branch 'branch-tag-count-methods' into 'master' Robert Speicher2016-03-084-11/+46
|\ \ \ \ \ \ \
| * | | | | | | Call after_create_branch in Repository#add_branchbranch-tag-count-methodsYorick Peterse2016-03-081-1/+2
| * | | | | | | Call the right hooks in Repository#add_tagYorick Peterse2016-03-081-1/+2
| * | | | | | | Call the right hooks when removing branchesYorick Peterse2016-03-081-2/+8
| * | | | | | | Cache & flush tag/branch countsYorick Peterse2016-03-084-7/+34
* | | | | | | | Remove instance variable @group multiple assignmentYatish Mehta2016-03-081-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'master' into 'master' Yorick Peterse2016-03-083-0/+23
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | adds test for git push service for updating the language of the projecttiagonbotelho2016-03-071-3/+5
| * | | | | | moves the main_language update logic to git push servicetiagonbotelho2016-03-072-8/+12
| * | | | | | removes automatic setting of main_language to project for it to set a main la...tiagonbotelho2016-03-071-10/+0
| * | | | | | fixes typotiagonbotelho2016-03-071-1/+1
| * | | | | | removes redundant selftiagonbotelho2016-03-071-1/+1
| * | | | | | adds tests and fixes some broken code to main language mrtiagonbotelho2016-03-071-3/+3
| * | | | | | adds swp and swo to gitignore and improves migration for project main_languagetiagonbotelho2016-03-073-6/+18
| * | | | | | removes unused methods that I forgottiagonbotelho2016-03-072-16/+0
| * | | | | | implements project languages saving them onto the databasetiagonbotelho2016-03-072-0/+12
| * | | | | | moves method to repository modeltiagonbotelho2016-03-072-7/+13
| * | | | | | changes if ! to unless and now asks for language instead of languagestiagonbotelho2016-03-071-3/+4
| * | | | | | adds cache to languages listtiagonbotelho2016-03-071-4/+4
| * | | | | | adds language names to projects list github styletiagonbotelho2016-03-072-0/+12
* | | | | | | Merge branch 'cache-raw-2' into 'master' Douwe Maan2016-03-075-1/+30
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Use Rails etag/cache_control helperscache-raw-2Jacob Vosmaer2016-03-071-11/+4
| * | | | | | Refactor caching codeJacob Vosmaer2016-03-074-11/+18
| * | | | | | Revert changes in the Project modelJacob Vosmaer2016-03-071-4/+3