Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change new pipeline to run pipeline18935-pipeline-button | Annabel Dunstone | 2016-07-06 | 1 | -1/+1 |
* | Merge branch 'escape-to-cancel-note' into 'master' | Jacob Schatz | 2016-07-06 | 1 | -9/+39 |
|\ | |||||
| * | Use switch/when statementescape-to-cancel-note | Douwe Maan | 2016-07-05 | 1 | -21/+24 |
| * | Double to single quotes | Douwe Maan | 2016-07-04 | 1 | -1/+1 |
| * | Add confirmation when canceling creating/editing with changes | Douwe Maan | 2016-07-04 | 1 | -0/+12 |
| * | Cancel creating or editing note by hitting Escape | Douwe Maan | 2016-07-04 | 1 | -5/+20 |
* | | Merge branch 'remove-lowercase-gitlab-ci-yml' into 'master' | Robert Speicher | 2016-07-06 | 15 | -238/+3 |
|\ \ | |||||
| * | | Fix specs | Rémy Coutable | 2016-07-06 | 1 | -3/+3 |
| * | | Remove duplicate templates that are lowercase | Rémy Coutable | 2016-07-06 | 14 | -235/+0 |
* | | | Merge branch '15094-throttling-pushes_since_gc' into 'master' | Douwe Maan | 2016-07-06 | 2 | -2/+9 |
|\ \ \ | |||||
| * | | | Throttle the update of `project.pushes_since_gc` to 1 minute15094-throttling-pushes_since_gc | Paco Guzman | 2016-07-05 | 2 | -2/+9 |
* | | | | Merge branch '19092-fix-event-for-legacydiffnote-not-considered-note' into 'm... | Douwe Maan | 2016-07-06 | 3 | -3/+34 |
|\ \ \ \ | |||||
| * | | | | Use a more future-proof check for Note/LegacyDiffNote19092-fix-event-for-legacydiffnote-not-considered-note | Rémy Coutable | 2016-07-06 | 2 | -5/+5 |
| * | | | | Fix diff comments not showing up in activity feed | Rémy Coutable | 2016-07-04 | 3 | -3/+34 |
* | | | | | Merge branch 'shell-version-bump' into 'master' | Douwe Maan | 2016-07-06 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Bump GITLAB_SHELL_VERSION to 3.2.0shell-version-bump | Patricio Cano | 2016-07-05 | 1 | -1/+1 |
* | | | | | | Merge branch 'gh-labels' into 'master' | Robert Speicher | 2016-07-06 | 11 | -54/+123 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix unescaped strings in the labels dropdown templategh-labels | Douglas Barbosa Alexandre | 2016-07-06 | 1 | -2/+2 |
| * | | | | | | Update CHANGELOG | Douglas Barbosa Alexandre | 2016-07-05 | 1 | -0/+1 |
| * | | | | | | Render label name contains ?, & in the labels dropdown without escaping | Douglas Barbosa Alexandre | 2016-07-05 | 2 | -6/+5 |
| * | | | | | | Use CGI.unescapeHTML rather than doing the gsub with a map | Douglas Barbosa Alexandre | 2016-07-05 | 2 | -12/+2 |
| * | | | | | | Move `unescape_html_entities` from LabelsHelper to Label model | Douglas Barbosa Alexandre | 2016-07-05 | 4 | -19/+13 |
| * | | | | | | Render references for labels that name contains ?, or & | Douglas Barbosa Alexandre | 2016-07-05 | 6 | -17/+77 |
| * | | | | | | Allow '?', or '&' for label titles | Douglas Barbosa Alexandre | 2016-07-05 | 6 | -44/+69 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'fix/import-url-validator' into 'master' | Robert Speicher | 2016-07-06 | 6 | -4/+156 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | refactor url validator to use sanitizer for checkfix/import-url-validator | James Lopez | 2016-07-01 | 1 | -3/+1 |
| * | | | | | typo | James Lopez | 2016-06-30 | 1 | -1/+1 |
| * | | | | | few more changes from suggestions | James Lopez | 2016-06-30 | 4 | -5/+4 |
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-... | James Lopez | 2016-06-30 | 414 | -768/+1863 |
| |\ \ \ \ \ | |||||
| * | | | | | | use class method | James Lopez | 2016-06-30 | 1 | -7/+8 |
| * | | | | | | few changes based on feedback | James Lopez | 2016-06-30 | 5 | -17/+20 |
| * | | | | | | fix merge conflicts | James Lopez | 2016-06-28 | 279 | -1673/+4090 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | added more info on how addressable URI differs from what we use in UrlValidator | James Lopez | 2016-06-24 | 1 | -1/+3 |
| * | | | | | | | updated validator based on feedback | James Lopez | 2016-06-23 | 1 | -3/+3 |
| * | | | | | | | fix chnagelog | James Lopez | 2016-06-22 | 1 | -2/+3 |
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-... | James Lopez | 2016-06-22 | 1 | -2/+5 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | another fix and fixed spec | James Lopez | 2016-06-22 | 2 | -1/+10 |
| * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-... | James Lopez | 2016-06-22 | 324 | -1798/+3805 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fix comment | James Lopez | 2016-06-20 | 1 | -1/+1 |
| * | | | | | | | | | fixed a few MySQL issues and added changelog | James Lopez | 2016-06-20 | 3 | -14/+46 |
| * | | | | | | | | | started working on a migration for projects that have current import_url issues | James Lopez | 2016-06-20 | 2 | -7/+59 |
| * | | | | | | | | | fix addressable url validator | James Lopez | 2016-06-20 | 1 | -7/+7 |
| * | | | | | | | | | Merge branches 'fix/import-url-validator' and 'master' of gitlab.com:gitlab-o... | James Lopez | 2016-06-20 | 268 | -1071/+11528 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fixing URL validation for import_url on projects | James Lopez | 2016-06-17 | 3 | -3/+55 |
* | | | | | | | | | | | Merge branch 'update-templates-for-8-10' into 'master' | Rémy Coutable | 2016-07-06 | 25 | -24/+526 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add and update .gitignore & .gitlab-ci.yml templates for 8.10update-templates-for-8-10 | Rémy Coutable | 2016-07-06 | 25 | -24/+526 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'fix/project-export-error' into 'master' | Rémy Coutable | 2016-07-06 | 4 | -3/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | fix typofix/project-export-error | James Lopez | 2016-07-06 | 1 | -1/+1 |
| * | | | | | | | | | | even more debug | James Lopez | 2016-07-06 | 3 | -3/+5 |
| * | | | | | | | | | | add more debug info to project export | James Lopez | 2016-07-05 | 1 | -0/+4 |