summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \
| * | | | Remove MergeRequest#closes_issue?; Remove the default parameter value for #ca...Dongqing Hu2017-01-311-6/+2
| * | | | should pass in current_user from MergeRequestsHelperDongqing Hu2017-01-191-2/+2
| * | | | use the current_user parameter in MergeRequest#issues_mentioned_but_not_closingDongqing Hu2017-01-181-1/+1
* | | | | Merge branch 'removed-unused-parameter-status-only' into 'master'Rémy Coutable2017-02-082-6/+6
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of https://gitlab.com/dinsaw/gitlab-ce into removed-unu...Dinesh Sawant2017-02-07341-1393/+4565
| |\ \ \ \ \
| * | | | | | Removed unused parameter `status_only: true`.Dinesh Sawant2017-02-072-6/+6
* | | | | | | Merge branch 'lfs-noauth-public-repo' into 'master'Rémy Coutable2017-02-081-0/+4
|\ \ \ \ \ \ \
| * | | | | | | lfs: do not require auth for public repositoriesBen Boeckel2017-02-071-0/+4
* | | | | | | | Merge branch 'fix-pipelines-store-test' into 'master' Alfredo Sumaran2017-02-081-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Replace arrow function with regular function to prevent overiding function co...Clement Ho2017-02-071-1/+1
* | | | | | | | | Merge branch '27822-default-bulk-assign-labels' into 'master' Alfredo Sumaran2017-02-081-4/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add default labels to bulk assign dropdownsAnnabel Dunstone Gray2017-02-071-4/+4
* | | | | | | | | Merge branch 'no-sidebar-on-action-btn-click' into 'master' Clement Ho2017-02-081-11/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | dismiss sidebar on repo buttons clickAdam Pahlevi2017-02-081-11/+12
* | | | | | | | | | Merge branch '25134-mobile-issue-view-doesn-t-show-organization-membership' i...Annabel Dunstone Gray2017-02-071-4/+7
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix static class error25134-mobile-issue-view-doesn-t-show-organization-membershipAnnabel Dunstone Gray2017-02-071-1/+1
| * | | | | | | | | Show organisation membership and delete comment on smaller viewports, plus ch...dimitrieh2017-02-061-4/+7
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fix/gb/invalid-new-merge-request-api' into 'master' Fatih Acet2017-02-073-4/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove changelog entry; Changes after reviewFilipa Lacerda2017-02-071-1/+1
| * | | | | | | | | Update _pipelines.html.hamlKamil Trzciński2017-02-071-1/+1
| * | | | | | | | | Fix rendering pipelines for a new merge requestGrzegorz Bizon2017-02-072-3/+5
| * | | | | | | | | Pass proper endpoint path to MR pipelines partialGrzegorz Bizon2017-02-071-1/+3
* | | | | | | | | | Merge branch 'fix-droplab-rendering' into 'master' Alfredo Sumaran2017-02-071-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix droplab rendering template when data-dynamic selector is unavailablefix-droplab-renderingClement Ho2017-02-061-2/+2
* | | | | | | | | | | Merge branch '23785-with-builds-tab-gone-give-additional-context-in-system-in...Alfredo Sumaran2017-02-078-73/+136
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | added inline pipeline graph23785-with-builds-tab-gone-give-additional-context-in-system-information-element-in-mr-commit-views-by-adding-mini-pipeline-graphLuke "Jared" Bennett2017-02-078-73/+136
* | | | | | | | | | | | Merge branch 'route-map' into 'master' Robert Speicher2017-02-0721-56/+165
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Move permission check before more expensive checksroute-mapDouwe Maan2017-02-071-3/+5
| * | | | | | | | | | | | Don't skip authorization when stopping CI environmentsDouwe Maan2017-02-072-8/+4
| * | | | | | | | | | | | Address feedbackDouwe Maan2017-02-0613-76/+102
| * | | | | | | | | | | | CI is fine with lookup errorsDouwe Maan2017-02-061-1/+1
| * | | | | | | | | | | | No || neededDouwe Maan2017-02-061-1/+1
| * | | | | | | | | | | | Add feature specsDouwe Maan2017-02-063-5/+7
| * | | | | | | | | | | | Improve performance of finding last deployed environmentDouwe Maan2017-02-0610-40/+22
| * | | | | | | | | | | | Add testsDouwe Maan2017-02-063-6/+6
| * | | | | | | | | | | | Validate route mapDouwe Maan2017-02-062-13/+6
| * | | | | | | | | | | | Fix XSS issue by not using URI.joinDouwe Maan2017-02-061-2/+1
View Lorry Controller Status