summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Backport Group API code that was added in EE onlybackport-ee-js-groups-apiRémy Coutable2016-10-317-16/+33
* Merge branch 'issue_23951' into 'master' Sean McGivern2016-10-313-1/+22
|\
| * Fix builds tab visibilityissue_23951Felipe Artur2016-10-313-1/+22
* | Merge branch 'add-retry-limit-project-webhook'Douwe Maan2016-10-311-0/+2
|\ \
| * \ Merge branch 'master' into 'add-retry-limit-project-webhook'add-retry-limit-project-webhookDouwe Maan2016-10-31660-2589/+7446
| |\ \ | |/ / |/| |
* | | Merge branch '22271-drone-tag-pipeline-build' into 'master' Douwe Maan2016-10-3118-87/+161
|\ \ \
| * | | Fix lightweight tags not processed correctly by GitTagPushService22271-drone-tag-pipeline-buildAlejandro Rodríguez2016-10-2818-87/+161
* | | | Merge branch '23106-events-default-scope-results-in-a-slow-query' into 'master' Yorick Peterse2016-10-315-5/+6
|\ \ \ \
| * | | | Optimize Event queries by removing default order23106-events-default-scope-results-in-a-slow-queryAlejandro Rodríguez2016-10-275-5/+6
* | | | | Merge branch 'lfs_object_removal' into 'master' Sean McGivern2016-10-310-0/+0
|\ \ \ \ \
* \ \ \ \ \ Merge branch 'lfs_object_removal' into 'master' 23858-task-listsSean McGivern2016-10-315-0/+73
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Remove unreferenced LFS objects from DB and fsFrank Groeneveld2016-10-285-0/+73
* | | | | | Merge branch 'dz-bump-gitlab-shell' into 'master' Dmitriy Zaporozhets2016-10-311-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Bump gitlab-shell version to 4.0.0dz-bump-gitlab-shellDmitriy Zaporozhets2016-10-311-1/+1
|/ / / / /
* | | | | Merge branch 'patch-4' into 'master' Sean McGivern2016-10-311-4/+4
|\ \ \ \ \
| * | | | | improve docs on gitlab-ci-token userBen Bodenmiller2016-09-211-4/+4
* | | | | | Merge branch 'fix-teaspoon-task' into 'master' Rémy Coutable2016-10-311-18/+20
|\ \ \ \ \ \
| * | | | | | Ignore teaspoon tasks in production environmentwinniehell2016-10-291-18/+20
* | | | | | | Merge branch 'sticky-mr-tabs-pinned-nav' into 'master' Fatih Acet2016-10-282-0/+13
|\ \ \ \ \ \ \
| * | | | | | | Fixed sticky MR tabs positioning when sidebar is pinnedsticky-mr-tabs-pinned-navPhil Hughes2016-10-292-0/+13
| |/ / / / / /
* | | | | | | Merge branch 'dropdown-input-fix' into 'master' Fatih Acet2016-10-283-17/+73
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Do not allow text input in dropdown while loadingIdo Leibovich2016-10-283-17/+73
* | | | | | | Merge branch '23849-pipeline-graph-bug' into 'master' Fatih Acet2016-10-281-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Only remove right connector of first build of last stage23849-pipeline-graph-bugAnnabel Dunstone Gray2016-10-281-2/+1
* | | | | | | | Merge branch 'dz-internal-api-fullpath' into 'master' Dmitriy Zaporozhets2016-10-283-4/+33
|\ \ \ \ \ \ \ \
| * | | | | | | | Refactor storage path extraction from full repo pathdz-internal-api-fullpathDmitriy Zaporozhets2016-10-283-6/+25
| * | | | | | | | Make internal api work with full repo path instead of nameDmitriy Zaporozhets2016-10-271-4/+14
* | | | | | | | | Merge branch 'cycle-analytics-bundle' into 'master' Fatih Acet2016-10-284-0/+6
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | CHANGELOG itemcycle-analytics-bundlePhil Hughes2016-10-281-0/+1
| * | | | | | | | Create cycle analytics bundlePhil Hughes2016-10-283-0/+5
* | | | | | | | | Merge branch '22392-add-x-of-y-tasks-completed-on-issuable' into 'master' Sean McGivern2016-10-2811-8/+42
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add "x of y tasks completed" on issuableGuilherme Salazar2016-10-2811-8/+42
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-8-13-changelog-gh-import' into 'master' Rémy Coutable2016-10-281-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix CHANGELOG for GH import fixesfix-8-13-changelog-gh-importSean McGivern2016-10-281-3/+3
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ee-1159-allow-permission-check-bypass-in-approve-access-request...Stan Hu2016-10-282-11/+73
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Allow Members::ApproveAccessRequestService to accept a new :force paramee-1159-allow-permission-check-bypass-in-approve-access-request-serviceRémy Coutable2016-10-282-11/+73
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch '23872-members-of-group-that-has-project-access-getting-404-on-a...Rémy Coutable2016-10-282-8/+195
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Add specs for a user from a group link23872-members-of-group-that-has-project-access-getting-404-on-accessing-a-project-issueSean McGivern2016-10-281-0/+30
| * | | | | | | Fix project member access for group linksSean McGivern2016-10-282-8/+165
| |/ / / / / /
* | | | | | | Merge branch 'adam-fix-labels-find-or-create' into 'master' Douwe Maan2016-10-2810-46/+70
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Pass user instance to Labels::FindOrCreateService or skip_authorization: trueadam-fix-labels-find-or-createAdam Niedzielski2016-10-2810-46/+70
| |/ / / / /
* | | | | | Merge branch 'use-optimistic-locking' into 'master' Stan Hu2016-10-2814-49/+122
|\ \ \ \ \ \
| * | | | | | Make retry_lock to not be infiniteuse-optimistic-lockingKamil Trzcinski2016-10-273-5/+20
| * | | | | | Fix Rubocop unused variables warningStan Hu2016-10-261-2/+2
| * | | | | | Remove puts to solve Rubocop errorsStan Hu2016-10-261-2/+0
| * | | | | | Fix duration specsKamil Trzcinski2016-10-261-14/+7
| * | | | | | Fix optimistic lockingKamil Trzcinski2016-10-267-16/+27
| * | | | | | Add tests for optimistic lockingKamil Trzcinski2016-10-265-7/+38
| * | | | | | Use optimistic lockingKamil Trzcinski2016-10-266-25/+50
* | | | | | | Merge branch 'issue-board-welcome-cookie-monster' into 'master' Robert Speicher2016-10-284-2/+9
|\ \ \ \ \ \ \