summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make parent_id field integer/null value instead of stringupdate-namespaces-api-docsTomasz Maczukin2018-02-131-5/+5
* Merge branch 'sh-no-cache-populate-migration' into 'master'Sean McGivern2018-02-134-7/+24
|\
| * Fix a transient failure in db/post_migrate/20170717111152_cleanup_move_system...sh-no-cache-populate-migrationRémy Coutable2018-02-121-1/+1
| * Use the latest migration in spec/migrations/rename_reserved_project_names_spe...Rémy Coutable2018-02-121-4/+8
| * Allow to use the latest migration in migration specsRémy Coutable2018-02-121-1/+7
| * Call .reset_column_in_all_models! before migrating in MigrationsHelpers.schem...Rémy Coutable2018-02-121-0/+2
| * Use the :migration metadata in migration specsRémy Coutable2018-02-122-5/+6
| * Disable caching of tables for migration spec that drops a temporary tableStan Hu2018-02-122-1/+5
* | Merge branch 'sh-fix-issue-43193' into 'master'Sean McGivern2018-02-132-14/+26
|\ \
| * | Fix Error 500s creating merge requests with external issue trackersh-fix-issue-43193Stan Hu2018-02-122-14/+26
* | | Merge branch 'winh-new-branch-dropdown-style' into 'master'Phil Hughes2018-02-1310-139/+135
|\ \ \
| * | | Cleanup new branch/merge request form in issueswinh-new-branch-dropdown-styleWinnie Hellmann2018-02-1210-139/+135
* | | | Merge branch 'jivl-update-katex' into 'master'Clement Ho2018-02-1290-9702/+55
|\ \ \ \
| * | | | Addressed mr observationsjivl-update-katexJose Ivan Vargas2018-02-124-19/+12
| * | | | Merge branch 'master' into jivl-update-katexJose Ivan Vargas2018-02-12696-4170/+16323
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' into jivl-update-katexJose Ivan Vargas2018-02-053112-38931/+73844
| |\ \ \ \
| * | | | | removed unused importsJose Ivan Vargas2017-12-211-2/+0
| * | | | | Removed the katex precompile steps from the application configurationJose Ivan Vargas2017-12-212-3/+0
| * | | | | Removed the remains of katex from vendor assets and load everything via webpackJose Ivan Vargas2017-12-2185-1197/+37
| * | | | | added katex.js and load it via webpackJose Ivan Vargas2017-12-216-14423/+20
| * | | | | Updated katex libraryJose Ivan Vargas2017-12-2183-4778/+10717
* | | | | | Merge branch 'andr3-clean-eslint-disables-from-board-components' into 'master'Clement Ho2018-02-123-7/+6
|\ \ \ \ \ \
| * | | | | | Clean new Flash() and stop disabling no-new (eslint) when possibleAndré Luís2018-02-123-7/+6
|/ / / / / /
* | | | | | Merge branch 'sh-disable-query-limiter' into 'master'Ian Baum2018-02-122-5/+7
|\ \ \ \ \ \
| * | | | | | Disable query limiting warnings for now on GitLab.comStan Hu2018-02-122-5/+7
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'ac/4878-fix-attachments-ext' into 'master'Nick Thomas2018-02-122-7/+11
|\ \ \ \ \ \
| * | | | | | Honour workhorse provided file nameac/4878-fix-attachments-extAlessio Caiazza2018-02-122-7/+11
* | | | | | | Merge branch 'jivl-fix-warning-messages-labels-milestones' into 'master'43024-links-in-issue-board-are-brokenClement Ho2018-02-123-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix warning messages for promoting labels and milestonesJose Ivan Vargas2018-02-123-3/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading...Ian Baum2018-02-126-113/+17
|\ \ \ \ \ \ \
| * | | | | | | 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-keyRubén Dávila2018-02-126-113/+17
* | | | | | | | Merge branch 'jivl-fix-missing-js-selector-realtime-pipeline' into 'master'Filipa Lacerda2018-02-122-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed missing js selector for the realtime pipelines commit compjivl-fix-missing-js-selector-realtime-pipelineJose Ivan Vargas2018-02-122-2/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'groups-select-axios' into 'master'Filipa Lacerda2018-02-121-11/+11
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Convert groups_select ajax to use axiosgroups-select-axiosPhil Hughes2018-02-091-11/+11
* | | | | | | | Merge branch '40994-fix-ee-ce-compatible-test' into 'master'Kamil Trzciński2018-02-121-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Make GITLAB_FEATURES in build_spec compatible with EE40994-fix-ee-ce-compatible-testDylan Griffith2018-02-091-1/+1
* | | | | | | | Merge branch '4826-geo-wikisyncservice-attempts-to-sync-projects' into 'master'Nick Thomas2018-02-124-2/+76
|\ \ \ \ \ \ \ \
| * | | | | | | | Create an empty wiki when there is no wiki in the gitlab export bundleValery Sizov2018-02-124-2/+76
|/ / / / / / / /
* | | | | | | | Merge branch 'group-label-page-breadcrumb' into 'master'Phil Hughes2018-02-122-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert and remove header_title line from labels issueOnuwa Nnachi Isaac2018-02-123-2/+6
| * | | | | | | | Fix breadcrumb on labels page for groupsOnuwa Nnachi Isaac2018-02-092-2/+2
* | | | | | | | | Merge branch 'diff-and-gpg-badges-ajax-refactor' into 'master'Phil Hughes2018-02-123-28/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed bug with param configdiff-and-gpg-badges-ajax-refactorConstance Okoghenun2018-02-121-1/+1
| * | | | | | | | | changed params passed to from a string to an objectConstance Okoghenun2018-02-121-2/+3
| * | | | | | | | | Fixed typo, updated test, and removed commented codeConstance Okoghenun2018-02-083-4/+3
| * | | | | | | | | Replaced use of $.get with axios.get and updated testsConstance Okoghenun2018-02-083-28/+46
* | | | | | | | | | Merge branch 'bw-fix-autoload-issue' into 'master'Rémy Coutable2018-02-121-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | make sure there is a dependency on Gitlab::CurrentSettings isbw-fix-autoload-issueBrett Walker2018-02-091-0/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'refactor/move-issuable-time-tracker-vue-component' into 'master'Filipa Lacerda2018-02-124-75/+85
|\ \ \ \ \ \ \ \ \