Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | spec fixes | Phil Hughes | 2018-03-22 | 7 | -90/+48 |
* | Added staged files state to IDE | Phil Hughes | 2018-03-22 | 14 | -36/+549 |
* | Merge branch 'performance-bar-position-fix' into 'master' | Filipa Lacerda | 2018-03-22 | 1 | -10/+2 |
|\ | |||||
| * | fixed karmaperformance-bar-position-fix | Phil Hughes | 2018-03-21 | 1 | -10/+2 |
* | | Merge branch 'jej/omniauth-initializer-refactor' into 'master' | Douwe Maan | 2018-03-22 | 1 | -0/+65 |
|\ \ | |||||
| * | | OmniauthInitializer created to improve devise.rb | James Edwards-Jones | 2018-03-20 | 1 | -0/+65 |
* | | | Merge branch 'add-query-counts-to-profiler-output' into 'master' | Stan Hu | 2018-03-22 | 1 | -2/+22 |
|\ \ \ | |||||
| * | | | Add query counts by model to profiler outputadd-query-counts-to-profiler-output | Sean McGivern | 2018-03-21 | 1 | -2/+22 |
* | | | | Merge branch 'disable-btn-mr-when-posting-comment' into 'master' | Fatih Acet | 2018-03-21 | 1 | -0/+14 |
|\ \ \ \ | |||||
| * | | | | Adds tests | Jacob Schatz | 2018-03-21 | 1 | -0/+14 |
* | | | | | Merge branch 'ide-folder-button-path' into 'master' | Tim Zallmann | 2018-03-21 | 1 | -0/+14 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Fixes the web IDE link in tree list opening the wrong URL | Phil Hughes | 2018-03-21 | 1 | -0/+14 |
* | | | | | Merge branch 'gitaly-upload-archive' into 'master' | Sean McGivern | 2018-03-21 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Send Gitaly payload for git-upload-archive SSH commands | Alejandro Rodríguez | 2018-03-21 | 1 | -0/+6 |
* | | | | | | Merge branch 'ab-43887-concurrent-migration-helpers' into 'master' | Yorick Peterse | 2018-03-21 | 1 | -11/+97 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Shortcut concurrent foreign key creation if already exists.ab-43887-concurrent-migration-helpers | Andreas Brandl | 2018-03-20 | 1 | -1/+45 |
| * | | | | | Shortcut concurrent index creation/removal if no effect. | Andreas Brandl | 2018-03-20 | 1 | -10/+52 |
* | | | | | | Merge branch 'ide-project-avatar-identicon' into 'master' | Filipa Lacerda | 2018-03-21 | 1 | -0/+39 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Changes empty project avatar to identicon in the IDE | Phil Hughes | 2018-03-21 | 1 | -0/+39 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'update-licensee' into 'master' | Douwe Maan | 2018-03-21 | 3 | -4/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix test failures with licensee 8.9 | Pirate Praveen | 2018-03-20 | 3 | -4/+4 |
* | | | | | Merge branch 'make-ide-ce' into 'master' | Tim Zallmann | 2018-03-21 | 46 | -0/+4692 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | updated file references in specs | Phil Hughes | 2018-03-20 | 43 | -428/+629 |
| * | | | | Move IDE to CE | Phil Hughes | 2018-03-20 | 46 | -0/+4491 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'update-spec-import-path-for-vue-mount-component-helper' into 'm... | Clement Ho | 2018-03-20 | 15 | -22/+22 |
|\ \ \ \ | |||||
| * | | | | Update spec import path for vue mount component helper | George Tsiolis | 2018-03-20 | 15 | -22/+22 |
* | | | | | Resolve "Loss of input text on comments after preview" | Simon Knox | 2018-03-20 | 1 | -5/+5 |
* | | | | | Merge branch 'fix-ci-job-auto-retry' into 'master' | Grzegorz Bizon | 2018-03-20 | 1 | -0/+29 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Prevent auto-retry AccessDenied error from stopping transition to failed | Tomasz Maczukin | 2018-03-20 | 1 | -0/+29 |
* | | | | | Merge branch 'fix/sm/erase_old_trace' into 'master' | Kamil Trzciński | 2018-03-20 | 1 | -0/+22 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Use update_column than write_attribute and savefix/sm/erase_old_trace | Shinya Maeda | 2018-03-19 | 1 | -0/+22 |
* | | | | | Merge branch '42558-add-monitoring-no-data-empty-state' into 'master' | Phil Hughes | 2018-03-20 | 2 | -34/+13 |
|\ \ \ \ \ | |||||
| * | | | | | fix tests for dahboard.vue42558-add-monitoring-no-data-empty-state | Mike Greiling | 2018-03-19 | 2 | -34/+13 |
* | | | | | | Merge branch '44280-fix-code-search' into 'master' | Sean McGivern | 2018-03-20 | 1 | -5/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Split repository search result on \n instead of $ to prevent the items of the... | Jasper Maes | 2018-03-19 | 1 | -5/+17 |
* | | | | | | | Merge branch 'issue_25542' into 'master' | Sean McGivern | 2018-03-20 | 2 | -1/+47 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Improve JIRA event descriptionsissue_25542 | Felipe Artur | 2018-03-19 | 2 | -1/+47 |
* | | | | | | | move render_gfm into behaviors directory | Mike Greiling | 2018-03-19 | 7 | -9/+7 |
* | | | | | | | Merge branch 'ajax-requests-in-performance-bar' into 'master' | Robert Speicher | 2018-03-19 | 5 | -5/+275 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Show Ajax requests in performance bar | Sean McGivern | 2018-03-19 | 5 | -5/+275 |
* | | | | | | | Merge branch 'api-delimiter' into 'master' | Robert Speicher | 2018-03-19 | 1 | -24/+24 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Optional '/-/' delimiter for search API | Jan Provaznik | 2018-03-19 | 1 | -24/+24 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch '43933-always-notify-mentions' into 'master' | Sean McGivern | 2018-03-19 | 1 | -3/+18 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Always notify new mentions even if explicitly unsubscribed43933-always-notify-mentions | Mario de la Ossa | 2018-03-19 | 1 | -3/+18 |
* | | | | | | | Merge branch 'sh-admin-projects-remove-n-plus-one' into 'master' | Robert Speicher | 2018-03-19 | 1 | -0/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove N+1 queries in /admin/projects page | Stan Hu | 2018-03-19 | 1 | -0/+10 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'refactor/move-mr-widget-sha-mismatch-vue-component' into 'master' | Clement Ho | 2018-03-19 | 1 | -4/+5 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Move ShaMismatch vue component | George Tsiolis | 2018-03-19 | 1 | -4/+5 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch '31114-internal-ids-are-not-atomic' into 'master' | Sean McGivern | 2018-03-19 | 7 | -3/+163 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add spec for concurrent insert situation.31114-internal-ids-are-not-atomic | Andreas Brandl | 2018-03-18 | 1 | -0/+13 |