Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dz-fix-route-rename-descendants' into 'master' | Dmitriy Zaporozhets | 2017-02-08 | 1 | -5/+10 |
|\ | |||||
| * | Fix route rename descendants if route.name is blank | Dmitriy Zaporozhets | 2017-02-08 | 1 | -5/+10 |
* | | Merge branch 'bypass-whitelist-for-external-user' into 'master' | Robert Speicher | 2017-02-08 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Bypass signup domain validation for external users | Reza Mohammadi | 2017-02-08 | 1 | -1/+1 |
* | | Merge branch 'dz-refactor-full-path' into 'master' | Dmitriy Zaporozhets | 2017-02-08 | 4 | -58/+98 |
|\ \ | |||||
| * | | Store group and project full name and full path in routes tabledz-refactor-full-path | Dmitriy Zaporozhets | 2017-02-08 | 4 | -58/+98 |
| |/ | |||||
* | | Merge branch 'dz-limit-nested-groups' into 'master' | Douwe Maan | 2017-02-08 | 1 | -1/+14 |
|\ \ | |||||
| * | | Limit level of nesting for groupsdz-limit-nested-groups | Dmitriy Zaporozhets | 2017-02-08 | 1 | -1/+14 |
* | | | Merge branch 'feature/gb/paginated-environments-api' into 'master' | Rémy Coutable | 2017-02-08 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into feature/gb/paginated-environments-api | Filipa Lacerda | 2017-02-07 | 7 | -9/+216 |
| |\ \ \ | | |/ / | |||||
| * | | | Rename `Gitlab::Serialize` module to reuse it later | Grzegorz Bizon | 2017-02-06 | 1 | -1/+1 |
* | | | | Merge branch 'restore-issues_mentioned_but_not_closing' into 'master' | Sean McGivern | 2017-02-08 | 1 | -7/+3 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Remove MergeRequest#closes_issue?; Remove the default parameter value for #ca... | Dongqing Hu | 2017-01-31 | 1 | -6/+2 |
| * | | | use the current_user parameter in MergeRequest#issues_mentioned_but_not_closing | Dongqing Hu | 2017-01-18 | 1 | -1/+1 |
* | | | | Merge branch 'route-map' into 'master' | Robert Speicher | 2017-02-07 | 6 | -42/+70 |
|\ \ \ \ | |||||
| * | | | | Address feedback | Douwe Maan | 2017-02-06 | 4 | -53/+29 |
| * | | | | CI is fine with lookup errors | Douwe Maan | 2017-02-06 | 1 | -1/+1 |
| * | | | | No || needed | Douwe Maan | 2017-02-06 | 1 | -1/+1 |
| * | | | | Add feature specs | Douwe Maan | 2017-02-06 | 1 | -1/+3 |
| * | | | | Improve performance of finding last deployed environment | Douwe Maan | 2017-02-06 | 5 | -34/+16 |
| * | | | | Add tests | Douwe Maan | 2017-02-06 | 3 | -6/+6 |
| * | | | | Validate route map | Douwe Maan | 2017-02-06 | 1 | -12/+5 |
| * | | | | Fix XSS issue by not using URI.join | Douwe Maan | 2017-02-06 | 1 | -2/+1 |
| * | | | | Add 'View on [env]' link to blobs and individual files in diffs | Douwe Maan | 2017-02-06 | 5 | -10/+86 |
* | | | | | Merge branch '26908-add-foreign-keys-to-timelogs' into 'master' | Rubén Dávila Santos | 2017-02-07 | 2 | -2/+18 |
|\ \ \ \ \ | |||||
| * | | | | | Use normal associations instead of polymorphic. | Ruben Davila | 2017-02-07 | 2 | -2/+18 |
* | | | | | | Merge branch '25487-small-improvements-to-the-ui-of-mattermost-and-slack-comm... | Clement Ho | 2017-02-07 | 3 | -5/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Added small improvments to the chat slash command services | Luke "Jared" Bennett | 2017-02-07 | 3 | -5/+5 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch '24147-delete-env-button' into 'master' | Rémy Coutable | 2017-02-07 | 2 | -6/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix stoppable? | Kamil Trzcinski | 2017-02-07 | 1 | -1/+1 |
| * | | | | | | Update changes | Kamil Trzcinski | 2017-02-06 | 1 | -4/+4 |
| * | | | | | | Merge remote-tracking branch 'origin/master' into 24147-delete-env-button | Kamil Trzcinski | 2017-02-06 | 32 | -352/+569 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into 24147-delete-env-button | Kamil Trzcinski | 2017-01-24 | 113 | -1685/+3006 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Allow to stop any environment | Kamil Trzcinski | 2016-11-10 | 1 | -4/+9 |
* | | | | | | | | | Merge branch 'refresh-permissions-when-moving-projects' into 'master' | Rémy Coutable | 2017-02-07 | 2 | -1/+10 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Refresh authorizations when transferring projectsrefresh-permissions-when-moving-projects | Yorick Peterse | 2017-02-07 | 2 | -1/+10 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch '21518_recaptcha_spam_issues' into 'master' | Sean McGivern | 2017-02-07 | 1 | -3/+9 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Use reCaptcha when an issue identified as spam | Jarka Kadlecova | 2017-02-07 | 1 | -3/+9 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'ee-1439-read-only-user' into 'master' | Douwe Maan | 2017-02-07 | 1 | -0/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix indentationee-1439-read-only-user | Douwe Maan | 2017-02-06 | 1 | -4/+4 |
| * | | | | | | | Backport of the frontend view, including tests | Jose Ivan Vargas | 2017-02-06 | 1 | -0/+15 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'fix-deleting-project-again' into 'master' | Douwe Maan | 2017-02-06 | 1 | -4/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Skip or retain project while deleting the project: | Lin Jen-Shin | 2017-02-03 | 1 | -4/+17 |
* | | | | | | | | Don't delete assigned MRs/issues when user is deleted | Douwe Maan | 2017-02-06 | 1 | -2/+3 |
| |_|_|_|_|/ / |/| | | | | | | |||||
* | | | | | | | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ce | James Edwards-Jones | 2017-02-06 | 4 | -7/+17 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Introduce maximum session time for terminal websocket connectionterminal-max-session-time | Adam Niedzielski | 2017-02-06 | 2 | -2/+16 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Remove backlog lists from boards | Douglas Barbosa Alexandre | 2017-02-03 | 2 | -5/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'master' into jej-pages-picked-from-ee | James Edwards-Jones | 2017-02-03 | 8 | -255/+321 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'squash' into 'master' | Sean McGivern | 2017-02-03 | 1 | -2/+2 |
| |\ \ \ \ | |||||
| | * | | | | Backport changes from EE squash | Sean McGivern | 2017-02-03 | 1 | -2/+2 |