| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Improved formatting, excluding the `format` parameter once againan/lograge-fix | Andrew Newdigate | 2018-02-28 | 1 | -2/+4 |
| | | |||||
| * | Fix for open-ended parameter's in lograge causing elastic memory issues. | Andrew Newdigate | 2018-02-28 | 1 | -1/+4 |
| | | | | | | | See https://gitlab.com/gitlab-com/infrastructure/issues/2888 See https://gitlab.com/gitlab-org/gitlab-ce/issues/43678 See https://gitlab.com/gitlab-com/migration/issues/163 | ||||
| * | Merge branch '43669-fix-webpack-trailing-comma' into 'master' | Mike Greiling | 2018-02-27 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Fix webpack.config.js syntax error from trailing comma Closes #43669 See merge request gitlab-org/gitlab-ce!17404 | ||||
| | * | Remove trailing comma in webpack config to support Node@<8 | Eric Eastwood | 2018-02-27 | 1 | -1/+1 |
| | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/43669 | ||||
| * | | Merge branch 'remove-snippets-bundle' into 'master' | Jacob Schatz | 2018-02-27 | 7 | -14/+25 |
| |\ \ | | | | | | | | | | | | | Remove snippet bundle webpack entry point See merge request gitlab-org/gitlab-ce!17329 | ||||
| | * | | Remove snippet bundle webpack entry point | Clement Ho | 2018-02-27 | 7 | -14/+25 |
| |/ / | |||||
| * | | Merge branch 'profile-bundle-tag-refactor' into 'master' | Jacob Schatz | 2018-02-27 | 17 | -101/+82 |
| |\ \ | |/ |/| | | | | | removed profile webpack bundle tag See merge request gitlab-org/gitlab-ce!17320 | ||||
| | * | Resolved conflicts in dispatcher.jsprofile-bundle-tag-refactor | Constance Okoghenun | 2018-02-27 | 223 | -1018/+1357 |
| | |\ | |/ |/| | |||||
| * | | Merge branch 'remove-sidebar-bundle' into 'master' | Jacob Schatz | 2018-02-27 | 7 | -8/+12 |
| |\ \ | | | | | | | | | | | | | Remove sidebar bundle webpack entry point See merge request gitlab-org/gitlab-ce!17343 | ||||
| | * \ | Merge branch 'master' into remove-sidebar-bundleremove-sidebar-bundle | Clement Ho | 2018-02-23 | 7 | -9/+15 |
| | |\ \ | |||||
| | * | | | Remove sidebar bundle webpack entry point | Clement Ho | 2018-02-23 | 7 | -8/+12 |
| | | | | | |||||
| * | | | | Merge branch 'rc/reduce-delta-with-ce-in-controllers-ce' into 'master' | Douwe Maan | 2018-02-27 | 27 | -460/+437 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove explicit audit event log in MembershipActions See merge request gitlab-org/gitlab-ce!14824 | ||||
| | * | | | | Improve Member servicesrc/reduce-delta-with-ce-in-controllers-ce | Rémy Coutable | 2018-02-27 | 24 | -326/+251 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | Move the #update action from Project/Member controllers to the ↵ | Rémy Coutable | 2018-02-27 | 7 | -24/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MembershipActions concern Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | Remove explicit audit event log in MembershipActions | Rémy Coutable | 2018-02-27 | 19 | -217/+277 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move it to Members::ApproveAccessRequestService. Also, note that there was a double audit event log for access request destruction. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | Merge branch ↵ | Robert Speicher | 2018-02-27 | 1 | -8/+11 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43662-can-t-modify-frozen-hash-error-in-development-when-running-a-rake-task' into 'master' Resolve "`can't modify frozen Hash` error in development when running a rake task" Closes #43662 See merge request gitlab-org/gitlab-ce!17396 | ||||
| | * | | | | | Fix a "can't modify frozen Hash" error in lib/api/services.rb in development env | Rémy Coutable | 2018-02-27 | 1 | -8/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | Merge branch 'fix-webpack-dynamic-entries' into 'master' | Clement Ho | 2018-02-27 | 3 | -30/+57 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent webpack from rebooting while switching branches Closes #43638 and #43418 See merge request gitlab-org/gitlab-ce!17389 | ||||
| | * | | | | | | Prevent webpack from rebooting while switching branches | Mike Greiling | 2018-02-27 | 3 | -30/+57 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch '24774-clear-the-Labels-dropdown-search-filter' into 'master' | Phil Hughes | 2018-02-27 | 3 | -0/+23 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear "Labels" dropdown search filter after selection Closes #24774 See merge request gitlab-org/gitlab-ce!17393 | ||||
| | * | | | | | Add test for label search behaviour24774-clear-the-Labels-dropdown-search-filter | Kushal Pandya | 2018-02-27 | 1 | -0/+12 |
| | | | | | | | |||||
| | * | | | | | Add changelog entry | Kushal Pandya | 2018-02-27 | 1 | -0/+5 |
| | | | | | | | |||||
| | * | | | | | Clear "Labels" dropdown search filter after selection | Kushal Pandya | 2018-02-27 | 1 | -0/+6 |
| | | | | | | | |||||
| * | | | | | | Merge branch '40502-osw-keep-link-when-redacting-unauthorized-objects' into ↵ | Douwe Maan | 2018-02-27 | 4 | -10/+45 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Keep raw link when redacting unauthorized link object references Closes #40502 See merge request gitlab-org/gitlab-ce!17365 | ||||
| | * | | | | | Keep link when redacting unauthorized object links | Oswaldo Ferreira | 2018-02-27 | 4 | -10/+45 |
| | | | | | | | |||||
| * | | | | | | Merge branch '43620-lib-api-services-rb-retains-a-lot-of-memory-and-objects' ↵ | Sean McGivern | 2018-02-27 | 1 | -42/+42 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix a performance/memory issue in lib/api/services.rb Closes #43620 See merge request gitlab-org/gitlab-ce!17369 | ||||
| | * | | | | | | Fix a performance/memory issue in lib/api/services.rb43620-lib-api-services-rb-retains-a-lot-of-memory-and-objects | Rémy Coutable | 2018-02-26 | 1 | -42/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | Merge branch '43304-simplify-filtering-non-human-users' into 'master' | Yorick Peterse | 2018-02-27 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify filtering of non-human users. Closes #43304 See merge request gitlab-org/gitlab-ce!17288 | ||||
| | * | | | | | | | Simplify filtering of non-human users (like ghosts).43304-simplify-filtering-non-human-users | Andreas Brandl | 2018-02-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that `ghost IS NOT TRUE` is equivalent to `ghost = 'f' OR ghost is null`: (true), (false), (NULL)) AS t (flag); flag | ?column? | ?column? ------+----------+---------- t | f | f f | t | t | t | t (3 rows) This makes it a little easier to create partial indexes for this (as only one condition is needed). Closes #43304. | ||||
| * | | | | | | | | Merge branch '41851-enable-eslint-codeclimate' into 'master' | Dmitriy Zaporozhets | 2018-02-27 | 2 | -2/+7 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Enable eslint in codeclimate" Closes #41851 See merge request gitlab-org/gitlab-ce!17392 | ||||
| | * | | | | | | | | Adds MR ID to changelog entry41851-enable-eslint-codeclimate | Filipa Lacerda | 2018-02-27 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Enables eslint in codeclimate job | Filipa Lacerda | 2018-02-27 | 2 | -2/+7 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'backstage/gb/build-stages-catch-up-migration' into 'master' | Kamil Trzciński | 2018-02-27 | 7 | -0/+199 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fully migrate build stages again Closes #38756 See merge request gitlab-org/gitlab-ce!15741 | ||||
| | * \ \ \ \ \ \ \ \ | Merge commit '981b5905a02ac89ca9f33ad7c91d8c1a576ed9af' into ↵backstage/gb/build-stages-catch-up-migration | Grzegorz Bizon | 2018-02-23 | 242 | -1329/+4349 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backstage/gb/build-stages-catch-up-migration * commit '981b5905a02ac89ca9f33ad7c91d8c1a576ed9af': (40 commits) | ||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into 'backstage/gb/build-stages-catch-up-migration' | Grzegorz Bizon | 2018-02-22 | 654 | -8676/+7402 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| | * | | | | | | | | | | | Add changelog entry for pipeline stages migration | Grzegorz Bizon | 2018-02-21 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | * | | | | | | | | | | | Create index on id instead of stage_id in migration | Grzegorz Bizon | 2018-02-21 | 2 | -6/+6 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Separate adding and removing index from stages migration | Grzegorz Bizon | 2018-02-20 | 4 | -6/+29 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Add index before going through builds in a migration | Grzegorz Bizon | 2018-02-20 | 1 | -0/+5 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Use a helper to schedule pipeline stages migration | Grzegorz Bizon | 2018-02-16 | 2 | -7/+6 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into backstage/gb/build-stages-catch-up-migration | Grzegorz Bizon | 2018-02-16 | 103 | -668/+1218 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (38 commits) | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into 'backstage/gb/build-stages-catch-up-migration' | Grzegorz Bizon | 2018-02-15 | 342 | -14015/+20374 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: db/schema.rb | ||||
| | * | | | | | | | | | | | | | Recover from unique constraint violation in stages migration | Grzegorz Bizon | 2018-02-15 | 3 | -10/+21 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Migrate pipeline stages in batches instead of single row | Grzegorz Bizon | 2018-02-14 | 2 | -64/+32 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Schedule pipeline stages migration every 5 minutes | Grzegorz Bizon | 2018-02-13 | 2 | -15/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | * | | | | | | | | | | | | | Move pipeline stages background migration in time | Grzegorz Bizon | 2018-02-12 | 3 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge branch 'master' into backstage/gb/build-stages-catch-up-migration | Grzegorz Bizon | 2018-02-12 | 87 | -770/+1354 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (26 commits) | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into backstage/gb/build-stages-catch-up-migration | Grzegorz Bizon | 2018-02-09 | 2776 | -34184/+66618 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (1480 commits) Conflicts: db/schema.rb | ||||
| | * | | | | | | | | | | | | | | | Fix rubocop offense in build stage migration classes | Grzegorz Bizon | 2018-01-06 | 2 | -5/+3 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Randomize build ids in stages migration test data | Grzegorz Bizon | 2018-01-06 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |