summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* More efficient query for mentionable usersDmitriy Zaporozhets2014-06-041-1/+1
* Prevent a lot of sql queries for ProjectTeam#fetch_members methodDmitriy Zaporozhets2014-06-041-1/+4
* Merge branch 'perforemance-improve' into 'master'Dmitriy Zaporozhets2014-06-044-11/+49
|\
| * Prevent exceptions for methods like ProjectTeam#developer? if no membership e...Dmitriy Zaporozhets2014-06-041-4/+4
| * Improve performance of application for large teamsDmitriy Zaporozhets2014-06-044-11/+49
* | Merge branch 'improve-mr-tabs' into 'master'Dmitriy Zaporozhets2014-06-041-2/+4
|\ \
| * | Make MR tabs look like tabs :)Dmitriy Zaporozhets2014-06-041-2/+4
|/ /
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-06-041-1/+1
|\ \
| * \ Merge branch 'master' into 'master'Sytse Sijbrandij2014-06-041-1/+1
| |\ \ | | |/ | |/|
| | * Fixing typoKaizer Sogiawala2014-06-041-1/+1
* | | Merge branch 'fix-500-on-labels-page' into 'master'Dmitriy Zaporozhets2014-06-041-0/+2
|\ \ \
| * | | Fix 500 error when generate labels on labels page. Fixes #1311Dmitriy Zaporozhets2014-06-041-0/+2
| |/ /
* | | Merge branch 'broadcast-3-digit-colors' into 'master'Dmitriy Zaporozhets2014-06-041-2/+2
|\ \ \ | |/ / |/| |
| * | Allow set broadcast color with 3 digits like #444Dmitriy Zaporozhets2014-06-041-2/+2
|/ /
* | Mention 4.1 rails update in CHANGELOGDmitriy Zaporozhets2014-06-041-0/+1
* | Merge branch 'update/patch_doc' into 'master'Sytse Sijbrandij2014-06-041-4/+4
|\ \ | |/ |/|
| * Update patch release document.Marin Jankovski2014-06-041-4/+4
* | Merge branch 'upgrade_to_rails_4.1' into 'master'Dmitriy Zaporozhets2014-06-0411-75/+216
|\ \ | |/ |/|
| * Rename snippets scopes to plural names.Marin Jankovski2014-06-044-17/+17
| * Update mysql2 gem.Marin Jankovski2014-06-031-1/+1
| * Update jasmine.Marin Jankovski2014-06-032-5/+5
| * Fix the system_hook test.Marin Jankovski2014-06-031-1/+1
| * Add acts-as-taggable-on-patch for gem version 2.4.1 and Rails 4.1.Marin Jankovski2014-06-031-0/+130
| * Remove active_record.auto_explain_treshold_in_seconds, rails 4.0 deprecationMarin Jankovski2014-06-031-4/+0
| * Convert to array since Relation no longer returns an array.Marin Jankovski2014-06-031-1/+1
| * Fix failing submodule test.Marin Jankovski2014-06-031-1/+2
| * Add a state_machine patch for rails 4.1.Marin Jankovski2014-06-031-0/+9
| * Replace snippets scopes in view and controller.Marin Jankovski2014-06-032-11/+11
| * Replace now forbidden keywords public and private for snippets scopeMarin Jankovski2014-06-032-3/+3
| * Bump to Rails 4.1.Marin Jankovski2014-06-032-48/+53
* | Merge pull request #7067 from cirosantilli/doc-md-styleSytse Sijbrandij2014-06-0488-1414/+1352
|\ \
| * | Update docs to markdown style guide.Ciro Santilli2014-06-0388-1414/+1352
|/ /
* | Add some entries to changelogDmitriy Zaporozhets2014-06-031-0/+2
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-06-031-1/+1
|\ \
| * \ Merge pull request #7068 from chino/only-check-ci-status-when-ci-service-enabledDmitriy Zaporozhets2014-06-031-1/+1
| |\ \
| | * | project: ci_service should only catch ci servicesDaniel Aquino2014-06-031-1/+1
* | | | Small spelling correction in the readme.Sytse Sijbrandij2014-06-031-1/+1
|/ / /
* | | Merge branch 'chrome-app' into 'master'Sytse Sijbrandij2014-06-031-1/+1
|\ \ \
| * | | Add chrome app of Go Sueyoshi.Sytse Sijbrandij2014-06-031-1/+1
|/ / /
* | | Merge branch 'same-origin-header' into 'master'Dmitriy Zaporozhets2014-06-032-0/+2
|\ \ \
| * | | Ensure sidekiq is displayed by setting X-Frame-Options.GitLab2014-06-032-0/+2
| * | | Revert "Set x-frame-option to sameorigin to allow the Sidekiq iframe to displ...GitLab2014-06-032-2/+1
| * | | Set x-frame-option to sameorigin to allow the Sidekiq iframe to display.GitLab2014-06-032-1/+2
* | | | Merge branch 'case-insensetive-search' into 'master'Dmitriy Zaporozhets2014-06-031-1/+1
|\ \ \ \
| * | | | Case-insensetive search for issue/mr titleDmitriy Zaporozhets2014-06-031-1/+1
* | | | | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2014-06-031-7/+7
|\ \ \ \ \
| * | | | | Improve green themeDmitriy Zaporozhets2014-06-031-7/+7
| |/ / / /
* | | | | Show events from all projects on user pageDmitriy Zaporozhets2014-06-031-1/+2
|/ / / /
* | | | Merge branch 'remove_artifact' into 'master'Dmitriy Zaporozhets2014-06-032-2/+1
|\ \ \ \
| * | | | Add ch width.Marin Jankovski2014-06-032-1/+1
View Lorry Controller Status