summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* updated changelogfix/import-issues-last-updatedJames Lopez2016-07-141-0/+1
|
* fixed similar issue with gitlab.com importer because why not!James Lopez2016-07-141-25/+28
|
* fix updated_at not preserved after import - for GitLab projectsJames Lopez2016-07-142-1/+12
|
* Merge branch 'mrchrisw/oauth-callback' into 'master' Achilleas Pipinellis2016-07-141-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include default callback URL (OAuth) ## What does this MR do? Adds information on the OAuth callback URL ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? This information was missing. ## What are the relevant issue numbers? http://www.twitter.com/designingcode/status/753511397124866049 ## Does this MR meet the acceptance criteria? - [X ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) See merge request !5246
| * Include default callback URL (OAuth)Chris Wilson2016-07-141-1/+2
|/
* Merge branch 'fix-label-reference-filter' into 'master' Robert Speicher2016-07-133-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-filterDouglas Barbosa Alexandre2016-07-131-1/+1
| |
| * Update CHANGELOGDouglas Barbosa Alexandre2016-07-131-0/+1
| |
| * Doesn't match empty label references surrounded in quotesDouglas Barbosa Alexandre2016-07-131-1/+1
| |
| * Fix markdown rendering for label references that contains `.`Douglas Barbosa Alexandre2016-07-132-15/+15
| |
| * Fix markdown rendering for label references that begin with a digitDouglas Barbosa Alexandre2016-07-132-1/+52
| |
| * Fix markdown rendering for consecutive label referencesDouglas Barbosa Alexandre2016-07-132-1/+41
| |
* | Merge branch 'rails-4-2-7' into 'master' Robert Speicher2016-07-133-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 Shea2016-07-133-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 Speicher2016-07-1335-507/+303
|/ / | | | | | | | | This reverts commit 9ca633eb4c62231e4ddff5466c723cf8e2bdb25d, reversing changes made to fb229bbf7970ba908962b837b270adf56f14098f.
* | Merge branch 'better-parallel-diff' into 'master' Robert Speicher2016-07-133-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-diffDouwe Maan2016-07-134-103/+65
| | |
* | | Merge branch 'dropdown-load-fix' into 'master' Douwe Maan2016-07-136-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 properlytiagonbotelho2016-07-131-1/+2
| | | |
| * | | deletes swn filetiagonbotelho2016-07-131-0/+0
| | | |
| * | | removes redundant filter_branches filetiagonbotelho2016-07-121-8/+0
| | | |
| * | | fixes test for simplified version of projecttiagonbotelho2016-07-122-1/+9
| | | |
| * | | fixes test according to four-phase test patterntiagonbotelho2016-07-122-0/+1
| | | |
| * | | removes basicprojectwithaccess and replaces it with basicprojectdetailstiagonbotelho2016-07-123-9/+1
| | | |
| * | | Merge branch 'dropdown-load-fix' of gitlab.com:tiagonbotelho/gitlab-ce into ↵tiagonbotelho2016-07-120-0/+0
| |\ \ \ | | | | | | | | | | | | | | | dropdown-load-fix
| | * | | changes string to symbol in paramtiagonbotelho2016-07-121-1/+1
| | | | |
| | * | | moves let variable to it statement by using a local variabletiagonbotelho2016-07-111-2/+2
| | | | |
| | * | | adds test to check json fields on simple request and changes the url request ↵tiagonbotelho2016-07-115-4/+13
| | | | | | | | | | | | | | | | | | | | format
| | * | | removes gemfile.lock dotfilestiagonbotelho2016-07-082-0/+0
| | | | |
| | * | | fixes missing field on basicprojectdetailstiagonbotelho2016-07-084-0/+2
| | | | |
| | * | | changes the project_title_spec accordinglytiagonbotelho2016-07-081-1/+1
| | | | |
| | * | | changes the usage of simpleprojectdetails to already implemented ↵tiagonbotelho2016-07-083-20/+7
| | | | | | | | | | | | | | | | | | | | basicprojectsdetails and changes the url to a more reader friendly format
| | * | | adds entry to changelogtiagonbotelho2016-07-071-0/+1
| | | | |
| | * | | removes debugging printtiagonbotelho2016-07-071-1/+0
| | | | |
| | * | | gets the new object through /simple endpoint and renders on the dropdowntiagonbotelho2016-07-072-1/+2
| | | | |
| | * | | adds basic functionality to the new endpoint of the apitiagonbotelho2016-07-063-21/+25
| | | | |
| | * | | implements filter_paramstiagonbotelho2016-07-063-0/+21
| | | | |
| * | | | adds test to check json fields on simple request and changes the url request ↵tiagonbotelho2016-07-122-2/+0
| | | | | | | | | | | | | | | | | | | | format
| * | | | removes gemfile.lock dotfilestiagonbotelho2016-07-122-0/+0
| | | | |
| * | | | fixes missing field on basicprojectdetailstiagonbotelho2016-07-123-0/+1
| | | | |
| * | | | changes the project_title_spec accordinglytiagonbotelho2016-07-121-0/+1
| | | | |
| * | | | changes the usage of simpleprojectdetails to already implemented ↵tiagonbotelho2016-07-122-17/+0
| | | | | | | | | | | | | | | | | | | | basicprojectsdetails and changes the url to a more reader friendly format
| * | | | removes debugging printtiagonbotelho2016-07-121-1/+0
| | | | |
| * | | | gets the new object through /simple endpoint and renders on the dropdowntiagonbotelho2016-07-121-0/+1
| | | | |
| * | | | adds basic functionality to the new endpoint of the apitiagonbotelho2016-07-123-19/+17
| | | | |
| * | | | implements filter_paramstiagonbotelho2016-07-122-0/+19
| | | | |
| * | | | changes string to symbol in paramtiagonbotelho2016-07-121-1/+1
| | | | |
| * | | | moves let variable to it statement by using a local variabletiagonbotelho2016-07-121-2/+2
| | | | |
| * | | | adds test to check json fields on simple request and changes the url request ↵tiagonbotelho2016-07-125-4/+13
| | | | | | | | | | | | | | | | | | | | format
| * | | | removes gemfile.lock dotfilestiagonbotelho2016-07-122-0/+0
| | | | |
View Lorry Controller Status