| Commit message (Expand) | Author | Age | Files | Lines |
* | Make retry_lock to not be infiniteuse-optimistic-locking | Kamil Trzcinski | 2016-10-27 | 1 | -3/+7 |
* | Add tests for optimistic locking | Kamil Trzcinski | 2016-10-26 | 1 | -5/+7 |
* | Use optimistic locking | Kamil Trzcinski | 2016-10-26 | 1 | -0/+13 |
* | Merge branch 'fix-events-api' into 'master'
| Rémy Coutable | 2016-10-25 | 1 | -2/+2 |
|\ |
|
| * | Get rid of extra .page call | Airat Shigapov | 2016-10-24 | 1 | -2/+1 |
| * | Fix events order in user contributions API | Airat Shigapov | 2016-10-24 | 1 | -1/+2 |
* | | Don't schedule ProjectCacheWorker unless neededproject-cache-worker-scheduling | Yorick Peterse | 2016-10-25 | 1 | -1/+8 |
* | | Merge branch '23372-fix-ce-to-ee-merge-check-task' into 'master'
| Robert Speicher | 2016-10-25 | 4 | -101/+277 |
|\ \ |
|
| * | | Disable Rails/Output cop since it makes no sense here23372-fix-ce-to-ee-merge-check-task | Rémy Coutable | 2016-10-24 | 1 | -0/+1 |
| * | | Use File.write instead of File.open + File#write | Rémy Coutable | 2016-10-24 | 1 | -1/+1 |
| * | | Don't print out implementation detail step | Rémy Coutable | 2016-10-24 | 1 | -1/+1 |
| * | | Change the approach to check if patches apply cleanly | Rémy Coutable | 2016-10-21 | 4 | -101/+276 |
* | | | Escape ref and path for relative links (!6050) | winniehell | 2016-10-24 | 1 | -2/+2 |
| |/
|/| |
|
* | | Merge branch 'grapify-labels-api' into 'master'
| Rémy Coutable | 2016-10-24 | 1 | -53/+38 |
|\ \ |
|
| * | | Grapify the labels APIgrapify-labels-api | Robert Schilling | 2016-10-24 | 1 | -53/+38 |
* | | | Merge branch 'grapify-builds-api' into 'master'
| Rémy Coutable | 2016-10-24 | 1 | -83/+79 |
|\ \ \ |
|
| * | | | Grapify builds APIgrapify-builds-api | Robert Schilling | 2016-10-24 | 1 | -83/+79 |
| |/ / |
|
* | | | Added path parameter to Commits API | Luis HGO | 2016-10-24 | 1 | -0/+2 |
* | | | Merge branch '21513-fix-branch-protection-api' into 'master'
| Douwe Maan | 2016-10-24 | 1 | -33/+15 |
|\ \ \ |
|
| * | | | Implement second round of review comments from @DouweM. | Timothy Andrew | 2016-10-24 | 1 | -6/+3 |
| * | | | Implement review comments from @DouweM. | Timothy Andrew | 2016-10-24 | 1 | -2/+2 |
| * | | | Fix branch protection API. | Timothy Andrew | 2016-10-24 | 1 | -31/+16 |
| |/ / |
|
* | | | Add relative url support to routing contrainers | Dmitriy Zaporozhets | 2016-10-24 | 1 | -1/+12 |
|/ / |
|
* | | Merge branch 'sh-fix-broken-label-controller' into 'master'
| Rémy Coutable | 2016-10-22 | 1 | -1/+1 |
|\ \ |
|
| * | | Fix error in generating labelssh-fix-broken-label-controller | Stan Hu | 2016-10-22 | 1 | -1/+1 |
| |/ |
|
* | | Merge branch '23653-dont-clear-db-cache-every-release' into 'master'
| Yorick Peterse | 2016-10-22 | 1 | -1/+1 |
|\ \ |
|
| * | | Stop clearing the database cache on rake cache:clear | Nick Thomas | 2016-10-22 | 1 | -1/+1 |
| |/ |
|
* | | Fix documents and comments on Build API `scope`. #23146 #19131 | Lemures Lemniscati | 2016-10-22 | 1 | -2/+2 |
|/ |
|
* | Merge branch '12622-backup-restore-doesn-t-clear-cache-resulting-in-missing-b... | Valery Sizov | 2016-10-21 | 1 | -0/+2 |
|\ |
|
| * | Fix: Backup restore doesn't clear cache12622-backup-restore-doesn-t-clear-cache-resulting-in-missing-branches-and-tags | Valery Sizov | 2016-10-20 | 1 | -0/+2 |
* | | Don't use Hash#slice since it's not supported in Ruby 2.1fix-ruby-2-1-failures | Rémy Coutable | 2016-10-20 | 1 | -3/+8 |
* | | Merge remote-tracking branch 'upstream/master' into preserve-note_type-and-po...preserve-note_type-and-position | Lin Jen-Shin | 2016-10-20 | 2 | -7/+10 |
|\ \
| |/ |
|
| * | Merge branch 'refactoring_find_commits_method' into 'master'
| Sean McGivern | 2016-10-20 | 1 | -5/+1 |
| |\ |
|
| | * | Refactoring find_commits functionality | Valery Sizov | 2016-10-20 | 1 | -5/+1 |
| * | | Differentiate the expire from leave event | Callum Dryden | 2016-10-20 | 1 | -2/+9 |
* | | | Preserve note_type and position for notes from emails | Lin Jen-Shin | 2016-10-20 | 1 | -1/+3 |
|/ / |
|
* | | Merge branch 'feature/group-level-labels' into 'master'
| Douwe Maan | 2016-10-19 | 16 | -81/+160 |
|\ \ |
|
| * | | Use LabelsFinder on Fogbuz importer | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -1/+2 |
| * | | Use LabelsFinder on Google Code importer | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -1/+2 |
| * | | Rename Labels::CreateService to Labels::FindOrCreateService | Douglas Barbosa Alexandre | 2016-10-19 | 4 | -4/+4 |
| * | | Update specs to cope with new label types and priorities | James Lopez | 2016-10-19 | 4 | -12/+27 |
| * | | Fix GitHub importer spec | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -1/+4 |
| * | | User Labes::CreateService to create labels | Douglas Barbosa Alexandre | 2016-10-19 | 4 | -9/+10 |
| * | | Reuse LabelsFinder on Banzai::Filter::LabelReferenceFilter | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -7/+1 |
| * | | Remove Issuable#add_labels_by_names | Douglas Barbosa Alexandre | 2016-10-19 | 2 | -26/+18 |
| * | | List all available labels to the project on the labels API | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -1/+1 |
| * | | Add support to group labels on issues board API | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -2/+2 |
| * | | Validate label params against all labels available to project on the API | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -10/+9 |
| * | | Move label management to services on merge requests API | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -11/+4 |
| * | | Keep cross project reference logic in GroupLabel#to_reference | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -9/+1 |