summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ignore .byebug_historyignore-byebug-historyZeger-Jan van de Weg2016-03-091-0/+1
* Merge branch 'fix-todos' into 'master' Douglas Barbosa Alexandre2016-03-097-3/+28
|\
| * Update CHANGELOGDouglas Barbosa Alexandre2016-03-091-1/+2
| * Avoid error 500 when todo author was removedDouglas Barbosa Alexandre2016-03-092-2/+5
| * Update CHANGELOGDouglas Barbosa Alexandre2016-03-091-0/+3
| * Remove invalid todos from databaseDouglas Barbosa Alexandre2016-03-092-1/+17
| * Destroy all related todos when removing a projectDouglas Barbosa Alexandre2016-03-092-0/+2
* | 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 'rs-bump-poltergeist' into 'master' Dmitriy Zaporozhets2016-03-092-3/+3
|\ \ \ \
| * | | | Bump poltergeist to `~> 1.9.0`rs-bump-poltergeistRobert Speicher2016-03-072-3/+3
* | | | | Merge branch 'retry-tests' into 'master' Kamil Trzciński2016-03-098-36/+83
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix script errorKamil Trzcinski2016-03-091-1/+1
| * | | | Retry apt-get installation and bundle installKamil Trzcinski2016-03-092-8/+20
| * | | | Retry spinach testsKamil Trzcinski2016-03-095-28/+53
| * | | | Retry failed testsKamil Trzcinski2016-03-094-0/+10
|/ / / /
* | | | Merge branch 'iurisilvio/gitlab-ce-bitbucket_closed' into 'master' Rémy Coutable2016-03-093-1/+90
|\ \ \ \
| * | | | Fix bug where Bitbucket `closed` issues were imported as `opened`iurisilvio/gitlab-ce-bitbucket_closedIuri de Silvio2016-03-073-1/+90
| |/ / /
* | | | Merge branch 'update-db-schema' into 'master' Yorick Peterse2016-03-091-0/+1
|\ \ \ \
| * | | | Added main_language to the schemaYorick Peterse2016-03-091-0/+1
|/ / / /
* | | | Merge branch 'fix/upgrader-docs' into 'master' Achilleas Pipinellis2016-03-091-1/+1
|\ \ \ \
| * | | | Fix URL to upgrader guideJonas Friedmann2016-03-091-1/+1
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-03-0921-69/+42
|\ \ \ \ \
| * \ \ \ \ Merge branch 'rs-traits-are-good' into 'master' Dmitriy Zaporozhets2016-03-098-36/+32
| |\ \ \ \ \
| | * | | | | Make better use of the `visibility_level` factory traitsrs-traits-are-goodRobert Speicher2016-03-085-20/+19
| | * | | | | Simplify the various Snippet factoriesRobert Speicher2016-03-083-16/+13
| * | | | | | Merge branch 'rs-snippets-dont-expire' into 'master' Dmitriy Zaporozhets2016-03-0913-33/+10
| |\ \ \ \ \ \
| | * | | | | | Remove `Snippet#expires_at`rs-snippets-dont-expireRobert Speicher2016-03-0513-33/+10
* | | | | | | | 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-0916-69/+93
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Updated project list dropdown to use dropdown classesimprove-archived-projectsPhil Hughes2016-03-052-32/+11
| * | | | | | | | Align projects sort checkboxDmitriy Zaporozhets2016-03-042-1/+22
| * | | | | | | | Fix testDmitriy Zaporozhets2016-03-041-1/+1
| * | | | | | | | Show active sorting method for projects listDmitriy Zaporozhets2016-03-042-21/+26
| * | | | | | | | Add test for archive toggle featureDmitriy Zaporozhets2016-03-043-0/+10
| * | | | | | | | 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-086-14/+155
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Call after_create_branch in Repository#add_branchbranch-tag-count-methodsYorick Peterse2016-03-082-1/+8