summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* 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 'dz-refactor-full-path' into 'master' Dmitriy Zaporozhets2017-02-084-58/+98
|\ \
| * | Store group and project full name and full path in routes tabledz-refactor-full-pathDmitriy Zaporozhets2017-02-084-58/+98
| |/
* | 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 'feature/gb/paginated-environments-api' into 'master'Rémy Coutable2017-02-081-1/+1
|\ \ \
| * \ \ Merge branch 'master' into feature/gb/paginated-environments-apiFilipa Lacerda2017-02-077-9/+216
| |\ \ \ | | |/ /
| * | | Rename `Gitlab::Serialize` module to reuse it laterGrzegorz Bizon2017-02-061-1/+1
* | | | Merge branch 'restore-issues_mentioned_but_not_closing' into 'master'Sean McGivern2017-02-081-7/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove MergeRequest#closes_issue?; Remove the default parameter value for #ca...Dongqing Hu2017-01-311-6/+2
| * | | use the current_user parameter in MergeRequest#issues_mentioned_but_not_closingDongqing Hu2017-01-181-1/+1
* | | | Merge branch 'route-map' into 'master' Robert Speicher2017-02-076-42/+70
|\ \ \ \
| * | | | Address feedbackDouwe Maan2017-02-064-53/+29
| * | | | CI is fine with lookup errorsDouwe Maan2017-02-061-1/+1
| * | | | No || neededDouwe Maan2017-02-061-1/+1
| * | | | Add feature specsDouwe Maan2017-02-061-1/+3
| * | | | Improve performance of finding last deployed environmentDouwe Maan2017-02-065-34/+16
| * | | | Add testsDouwe Maan2017-02-063-6/+6
| * | | | Validate route mapDouwe Maan2017-02-061-12/+5
| * | | | Fix XSS issue by not using URI.joinDouwe Maan2017-02-061-2/+1
| * | | | Add 'View on [env]' link to blobs and individual files in diffsDouwe Maan2017-02-065-10/+86
* | | | | Merge branch '26908-add-foreign-keys-to-timelogs' into 'master' Rubén Dávila Santos2017-02-072-2/+18
|\ \ \ \ \
| * | | | | Use normal associations instead of polymorphic.Ruben Davila2017-02-072-2/+18
* | | | | | Merge branch '25487-small-improvements-to-the-ui-of-mattermost-and-slack-comm...Clement Ho2017-02-073-5/+5
|\ \ \ \ \ \
| * | | | | | Added small improvments to the chat slash command servicesLuke "Jared" Bennett2017-02-073-5/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '24147-delete-env-button' into 'master' Rémy Coutable2017-02-072-6/+6
|\ \ \ \ \ \
| * | | | | | Fix stoppable?Kamil Trzcinski2017-02-071-1/+1
| * | | | | | Update changesKamil Trzcinski2017-02-061-4/+4
| * | | | | | Merge remote-tracking branch 'origin/master' into 24147-delete-env-buttonKamil Trzcinski2017-02-0632-352/+569
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 24147-delete-env-buttonKamil Trzcinski2017-01-24113-1685/+3006
| |\ \ \ \ \ \ \
| * | | | | | | | Allow to stop any environmentKamil Trzcinski2016-11-101-4/+9
* | | | | | | | | Merge branch 'refresh-permissions-when-moving-projects' into 'master' Rémy Coutable2017-02-072-1/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Refresh authorizations when transferring projectsrefresh-permissions-when-moving-projectsYorick Peterse2017-02-072-1/+10
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch '21518_recaptcha_spam_issues' into 'master'Sean McGivern2017-02-071-3/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Use reCaptcha when an issue identified as spamJarka Kadlecova2017-02-071-3/+9
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'ee-1439-read-only-user' into 'master' Douwe Maan2017-02-071-0/+15
|\ \ \ \ \ \ \
| * | | | | | | Fix indentationee-1439-read-only-userDouwe Maan2017-02-061-4/+4
| * | | | | | | Backport of the frontend view, including testsJose Ivan Vargas2017-02-061-0/+15
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'fix-deleting-project-again' into 'master' Douwe Maan2017-02-061-4/+17
|\ \ \ \ \ \ \
| * | | | | | | Skip or retain project while deleting the project:Lin Jen-Shin2017-02-031-4/+17
* | | | | | | | Don't delete assigned MRs/issues when user is deletedDouwe Maan2017-02-061-2/+3
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-064-7/+17
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Introduce maximum session time for terminal websocket connectionterminal-max-session-timeAdam Niedzielski2017-02-062-2/+16
| | |/ / / / | |/| | | |
| * | | | | Remove backlog lists from boardsDouglas Barbosa Alexandre2017-02-032-5/+1
| |/ / / /
* | | | | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-038-255/+321
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'squash' into 'master' Sean McGivern2017-02-031-2/+2
| |\ \ \ \
| | * | | | Backport changes from EE squashSean McGivern2017-02-031-2/+2