Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '43240-external-tracker-issues-don-t-have-the-correct-closing-te... | Rémy Coutable | 2018-02-14 | 1 | -117/+55 |
|\ | |||||
| * | Fix closing issues text added to MRs for external issue trackers | Sean McGivern | 2018-02-14 | 1 | -117/+55 |
* | | Merge branch 'ce-port-ee-f531c07299' into 'master' | Sean McGivern | 2018-02-14 | 1 | -8/+7 |
|\ \ | |||||
| * | | Fix a too strict array-matching expectation | Rémy Coutable | 2018-02-14 | 1 | -8/+7 |
* | | | Merge branch 'mk-fix-pg-undefined-table-ci-errors' into 'master' | Rémy Coutable | 2018-02-14 | 4 | -29/+10 |
|\ \ \ | |||||
| * | | | Avoid dropping tables in test | Michael Kozono | 2018-02-14 | 4 | -29/+10 |
* | | | | Merge branch '42800-change-usage-of-avatar_icon' into 'master' | Yorick Peterse | 2018-02-14 | 3 | -14/+50 |
|\ \ \ \ | |||||
| * | | | | Extract repeated logic into #avatar_icon_for.42800-change-usage-of-avatar_icon | Andreas Brandl | 2018-02-13 | 1 | -0/+16 |
| * | | | | Remove generic #avatar_icon helper. | Andreas Brandl | 2018-02-13 | 1 | -28/+0 |
| * | | | | Explicit use of avatar_icon_* calls depending on situation. | Andreas Brandl | 2018-02-13 | 1 | -8/+8 |
| * | | | | Use more specific #avatar_icon_for_user. | Andreas Brandl | 2018-02-13 | 1 | -1/+1 |
| * | | | | Refactor and split ApplicationHelper#avatar_icon. | Andreas Brandl | 2018-02-13 | 1 | -0/+48 |
* | | | | | Merge branch 'expired-ci-artifacts' into 'master' | Grzegorz Bizon | 2018-02-14 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Add indexes and change SQL for expired artifacts to deal with artifacts migra... | Greg Stark | 2018-02-08 | 1 | -2/+2 |
* | | | | | | Merge branch 'fix/template-project-visibility' into 'master' | Douwe Maan | 2018-02-14 | 1 | -2/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add description, visibility to CreateFromTemplateService spec | George Tsiolis | 2018-02-14 | 1 | -2/+6 |
* | | | | | | | Resolve "Remove notification settings for groups and projects you were previo... | 🙈 jacopo beschi 🙉 | 2018-02-14 | 1 | -6/+50 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge branch 'feature/include-custom-attributes-in-api' into 'master' | Douwe Maan | 2018-02-14 | 1 | -37/+121 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Allow including custom attributes in API responses | Markus Koller | 2018-02-08 | 1 | -37/+121 |
* | | | | | | Merge branch '42934-search-api-fix' into 'master' | Sean McGivern | 2018-02-14 | 4 | -6/+12 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | API - Include project in commits&blobs search results | Jarka Kadlecová | 2018-02-14 | 4 | -6/+12 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch '37050-ext-issue-tracker' into 'master' | Sean McGivern | 2018-02-14 | 2 | -9/+114 |
|\ \ \ \ \ | |||||
| * | | | | | Display a link to external issue tracker when enabled | Jarka Kadlecová | 2018-02-14 | 2 | -9/+114 |
* | | | | | | Merge branch 'api-refs-for-commit' into 'master' | Douwe Maan | 2018-02-14 | 1 | -0/+66 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Refactor commits/refs API to use hash and add pagination headers | Robert Schilling | 2018-02-14 | 1 | -16/+20 |
| * | | | | | | Separate branch and tag names | Robert Schilling | 2018-02-09 | 1 | -10/+12 |
| * | | | | | | Start with tests | Robert Schilling | 2018-02-09 | 1 | -0/+60 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'remove_ldap_person_validation' into 'master' | Stan Hu | 2018-02-13 | 1 | -9/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Revert problematic LDAP person validation that threw exceptions | Drew Blessing | 2018-02-13 | 1 | -9/+0 |
* | | | | | | | 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 |