Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | CE: Move EE differences for6105-move-ee-differences-group-members | Donald Cook | 2019-05-07 | 1 | -0/+2 |
* | Merge branch 'patch-17' into 'master' | Bob Van Landuyt | 2019-05-07 | 2 | -5/+5 |
|\ | |||||
| * | add changelog entry | Simon Hardt | 2019-05-07 | 1 | -0/+5 |
| * | remove note that multi-line suggestions are not yet available | Simon Hardt | 2019-05-06 | 1 | -5/+0 |
* | | Merge branch 'fj-59522-improve-search-controller-performance' into 'master' | James Lopez | 2019-05-07 | 14 | -113/+182 |
|\ \ | |||||
| * | | Add improvements to the global search process | Francisco Javier López | 2019-05-07 | 14 | -113/+182 |
|/ / | |||||
* | | Merge branch 'patch-17' into 'master' | Bob Van Landuyt | 2019-05-07 | 1 | -2/+2 |
|\ \ | |||||
| * | | include local: remove superfluous ":" | Elan Ruusamäe | 2019-05-06 | 1 | -2/+2 |
* | | | Merge branch 'bvl-fix-ordering-mysql' into 'master' | Sean McGivern | 2019-05-07 | 1 | -5/+5 |
|\ \ \ | |||||
| * | | | Set created_at and updated_at for sorting specs | Bob Van Landuyt | 2019-05-07 | 1 | -5/+5 |
* | | | | Merge branch 'docs/fix-source-install-git' into 'master' | Bob Van Landuyt | 2019-05-07 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix installation from source | Dmitriy Zaporozhets | 2019-05-07 | 1 | -1/+1 |
* | | | | | Merge branch 'gitaly-version-v1.42.0' into 'master' | Douwe Maan | 2019-05-07 | 2 | -1/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Upgrade Gitaly to v1.42.0 | GitalyBot | 2019-05-07 | 2 | -1/+6 |
|/ / / / / | |||||
* | | | | | Merge branch 'dz-registry-proxy-ui-ce' into 'master' | Tim Zallmann | 2019-05-07 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Backport change to group sidebardz-registry-proxy-ui-ce | mfluharty | 2019-05-01 | 1 | -0/+1 |
* | | | | | | Merge branch 'sh-cleanup-import-export' into 'master' | James Lopez | 2019-05-07 | 3 | -4/+37 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Clean up CarrierWave's import/export files | Stan Hu | 2019-05-07 | 3 | -4/+37 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'friendly-wrap-component' into 'master' | Tim Zallmann | 2019-05-07 | 2 | -0/+9 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Add wbr style for IE11 compatibilityfriendly-wrap-component | Paul Gascou-Vaillancourt | 2019-05-06 | 2 | -0/+9 |
* | | | | | | Merge branch '59930-todos-scss' into 'master' | Phil Hughes | 2019-05-07 | 2 | -35/+28 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Cleans up todos.scss stylelint warnings59930-todos-scss | Filipa Lacerda | 2019-05-03 | 2 | -35/+28 |
* | | | | | | | Merge branch 'winh-separate-frontend-fixtures' into 'master' | Phil Hughes | 2019-05-07 | 8 | -10/+22 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Load EE fixtures from ee/ directory in Jestwinh-separate-frontend-fixtures | Winnie Hellmann | 2019-05-02 | 2 | -4/+7 |
| * | | | | | | | Load EE fixtures from ee/ directory in Karma | Winnie Hellmann | 2019-05-02 | 2 | -2/+7 |
| * | | | | | | | Generate EE frontend fixtures into ee/ directory | Winnie Hellmann | 2019-05-02 | 1 | -1/+1 |
| * | | | | | | | Allow to override Gitlab.ee? with IS_GITLAB_EE | Winnie Hellmann | 2019-05-02 | 1 | -1/+5 |
| * | | | | | | | Ignore PDF and balsamiq fixture files | Winnie Hellmann | 2019-05-02 | 2 | -2/+2 |
* | | | | | | | | Merge branch '61278-next' into 'master' | Phil Hughes | 2019-05-07 | 3 | -5/+23 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Only renders Next badge for gitlab.com | Filipa Lacerda | 2019-05-07 | 3 | -5/+23 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'allow-replying-to-individual-notes-from-api' into 'master' | James Lopez | 2019-05-07 | 5 | -11/+34 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Allow replying to an individual note in the APIallow-replying-to-individual-notes-from-api | Sean McGivern | 2019-05-06 | 5 | -11/+34 |
* | | | | | | | | Merge branch 'strip-attr-cron-in-pipeline-schedule' into 'master' | Grzegorz Bizon | 2019-05-07 | 2 | -0/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Strip whitespace for PipelineSchedule#cronstrip-attr-cron-in-pipeline-schedule | Fabio Pitino | 2019-05-02 | 2 | -0/+12 |
* | | | | | | | | | Merge branch 'instance_level_clusters' into 'master' | Bob Van Landuyt | 2019-05-07 | 39 | -45/+1109 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Remove duplicate clusterable presenter methodinstance_level_clusters | James Fargher | 2019-05-07 | 5 | -26/+0 |
| * | | | | | | | | | Convert instance level clusters enabled to class method | James Fargher | 2019-05-07 | 3 | -7/+3 |
| * | | | | | | | | | Change specs to match gitlab code standards | James Fargher | 2019-05-07 | 3 | -19/+23 |
| * | | | | | | | | | Stop using `go` function in clusters controller specs | James Fargher | 2019-05-07 | 1 | -54/+54 |
| * | | | | | | | | | Check instance cluster feature at policy level | James Fargher | 2019-05-07 | 10 | -36/+107 |
| * | | | | | | | | | Allow projects to use instance level clusters | James Fargher | 2019-05-07 | 7 | -11/+66 |
| * | | | | | | | | | Instance level kubernetes clusters admin | James Fargher | 2019-05-07 | 27 | -5/+969 |
* | | | | | | | | | | Merge branch 'sh-fix-activerecord-patch-mark2' into 'master' | Stan Hu | 2019-05-07 | 3 | -11/+37 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Additional fix to handle NULL lock_versionsh-fix-activerecord-patch-mark2 | Stan Hu | 2019-05-06 | 3 | -11/+37 |
* | | | | | | | | | | | Merge branch 'sh-fix-ldap-members-icon-ce' into 'master' | Kushal Pandya | 2019-05-07 | 2 | -4/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Backport members SCSS changessh-fix-ldap-members-icon-ce | Stan Hu | 2019-05-06 | 2 | -4/+1 |
* | | | | | | | | | | | | Merge branch '56992-add-filtering-to-project-dashboard-fe' into 'master' | Kushal Pandya | 2019-05-07 | 23 | -51/+575 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Updated translation strings56992-add-filtering-to-project-dashboard-fe | Ezekiel Kigbo | 2019-05-06 | 1 | -3/+0 |
| * | | | | | | | | | | | | Cleanup css classes and styles | Ezekiel Kigbo | 2019-05-06 | 6 | -30/+22 |
| * | | | | | | | | | | | | Added blank lines to meet style guide | Ezekiel Kigbo | 2019-05-06 | 14 | -79/+86 |