summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rc/reduce-delta-with-ce-in-controllers-ce' into 'master'Douwe Maan2018-02-273-9/+15
|\
| * Improve Member servicesrc/reduce-delta-with-ce-in-controllers-ceRémy Coutable2018-02-273-9/+7
| * Remove explicit audit event log in MembershipActionsRémy Coutable2018-02-273-10/+18
* | Fix a "can't modify frozen Hash" error in lib/api/services.rb in development envRémy Coutable2018-02-271-8/+11
* | Merge branch '40502-osw-keep-link-when-redacting-unauthorized-objects' into '...Douwe Maan2018-02-272-10/+30
|\ \ | |/ |/|
| * Keep link when redacting unauthorized object linksOswaldo Ferreira2018-02-272-10/+30
* | Merge branch '43620-lib-api-services-rb-retains-a-lot-of-memory-and-objects' ...Sean McGivern2018-02-271-42/+42
|\ \
| * | 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
* | | Merge branch 'backstage/gb/build-stages-catch-up-migration' into 'master'Kamil Trzciński2018-02-271-0/+48
|\ \ \
| * \ \ Merge commit '981b5905a02ac89ca9f33ad7c91d8c1a576ed9af' into backstage/gb/bui...backstage/gb/build-stages-catch-up-migrationGrzegorz Bizon2018-02-2315-11/+303
| |\ \ \
| * \ \ \ Merge branch 'master' into 'backstage/gb/build-stages-catch-up-migration'Grzegorz Bizon2018-02-2225-191/+446
| |\ \ \ \
| * | | | | Use a helper to schedule pipeline stages migrationGrzegorz Bizon2018-02-161-2/+0
| * | | | | Merge branch 'master' into backstage/gb/build-stages-catch-up-migrationGrzegorz Bizon2018-02-167-10/+21
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into 'backstage/gb/build-stages-catch-up-migration'Grzegorz Bizon2018-02-1522-102/+181
| |\ \ \ \ \ \
| * | | | | | | Recover from unique constraint violation in stages migrationGrzegorz Bizon2018-02-151-9/+9
| * | | | | | | Migrate pipeline stages in batches instead of single rowGrzegorz Bizon2018-02-141-54/+30
| * | | | | | | Merge branch 'master' into backstage/gb/build-stages-catch-up-migrationGrzegorz Bizon2018-02-126-22/+32
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into backstage/gb/build-stages-catch-up-migrationGrzegorz Bizon2018-02-09270-1541/+4482
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix rubocop offense in build stage migration classesGrzegorz Bizon2018-01-061-1/+1
| * | | | | | | | | Do not attempt to migrate legacy pipeline stagesGrzegorz Bizon2018-01-061-12/+21
| * | | | | | | | | Fix Rubocop offenses in build status migrations :cop:Grzegorz Bizon2018-01-061-3/+1
| * | | | | | | | | Migrate a build stage completely in a background migrationGrzegorz Bizon2018-01-061-0/+67
* | | | | | | | | | Merge branch 'slash-commands-changes-for-chatops' into 'master'Kamil Trzciński2018-02-272-5/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Expose ChatName objects to slash commandsslash-commands-changes-for-chatopsYorick Peterse2018-02-232-5/+7
* | | | | | | | | | Merge branch 'feature/migrate-recursive-tree-entries-fetching' into 'master'Robert Speicher2018-02-262-6/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Migrate recursive tree entries fetching to GitalyAhmad Sherif2018-02-262-6/+22
* | | | | | | | | | | Merge branch 'suppress-squash-warnings' into 'master'Douwe Maan2018-02-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Suppress whitespace warnings in squash error messagessuppress-squash-warningsSean McGivern2018-02-261-1/+1
* | | | | | | | | | | Merge branch 'dm-waitable-worker' into 'master'Sean McGivern2018-02-261-1/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Extract WaitableWorker out of AuthorizedProjectsWorkerDouwe Maan2018-02-261-1/+7
* | | | | | | | | | | | Merge branch 'mk/fix-error-code-for-repo-does-not-exist' into 'master'Douwe Maan2018-02-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Respond 404 when repo does not existmk/fix-error-code-for-repo-does-not-existMichael Kozono2018-02-241-1/+1
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failedJacob Vosmaer (GitLab)2018-02-263-67/+156
|/ / / / / / / / / / /
* | | | | | | | | | | Backport custom metrics ce componentsPaweł Chojnacki2018-02-236-21/+31
* | | | | | | | | | | Merge branch 'master' into '29497-pages-custom-domain-dns-verification'Robert Speicher2018-02-235-19/+27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Resolve "Milestone Quick Action not displayed with no project milestones but ...🙈 jacopo beschi 🙉2018-02-233-17/+13
| | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'users-autocomplete' into 'master'Douwe Maan2018-02-232-2/+14
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Added changelog for user search improvementsusers-autocompleteYorick Peterse2018-02-221-4/+2
| | * | | | | | | | | Optimise searching for users using short queriesYorick Peterse2018-02-222-2/+16
| | |/ / / / / / / /
* | | | | | | | | | Add DNS verification to Pages custom domainsNick Thomas2018-02-231-0/+8
|/ / / / / / / / /
* | | | | | | | | Allow token authentication on go-get requestDouwe Maan2018-02-232-1/+17
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge branch 'bvl-external-auth-port' into 'master'Douwe Maan2018-02-2313-9/+287
|\ \ \ \ \ \ \ \
| * | | | | | | | Use `Redactor` to hide cross project informationbvl-external-auth-portBob Van Landuyt2018-02-223-42/+20
| * | | | | | | | Port `read_cross_project` ability from EEBob Van Landuyt2018-02-2214-8/+308
| |/ / / / / / /
* | | | | | | | Modify cluster creation API method to enable legacy_apac as defaultMayra Cabrera2018-02-221-1/+5
|/ / / / / / /
* | | | | | | Merge branch '42332-actionview-template-error-366-524-out-of-range' into 'mas...Douwe Maan2018-02-221-1/+11
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fix 500 error when diff context line has broken encoding42332-actionview-template-error-366-524-out-of-rangeSean McGivern2018-02-221-1/+11
* | | | | | | Merge branch 'fix-squash-with-renamed-files' into 'master'Grzegorz Bizon2018-02-221-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix squash with renamed filesfix-squash-with-renamed-filesSean McGivern2018-02-191-1/+1
* | | | | | | | Merge branch 'zj-branch-contains-git-message' into 'master'Douwe Maan2018-02-221-10/+16
|\ \ \ \ \ \ \ \