Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [cherry-pick] fix the Upload model being tainted after migration specce-fix-upload-model-tainted-after-migration-spec | Micaël Bergeron | 2018-01-19 | 1 | -0/+4 |
* | Merge branch 'fix-redirect-routes-schema' into 'master' | Yorick Peterse | 2018-01-19 | 4 | -3/+76 |
|\ | |||||
| * | Rework indexes on redirect_routes to be more effective and enforce a case ins...fix-redirect-routes-schema | Greg Stark | 2018-01-18 | 4 | -3/+76 |
* | | Merge branch 'mr-widget-vue' into 'master' | Phil Hughes | 2018-01-19 | 5 | -39/+60 |
|\ \ | |||||
| * | | Fix conflict with ee iconmr-widget-vue | Filipa Lacerda | 2018-01-18 | 1 | -1/+1 |
| * | | Move archived component to vue file | Filipa Lacerda | 2018-01-18 | 5 | -39/+60 |
* | | | Merge branch '41532-email-reason' into 'master' | Sean McGivern | 2018-01-19 | 17 | -94/+288 |
|\ \ \ | |||||
| * | | | Initial work to add notification reason to emails | Mario de la Ossa | 2018-01-16 | 17 | -94/+288 |
* | | | | Merge branch 'sh-fix-authorized-keys-docs' into 'master' | Nick Thomas | 2018-01-19 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix incorrect path for gitlab-shell authorized keys helpersh-fix-authorized-keys-docs | Stan Hu | 2018-01-18 | 1 | -1/+1 |
* | | | | | Merge branch '26296-update-styling-disabled-buttons' into 'master' | Phil Hughes | 2018-01-19 | 6 | -19/+44 |
|\ \ \ \ \ | |||||
| * | | | | | Change cursor to default for disabled buttons26296-update-styling-disabled-buttons | Annabel Dunstone Gray | 2018-01-18 | 2 | -2/+2 |
| * | | | | | Remove hover states from disabled buttons | Annabel Dunstone Gray | 2018-01-17 | 2 | -16/+21 |
| * | | | | | Update styling of all disabled buttons | Annabel Dunstone Gray | 2018-01-16 | 5 | -13/+33 |
* | | | | | | Merge branch 'tz-fix-ide-bugs' into 'master' | Phil Hughes | 2018-01-19 | 25 | -77/+169 |
|\ \ \ \ \ \ | |||||
| * | | | | | | WebIDE: Fix Commit bugs | Tim Zallmann | 2018-01-19 | 25 | -77/+169 |
|/ / / / / / | |||||
* | | | | | | Merge branch '42157-41989-fix-duplicate-in-create-item-dropdown' into 'master' | Phil Hughes | 2018-01-19 | 4 | -1/+135 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix duplicate item in protected branch/tag dropdown42157-41989-fix-duplicate-in-create-item-dropdown | Eric Eastwood | 2018-01-18 | 4 | -1/+135 |
* | | | | | | | Merge branch 'fix-derefenced-target' into 'master' | Douwe Maan | 2018-01-19 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix dereferenced_target naming in Gitlab::Git::Ref initialize | Serdar Dogruyol | 2018-01-17 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'fix-description-loss' into 'master' | Phil Hughes | 2018-01-19 | 2 | -0/+51 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix eslintfix-description-loss | Jacob Schatz | 2018-01-18 | 1 | -4/+2 |
| * | | | | | | | | Remove Event listener and make code more readable. | Jacob Schatz | 2018-01-18 | 1 | -4/+8 |
| * | | | | | | | | Add confirm when navigating away from page with tests. | Jacob Schatz | 2018-01-18 | 2 | -0/+49 |
* | | | | | | | | | Merge branch '42159-utf8-uploads' into 'master' | Douwe Maan | 2018-01-19 | 3 | -11/+17 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Correctly escape UTF-8 path elements for uploads | Nick Thomas | 2018-01-18 | 3 | -11/+17 |
* | | | | | | | | | | Merge branch '34055-issues-enabled-filter-misbehavior' into 'master' | James Lopez | 2018-01-19 | 4 | -2/+35 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Resolve "Projects API: filter 'with_issues_enabled=true' returns projects wit... | Jan Christophersen | 2018-01-19 | 4 | -2/+35 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'dispatcher-project-mr-edit' into 'master' | Jacob Schatz | 2018-01-19 | 4 | -11/+34 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Refactor dispatcher project mr edit and creation diff path | Clement Ho | 2018-01-18 | 4 | -11/+34 |
* | | | | | | | | | | Merge branch 'dispatcher-groups' into 'master' | Jacob Schatz | 2018-01-18 | 17 | -75/+149 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | dynamic imports for groups: pages | Simon Knox | 2018-01-18 | 17 | -75/+149 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch '42154-fix-artifact-size-calc' into 'master' | Robert Speicher | 2018-01-18 | 3 | -1/+12 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix a bug calculating artifact size for project statistics | Nick Thomas | 2018-01-18 | 3 | -1/+12 |
* | | | | | | | | | | | Merge branch '42187-update-gitlab-styles-to-2-3-0' into 'master' | Robert Speicher | 2018-01-18 | 5 | -86/+75 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Update rubocop, rubocop-rspec, and gitlab-styles42187-update-gitlab-styles-to-2-3-0 | Rémy Coutable | 2018-01-18 | 5 | -86/+75 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch '41247-timestamp' into 'master' | Robert Speicher | 2018-01-18 | 5 | -24/+58 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Return last edited time instead of update time41247-timestamp | Jan Provaznik | 2018-01-18 | 5 | -24/+58 |
* | | | | | | | | | | | | Merge branch '42190-make-edit-labels-in-the-issuable-sidebar-consistent' into... | Clement Ho | 2018-01-18 | 4 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Make the 'Edit' links consistent in the issuable sidebar42190-make-edit-labels-in-the-issuable-sidebar-consistent | Rémy Coutable | 2018-01-18 | 4 | -6/+6 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'dispatcher-projects-mr-creation-new' into 'master' | Jacob Schatz | 2018-01-18 | 2 | -14/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Refactor dispatcher project mr creations new path | Clement Ho | 2018-01-18 | 2 | -14/+21 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'tz-karma-libraries-upgrade' into 'master' | Filipa Lacerda | 2018-01-18 | 3 | -234/+1259 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Upgraded Karma Dependencies | Tim Zallmann | 2018-01-18 | 3 | -234/+1259 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch '42186-username-trailing-space' into 'master' | Filipa Lacerda | 2018-01-18 | 1 | -3/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Remove trailing space after author name in note header | Annabel Dunstone Gray | 2018-01-18 | 1 | -3/+1 |
* | | | | | | | | | | | | | Merge branch 'rc/improve-mr-feature-specs' into 'master' | Robert Speicher | 2018-01-18 | 60 | -1748/+1087 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Improve MR feature specs and reduce duplicationrc/improve-mr-feature-specs | Rémy Coutable | 2018-01-18 | 60 | -1748/+1087 |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'jramsay-3953-fast-ssh-ce-docs' into 'master' | Marcia Ramos | 2018-01-18 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Add EE version and CE issue linkjramsay-3953-fast-ssh-ce-docs | James Ramsay | 2018-01-18 | 1 | -2/+3 |