Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | added changelogfix/ee-to-ce-import | James Lopez | 2016-07-14 | 1 | -0/+1 |
| | |||||
* | fix EE => CE project import, and updated JSON spec | James Lopez | 2016-07-14 | 2 | -2/+7 |
| | |||||
* | Merge branch 'fix-label-reference-filter' into 'master' | Robert Speicher | 2016-07-13 | 3 | -14/+106 |
|\ | | | | | | | | | | | | | Fix markdown rendering for label references Fixes #14424, #19753, #19760 See merge request !5224 | ||||
| * | Simplify regex for string-based multi-word label surrounded in quotesfix-label-reference-filter | Douglas Barbosa Alexandre | 2016-07-13 | 1 | -1/+1 |
| | | |||||
| * | Update CHANGELOG | Douglas Barbosa Alexandre | 2016-07-13 | 1 | -0/+1 |
| | | |||||
| * | Doesn't match empty label references surrounded in quotes | Douglas Barbosa Alexandre | 2016-07-13 | 1 | -1/+1 |
| | | |||||
| * | Fix markdown rendering for label references that contains `.` | Douglas Barbosa Alexandre | 2016-07-13 | 2 | -15/+15 |
| | | |||||
| * | Fix markdown rendering for label references that begin with a digit | Douglas Barbosa Alexandre | 2016-07-13 | 2 | -1/+52 |
| | | |||||
| * | Fix markdown rendering for consecutive label references | Douglas Barbosa Alexandre | 2016-07-13 | 2 | -1/+41 |
| | | |||||
* | | Merge branch 'rails-4-2-7' into 'master' | Robert Speicher | 2016-07-13 | 3 | -32/+33 |
|\ \ | | | | | | | | | | | | | | | | | | | Upgrade Rails from 4.2.6 to 4.2.7. Primarily just bug fixes. See merge request !5236 | ||||
| * | | Upgrade Rails from 4.2.6 to 4.2.7. | Connor Shea | 2016-07-13 | 3 | -32/+33 |
| | | | | | | | | | | | | | | | | | | Primarily just bug fixes. Changelog: https://github.com/rails/rails/compare/v4.2.6...v4.2.7 | ||||
* | | | Revert "Merge branch '18193-developers-can-merge' into 'master' " | Robert Speicher | 2016-07-13 | 35 | -507/+303 |
|/ / | | | | | | | | | This reverts commit 9ca633eb4c62231e4ddff5466c723cf8e2bdb25d, reversing changes made to fb229bbf7970ba908962b837b270adf56f14098f. | ||||
* | | Merge branch 'better-parallel-diff' into 'master' | Robert Speicher | 2016-07-13 | 3 | -101/+63 |
|\ \ | | | | | | | | | | | | | Actually render old and new sections of parallel diff next to each other See merge request !5173 | ||||
| * | | Actually render old and new sections of parallel diff next to each otherbetter-parallel-diff | Douwe Maan | 2016-07-13 | 4 | -103/+65 |
| | | | |||||
* | | | Merge branch 'dropdown-load-fix' into 'master' | Douwe Maan | 2016-07-13 | 6 | -3/+21 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dropdown loading time preformance fix ## What does this MR do? Optimizes the performance of the dropdown load time by just sending the required data to load the dropdown instead of the full object This MR aims to fix #17474 See merge request !5113 | ||||
| * | | | formats my test properly | tiagonbotelho | 2016-07-13 | 1 | -1/+2 |
| | | | | |||||
| * | | | deletes swn file | tiagonbotelho | 2016-07-13 | 1 | -0/+0 |
| | | | | |||||
| * | | | removes redundant filter_branches file | tiagonbotelho | 2016-07-12 | 1 | -8/+0 |
| | | | | |||||
| * | | | fixes test for simplified version of project | tiagonbotelho | 2016-07-12 | 2 | -1/+9 |
| | | | | |||||
| * | | | fixes test according to four-phase test pattern | tiagonbotelho | 2016-07-12 | 2 | -0/+1 |
| | | | | |||||
| * | | | removes basicprojectwithaccess and replaces it with basicprojectdetails | tiagonbotelho | 2016-07-12 | 3 | -9/+1 |
| | | | | |||||
| * | | | Merge branch 'dropdown-load-fix' of gitlab.com:tiagonbotelho/gitlab-ce into ↵ | tiagonbotelho | 2016-07-12 | 0 | -0/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | dropdown-load-fix | ||||
| | * | | | changes string to symbol in param | tiagonbotelho | 2016-07-12 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | moves let variable to it statement by using a local variable | tiagonbotelho | 2016-07-11 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | adds test to check json fields on simple request and changes the url request ↵ | tiagonbotelho | 2016-07-11 | 5 | -4/+13 |
| | | | | | | | | | | | | | | | | | | | | format | ||||
| | * | | | removes gemfile.lock dotfiles | tiagonbotelho | 2016-07-08 | 2 | -0/+0 |
| | | | | | |||||
| | * | | | fixes missing field on basicprojectdetails | tiagonbotelho | 2016-07-08 | 4 | -0/+2 |
| | | | | | |||||
| | * | | | changes the project_title_spec accordingly | tiagonbotelho | 2016-07-08 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | changes the usage of simpleprojectdetails to already implemented ↵ | tiagonbotelho | 2016-07-08 | 3 | -20/+7 |
| | | | | | | | | | | | | | | | | | | | | basicprojectsdetails and changes the url to a more reader friendly format | ||||
| | * | | | adds entry to changelog | tiagonbotelho | 2016-07-07 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | removes debugging print | tiagonbotelho | 2016-07-07 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | gets the new object through /simple endpoint and renders on the dropdown | tiagonbotelho | 2016-07-07 | 2 | -1/+2 |
| | | | | | |||||
| | * | | | adds basic functionality to the new endpoint of the api | tiagonbotelho | 2016-07-06 | 3 | -21/+25 |
| | | | | | |||||
| | * | | | implements filter_params | tiagonbotelho | 2016-07-06 | 3 | -0/+21 |
| | | | | | |||||
| * | | | | adds test to check json fields on simple request and changes the url request ↵ | tiagonbotelho | 2016-07-12 | 2 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | format | ||||
| * | | | | removes gemfile.lock dotfiles | tiagonbotelho | 2016-07-12 | 2 | -0/+0 |
| | | | | | |||||
| * | | | | fixes missing field on basicprojectdetails | tiagonbotelho | 2016-07-12 | 3 | -0/+1 |
| | | | | | |||||
| * | | | | changes the project_title_spec accordingly | tiagonbotelho | 2016-07-12 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | changes the usage of simpleprojectdetails to already implemented ↵ | tiagonbotelho | 2016-07-12 | 2 | -17/+0 |
| | | | | | | | | | | | | | | | | | | | | basicprojectsdetails and changes the url to a more reader friendly format | ||||
| * | | | | removes debugging print | tiagonbotelho | 2016-07-12 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | gets the new object through /simple endpoint and renders on the dropdown | tiagonbotelho | 2016-07-12 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | adds basic functionality to the new endpoint of the api | tiagonbotelho | 2016-07-12 | 3 | -19/+17 |
| | | | | | |||||
| * | | | | implements filter_params | tiagonbotelho | 2016-07-12 | 2 | -0/+19 |
| | | | | | |||||
| * | | | | changes string to symbol in param | tiagonbotelho | 2016-07-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | moves let variable to it statement by using a local variable | tiagonbotelho | 2016-07-12 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | adds test to check json fields on simple request and changes the url request ↵ | tiagonbotelho | 2016-07-12 | 5 | -4/+13 |
| | | | | | | | | | | | | | | | | | | | | format | ||||
| * | | | | removes gemfile.lock dotfiles | tiagonbotelho | 2016-07-12 | 2 | -0/+0 |
| | | | | | |||||
| * | | | | fixes missing field on basicprojectdetails | tiagonbotelho | 2016-07-12 | 4 | -0/+2 |
| | | | | | |||||
| * | | | | changes the project_title_spec accordingly | tiagonbotelho | 2016-07-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | changes the usage of simpleprojectdetails to already implemented ↵ | tiagonbotelho | 2016-07-12 | 3 | -20/+7 |
| | | | | | | | | | | | | | | | | | | | | basicprojectsdetails and changes the url to a more reader friendly format |