summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Move gitlab-ssl nginx config from gitlab-recipesgitlab-ssl-nginxAchilleas Pipinellis2014-06-051-0/+164
|
* Merge branch 'milestone-mr-dragging' into 'master'Dmitriy Zaporozhets2014-06-054-19/+56
|\ | | | | | | | | | | Milestone merge request dragging This is part of #1207.
| * Merge request drag-n-drop on milestone pageDmitriy Zaporozhets2014-06-054-19/+56
| | | | | | | | | | | | | | Allows moving milestone between 3 columns: unassigned, assigned, declined Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'ruby2.1' into 'master'Dmitriy Zaporozhets2014-06-052-3/+4
|\ \ | |/ |/| | | | | | | Ruby2.1 Fixed #1075
| * Support Ruby 2.1 and better explain the memory requirements.Sytse Sijbrandij2014-06-052-3/+4
| |
* | Merge pull request #7077 from bbodenmiller/patch-2Dmitriy Zaporozhets2014-06-051-4/+3
|\ \ | | | | | | improve no projects screen
| * | improve no projects screenBen Bodenmiller2014-06-041-4/+3
| | | | | | | | | | | | | | | * correct odd capitalization pattern in tagline * remove "click on button" statement as telling a user to click something is not a good web development practice * add missing period for consistency
* | | Merge branch 'milestone-issues-dragging' into 'master'Dmitriy Zaporozhets2014-06-0511-19/+81
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Milestone issues dragging This is part of #1207. I will submit this feature with small but finished merge requests.
| * | Milestone drag-n-drop with 3 columnsDmitriy Zaporozhets2014-06-052-10/+9
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix testsDmitriy Zaporozhets2014-06-042-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add reopened tab to milestone issues. Add ids and data to milestone issues ↵Dmitriy Zaporozhets2014-06-046-20/+35
| | | | | | | | | | | | | | | | | | to enable dragging Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add js milestone class. Activate drag-drop for issues on milestone pageDmitriy Zaporozhets2014-06-042-0/+42
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add only open/reopen scopes to issuesDmitriy Zaporozhets2014-06-041-0/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add current_user_id to gon varsDmitriy Zaporozhets2014-06-041-1/+5
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix help page UIDmitriy Zaporozhets2014-06-052-9/+11
| |/ |/| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'performance-improve' into 'master'Dmitriy Zaporozhets2014-06-042-2/+5
|\ \ | |/ |/| | | | | | | | | More performance improvements for large groups * fetch team members using much less sql queries * collect mentioned users without iterating over all project users
| * More efficient query for mentionable usersDmitriy Zaporozhets2014-06-041-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Prevent a lot of sql queries for ProjectTeam#fetch_members methodDmitriy Zaporozhets2014-06-041-1/+4
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'perforemance-improve' into 'master'Dmitriy Zaporozhets2014-06-044-11/+49
|\ | | | | | | | | | | | | | | Performance improve Fixes #1315. For group with 500 users it reduce amount of sql queries from 500 to 20. It reduces page load ~ 3 times or even more. For larger group it will be even more difference
| * Prevent exceptions for methods like ProjectTeam#developer? if no membership ↵Dmitriy Zaporozhets2014-06-041-4/+4
| | | | | | | | | | | | exists Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Improve performance of application for large teamsDmitriy Zaporozhets2014-06-044-11/+49
| | | | | | | | | | | | | | This commit fixes a lot of sql queries to db for for groups and projects with big amount of members. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'improve-mr-tabs' into 'master'Dmitriy Zaporozhets2014-06-041-2/+4
|\ \ | | | | | | | | | | | | | | | Improve MR tabs UI/UX ![Screenshot 2014-06-04 12.29.19](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/b75785b28f/Screenshot_2014-06-04_12.29.19.png)
| * | Make MR tabs look like tabs :)Dmitriy Zaporozhets2014-06-041-2/+4
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | 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 typo in help for public access Fixing a typo in the help page
| | * Fixing typoKaizer Sogiawala2014-06-041-1/+1
| | |
* | | Merge branch 'fix-500-on-labels-page' into 'master'Dmitriy Zaporozhets2014-06-041-0/+2
|\ \ \ | | | | | | | | | | | | Fix 500 on labels page
| * | | Fix 500 error when generate labels on labels page. Fixes #1311Dmitriy Zaporozhets2014-06-041-0/+2
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'broadcast-3-digit-colors' into 'master'Dmitriy Zaporozhets2014-06-041-2/+2
|\ \ \ | |/ / |/| | | | | Broadcast 3 digit colors
| * | Allow set broadcast color with 3 digits like #444Dmitriy Zaporozhets2014-06-041-2/+2
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Mention 4.1 rails update in CHANGELOGDmitriy Zaporozhets2014-06-041-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'update/patch_doc' into 'master'Sytse Sijbrandij2014-06-041-4/+4
|\ \ | |/ |/| | | Update patch release document
| * 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
|\ \ | |/ |/| | | Upgrade to rails 4.1
| * 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 match new markdown style guide 2
| * | Update docs to markdown style guide.Ciro Santilli2014-06-0388-1414/+1352
|/ /
* | Add some entries to changelogDmitriy Zaporozhets2014-06-031-0/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-06-031-1/+1
|\ \
View Lorry Controller Status