summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-backup-raketask' into 'master'Timothy Andrew2017-05-231-1/+5
* Resolve migration helper conflictsmr-11396-conflictsBob Van Landuyt2017-05-221-13/+0
* [ci skip] Conflicts while picking !11396 into 9-2-stableYorick Peterse2017-05-221-0/+18
* Merge branch '9-2-stable-fix-conflicts-for-mr-11298' into '9-2-stable'Douwe Maan2017-05-191-8/+34
|\
| * Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master'Douwe Maan2017-05-191-8/+34
* | Merge branch 'disable-usage-ping' into 'master'Robert Speicher2017-05-191-0/+1
* | Merge branch 'remove-services-count-from-usage-ping-data' into 'master'Stan Hu2017-05-191-1/+0
|/
* Merge branch 'fixes_for_multiple_issue_assignees' into 'master' Sean McGivern2017-05-191-4/+4
* Merge branch 'bvl-fix-incorrectly-renamed-routes' into 'master'Douwe Maan2017-05-193-1/+16
* Merge branch 'dm-catch-uri-errors' into 'master'Robert Speicher2017-05-191-1/+1
* Merge branch 'reenable-gitaly-ref-name' into 'master'Robert Speicher2017-05-182-14/+14
* Merge branch 'dm-no-conflicts-when-branches-are-missing-9-2' into '9-2-stable'Regis Boudinot2017-05-191-1/+1
|\
| * Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missing-9-2Douwe Maan2017-05-181-1/+1
* | Gitaly reuse stubsAndrew Newdigate2017-05-186-53/+38
|/
* Merge branch 'bvl-fix-dynamic-path-query' into 'master' Douwe Maan2017-05-121-1/+1
* Use new SnippetsFinder signature in APIbvl-9-2-security-patchesBob Van Landuyt2017-05-101-2/+2
* Merge branch 'tc-fix-private-subgroups-shown' into 'security' Douwe Maan2017-05-102-2/+2
* Merge branch 'snippets-finder-visibility' into 'security'Douwe Maan2017-05-104-8/+6
* Merge branch '31157-respect-project-features-in-wiki-search' into 'security' Douwe Maan2017-05-101-0/+4
* Merge branch 'bvl-security-9-1-validate-urls-in-markdown-using-uri'Robert Speicher2017-05-101-18/+18
* Merge branch 'bvl-security-9-1-markup-pipeline'Robert Speicher2017-05-103-7/+20
* Merge branch 'mr-widget-redesign-review' into 'master'Jacob Schatz2017-05-091-4/+4
* Merge branch 'Add-index_redirect_routes_path_for_link-migration-to-setup_post...Sean McGivern2017-05-091-0/+1
* Merge branch 'fix/gl-project-id' into 'master'James Lopez2017-05-081-1/+0
|\
| * remove gl_project_id for I/E version updatefix/gl-project-idJames Lopez2017-05-021-1/+0
* | Merge branch 'fix/support-gitaly-commit-diff-flags' into 'master' Robert Speicher2017-05-071-1/+3
|\ \
| * | Re-enable Gitaly commit_raw_diff featureAhmad Sherif2017-05-071-1/+3
* | | Add Pipeline Schedules that supersedes experimental Trigger ScheduleZeger-Jan van de Weg2017-05-074-5/+6
|/ /
* | Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into ...Kamil Trzciński2017-05-0612-33/+50
|\ \
| * | Refine inheritance model of extended CI/CD statusesGrzegorz Bizon2017-05-059-32/+16
| * | Introduce generic manual action extended status classGrzegorz Bizon2017-05-053-6/+26
| * | Check ability to update build on the API resourceGrzegorz Bizon2017-05-052-5/+14
| * | Use update build policy instead of new play policyGrzegorz Bizon2017-05-051-1/+1
| * | Merge commit '3a2b60f7' from 'master'Grzegorz Bizon2017-05-0516-52/+94
| |\ \
| * \ \ Merge branch 'master' into feature/gb/manual-actions-protected-branches-permi...Grzegorz Bizon2017-05-0320-75/+510
| |\ \ \
| * \ \ \ Merge branch 'master' into feature/gb/manual-actions-protected-branches-permi...Grzegorz Bizon2017-05-0255-254/+1242
| |\ \ \ \
| * | | | | Extend action tooltop to show info about abilitiesGrzegorz Bizon2017-05-011-1/+5
| * | | | | Merge branch 'master' into feature/gb/manual-actions-protected-branches-permi...Grzegorz Bizon2017-04-2236-160/+299
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into feature/gb/manual-actions-protected-branches-permi...Grzegorz Bizon2017-04-1384-441/+1814
| |\ \ \ \ \ \
| * | | | | | | Use build policy to determine if user can play buildGrzegorz Bizon2017-04-121-1/+1
| * | | | | | | Do not show play action if user not allowed to run itGrzegorz Bizon2017-04-061-1/+1
* | | | | | | | Real time pipeline show actionZeger-Jan van de Weg2017-05-063-1/+39
* | | | | | | | Merge branch '17361-redirect-renamed-paths' into 'master' Sean McGivern2017-05-064-3/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Index redirect_routes path for LIKEMichael Kozono2017-05-051-0/+1
| * | | | | | | | Redirect from redirect routes to canonical routesMichael Kozono2017-05-053-3/+3
* | | | | | | | | Merge branch 'fix/fork-spec-mysql' into 'master' Stan Hu2017-05-061-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | workaround spec failure for mySQL invalid date issuefix/fork-spec-mysqlJames Lopez2017-05-051-0/+2
* | | | | | | | | | Merge branch '29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-g...Sean McGivern2017-05-056-79/+67
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Pass GL_REPOSITORY in Workhorse responses29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-gitlab-ceAlejandro Rodríguez2017-05-053-3/+9
| * | | | | | | | | | Allow gl-repository strings as project identifiers in PostReceive workerAlejandro Rodríguez2017-05-051-26/+3
View Lorry Controller Status