Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | backport dependency import change in issue_card_inner.jsbackport-4006-add-weight-indicator-to-issues-board | Dennis Tang | 2018-03-21 | 1 | -2/+2 |
* | Merge branch 'docs/ci-caching' into 'master' | Marcia Ramos | 2018-03-21 | 4 | -86/+569 |
|\ | |||||
| * | Gather info on CI/CD caching | Achilleas Pipinellis | 2018-03-21 | 4 | -86/+569 |
* | | Merge branch 'refactor/move-time-tracking-vue-components' into 'master' | Filipa Lacerda | 2018-03-21 | 4 | -98/+109 |
|\ \ | |||||
| * | | Move TimeTrackingCollapsedState vue component | George Tsiolis | 2018-03-21 | 4 | -98/+109 |
* | | | Merge branch 'docs/clarify-mail-room-procfile-location' into 'master' | Sean McGivern | 2018-03-21 | 2 | -9/+2 |
|\ \ \ | |||||
| * | | | Launch mail_room manually and remove foreman reference | Eric Eastwood | 2018-03-21 | 2 | -9/+2 |
* | | | | Merge branch 'update-omniauth' into 'master' | Robert Speicher | 2018-03-21 | 2 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | Update omniauth 1.4.2 -> 1.8 | Pirate Praveen | 2018-03-21 | 2 | -4/+4 |
* | | | | | Merge branch 'ee-5063-to-ce-backport' into 'master' | Douwe Maan | 2018-03-21 | 3 | -5/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Backports changes made in https://gitlab.com/gitlab-org/gitlab-ee/merge_reque...ee-5063-to-ce-backport | Tiago Botelho | 2018-03-21 | 3 | -5/+5 |
* | | | | | | Merge branch 'blackst0ne-rails5-add-second-gemfile' into 'master' | Robert Speicher | 2018-03-21 | 3 | -5/+1255 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | [Rails5] Add Gemfile.rails5blackst0ne-rails5-add-second-gemfile | blackst0ne | 2018-03-15 | 3 | -5/+1255 |
* | | | | | | Merge branch '43786-on-the-issuable-list-add-tooltips-to-icons' into 'master' | Clement Ho | 2018-03-21 | 5 | -11/+25 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Issuable list: add tooltips to icons | Lukas Eipert | 2018-03-21 | 5 | -11/+25 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'ide-folder-button-path' into 'master' | Tim Zallmann | 2018-03-21 | 7 | -46/+95 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixes the web IDE link in tree list opening the wrong URL | Phil Hughes | 2018-03-21 | 7 | -46/+95 |
* | | | | | | | Merge branch 'blackst0ne-rails5-update-ar5-batching-initializer' into 'master' | Robert Speicher | 2018-03-21 | 1 | -37/+35 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | [Rails5] Update ar5_batching initializerblackst0ne-rails5-update-ar5-batching-initializer | blackst0ne | 2018-03-21 | 1 | -37/+35 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'blackst0ne-rails5-update-ar5-pg-10-support-initializer' into 'm... | Robert Speicher | 2018-03-21 | 1 | -3/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | [Rails5] Update ar5_pg_10_support initializerblackst0ne-rails5-update-ar5-pg-10-support-initializer | blackst0ne | 2018-03-21 | 1 | -3/+2 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'remove-parser-warnings-workaround' into 'master' | Robert Speicher | 2018-03-21 | 1 | -9/+0 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | It's now updated so we could remove it | Lin Jen-Shin | 2018-03-21 | 1 | -9/+0 |
* | | | | | | | Merge branch 'gitaly-upload-archive' into 'master' | Sean McGivern | 2018-03-21 | 3 | -2/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Send Gitaly payload for git-upload-archive SSH commands | Alejandro RodrÃguez | 2018-03-21 | 3 | -2/+8 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'ab-44446-add-indexes-for-user-activity-queries' into 'master' | Yorick Peterse | 2018-03-21 | 3 | -1/+48 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Guard creation/removal with existence checks. | Andreas Brandl | 2018-03-21 | 1 | -6/+16 |
| * | | | | | | | Flip column order in new index. | Andreas Brandl | 2018-03-21 | 2 | -3/+3 |
| * | | | | | | | Patch MySQL's odd foreign key behavior. | Andreas Brandl | 2018-03-21 | 1 | -1/+14 |
| * | | | | | | | Add indexes for user activity queries. | Andreas Brandl | 2018-03-21 | 3 | -1/+25 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'flip-carets' into 'master' | Phil Hughes | 2018-03-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | makes caret go to the right side when closing most right issueboard listflip-carets | Dimitrie Hoekstra | 2018-03-15 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'ab-43887-concurrent-migration-helpers' into 'master' | Yorick Peterse | 2018-03-21 | 7 | -62/+163 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Shortcut concurrent foreign key creation if already exists.ab-43887-concurrent-migration-helpers | Andreas Brandl | 2018-03-20 | 6 | -51/+92 |
| * | | | | | | | | Shortcut concurrent index creation/removal if no effect. | Andreas Brandl | 2018-03-20 | 3 | -11/+71 |
* | | | | | | | | | Merge branch '39584-nesting-depth-5-framework-dropdowns' into 'master' | Clement Ho | 2018-03-21 | 2 | -4/+7 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Apply NestingDepth (level 5) (framework/dropdowns.scss) | Takuya Noguchi | 2018-03-21 | 2 | -4/+7 |
* | | | | | | | | | Merge branch 'ide-project-avatar-identicon' into 'master' | Filipa Lacerda | 2018-03-21 | 3 | -7/+62 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Changes empty project avatar to identicon in the IDE | Phil Hughes | 2018-03-21 | 3 | -7/+62 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'fix-confirm-danger-modal' into 'master' | Filipa Lacerda | 2018-03-21 | 4 | -41/+32 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | move confirm_danger_modal bindings directly into the only two pages that need itfix-confirm-danger-modal | Mike Greiling | 2018-03-20 | 4 | -10/+15 |
| * | | | | | | | | | refactor ConfirmDangerModal into ES module | Mike Greiling | 2018-03-20 | 2 | -37/+23 |
* | | | | | | | | | | Merge branch 'update-licensee' into 'master' | Douwe Maan | 2018-03-21 | 5 | -7/+7 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Fix test failures with licensee 8.9 | Pirate Praveen | 2018-03-20 | 3 | -4/+4 |
| * | | | | | | | | | Update licensee 8.7.0 -> 8.9 | Pirate Praveen | 2018-03-19 | 2 | -3/+3 |
* | | | | | | | | | | Merge branch 'update-gettext_i18n_rails_js' into 'master' | Douwe Maan | 2018-03-21 | 2 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | Update gettext_i18n_rails_js 1.2.0 -> 1.3 | Pirate Praveen | 2018-03-16 | 2 | -8/+8 |
* | | | | | | | | | | Merge branch 'make-ide-ce' into 'master' | Tim Zallmann | 2018-03-21 | 120 | -167/+9213 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fixed ide_edit_button not existingmake-ide-ce | Phil Hughes | 2018-03-20 | 2 | -0/+12 |
| * | | | | | | | | | | remove JS for cookie toggle | Phil Hughes | 2018-03-20 | 1 | -22/+19 |