Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | explicitly disable eslint inlineexplicitly-disable-eslint-inline | Luke "Jared" Bennett | 2016-11-15 | 149 | -148/+150 |
* | Merge branch 'master-recursiveTree' into 'master' | Douwe Maan | 2016-11-15 | 7 | -26/+99 |
|\ | |||||
| * | Issue #4270: Recursive option for files through API | Rebeca Méndez | 2016-11-12 | 7 | -26/+99 |
* | | Merge branch '21076-deleted-merged-branches' into 'master' | Douwe Maan | 2016-11-15 | 14 | -5/+231 |
|\ \ | |||||
| * | | Add button to delete all merged branches | Toon Claes | 2016-11-09 | 14 | -5/+231 |
* | | | Merge branch 'stanhu/gitlab-ce-fix-error-500-with-mr-images' into 'master' | Douwe Maan | 2016-11-15 | 6 | -6/+48 |
|\ \ \ | |||||
| * | | | Fix Error 500 when creating a merge request that contains an image that was d...stanhu/gitlab-ce-fix-error-500-with-mr-images | Stan Hu | 2016-11-14 | 6 | -6/+48 |
* | | | | Merge branch 'fix_saml_ldap_link' into 'master' | Douwe Maan | 2016-11-15 | 3 | -1/+29 |
|\ \ \ \ | |||||
| * | | | | Omniauth auto link LDAP user falls back to find by DN when user cannot be fou... | Drew Blessing | 2016-11-10 | 3 | -1/+29 |
* | | | | | Merge branch '24392-lfs-helper-refactor' into 'master' | Douwe Maan | 2016-11-15 | 2 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Move the `objects` method to `LfsHelper` so that it is also available to `Lfs...24392-lfs-helper-refactor | Patricio Cano | 2016-11-10 | 2 | -4/+4 |
* | | | | | | Fix duplicate changelog headers | Robert Speicher | 2016-11-15 | 1 | -3/+0 |
* | | | | | | Merge branch 'patch-9' into 'master' | Sean McGivern | 2016-11-15 | 1 | -1/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | clarify best way to install custom CA | Ben Bodenmiller | 2016-11-14 | 1 | -1/+5 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'fix-migration-changes' into 'master' | Stan Hu | 2016-11-15 | 1 | -4/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use `default_value_for` to handle null values in only_allow_merge_if_all_disc...fix-migration-changes | Alejandro Rodríguez | 2016-11-14 | 1 | -4/+1 |
* | | | | | | | Revert bad merge after release | Alejandro Rodríguez | 2016-11-14 | 5 | -20/+0 |
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Alejandro Rodríguez | 2016-11-14 | 5 | -0/+20 |
|\ \ \ \ \ \ \ | |||||
* | | | | | | | | Update CHANGELOG.md for 8.14.0-rc2 | Alejandro Rodríguez | 2016-11-14 | 22 | -84/+24 |
* | | | | | | | | Merge branch 'issue-13823' into 'master' | Alfredo Sumaran | 2016-11-14 | 5 | -4/+22 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Review comments Nov 11th | Josep Llaneras | 2016-11-11 | 3 | -2/+5 |
| * | | | | | | | | Add new messages | Josep Llaneras | 2016-11-11 | 1 | -1/+5 |
| * | | | | | | | | Remove author | Josep Llaneras | 2016-11-11 | 4 | -28/+6 |
| * | | | | | | | | Issue #13823: random message when all Todos are Done | Josep Llaneras | 2016-11-11 | 7 | -4/+37 |
* | | | | | | | | | Merge branch '21778-pinned-nav-header' into 'master' | Annabel Dunstone Gray | 2016-11-14 | 3 | -2/+26 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | 21778 Correct css styles for pinned navigation21778-pinned-nav-header | tauriedavis | 2016-11-11 | 3 | -2/+26 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'fix-search-input-padding' into 'master' | Annabel Dunstone Gray | 2016-11-14 | 2 | -2/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Use shorthand property for padding fix | Philip Karpiak | 2016-11-14 | 1 | -2/+1 |
| * | | | | | | | | | Give search-input correct padding-right value | Philip Karpiak | 2016-11-10 | 2 | -1/+5 |
* | | | | | | | | | | Merge branch 'grapify-declared-params' into 'master' | Rémy Coutable | 2016-11-14 | 12 | -36/+20 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Use declared_params helper in APIgrapify-declared-params | Robert Schilling | 2016-11-14 | 12 | -36/+20 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'issue-boards-signed-out-state' into 'master' 24457-cannot-delete-labels | Fatih Acet | 2016-11-14 | 7 | -6/+10 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Fixed issue boards when not logged inissue-boards-signed-out-state | Phil Hughes | 2016-11-14 | 7 | -6/+10 |
* | | | | | | | | | | Merge branch 'always-show-download-button' into 'master' | Annabel Dunstone Gray | 2016-11-14 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Project download buttons always show | Philip Karpiak | 2016-11-10 | 2 | -1/+5 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'grapify-to-h' into 'master' | Rémy Coutable | 2016-11-14 | 3 | -7/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Use #to_h to convert params to a hashgrapify-to-h | Robert Schilling | 2016-11-14 | 3 | -7/+9 |
* | | | | | | | | | | Merge branch 'master' into 'master' | Rémy Coutable | 2016-11-14 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix typos and grammar | seongahjo | 2016-11-14 | 1 | -2/+2 |
* | | | | | | | | | | | Merge branch 'fix/improve-naming-convention-in-ci-config' into 'master' | Kamil Trzciński | 2016-11-14 | 56 | -221/+219 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Fix indentation in CI variables entry class | Grzegorz Bizon | 2016-11-14 | 1 | -1/+1 |
| * | | | | | | | | | | Change name of method for setting CI config entries | Grzegorz Bizon | 2016-11-14 | 5 | -28/+28 |
| * | | | | | | | | | | Improve naming convention in ci configuration modulefix/improve-naming-convention-in-ci-config | Grzegorz Bizon | 2016-11-14 | 55 | -168/+166 |
* | | | | | | | | | | | Merge branch 'grapify-subscription-api' into 'master' | Rémy Coutable | 2016-11-14 | 1 | -23/+14 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Grapify subscription API | Robert Schilling | 2016-11-14 | 1 | -23/+14 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'fix-help-page-links' into 'master' | Rémy Coutable | 2016-11-14 | 3 | -2/+44 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fix error links in help page | Fu Xu | 2016-11-12 | 3 | -2/+44 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'sh-fix-sidekiq-throttling-init' into 'master' | Robert Speicher | 2016-11-14 | 2 | -1/+11 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Only turn on Sidekiq throttling if application settings existssh-fix-sidekiq-throttling-init | Stan Hu | 2016-11-12 | 2 | -1/+11 |
* | | | | | | | | | | Link to correct version of SanitizationFilter API docs for whitelist | Robert Speicher | 2016-11-14 | 1 | -1/+1 |