summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'remove-jquery-ui-sortable' into 'master' Jacob Schatz2017-02-0819-135/+160
|\
| * Removed jQuery UI sortableremove-jquery-ui-sortablePhil Hughes2017-02-0619-135/+160
* | Merge branch 'dz-fix-route-rename-descendants' into 'master' Dmitriy Zaporozhets2017-02-082-11/+28
|\ \
| * | Fix route rename descendants if route.name is blankDmitriy Zaporozhets2017-02-082-11/+28
* | | Merge branch 'bypass-whitelist-for-external-user' into 'master' Robert Speicher2017-02-084-4/+36
|\ \ \ | |/ / |/| |
| * | Bypass signup domain validation for external usersReza Mohammadi2017-02-084-4/+36
* | | Merge branch 'mr-widget-pipelines' into 'master' Fatih Acet2017-02-081-0/+6
|\ \ \
| * | | Reduce padding of mr widget mini graphAnnabel Dunstone Gray2017-02-081-0/+6
* | | | Merge branch '27756-fix-json-404-response' into 'master' Clement Ho2017-02-084-5/+28
|\ \ \ \
| * | | | Remove sleep from testsClement Ho2017-02-081-2/+0
| * | | | Add tests27756-fix-json-404-responseAlfredo Sumaran2017-02-072-1/+25
| * | | | Fixes ajax requests when current URL has a trailing slashAlfredo Sumaran2017-02-073-5/+6
* | | | | Merge branch '27880-pipelines-table-not-showing-commit-branch' into 'master' Clement Ho2017-02-083-3/+11
|\ \ \ \ \
| * | | | | Looks for correct key to pass to commit prop. Adds rspec test.Filipa Lacerda2017-02-083-3/+11
* | | | | | Merge branch 'dz-refactor-full-path' into 'master' Dmitriy Zaporozhets2017-02-0816-98/+191
|\ \ \ \ \ \
| * | | | | | Store group and project full name and full path in routes tabledz-refactor-full-pathDmitriy Zaporozhets2017-02-0816-98/+191
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'widget-spec-failure' into 'master' Sean McGivern2017-02-081-2/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fixed random merge request widget failurePhil Hughes2017-02-081-2/+0
* | | | | | Merge branch 'rename_delete_services' into 'master'Rémy Coutable2017-02-0819-86/+89
|\ \ \ \ \ \
| * | | | | | Fix inconsistent naming for services that delete thingsdixpac2017-02-0819-86/+89
* | | | | | | Merge branch 'minigraph-fix' into 'master' Filipa Lacerda2017-02-081-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Listens on document for mini-pipeline graphminigraph-fixPhil Hughes2017-02-081-1/+1
* | | | | | | Merge branch 'backport-ee-build-fixes' into 'master' Filipa Lacerda2017-02-083-1/+15
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | backport fixes for pipelines_store frontend specsbackport-ee-build-fixesMike Greiling2017-02-083-1/+15
* | | | | | | Merge branch 'patch-12' into 'master' Rémy Coutable2017-02-081-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix link in CONTRIBUTING.mdCarlos Galarza2017-01-281-1/+1
* | | | | | | | Merge branch '20495-plus-icon-button' into 'master' Alfredo Sumaran2017-02-083-6/+6
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Remove plus icon in commits view MR buttonAnnabel Dunstone Gray2017-02-081-3/+1
| * | | | | | | Add changelog20495-plus-icon-buttonAnnabel Dunstone Gray2017-02-071-0/+4
| * | | | | | | Remove plus icon from compare viewAnnabel Dunstone Gray2017-02-071-3/+1
* | | | | | | | Merge branch '23104-remove-public-param-for-projects' into 'master' Douwe Maan2017-02-084-70/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Use VisibilityLevel constants in spec23104-remove-public-param-for-projectsToon Claes2017-02-071-4/+4
| * | | | | | | | API: remove `public` param for projectsToon Claes2017-02-074-67/+14
* | | | | | | | | Merge branch 'dz-limit-nested-groups' into 'master' Douwe Maan2017-02-082-12/+36
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Limit level of nesting for groupsdz-limit-nested-groupsDmitriy Zaporozhets2017-02-082-12/+36
* | | | | | | | | Merge branch 'pages-0.3.0' into 'master' Robert Speicher2017-02-081-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update GitLab pages to v0.3.0Nick Thomas2017-02-071-1/+1
* | | | | | | | | | Merge branch '26705-filter-todos-by-manual-add' into 'master'Sean McGivern2017-02-084-8/+61
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Filter todos by manual addJacopo2017-01-284-8/+61
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'patch-10' into 'master'Rémy Coutable2017-02-081-17/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Shows how to reference a line within a repository file.Marcel Huber2016-12-221-17/+18
* | | | | | | | | | | Merge branch 'fix-api-delete-file-example' into 'master'Rémy Coutable2017-02-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix the curl command for deleting files (DELETE instead of PUT)Bruno Melli2016-12-211-1/+1
* | | | | | | | | | | | Merge branch 'feature/gb/paginated-environments-api' into 'master'Rémy Coutable2017-02-089-34/+282
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Make headers asserts explicit in pagination specsfeature/gb/paginated-environments-apiGrzegorz Bizon2017-02-071-5/+8
| * | | | | | | | | | | | Use `#present?` instead of `defined?` in serializersGrzegorz Bizon2017-02-072-2/+2
| * | | | | | | | | | | | Simplify implementation of environments serializerGrzegorz Bizon2017-02-071-5/+4
| * | | | | | | | | | | | Merge branch 'master' into feature/gb/paginated-environments-apiFilipa Lacerda2017-02-07305-1117/+10648
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Add specs for standalone pagination for serializersGrzegorz Bizon2017-02-064-5/+61
| * | | | | | | | | | | | Move serializers pagination class to separate moduleGrzegorz Bizon2017-02-064-25/+29