summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dz-create-nested-groups-via-ui' into 'master' Dmitriy Zaporozhets2017-02-098-53/+92
|\
| * Allow creating nested group via UIdz-create-nested-groups-via-uiDmitriy Zaporozhets2017-02-078-53/+92
* | Merge branch 'remove-jquery-ui-datepicker' into 'master' Jacob Schatz2017-02-0814-207/+157
|\ \
| * | Changed date check testremove-jquery-ui-datepickerPhil Hughes2017-02-065-12/+6
| * | Fixed missing edit link clickPhil Hughes2017-02-061-1/+0
| * | Fixed some specsPhil Hughes2017-02-063-5/+5
| * | Updated styles for PikadayPhil Hughes2017-02-068-172/+73
| * | Replaced more jQuery UI datepickersPhil Hughes2017-02-066-25/+70
| * | Removed jQuery UI datepickerPhil Hughes2017-02-066-14/+25
| |/
* | Merge branch 'remove-jquery-ui-sortable' into 'master' Jacob Schatz2017-02-0813-117/+123
|\ \
| * | Removed jQuery UI sortableremove-jquery-ui-sortablePhil Hughes2017-02-0613-117/+123
| |/
* | Merge branch 'dz-fix-route-rename-descendants' into 'master' Dmitriy Zaporozhets2017-02-081-5/+10
|\ \
| * | Fix route rename descendants if route.name is blankDmitriy Zaporozhets2017-02-081-5/+10
* | | Merge branch 'bypass-whitelist-for-external-user' into 'master' Robert Speicher2017-02-081-1/+1
|\ \ \ | |/ / |/| |
| * | Bypass signup domain validation for external usersReza Mohammadi2017-02-081-1/+1
* | | 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-083-5/+6
|\ \ \ \
| * | | | Add tests27756-fix-json-404-responseAlfredo Sumaran2017-02-071-1/+1
| * | | | 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-081-3/+3
|\ \ \ \ \
| * | | | | Looks for correct key to pass to commit prop. Adds rspec test.Filipa Lacerda2017-02-081-3/+3
* | | | | | Merge branch 'dz-refactor-full-path' into 'master' Dmitriy Zaporozhets2017-02-089-64/+104
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Store group and project full name and full path in routes tabledz-refactor-full-pathDmitriy Zaporozhets2017-02-089-64/+104
| | |_|/ / | |/| | |
* | | | | Merge branch 'rename_delete_services' into 'master'Rémy Coutable2017-02-0811-67/+65
|\ \ \ \ \
| * | | | | Fix inconsistent naming for services that delete thingsdixpac2017-02-0811-67/+65
* | | | | | 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-082-1/+12
|\ \ \ \ \ \
| * | | | | | backport fixes for pipelines_store frontend specsbackport-ee-build-fixesMike Greiling2017-02-082-1/+12
* | | | | | | Merge branch '20495-plus-icon-button' into 'master' Alfredo Sumaran2017-02-082-6/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove plus icon in commits view MR buttonAnnabel Dunstone Gray2017-02-081-3/+1
| * | | | | | Remove plus icon from compare viewAnnabel Dunstone Gray2017-02-071-3/+1
* | | | | | | Merge branch 'dz-limit-nested-groups' into 'master' Douwe Maan2017-02-081-1/+14
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Limit level of nesting for groupsdz-limit-nested-groupsDmitriy Zaporozhets2017-02-081-1/+14
* | | | | | | Merge branch '26705-filter-todos-by-manual-add' into 'master'Sean McGivern2017-02-081-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Filter todos by manual addJacopo2017-01-281-1/+3
* | | | | | | | Merge branch 'feature/gb/paginated-environments-api' into 'master'Rémy Coutable2017-02-083-29/+60
|\ \ \ \ \ \ \ \
| * | | | | | | | 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-07107-452/+2167
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Add specs for standalone pagination for serializersGrzegorz Bizon2017-02-061-3/+4
| * | | | | | | | Move serializers pagination class to separate moduleGrzegorz Bizon2017-02-063-25/+2
| * | | | | | | | Rename `Gitlab::Serialize` module to reuse it laterGrzegorz Bizon2017-02-061-1/+1
| * | | | | | | | Merge branch 'master' into feature/gb/paginated-environments-apiGrzegorz Bizon2017-02-06269-992/+2464
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Extend environments folders and pagination API specsGrzegorz Bizon2017-02-031-1/+1
| * | | | | | | | Order environments twice in environments serializerGrzegorz Bizon2017-02-031-0/+1
| * | | | | | | | Encapsulate reused pagination component in a classGrzegorz Bizon2017-02-023-28/+42
| * | | | | | | | Use serializer to group environments into foldersGrzegorz Bizon2017-02-021-0/+39
* | | | | | | | | Merge branch 'restore-issues_mentioned_but_not_closing' into 'master'Sean McGivern2017-02-082-9/+5
|\ \ \ \ \ \ \ \ \