summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 'remove-snippets-bundle'remove-snippets-bundleClement Ho2018-02-27230-1070/+1420
|\ | | | | | | # Conflicts: # config/webpack.config.js
| * Merge branch 'remove-sidebar-bundle' into 'master'Jacob Schatz2018-02-277-8/+12
| |\ | | | | | | | | | | | | Remove sidebar bundle webpack entry point See merge request gitlab-org/gitlab-ce!17343
| | * Merge branch 'master' into remove-sidebar-bundleremove-sidebar-bundleClement Ho2018-02-237-9/+15
| | |\
| | * | Remove sidebar bundle webpack entry pointClement Ho2018-02-237-8/+12
| | | |
| * | | Merge branch 'rc/reduce-delta-with-ce-in-controllers-ce' into 'master'Douwe Maan2018-02-2727-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-ceRémy Coutable2018-02-2724-326/+251
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | Move the #update action from Project/Member controllers to the ↵Rémy Coutable2018-02-277-24/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MembershipActions concern Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | Remove explicit audit event log in MembershipActionsRémy Coutable2018-02-2719-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 Speicher2018-02-271-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 envRémy Coutable2018-02-271-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Merge branch 'fix-webpack-dynamic-entries' into 'master'Clement Ho2018-02-273-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 branchesMike Greiling2018-02-273-30/+57
| |/ / / / /
| * | | | | Merge branch '24774-clear-the-Labels-dropdown-search-filter' into 'master'Phil Hughes2018-02-273-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-filterKushal Pandya2018-02-271-0/+12
| | | | | |
| | * | | | Add changelog entryKushal Pandya2018-02-271-0/+5
| | | | | |
| | * | | | Clear "Labels" dropdown search filter after selectionKushal Pandya2018-02-271-0/+6
| | | | | |
| * | | | | Merge branch '40502-osw-keep-link-when-redacting-unauthorized-objects' into ↵Douwe Maan2018-02-274-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 linksOswaldo Ferreira2018-02-274-10/+45
| | | | | |
| * | | | | Merge branch '43620-lib-api-services-rb-retains-a-lot-of-memory-and-objects' ↵Sean McGivern2018-02-271-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-objectsRémy Coutable2018-02-261-42/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Merge branch '43304-simplify-filtering-non-human-users' into 'master'Yorick Peterse2018-02-271-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-usersAndreas Brandl2018-02-261-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 Zaporozhets2018-02-272-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-codeclimateFilipa Lacerda2018-02-271-1/+1
| | | | | | | | |
| | * | | | | | | Enables eslint in codeclimate jobFilipa Lacerda2018-02-272-2/+7
| | | | | | | | |
| * | | | | | | | Merge branch 'backstage/gb/build-stages-catch-up-migration' into 'master'Kamil Trzciński2018-02-277-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-migrationGrzegorz Bizon2018-02-23242-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 Bizon2018-02-22654-8676/+7402
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| | * | | | | | | | | | Add changelog entry for pipeline stages migrationGrzegorz Bizon2018-02-211-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | | | | | | Create index on id instead of stage_id in migrationGrzegorz Bizon2018-02-212-6/+6
| | | | | | | | | | | |
| | * | | | | | | | | | Separate adding and removing index from stages migrationGrzegorz Bizon2018-02-204-6/+29
| | | | | | | | | | | |
| | * | | | | | | | | | Add index before going through builds in a migrationGrzegorz Bizon2018-02-201-0/+5
| | | | | | | | | | | |
| | * | | | | | | | | | Use a helper to schedule pipeline stages migrationGrzegorz Bizon2018-02-162-7/+6
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' into backstage/gb/build-stages-catch-up-migrationGrzegorz Bizon2018-02-16103-668/+1218
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (38 commits)
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'backstage/gb/build-stages-catch-up-migration'Grzegorz Bizon2018-02-15342-14015/+20374
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: db/schema.rb
| | * | | | | | | | | | | | Recover from unique constraint violation in stages migrationGrzegorz Bizon2018-02-153-10/+21
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Migrate pipeline stages in batches instead of single rowGrzegorz Bizon2018-02-142-64/+32
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Schedule pipeline stages migration every 5 minutesGrzegorz Bizon2018-02-132-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | | | | | | | | Move pipeline stages background migration in timeGrzegorz Bizon2018-02-123-2/+2
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' into backstage/gb/build-stages-catch-up-migrationGrzegorz Bizon2018-02-1287-770/+1354
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (26 commits)
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into backstage/gb/build-stages-catch-up-migrationGrzegorz Bizon2018-02-092776-34184/+66618
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (1480 commits) Conflicts: db/schema.rb
| | * | | | | | | | | | | | | | Fix rubocop offense in build stage migration classesGrzegorz Bizon2018-01-062-5/+3
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Randomize build ids in stages migration test dataGrzegorz Bizon2018-01-061-7/+7
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Do not attempt to migrate legacy pipeline stagesGrzegorz Bizon2018-01-062-13/+25
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Reduce batch size of stages we schedule for a migrationGrzegorz Bizon2018-01-061-1/+1
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Update specs for delayed background migration of stagesGrzegorz Bizon2018-01-061-4/+4
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Update background stages migration timestampGrzegorz Bizon2018-01-064-4/+4
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix Rubocop offenses in build status migrations :cop:Grzegorz Bizon2018-01-062-4/+2
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Migrate a build stage completely in a background migrationGrzegorz Bizon2018-01-062-0/+115
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Schedule full build stage migration in the backgroundGrzegorz Bizon2018-01-062-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For builds that are still missing `stage_id`.
View Lorry Controller Status