Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'whitelisting' into 'master' | Yorick Peterse | 2018-02-13 | 1 | -12/+0 |
|\ | |||||
| * | Remove Sentry reporting for query limiting | Yorick Peterse | 2018-02-13 | 1 | -12/+0 |
* | | Merge branch '43198-fix-settings-panel-expanding-when-fragment-hash-linked' i... | Phil Hughes | 2018-02-13 | 1 | -0/+29 |
|\ \ | |||||
| * | | Fix settings panel not expanding when fragment hash linked | Eric Eastwood | 2018-02-13 | 1 | -0/+29 |
* | | | Merge branch 'ce-rc/move-all-ee-specs-to-ee-specs' into 'master' | Robert Speicher | 2018-02-13 | 2 | -43/+46 |
|\ \ \ | |||||
| * | | | Port spec/fixtures/api/schemas/deployment.json from EE | Rémy Coutable | 2018-02-13 | 2 | -43/+46 |
* | | | | Merge branch '26466-natural-sort-mrs' into 'master' | Sean McGivern | 2018-02-13 | 1 | -0/+35 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Change issue show page to group MRs by projects and namespaces | Jeff Stubler | 2018-02-13 | 1 | -0/+35 |
* | | | | Merge branch 'mk-fix-no-untracked-upload-files-error' into 'master' | Douwe Maan | 2018-02-13 | 1 | -116/+54 |
|\ \ \ \ | |||||
| * | | | | Dry up specmk-fix-no-untracked-upload-files-error | Michael Kozono | 2018-02-12 | 1 | -107/+29 |
| * | | | | Fix orphan temp table untracked_files_for_uploads | Michael Kozono | 2018-02-12 | 1 | -25/+17 |
| * | | | | Fix last batch size equals max batch size error | Michael Kozono | 2018-02-12 | 1 | -0/+24 |
* | | | | | Merge branch '42923-close-issue' into 'master' | Phil Hughes | 2018-02-13 | 4 | -0/+91 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | [ci skip] Merge branch 'master' into 42923-close-issue | Filipa Lacerda | 2018-02-13 | 12 | -119/+102 |
| |\ \ \ \ | |||||
| * | | | | | Reuse getter42923-close-issue | Filipa Lacerda | 2018-02-12 | 2 | -1/+7 |
| * | | | | | [ci skip] Merge branch 'master' into 42923-close-issue | Filipa Lacerda | 2018-02-12 | 24 | -161/+573 |
| |\ \ \ \ \ | |||||
| * | | | | | | Makes close/reopen issue request to inside the vue app | Filipa Lacerda | 2018-02-09 | 3 | -0/+85 |
* | | | | | | | Merge branch 'sh-no-cache-populate-migration' into 'master' | Sean McGivern | 2018-02-13 | 3 | -6/+23 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use the latest migration in spec/migrations/rename_reserved_project_names_spe... | Rémy Coutable | 2018-02-12 | 1 | -4/+8 |
| * | | | | | | | Allow to use the latest migration in migration specs | Rémy Coutable | 2018-02-12 | 1 | -1/+7 |
| * | | | | | | | Call .reset_column_in_all_models! before migrating in MigrationsHelpers.schem... | Rémy Coutable | 2018-02-12 | 1 | -0/+2 |
| * | | | | | | | Use the :migration metadata in migration specs | Rémy Coutable | 2018-02-12 | 2 | -5/+6 |
| * | | | | | | | Disable caching of tables for migration spec that drops a temporary table | Stan Hu | 2018-02-12 | 2 | -1/+5 |
* | | | | | | | | Merge branch 'sh-fix-issue-43193' into 'master' | Sean McGivern | 2018-02-13 | 1 | -11/+21 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix Error 500s creating merge requests with external issue trackersh-fix-issue-43193 | Stan Hu | 2018-02-12 | 1 | -11/+21 |
* | | | | | | | | | Merge branch 'winh-new-branch-dropdown-style' into 'master' | Phil Hughes | 2018-02-13 | 1 | -36/+77 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Cleanup new branch/merge request form in issueswinh-new-branch-dropdown-style | Winnie Hellmann | 2018-02-12 | 1 | -36/+77 |
* | | | | | | | | | Merge branch 'jivl-update-katex' into 'master' | Clement Ho | 2018-02-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into jivl-update-katex | Jose Ivan Vargas | 2018-02-12 | 207 | -1958/+8018 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into jivl-update-katex | Jose Ivan Vargas | 2018-02-05 | 991 | -8905/+19449 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | added katex.js and load it via webpack | Jose Ivan Vargas | 2017-12-21 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'sh-disable-query-limiter' into 'master' | Ian Baum | 2018-02-12 | 1 | -4/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Disable query limiting warnings for now on GitLab.com | Stan Hu | 2018-02-12 | 1 | -4/+6 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'ac/4878-fix-attachments-ext' into 'master' | Nick Thomas | 2018-02-12 | 1 | -3/+7 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Honour workhorse provided file nameac/4878-fix-attachments-ext | Alessio Caiazza | 2018-02-12 | 1 | -3/+7 |
* | | | | | | | | | | | Revert "Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-s...rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key | Rubén Dávila | 2018-02-12 | 3 | -83/+7 |
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge branch '40994-fix-ee-ce-compatible-test' into 'master' | Kamil Trzciński | 2018-02-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Make GITLAB_FEATURES in build_spec compatible with EE40994-fix-ee-ce-compatible-test | Dylan Griffith | 2018-02-09 | 1 | -1/+1 |
* | | | | | | | | | | Create an empty wiki when there is no wiki in the gitlab export bundle | Valery Sizov | 2018-02-12 | 1 | -0/+45 |
* | | | | | | | | | | Merge branch 'diff-and-gpg-badges-ajax-refactor' into 'master' | Phil Hughes | 2018-02-12 | 1 | -21/+29 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Fixed typo, updated test, and removed commented code | Constance Okoghenun | 2018-02-08 | 1 | -2/+2 |
| * | | | | | | | | | Replaced use of $.get with axios.get and updated tests | Constance Okoghenun | 2018-02-08 | 1 | -21/+29 |
* | | | | | | | | | | Merge branch 'refactor/move-issuable-time-tracker-vue-component' into 'master' | Filipa Lacerda | 2018-02-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Move IssuableTimeTracker vue component | George Tsiolis | 2018-02-12 | 1 | -1/+1 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch '42928-default-protected-variables-to-off' into 'master' | Filipa Lacerda | 2018-02-12 | 2 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | Default CI variables to unprotected42928-default-protected-variables-to-off | Eric Eastwood | 2018-02-09 | 2 | -5/+5 |
* | | | | | | | | | | Merge branch '42937-search-api-fix' into 'master' | Grzegorz Bizon | 2018-02-12 | 1 | -0/+20 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | API - fix searching in group/project specified by path42937-search-api-fix | Jarka Kadlecová | 2018-02-09 | 1 | -0/+20 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'fix/encoding-to-unsupported-encodings' into 'master' | Robert Speicher | 2018-02-09 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Return a warning string if we try to encode to unsupported encoding | Ahmad Sherif | 2018-02-09 | 1 | -0/+5 |